From xen-changelog-bounces@lists.xen.org Mon Mar 02 06:01:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 06:01:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJPY-0007BN-G9; Mon, 02 Mar 2015 06:01:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJPX-0007BI-MA for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:00:59 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id E3/97-02884-A9CF3F45; Mon, 02 Mar 2015 06:00:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1425276057!12095041!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8009 invoked from network); 2 Mar 2015 06:00:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 2 Mar 2015 06:00:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJPV-0007CD-15 for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:00:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSJOe-0002fE-4G for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:00:56 +0000 Date: Mon, 02 Mar 2015 06:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xen/arm: vgic-v2: Don't crash the hypervisor if the SGI target mode is invalid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e753b62a178afbd48a23dc4cb451c59bb0caf34 Author: Julien Grall AuthorDate: Fri Jan 23 14:15:07 2015 +0000 Commit: Ian Campbell CommitDate: Wed Feb 18 10:28:14 2015 +0000 xen/arm: vgic-v2: Don't crash the hypervisor if the SGI target mode is invalid The GICv2 spec reserved the value 0b11 for GICD_SGIR.TargetListFilter. Even if it's an invalid value, a malicious guest could write this value and threfore crash the hypervisor. Replace the BUG() by logging the error and inject a data abort to the guest. This was introduced by commit ea37fd21110b6fbcf9257f814076a243d3873cb7 "xen/arm: split vgic driver into generic and vgic-v2 driver". This is CVE-2015-0268 / XSA-117. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 477f05a..eb4c90b 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -255,7 +255,10 @@ static int vgic_v2_to_sgi(struct vcpu *v, register_t sgir) sgi_mode = SGI_TARGET_SELF; break; default: - BUG(); + printk(XENLOG_G_DEBUG + "%pv: vGICD: unhandled GICD_SGIR write %"PRIregister" with wrong mode\n", + v, sgir); + return 0; } return vgic_to_sgi(v, sgir, sgi_mode, virq, vcpu_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 Mon Mar 02 06:01:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 06:01:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJPY-0007BN-G9; Mon, 02 Mar 2015 06:01:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJPX-0007BI-MA for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:00:59 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id E3/97-02884-A9CF3F45; Mon, 02 Mar 2015 06:00:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1425276057!12095041!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8009 invoked from network); 2 Mar 2015 06:00:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 2 Mar 2015 06:00:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJPV-0007CD-15 for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:00:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSJOe-0002fE-4G for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:00:56 +0000 Date: Mon, 02 Mar 2015 06:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xen/arm: vgic-v2: Don't crash the hypervisor if the SGI target mode is invalid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e753b62a178afbd48a23dc4cb451c59bb0caf34 Author: Julien Grall AuthorDate: Fri Jan 23 14:15:07 2015 +0000 Commit: Ian Campbell CommitDate: Wed Feb 18 10:28:14 2015 +0000 xen/arm: vgic-v2: Don't crash the hypervisor if the SGI target mode is invalid The GICv2 spec reserved the value 0b11 for GICD_SGIR.TargetListFilter. Even if it's an invalid value, a malicious guest could write this value and threfore crash the hypervisor. Replace the BUG() by logging the error and inject a data abort to the guest. This was introduced by commit ea37fd21110b6fbcf9257f814076a243d3873cb7 "xen/arm: split vgic driver into generic and vgic-v2 driver". This is CVE-2015-0268 / XSA-117. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 477f05a..eb4c90b 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -255,7 +255,10 @@ static int vgic_v2_to_sgi(struct vcpu *v, register_t sgir) sgi_mode = SGI_TARGET_SELF; break; default: - BUG(); + printk(XENLOG_G_DEBUG + "%pv: vGICD: unhandled GICD_SGIR write %"PRIregister" with wrong mode\n", + v, sgir); + return 0; } return vgic_to_sgi(v, sgir, sgi_mode, virq, vcpu_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 Mon Mar 02 06:01:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 06:01: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 1YSJPj-0007Ot-Ih; Mon, 02 Mar 2015 06:01:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJPi-0007Lv-Ch for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:10 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 30/C1-03511-5ACF3F45; Mon, 02 Mar 2015 06:01:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1425276068!12214110!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3569 invoked from network); 2 Mar 2015 06:01:09 -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; 2 Mar 2015 06:01:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJPf-0007Ci-Nh for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSJPf-0002iZ-4u for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:07 +0000 Date: Mon, 02 Mar 2015 06:01:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/VPMU: disable when NMI watchdog is on X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d976397ffd3c9a16c29a3df3b9b0cdf9065938e1 Author: Boris Ostrovsky AuthorDate: Wed Feb 18 16:38:19 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 16:38:19 2015 +0100 x86/VPMU: disable when NMI watchdog is on NMI watchdog sets APIC_LVTPC register to generate an NMI when PMU counter overflow occurs. This may be overwritten by VPMU code later, effectively turning off the watchdog. We should disable VPMU when NMI watchdog is running. Signed-off-by: Boris Ostrovsky Reviewed-by: Andrew Cooper master commit: e5e09b5c46444b0ab8450c6d6ee8316d4016ac18 master date: 2015-02-03 11:30:09 +0100 --- docs/misc/xen-command-line.markdown | 2 ++ xen/arch/x86/hvm/vpmu.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 53070c0..0042e0f 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1330,6 +1330,8 @@ wrong behaviour (see handle\_pmc\_quirk()). If 'vpmu=bts' is specified the virtualisation of the Branch Trace Store (BTS) feature is switched on on Intel processors supporting this feature. +Note that if **watchdog** option is also specified vpmu will be turned off. + *Warning:* As the BTS virtualisation is not 100% safe and because of the nehalem quirk don't use the vpmu flag on production systems with Intel cpus! diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/hvm/vpmu.c index 37f0d9f..654b8b5 100644 --- a/xen/arch/x86/hvm/vpmu.c +++ b/xen/arch/x86/hvm/vpmu.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -284,3 +285,15 @@ void vpmu_dump(struct vcpu *v) vpmu->arch_vpmu_ops->arch_vpmu_dump(v); } +static int __init vpmu_init(void) +{ + /* NMI watchdog uses LVTPC and HW counter */ + if ( opt_watchdog && opt_vpmu_enabled ) + { + printk(XENLOG_WARNING "NMI watchdog is enabled. Turning VPMU off.\n"); + opt_vpmu_enabled = 0; + } + + return 0; +} +__initcall(vpmu_init); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 02 06:01:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 06:01: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 1YSJPj-0007Ot-Ih; Mon, 02 Mar 2015 06:01:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJPi-0007Lv-Ch for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:10 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 30/C1-03511-5ACF3F45; Mon, 02 Mar 2015 06:01:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1425276068!12214110!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3569 invoked from network); 2 Mar 2015 06:01:09 -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; 2 Mar 2015 06:01:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJPf-0007Ci-Nh for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSJPf-0002iZ-4u for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:07 +0000 Date: Mon, 02 Mar 2015 06:01:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/VPMU: disable when NMI watchdog is on X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d976397ffd3c9a16c29a3df3b9b0cdf9065938e1 Author: Boris Ostrovsky AuthorDate: Wed Feb 18 16:38:19 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 16:38:19 2015 +0100 x86/VPMU: disable when NMI watchdog is on NMI watchdog sets APIC_LVTPC register to generate an NMI when PMU counter overflow occurs. This may be overwritten by VPMU code later, effectively turning off the watchdog. We should disable VPMU when NMI watchdog is running. Signed-off-by: Boris Ostrovsky Reviewed-by: Andrew Cooper master commit: e5e09b5c46444b0ab8450c6d6ee8316d4016ac18 master date: 2015-02-03 11:30:09 +0100 --- docs/misc/xen-command-line.markdown | 2 ++ xen/arch/x86/hvm/vpmu.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 53070c0..0042e0f 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1330,6 +1330,8 @@ wrong behaviour (see handle\_pmc\_quirk()). If 'vpmu=bts' is specified the virtualisation of the Branch Trace Store (BTS) feature is switched on on Intel processors supporting this feature. +Note that if **watchdog** option is also specified vpmu will be turned off. + *Warning:* As the BTS virtualisation is not 100% safe and because of the nehalem quirk don't use the vpmu flag on production systems with Intel cpus! diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/hvm/vpmu.c index 37f0d9f..654b8b5 100644 --- a/xen/arch/x86/hvm/vpmu.c +++ b/xen/arch/x86/hvm/vpmu.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -284,3 +285,15 @@ void vpmu_dump(struct vcpu *v) vpmu->arch_vpmu_ops->arch_vpmu_dump(v); } +static int __init vpmu_init(void) +{ + /* NMI watchdog uses LVTPC and HW counter */ + if ( opt_watchdog && opt_vpmu_enabled ) + { + printk(XENLOG_WARNING "NMI watchdog is enabled. Turning VPMU off.\n"); + opt_vpmu_enabled = 0; + } + + return 0; +} +__initcall(vpmu_init); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 02 06:01:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 06:01: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 1YSJPt-0007iF-La; Mon, 02 Mar 2015 06:01:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJPs-0007fD-Rd for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:20 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 25/F4-10964-0BCF3F45; Mon, 02 Mar 2015 06:01:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1425276078!13809718!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14484 invoked from network); 2 Mar 2015 06:01:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 2 Mar 2015 06:01:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJPq-0007Cr-5Z for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSJPp-0002k0-SE for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:17 +0000 Date: Mon, 02 Mar 2015 06:01:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/hvm: wait for at least one ioreq server to be 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 2bfef90c47de6ff89c01cafe3e0c413ee223700b Author: Paul Durrant AuthorDate: Wed Feb 18 16:39:46 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 16:39:46 2015 +0100 x86/hvm: wait for at least one ioreq server to be enabled In the case where a stub domain is providing emulation for an HVM guest, there is no interlock in the toolstack to make sure that the stub domain is up and running before the guest is unpaused. Prior to the introduction of ioreq servers this was not a problem, since there was only ever one emulator so ioreqs were simply created anyway and the vcpu remained blocked until the stub domain started and picked up the ioreq. Since ioreq servers allow for multiple emulators for a single guest it's not possible to know a priori which emulator will handle a particular ioreq, so emulators must attach to a guest before the guest runs. This patch works around the lack of interlock in the toolstack for stub domains by keeping the domain paused until at least one ioreq server is created and enabled, which in practice means the stub domain is indeed up and running. Signed-off-by: Paul Durrant master commit: dd748d128d86996592afafea02e578cc7d4e6d42 master date: 2015-02-10 13:28:40 +0100 --- xen/arch/x86/hvm/hvm.c | 21 +++++++++++++++++++++ xen/include/asm-x86/hvm/domain.h | 1 + 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 72be5b9..5bf8c3d 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -874,6 +874,13 @@ static void hvm_ioreq_server_enable(struct hvm_ioreq_server *s, done: spin_unlock(&s->lock); + + /* This check is protected by the domain ioreq server lock. */ + if ( d->arch.hvm_domain.ioreq_server.waiting ) + { + d->arch.hvm_domain.ioreq_server.waiting = 0; + domain_unpause(d); + } } static void hvm_ioreq_server_disable(struct hvm_ioreq_server *s, @@ -1424,6 +1431,20 @@ int hvm_domain_initialise(struct domain *d) spin_lock_init(&d->arch.hvm_domain.ioreq_server.lock); INIT_LIST_HEAD(&d->arch.hvm_domain.ioreq_server.list); + + /* + * In the case where a stub domain is providing emulation for + * the guest, there is no interlock in the toolstack to prevent + * the guest from running before the stub domain is ready. + * Hence the domain must remain paused until at least one ioreq + * server is created and enabled. + */ + if ( !is_pvh_domain(d) ) + { + domain_pause(d); + d->arch.hvm_domain.ioreq_server.waiting = 1; + } + spin_lock_init(&d->arch.hvm_domain.irq_lock); spin_lock_init(&d->arch.hvm_domain.uc_lock); diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index 2757c7f..0702bf5 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -83,6 +83,7 @@ struct hvm_domain { struct { spinlock_t lock; ioservid_t id; + bool_t waiting; struct list_head list; } ioreq_server; struct hvm_ioreq_server *default_ioreq_server; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 02 06:01:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 06:01: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 1YSJPt-0007iF-La; Mon, 02 Mar 2015 06:01:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJPs-0007fD-Rd for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:20 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 25/F4-10964-0BCF3F45; Mon, 02 Mar 2015 06:01:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1425276078!13809718!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14484 invoked from network); 2 Mar 2015 06:01:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 2 Mar 2015 06:01:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJPq-0007Cr-5Z for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSJPp-0002k0-SE for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:17 +0000 Date: Mon, 02 Mar 2015 06:01:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/hvm: wait for at least one ioreq server to be 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 2bfef90c47de6ff89c01cafe3e0c413ee223700b Author: Paul Durrant AuthorDate: Wed Feb 18 16:39:46 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 16:39:46 2015 +0100 x86/hvm: wait for at least one ioreq server to be enabled In the case where a stub domain is providing emulation for an HVM guest, there is no interlock in the toolstack to make sure that the stub domain is up and running before the guest is unpaused. Prior to the introduction of ioreq servers this was not a problem, since there was only ever one emulator so ioreqs were simply created anyway and the vcpu remained blocked until the stub domain started and picked up the ioreq. Since ioreq servers allow for multiple emulators for a single guest it's not possible to know a priori which emulator will handle a particular ioreq, so emulators must attach to a guest before the guest runs. This patch works around the lack of interlock in the toolstack for stub domains by keeping the domain paused until at least one ioreq server is created and enabled, which in practice means the stub domain is indeed up and running. Signed-off-by: Paul Durrant master commit: dd748d128d86996592afafea02e578cc7d4e6d42 master date: 2015-02-10 13:28:40 +0100 --- xen/arch/x86/hvm/hvm.c | 21 +++++++++++++++++++++ xen/include/asm-x86/hvm/domain.h | 1 + 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 72be5b9..5bf8c3d 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -874,6 +874,13 @@ static void hvm_ioreq_server_enable(struct hvm_ioreq_server *s, done: spin_unlock(&s->lock); + + /* This check is protected by the domain ioreq server lock. */ + if ( d->arch.hvm_domain.ioreq_server.waiting ) + { + d->arch.hvm_domain.ioreq_server.waiting = 0; + domain_unpause(d); + } } static void hvm_ioreq_server_disable(struct hvm_ioreq_server *s, @@ -1424,6 +1431,20 @@ int hvm_domain_initialise(struct domain *d) spin_lock_init(&d->arch.hvm_domain.ioreq_server.lock); INIT_LIST_HEAD(&d->arch.hvm_domain.ioreq_server.list); + + /* + * In the case where a stub domain is providing emulation for + * the guest, there is no interlock in the toolstack to prevent + * the guest from running before the stub domain is ready. + * Hence the domain must remain paused until at least one ioreq + * server is created and enabled. + */ + if ( !is_pvh_domain(d) ) + { + domain_pause(d); + d->arch.hvm_domain.ioreq_server.waiting = 1; + } + spin_lock_init(&d->arch.hvm_domain.irq_lock); spin_lock_init(&d->arch.hvm_domain.uc_lock); diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index 2757c7f..0702bf5 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -83,6 +83,7 @@ struct hvm_domain { struct { spinlock_t lock; ioservid_t id; + bool_t waiting; struct list_head list; } ioreq_server; struct hvm_ioreq_server *default_ioreq_server; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 02 06:01:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 06:01: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 1YSJQ3-0007rE-OA; Mon, 02 Mar 2015 06:01:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJQ3-0007r1-3Y for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:31 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id C8/53-02750-ABCF3F45; Mon, 02 Mar 2015 06:01:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1425276088!13789819!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11162 invoked from network); 2 Mar 2015 06:01:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 2 Mar 2015 06:01:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJQ0-0007Cz-HE for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSJQ0-0002mp-8H for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:28 +0000 Date: Mon, 02 Mar 2015 06:01:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/hvm: explicitly mark ioreq server pages dirty X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e44c921c6adc0400ac71fb86667618ec407ba45 Author: Paul Durrant AuthorDate: Wed Feb 18 16:40:30 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 16:40:30 2015 +0100 x86/hvm: explicitly mark ioreq server pages dirty ...when they are added back into the guest physmap, when an ioreq server is disabled. If this is not done then the pages are missed during migration, causing ioreq server creation to fail on the remote end. This problem only manifests if the ioreq server is non-default because in the default case the pages are never removed from the guest physmap. Signed-off-by: Paul Durrant master commit: 70f691130081324a8efb97b23c504d8abc5421db master date: 2015-02-10 13:29:51 +0100 --- xen/arch/x86/hvm/hvm.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 5bf8c3d..55077f9 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -532,9 +532,16 @@ static void hvm_remove_ioreq_gmfn( static int hvm_add_ioreq_gmfn( struct domain *d, struct hvm_ioreq_page *iorp) { + int rc; + clear_page(iorp->va); - return guest_physmap_add_page(d, iorp->gmfn, - page_to_mfn(iorp->page), 0); + + rc = guest_physmap_add_page(d, iorp->gmfn, + page_to_mfn(iorp->page), 0); + if ( rc == 0 ) + paging_mark_dirty(d, page_to_mfn(iorp->page)); + + return rc; } static int hvm_print_line( -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 02 06:01:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 06:01: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 1YSJQ3-0007rE-OA; Mon, 02 Mar 2015 06:01:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJQ3-0007r1-3Y for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:31 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id C8/53-02750-ABCF3F45; Mon, 02 Mar 2015 06:01:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1425276088!13789819!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11162 invoked from network); 2 Mar 2015 06:01:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 2 Mar 2015 06:01:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJQ0-0007Cz-HE for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSJQ0-0002mp-8H for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:28 +0000 Date: Mon, 02 Mar 2015 06:01:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/hvm: explicitly mark ioreq server pages dirty X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e44c921c6adc0400ac71fb86667618ec407ba45 Author: Paul Durrant AuthorDate: Wed Feb 18 16:40:30 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 16:40:30 2015 +0100 x86/hvm: explicitly mark ioreq server pages dirty ...when they are added back into the guest physmap, when an ioreq server is disabled. If this is not done then the pages are missed during migration, causing ioreq server creation to fail on the remote end. This problem only manifests if the ioreq server is non-default because in the default case the pages are never removed from the guest physmap. Signed-off-by: Paul Durrant master commit: 70f691130081324a8efb97b23c504d8abc5421db master date: 2015-02-10 13:29:51 +0100 --- xen/arch/x86/hvm/hvm.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 5bf8c3d..55077f9 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -532,9 +532,16 @@ static void hvm_remove_ioreq_gmfn( static int hvm_add_ioreq_gmfn( struct domain *d, struct hvm_ioreq_page *iorp) { + int rc; + clear_page(iorp->va); - return guest_physmap_add_page(d, iorp->gmfn, - page_to_mfn(iorp->page), 0); + + rc = guest_physmap_add_page(d, iorp->gmfn, + page_to_mfn(iorp->page), 0); + if ( rc == 0 ) + paging_mark_dirty(d, page_to_mfn(iorp->page)); + + return rc; } static int hvm_print_line( -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 02 06:01:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 06:01: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 1YSJQE-0007sw-0N; Mon, 02 Mar 2015 06:01:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJQD-0007so-6m for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:41 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 20/DC-03132-4CCF3F45; Mon, 02 Mar 2015 06:01:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1425276098!6784101!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2541 invoked from network); 2 Mar 2015 06:01:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 2 Mar 2015 06:01:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJQA-0007D8-MB for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSJQA-0002oA-KL for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:38 +0000 Date: Mon, 02 Mar 2015 06:01:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/traps: export the exception_table[] function pointer table to 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 ad6b254f10559c68c4882ab1bb3fe6259240981c Author: Andrew Cooper AuthorDate: Wed Feb 18 16:41:20 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 16:41:20 2015 +0100 x86/traps: export the exception_table[] function pointer table to C and use it in preference to the direct call to do_nmi() in vmx.c The value 'TRAP_last_reserved' was only used where 'TRAP_nr' would be more appropriate, so is replaced. No functional change Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: d3eb16b8a7c06f0d2a2110948a8477a62b541bbf master date: 2015-02-11 17:16:18 +0100 --- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/x86_64/entry.S | 5 +++-- xen/include/asm-x86/processor.h | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f2554d6..f40f89d 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2686,7 +2686,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) && ((intr_info & INTR_INFO_INTR_TYPE_MASK) == (X86_EVENTTYPE_NMI << 8)) ) { - do_nmi(regs); + exception_table[TRAP_nmi](regs); enable_nmis(); } break; diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index b3d6e32..062c690 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -728,9 +728,10 @@ ENTRY(exception_table) .quad do_alignment_check .quad do_machine_check .quad do_simd_coprocessor_error - .rept TRAP_last_reserved + 1 - ((. - exception_table) / 8) + .rept TRAP_nr - ((. - exception_table) / 8) .quad do_reserved_trap /* Architecturally reserved exceptions. */ .endr + .size exception_table, . - exception_table ENTRY(hypercall_table) .quad do_set_trap_table /* 0 */ @@ -857,7 +858,7 @@ autogen_stubs: /* Automatically generated stubs. */ entrypoint 1b /* Reserved exceptions, heading towards do_reserved_trap(). */ - .elseif vec == TRAP_copro_seg || vec == TRAP_spurious_int || (vec > TRAP_simd_error && vec <= TRAP_last_reserved) + .elseif vec == TRAP_copro_seg || vec == TRAP_spurious_int || (vec > TRAP_simd_error && vec < TRAP_nr) 1: test $8,%spl /* 64bit exception frames are 16 byte aligned, but the word */ jz 2f /* size is 8 bytes. Check whether the processor gave us an */ diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index f98eaf5..b86f600 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -114,7 +114,7 @@ #define TRAP_machine_check 18 #define TRAP_simd_error 19 #define TRAP_virtualisation 20 -#define TRAP_last_reserved 31 +#define TRAP_nr 32 /* Set for entry via SYSCALL. Informs return code to use SYSRETQ not IRETQ. */ /* NB. Same as VGCF_in_syscall. No bits in common with any other TRAP_ defn. */ @@ -492,6 +492,9 @@ extern void mtrr_bp_init(void); void mcheck_init(struct cpuinfo_x86 *c, bool_t bsp); +/* Dispatch table for exceptions */ +extern void (* const exception_table[TRAP_nr])(struct cpu_user_regs *regs); + #define DECLARE_TRAP_HANDLER(_name) \ void _name(void); \ void do_ ## _name(struct cpu_user_regs *regs) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 02 06:01:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 06:01: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 1YSJQE-0007sw-0N; Mon, 02 Mar 2015 06:01:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJQD-0007so-6m for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:41 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 20/DC-03132-4CCF3F45; Mon, 02 Mar 2015 06:01:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1425276098!6784101!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2541 invoked from network); 2 Mar 2015 06:01:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 2 Mar 2015 06:01:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJQA-0007D8-MB for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSJQA-0002oA-KL for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:38 +0000 Date: Mon, 02 Mar 2015 06:01:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/traps: export the exception_table[] function pointer table to 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 ad6b254f10559c68c4882ab1bb3fe6259240981c Author: Andrew Cooper AuthorDate: Wed Feb 18 16:41:20 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 16:41:20 2015 +0100 x86/traps: export the exception_table[] function pointer table to C and use it in preference to the direct call to do_nmi() in vmx.c The value 'TRAP_last_reserved' was only used where 'TRAP_nr' would be more appropriate, so is replaced. No functional change Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: d3eb16b8a7c06f0d2a2110948a8477a62b541bbf master date: 2015-02-11 17:16:18 +0100 --- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/x86_64/entry.S | 5 +++-- xen/include/asm-x86/processor.h | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f2554d6..f40f89d 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2686,7 +2686,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) && ((intr_info & INTR_INFO_INTR_TYPE_MASK) == (X86_EVENTTYPE_NMI << 8)) ) { - do_nmi(regs); + exception_table[TRAP_nmi](regs); enable_nmis(); } break; diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index b3d6e32..062c690 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -728,9 +728,10 @@ ENTRY(exception_table) .quad do_alignment_check .quad do_machine_check .quad do_simd_coprocessor_error - .rept TRAP_last_reserved + 1 - ((. - exception_table) / 8) + .rept TRAP_nr - ((. - exception_table) / 8) .quad do_reserved_trap /* Architecturally reserved exceptions. */ .endr + .size exception_table, . - exception_table ENTRY(hypercall_table) .quad do_set_trap_table /* 0 */ @@ -857,7 +858,7 @@ autogen_stubs: /* Automatically generated stubs. */ entrypoint 1b /* Reserved exceptions, heading towards do_reserved_trap(). */ - .elseif vec == TRAP_copro_seg || vec == TRAP_spurious_int || (vec > TRAP_simd_error && vec <= TRAP_last_reserved) + .elseif vec == TRAP_copro_seg || vec == TRAP_spurious_int || (vec > TRAP_simd_error && vec < TRAP_nr) 1: test $8,%spl /* 64bit exception frames are 16 byte aligned, but the word */ jz 2f /* size is 8 bytes. Check whether the processor gave us an */ diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index f98eaf5..b86f600 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -114,7 +114,7 @@ #define TRAP_machine_check 18 #define TRAP_simd_error 19 #define TRAP_virtualisation 20 -#define TRAP_last_reserved 31 +#define TRAP_nr 32 /* Set for entry via SYSCALL. Informs return code to use SYSRETQ not IRETQ. */ /* NB. Same as VGCF_in_syscall. No bits in common with any other TRAP_ defn. */ @@ -492,6 +492,9 @@ extern void mtrr_bp_init(void); void mcheck_init(struct cpuinfo_x86 *c, bool_t bsp); +/* Dispatch table for exceptions */ +extern void (* const exception_table[TRAP_nr])(struct cpu_user_regs *regs); + #define DECLARE_TRAP_HANDLER(_name) \ void _name(void); \ void do_ ## _name(struct cpu_user_regs *regs) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 02 06:01:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 06:01: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 1YSJQP-0007uh-FE; Mon, 02 Mar 2015 06:01:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJQN-0007uP-IZ for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:51 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id D4/A7-02898-ECCF3F45; Mon, 02 Mar 2015 06:01:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1425276109!12119923!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26207 invoked from network); 2 Mar 2015 06:01:50 -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; 2 Mar 2015 06:01:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJQK-0007DE-Qk for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSJQK-0002oa-Oi for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:48 +0000 Date: Mon, 02 Mar 2015 06:01:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/nmi: fix shootdown of pcpus running in VMX non-root mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 75ac8cf17a6f7a4ef6dd598295e8d186c010b440 Author: Andrew Cooper AuthorDate: Wed Feb 18 16:42:11 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 16:42:11 2015 +0100 x86/nmi: fix shootdown of pcpus running in VMX non-root mode c/s 7dd3b06ff "vmx: fix handling of NMI VMEXIT" fixed one issue but inadvertently introduced a regression when it came to the NMI shootdown. The shootdown code worked by patching vector 2 in each IDT, but the introduced direct call to do_nmi() bypassed this. Instead of patching each IDT, take a different approach by updating the existing dispatch table. This allows for the removal of the remote IDT patching and the removal of the nmi_crash() entry point. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: cbeeaa7da01bfa37c1fcdfe79e8f4f1400262ccb master date: 2015-02-11 17:18:27 +0100 --- xen/arch/x86/crash.c | 59 ++++++++++++++++----------------------- xen/arch/x86/x86_64/entry.S | 9 ------ xen/include/asm-x86/processor.h | 1 - 3 files changed, 24 insertions(+), 45 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index c0b83df..eb7be9c 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -36,9 +36,11 @@ static unsigned int crashing_cpu; static DEFINE_PER_CPU_READ_MOSTLY(bool_t, crash_save_done); /* This becomes the NMI handler for non-crashing CPUs, when Xen is crashing. */ -void do_nmi_crash(struct cpu_user_regs *regs) +static void noreturn do_nmi_crash(const struct cpu_user_regs *regs) { - int cpu = smp_processor_id(); + unsigned int cpu = smp_processor_id(); + + stac(); /* nmi_shootdown_cpus() should ensure that this assertion is correct. */ ASSERT(cpu != crashing_cpu); @@ -113,11 +115,10 @@ void do_nmi_crash(struct cpu_user_regs *regs) halt(); } -void nmi_crash(void); static void nmi_shootdown_cpus(void) { unsigned long msecs; - int i, cpu = smp_processor_id(); + unsigned int cpu = smp_processor_id(); disable_lapic_nmi_watchdog(); local_irq_disable(); @@ -127,38 +128,26 @@ static void nmi_shootdown_cpus(void) cpumask_andnot(&waiting_to_crash, &cpu_online_map, cpumask_of(cpu)); - /* Change NMI trap handlers. Non-crashing pcpus get nmi_crash which - * invokes do_nmi_crash (above), which cause them to write state and - * fall into a loop. The crashing pcpu gets the nop handler to - * cause it to return to this function ASAP. + /* + * Disable IST for MCEs to avoid stack corruption race conditions, and + * change the NMI handler to a nop to avoid deviation from this codepath. */ - for ( i = 0; i < nr_cpu_ids; i++ ) - { - if ( idt_tables[i] == NULL ) - continue; - - if ( i == cpu ) - { - /* - * Disable the interrupt stack tables for this cpu's MCE and NMI - * handlers, and alter the NMI handler to have no operation. - * Disabling the stack tables prevents stack corruption race - * conditions, while changing the handler helps prevent cascading - * faults; we are certainly going to crash by this point. - * - * This update is safe from a security point of view, as this pcpu - * is never going to try to sysret back to a PV vcpu. - */ - _set_gate_lower(&idt_tables[i][TRAP_nmi], - SYS_DESC_irq_gate, 0, &trap_nop); - set_ist(&idt_tables[i][TRAP_machine_check], IST_NONE); - } - else - { - /* Do not update stack table for other pcpus. */ - _update_gate_addr_lower(&idt_tables[i][TRAP_nmi], &nmi_crash); - } - } + _set_gate_lower(&idt_tables[cpu][TRAP_nmi], + SYS_DESC_irq_gate, 0, &trap_nop); + set_ist(&idt_tables[cpu][TRAP_machine_check], IST_NONE); + + /* + * Ideally would be: + * exception_table[TRAP_nmi] = &do_nmi_crash; + * + * but the exception_table is read only. Borrow an unused fixmap entry + * to construct a writable mapping. + */ + set_fixmap(FIX_TBOOT_MAP_ADDRESS, __pa(&exception_table[TRAP_nmi])); + write_atomic((unsigned long *) + (fix_to_virt(FIX_TBOOT_MAP_ADDRESS) + + ((unsigned long)&exception_table[TRAP_nmi] & ~PAGE_MASK)), + (unsigned long)&do_nmi_crash); /* Ensure the new callback function is set before sending out the NMI. */ wmb(); diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 062c690..2d25d57 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -669,15 +669,6 @@ handle_ist_exception: je restore_all_guest jmp compat_restore_all_guest -ENTRY(nmi_crash) - pushq $0 - movl $TRAP_nmi,4(%rsp) - /* Set AC to reduce chance of further SMAP faults */ - SAVE_ALL STAC - movq %rsp,%rdi - callq do_nmi_crash /* Does not return */ - ud2 - ENTRY(machine_check) pushq $0 movl $TRAP_machine_check,4(%rsp) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index b86f600..b4e4731 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -527,7 +527,6 @@ DECLARE_TRAP_HANDLER(alignment_check); void trap_nop(void); void enable_nmis(void); -void noreturn do_nmi_crash(struct cpu_user_regs *regs); void do_reserved_trap(struct cpu_user_regs *regs); void syscall_enter(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 Mon Mar 02 06:01:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 06:01: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 1YSJQP-0007uh-FE; Mon, 02 Mar 2015 06:01:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJQN-0007uP-IZ for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:51 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id D4/A7-02898-ECCF3F45; Mon, 02 Mar 2015 06:01:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1425276109!12119923!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26207 invoked from network); 2 Mar 2015 06:01:50 -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; 2 Mar 2015 06:01:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSJQK-0007DE-Qk for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSJQK-0002oa-Oi for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 06:01:48 +0000 Date: Mon, 02 Mar 2015 06:01:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/nmi: fix shootdown of pcpus running in VMX non-root mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 75ac8cf17a6f7a4ef6dd598295e8d186c010b440 Author: Andrew Cooper AuthorDate: Wed Feb 18 16:42:11 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 16:42:11 2015 +0100 x86/nmi: fix shootdown of pcpus running in VMX non-root mode c/s 7dd3b06ff "vmx: fix handling of NMI VMEXIT" fixed one issue but inadvertently introduced a regression when it came to the NMI shootdown. The shootdown code worked by patching vector 2 in each IDT, but the introduced direct call to do_nmi() bypassed this. Instead of patching each IDT, take a different approach by updating the existing dispatch table. This allows for the removal of the remote IDT patching and the removal of the nmi_crash() entry point. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: cbeeaa7da01bfa37c1fcdfe79e8f4f1400262ccb master date: 2015-02-11 17:18:27 +0100 --- xen/arch/x86/crash.c | 59 ++++++++++++++++----------------------- xen/arch/x86/x86_64/entry.S | 9 ------ xen/include/asm-x86/processor.h | 1 - 3 files changed, 24 insertions(+), 45 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index c0b83df..eb7be9c 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -36,9 +36,11 @@ static unsigned int crashing_cpu; static DEFINE_PER_CPU_READ_MOSTLY(bool_t, crash_save_done); /* This becomes the NMI handler for non-crashing CPUs, when Xen is crashing. */ -void do_nmi_crash(struct cpu_user_regs *regs) +static void noreturn do_nmi_crash(const struct cpu_user_regs *regs) { - int cpu = smp_processor_id(); + unsigned int cpu = smp_processor_id(); + + stac(); /* nmi_shootdown_cpus() should ensure that this assertion is correct. */ ASSERT(cpu != crashing_cpu); @@ -113,11 +115,10 @@ void do_nmi_crash(struct cpu_user_regs *regs) halt(); } -void nmi_crash(void); static void nmi_shootdown_cpus(void) { unsigned long msecs; - int i, cpu = smp_processor_id(); + unsigned int cpu = smp_processor_id(); disable_lapic_nmi_watchdog(); local_irq_disable(); @@ -127,38 +128,26 @@ static void nmi_shootdown_cpus(void) cpumask_andnot(&waiting_to_crash, &cpu_online_map, cpumask_of(cpu)); - /* Change NMI trap handlers. Non-crashing pcpus get nmi_crash which - * invokes do_nmi_crash (above), which cause them to write state and - * fall into a loop. The crashing pcpu gets the nop handler to - * cause it to return to this function ASAP. + /* + * Disable IST for MCEs to avoid stack corruption race conditions, and + * change the NMI handler to a nop to avoid deviation from this codepath. */ - for ( i = 0; i < nr_cpu_ids; i++ ) - { - if ( idt_tables[i] == NULL ) - continue; - - if ( i == cpu ) - { - /* - * Disable the interrupt stack tables for this cpu's MCE and NMI - * handlers, and alter the NMI handler to have no operation. - * Disabling the stack tables prevents stack corruption race - * conditions, while changing the handler helps prevent cascading - * faults; we are certainly going to crash by this point. - * - * This update is safe from a security point of view, as this pcpu - * is never going to try to sysret back to a PV vcpu. - */ - _set_gate_lower(&idt_tables[i][TRAP_nmi], - SYS_DESC_irq_gate, 0, &trap_nop); - set_ist(&idt_tables[i][TRAP_machine_check], IST_NONE); - } - else - { - /* Do not update stack table for other pcpus. */ - _update_gate_addr_lower(&idt_tables[i][TRAP_nmi], &nmi_crash); - } - } + _set_gate_lower(&idt_tables[cpu][TRAP_nmi], + SYS_DESC_irq_gate, 0, &trap_nop); + set_ist(&idt_tables[cpu][TRAP_machine_check], IST_NONE); + + /* + * Ideally would be: + * exception_table[TRAP_nmi] = &do_nmi_crash; + * + * but the exception_table is read only. Borrow an unused fixmap entry + * to construct a writable mapping. + */ + set_fixmap(FIX_TBOOT_MAP_ADDRESS, __pa(&exception_table[TRAP_nmi])); + write_atomic((unsigned long *) + (fix_to_virt(FIX_TBOOT_MAP_ADDRESS) + + ((unsigned long)&exception_table[TRAP_nmi] & ~PAGE_MASK)), + (unsigned long)&do_nmi_crash); /* Ensure the new callback function is set before sending out the NMI. */ wmb(); diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 062c690..2d25d57 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -669,15 +669,6 @@ handle_ist_exception: je restore_all_guest jmp compat_restore_all_guest -ENTRY(nmi_crash) - pushq $0 - movl $TRAP_nmi,4(%rsp) - /* Set AC to reduce chance of further SMAP faults */ - SAVE_ALL STAC - movq %rsp,%rdi - callq do_nmi_crash /* Does not return */ - ud2 - ENTRY(machine_check) pushq $0 movl $TRAP_machine_check,4(%rsp) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index b86f600..b4e4731 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -527,7 +527,6 @@ DECLARE_TRAP_HANDLER(alignment_check); void trap_nop(void); void enable_nmis(void); -void noreturn do_nmi_crash(struct cpu_user_regs *regs); void do_reserved_trap(struct cpu_user_regs *regs); void syscall_enter(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 Mon Mar 02 20:11:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 20: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 1YSWgF-0005Qf-0y; Mon, 02 Mar 2015 20:11:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgD-0005QF-Ny for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:05 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 28/E4-10964-9D3C4F45; Mon, 02 Mar 2015 20:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1425327063!14028870!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13365 invoked from network); 2 Mar 2015 20:11:03 -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; 2 Mar 2015 20:11:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgA-0000fX-P6 for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSWgA-0000K0-MO for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:02 +0000 Date: Mon, 02 Mar 2015 20:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools/pygrub: Fix extlinux when /boot is a separate partition from / X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9c6425b06a1efdb3f48357313f72c61e003436cc Author: Andrew Cooper AuthorDate: Wed Jun 11 19:31:55 2014 +0100 Commit: Ian Jackson CommitDate: Fri Feb 27 15:15:41 2015 +0000 tools/pygrub: Fix extlinux when /boot is a separate partition from / Grub and Grub2 already cope with this. Reported-by: Joseph Hom Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit 0c12e5b7427b4dfd2dfabf21f6b0e6e24bc8e864) Conflicts: tools/pygrub/src/pygrub Signed-off-by: Ian Jackson --- tools/pygrub/src/pygrub | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 45a7290..d0199bc 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -431,7 +431,9 @@ class Grub: map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile), ["/boot/isolinux/isolinux.cfg", "/boot/extlinux/extlinux.conf", - "/boot/extlinux.conf"]) + \ + "/boot/extlinux.conf", + "/extlinux/extlinux.conf", + "/extlinux.conf"]) + \ map(lambda x: (x,grub.GrubConf.GrubConfigFile), ["/boot/grub/menu.lst", "/boot/grub/grub.conf", "/grub/menu.lst", "/grub/grub.conf"]) -- 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 Mon Mar 02 20:11:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 20: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 1YSWgF-0005Qf-0y; Mon, 02 Mar 2015 20:11:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgD-0005QF-Ny for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:05 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 28/E4-10964-9D3C4F45; Mon, 02 Mar 2015 20:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1425327063!14028870!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13365 invoked from network); 2 Mar 2015 20:11:03 -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; 2 Mar 2015 20:11:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgA-0000fX-P6 for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSWgA-0000K0-MO for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:02 +0000 Date: Mon, 02 Mar 2015 20:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools/pygrub: Fix extlinux when /boot is a separate partition from / X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9c6425b06a1efdb3f48357313f72c61e003436cc Author: Andrew Cooper AuthorDate: Wed Jun 11 19:31:55 2014 +0100 Commit: Ian Jackson CommitDate: Fri Feb 27 15:15:41 2015 +0000 tools/pygrub: Fix extlinux when /boot is a separate partition from / Grub and Grub2 already cope with this. Reported-by: Joseph Hom Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit 0c12e5b7427b4dfd2dfabf21f6b0e6e24bc8e864) Conflicts: tools/pygrub/src/pygrub Signed-off-by: Ian Jackson --- tools/pygrub/src/pygrub | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 45a7290..d0199bc 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -431,7 +431,9 @@ class Grub: map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile), ["/boot/isolinux/isolinux.cfg", "/boot/extlinux/extlinux.conf", - "/boot/extlinux.conf"]) + \ + "/boot/extlinux.conf", + "/extlinux/extlinux.conf", + "/extlinux.conf"]) + \ map(lambda x: (x,grub.GrubConf.GrubConfigFile), ["/boot/grub/menu.lst", "/boot/grub/grub.conf", "/grub/menu.lst", "/grub/grub.conf"]) -- 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 Mon Mar 02 20:11:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 20:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgP-0005UE-43; Mon, 02 Mar 2015 20:11:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgN-0005To-EK for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:15 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id EC/66-02770-2E3C4F45; Mon, 02 Mar 2015 20:11:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1425327073!13958969!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21195 invoked from network); 2 Mar 2015 20:11:14 -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; 2 Mar 2015 20:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgK-0000fa-VI for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSWgK-0000LK-Sk for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:12 +0000 Date: Mon, 02 Mar 2015 20:11:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools/pygrub: Make pygrub understand default entry in string format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3f9d2e1863a2301a219ed9f34f6857df019555ee Author: Boris Ostrovsky AuthorDate: Fri Jun 27 10:07:31 2014 -0400 Commit: Ian Jackson CommitDate: Fri Feb 27 15:16:04 2015 +0000 tools/pygrub: Make pygrub understand default entry in string format Currently pygrub can only correctly parse grub2's default attribute when it is specified as a number. If it is set to ${saved_entry} or ${next_entry} then the first image (i.e. entry number 0) is selected. If any other value is specified (typically this would be the string in menuentry) pygrub will crash. This patch will allow pygrub to interpret default attribute if it is specified as a string (note that in case of submenus only the leaf string will be considered). Also issue a warning if default is set to ${saved_entry} or ${next_entry}. Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell (cherry picked from commit d1b93ea2615bd789ee28901f1f1c05ffb319cb61) --- tools/pygrub/src/GrubConf.py | 10 +++++----- tools/pygrub/src/pygrub | 21 ++++++++++++++++++++- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py index 974cded..dea7044 100644 --- a/tools/pygrub/src/GrubConf.py +++ b/tools/pygrub/src/GrubConf.py @@ -231,7 +231,7 @@ class _GrubConfigFile(object): if val == "saved": self._default = 0 else: - self._default = int(val) + self._default = val if self._default < 0: raise ValueError, "default must be positive number" @@ -431,11 +431,11 @@ class Grub2ConfigFile(_GrubConfigFile): if self.commands.has_key(com): if self.commands[com] is not None: - if arg.strip() == "${saved_entry}": + arg_strip = arg.strip() + if arg_strip == "${saved_entry}" or arg_strip == "${next_entry}": + logging.warning("grub2's saved_entry/next_entry not supported") arg = "0" - elif arg.strip() == "${next_entry}": - arg = "0" - setattr(self, self.commands[com], arg.strip()) + setattr(self, self.commands[com], arg_strip) else: logging.info("Ignored directive %s" %(com,)) elif com.startswith('set:'): diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index d0199bc..21265a1 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -463,9 +463,28 @@ class Grub: def run(self): timeout = int(self.cf.timeout) - self.selected_image = self.cf.default + if self.cf.default.isdigit(): + self.selected_image = int(self.cf.default) + else: + # We don't fully support submenus. Look for the leaf value in + # "submenu0>submenu1>...>menuentry" and hope that it's unique. + title = self.cf.default + while 1: + try: + title = re.search('(\S)>(\S.+$)',title).group(2) + except AttributeError: + break + + # Map string to index in images array + self.selected_image = 0 + for i in range(len(self.cf.images)): + if self.cf.images[i].title == title: + self.selected_image = i + break + # If the selected (default) image doesn't exist we select the first entry if self.selected_image > len(self.cf.images): + logging.warning("Default image not found") self.selected_image = 0 self.isdone = False while not self.isdone: -- 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 Mon Mar 02 20:11:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 20:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgP-0005UE-43; Mon, 02 Mar 2015 20:11:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgN-0005To-EK for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:15 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id EC/66-02770-2E3C4F45; Mon, 02 Mar 2015 20:11:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1425327073!13958969!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21195 invoked from network); 2 Mar 2015 20:11:14 -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; 2 Mar 2015 20:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgK-0000fa-VI for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSWgK-0000LK-Sk for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:12 +0000 Date: Mon, 02 Mar 2015 20:11:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools/pygrub: Make pygrub understand default entry in string format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3f9d2e1863a2301a219ed9f34f6857df019555ee Author: Boris Ostrovsky AuthorDate: Fri Jun 27 10:07:31 2014 -0400 Commit: Ian Jackson CommitDate: Fri Feb 27 15:16:04 2015 +0000 tools/pygrub: Make pygrub understand default entry in string format Currently pygrub can only correctly parse grub2's default attribute when it is specified as a number. If it is set to ${saved_entry} or ${next_entry} then the first image (i.e. entry number 0) is selected. If any other value is specified (typically this would be the string in menuentry) pygrub will crash. This patch will allow pygrub to interpret default attribute if it is specified as a string (note that in case of submenus only the leaf string will be considered). Also issue a warning if default is set to ${saved_entry} or ${next_entry}. Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell (cherry picked from commit d1b93ea2615bd789ee28901f1f1c05ffb319cb61) --- tools/pygrub/src/GrubConf.py | 10 +++++----- tools/pygrub/src/pygrub | 21 ++++++++++++++++++++- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py index 974cded..dea7044 100644 --- a/tools/pygrub/src/GrubConf.py +++ b/tools/pygrub/src/GrubConf.py @@ -231,7 +231,7 @@ class _GrubConfigFile(object): if val == "saved": self._default = 0 else: - self._default = int(val) + self._default = val if self._default < 0: raise ValueError, "default must be positive number" @@ -431,11 +431,11 @@ class Grub2ConfigFile(_GrubConfigFile): if self.commands.has_key(com): if self.commands[com] is not None: - if arg.strip() == "${saved_entry}": + arg_strip = arg.strip() + if arg_strip == "${saved_entry}" or arg_strip == "${next_entry}": + logging.warning("grub2's saved_entry/next_entry not supported") arg = "0" - elif arg.strip() == "${next_entry}": - arg = "0" - setattr(self, self.commands[com], arg.strip()) + setattr(self, self.commands[com], arg_strip) else: logging.info("Ignored directive %s" %(com,)) elif com.startswith('set:'): diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index d0199bc..21265a1 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -463,9 +463,28 @@ class Grub: def run(self): timeout = int(self.cf.timeout) - self.selected_image = self.cf.default + if self.cf.default.isdigit(): + self.selected_image = int(self.cf.default) + else: + # We don't fully support submenus. Look for the leaf value in + # "submenu0>submenu1>...>menuentry" and hope that it's unique. + title = self.cf.default + while 1: + try: + title = re.search('(\S)>(\S.+$)',title).group(2) + except AttributeError: + break + + # Map string to index in images array + self.selected_image = 0 + for i in range(len(self.cf.images)): + if self.cf.images[i].title == title: + self.selected_image = i + break + # If the selected (default) image doesn't exist we select the first entry if self.selected_image > len(self.cf.images): + logging.warning("Default image not found") self.selected_image = 0 self.isdone = False while not self.isdone: -- 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 Mon Mar 02 20:11:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 20:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgZ-0005Xa-83; Mon, 02 Mar 2015 20:11:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgX-0005Wz-Nx for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:25 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 74/86-02770-DE3C4F45; Mon, 02 Mar 2015 20:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1425327083!9437517!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17492 invoked from network); 2 Mar 2015 20:11:24 -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; 2 Mar 2015 20:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgV-0000fj-42 for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSWgV-0000Lh-1W for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:23 +0000 Date: Mon, 02 Mar 2015 20:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] pygrub: fix non-interactive parsing of grub1 config files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7962c936a4637af4c1562ebd6bcf50d5193d936b Author: Simon Rowe AuthorDate: Mon Oct 27 16:00:14 2014 +0000 Commit: Ian Jackson CommitDate: Fri Feb 27 15:16:23 2015 +0000 pygrub: fix non-interactive parsing of grub1 config files Changes to handle non-numeric default attributes for grub2 caused run_grub() to attempt to index into the images list using a string. Pull out the code that handles submenus into a new function and use that to ensure sel is numeric. Reported-by: David Scott Signed-off-by: Simon Rowe Reviewed-by: Boris Ostrovsky Reviewed-and-tested-by: Andrew Cooper Acked-by: Ian Campbell (cherry picked from commit 4ee393f9d6528640c29a0554fdc6cb3e795fb6e8) --- tools/pygrub/src/pygrub | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 21265a1..8239499 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -460,11 +460,9 @@ class Grub: del f self.cf.parse(buf) - def run(self): - timeout = int(self.cf.timeout) - + def image_index(self): if self.cf.default.isdigit(): - self.selected_image = int(self.cf.default) + sel = int(self.cf.default) else: # We don't fully support submenus. Look for the leaf value in # "submenu0>submenu1>...>menuentry" and hope that it's unique. @@ -476,16 +474,23 @@ class Grub: break # Map string to index in images array - self.selected_image = 0 + sel = 0 for i in range(len(self.cf.images)): if self.cf.images[i].title == title: - self.selected_image = i + sel = i break # If the selected (default) image doesn't exist we select the first entry - if self.selected_image > len(self.cf.images): + if sel > len(self.cf.images): logging.warning("Default image not found") - self.selected_image = 0 + sel = 0 + + return sel + + def run(self): + timeout = int(self.cf.timeout) + self.selected_image = self.image_index() + self.isdone = False while not self.isdone: self.run_main(timeout) @@ -630,7 +635,7 @@ def run_grub(file, entry, fs, cfg_args): if interactive and not list_entries: curses.wrapper(run_main) else: - sel = g.cf.default + sel = g.image_index() # set the entry to boot as requested if entry is not None: -- 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 Mon Mar 02 20:11:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 20:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgZ-0005Xa-83; Mon, 02 Mar 2015 20:11:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgX-0005Wz-Nx for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:25 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 74/86-02770-DE3C4F45; Mon, 02 Mar 2015 20:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1425327083!9437517!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17492 invoked from network); 2 Mar 2015 20:11:24 -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; 2 Mar 2015 20:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgV-0000fj-42 for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSWgV-0000Lh-1W for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:23 +0000 Date: Mon, 02 Mar 2015 20:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] pygrub: fix non-interactive parsing of grub1 config files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7962c936a4637af4c1562ebd6bcf50d5193d936b Author: Simon Rowe AuthorDate: Mon Oct 27 16:00:14 2014 +0000 Commit: Ian Jackson CommitDate: Fri Feb 27 15:16:23 2015 +0000 pygrub: fix non-interactive parsing of grub1 config files Changes to handle non-numeric default attributes for grub2 caused run_grub() to attempt to index into the images list using a string. Pull out the code that handles submenus into a new function and use that to ensure sel is numeric. Reported-by: David Scott Signed-off-by: Simon Rowe Reviewed-by: Boris Ostrovsky Reviewed-and-tested-by: Andrew Cooper Acked-by: Ian Campbell (cherry picked from commit 4ee393f9d6528640c29a0554fdc6cb3e795fb6e8) --- tools/pygrub/src/pygrub | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 21265a1..8239499 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -460,11 +460,9 @@ class Grub: del f self.cf.parse(buf) - def run(self): - timeout = int(self.cf.timeout) - + def image_index(self): if self.cf.default.isdigit(): - self.selected_image = int(self.cf.default) + sel = int(self.cf.default) else: # We don't fully support submenus. Look for the leaf value in # "submenu0>submenu1>...>menuentry" and hope that it's unique. @@ -476,16 +474,23 @@ class Grub: break # Map string to index in images array - self.selected_image = 0 + sel = 0 for i in range(len(self.cf.images)): if self.cf.images[i].title == title: - self.selected_image = i + sel = i break # If the selected (default) image doesn't exist we select the first entry - if self.selected_image > len(self.cf.images): + if sel > len(self.cf.images): logging.warning("Default image not found") - self.selected_image = 0 + sel = 0 + + return sel + + def run(self): + timeout = int(self.cf.timeout) + self.selected_image = self.image_index() + self.isdone = False while not self.isdone: self.run_main(timeout) @@ -630,7 +635,7 @@ def run_grub(file, entry, fs, cfg_args): if interactive and not list_entries: curses.wrapper(run_main) else: - sel = g.cf.default + sel = g.image_index() # set the entry to boot as requested if entry is not None: -- 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 Mon Mar 02 20:11:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 20:11:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgj-0005aL-Dn; Mon, 02 Mar 2015 20:11:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgh-0005a0-Hg for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:35 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 28/D9-02994-6F3C4F45; Mon, 02 Mar 2015 20:11:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1425327093!9086070!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 790 invoked from network); 2 Mar 2015 20:11:34 -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; 2 Mar 2015 20:11:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgf-0000fr-9O for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSWgf-0000MT-8P for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:33 +0000 Date: Mon, 02 Mar 2015 20:11:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] pygrub: Fix regression from c/s d1b93ea, attempt 2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc0ce24c8f1ba7a80a575d2f6593cc12aaa31e0f Author: Boris Ostrovsky AuthorDate: Tue Nov 25 11:11:50 2014 -0500 Commit: Ian Jackson CommitDate: Fri Feb 27 15:16:32 2015 +0000 pygrub: Fix regression from c/s d1b93ea, attempt 2 c/s d1b93ea causes substantial functional regressions in pygrub's ability to parse bootloader configuration files. c/s d1b93ea itself changed an an interface which previously used exclusively integers, to using strings in the case of a grub configuration with explicit default set, along with changing the code calling the interface to require a string. The default value for "default" remained as an integer. As a result, any Extlinux or Lilo configuration (which drives this interface exclusively with integers), or Grub configuration which doesn't explicitly declare a default will die with an AttributeError when attempting to call "self.cf.default.isdigit()" where "default" is an integer. Sadly, this AttributeError gets swallowed by the blanket ignore in the loop which searches partitions for valid bootloader configurations, causing the issue to be reported as "Unable to find partition containing kernel" We should explicitly check type of "default" in image_index() and process it appropriately. Reported-by: Andrew Cooper Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell (cherry picked from commit 3b279811707dab4bab95c2e952e94ebf4d6badd9) --- tools/pygrub/src/pygrub | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub old mode 100644 new mode 100755 index 8239499..c7b6aa7 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -461,7 +461,9 @@ class Grub: self.cf.parse(buf) def image_index(self): - if self.cf.default.isdigit(): + if isinstance(self.cf.default, int): + sel = self.cf.default + elif self.cf.default.isdigit(): sel = int(self.cf.default) else: # We don't fully support submenus. Look for the leaf value in -- 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 Mon Mar 02 20:11:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2015 20:11:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgj-0005aL-Dn; Mon, 02 Mar 2015 20:11:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgh-0005a0-Hg for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:35 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 28/D9-02994-6F3C4F45; Mon, 02 Mar 2015 20:11:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1425327093!9086070!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 790 invoked from network); 2 Mar 2015 20:11:34 -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; 2 Mar 2015 20:11:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSWgf-0000fr-9O for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSWgf-0000MT-8P for xen-changelog@lists.xensource.com; Mon, 02 Mar 2015 20:11:33 +0000 Date: Mon, 02 Mar 2015 20:11:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] pygrub: Fix regression from c/s d1b93ea, attempt 2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc0ce24c8f1ba7a80a575d2f6593cc12aaa31e0f Author: Boris Ostrovsky AuthorDate: Tue Nov 25 11:11:50 2014 -0500 Commit: Ian Jackson CommitDate: Fri Feb 27 15:16:32 2015 +0000 pygrub: Fix regression from c/s d1b93ea, attempt 2 c/s d1b93ea causes substantial functional regressions in pygrub's ability to parse bootloader configuration files. c/s d1b93ea itself changed an an interface which previously used exclusively integers, to using strings in the case of a grub configuration with explicit default set, along with changing the code calling the interface to require a string. The default value for "default" remained as an integer. As a result, any Extlinux or Lilo configuration (which drives this interface exclusively with integers), or Grub configuration which doesn't explicitly declare a default will die with an AttributeError when attempting to call "self.cf.default.isdigit()" where "default" is an integer. Sadly, this AttributeError gets swallowed by the blanket ignore in the loop which searches partitions for valid bootloader configurations, causing the issue to be reported as "Unable to find partition containing kernel" We should explicitly check type of "default" in image_index() and process it appropriately. Reported-by: Andrew Cooper Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell (cherry picked from commit 3b279811707dab4bab95c2e952e94ebf4d6badd9) --- tools/pygrub/src/pygrub | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub old mode 100644 new mode 100755 index 8239499..c7b6aa7 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -461,7 +461,9 @@ class Grub: self.cf.parse(buf) def image_index(self): - if self.cf.default.isdigit(): + if isinstance(self.cf.default, int): + sel = self.cf.default + elif self.cf.default.isdigit(): sel = int(self.cf.default) else: # We don't fully support submenus. Look for the leaf value in -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 05:33:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 05:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfS9-0000H0-5Q; Tue, 03 Mar 2015 05:33:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfS7-0000GV-Ui for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:08 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id A4/EE-25903-39745F45; Tue, 03 Mar 2015 05:33:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1425360785!12485556!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28803 invoked from network); 3 Mar 2015 05:33:06 -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; 3 Mar 2015 05:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfS2-0005mD-TN for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSfS2-0003gC-Q6 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:02 +0000 Date: Tue, 03 Mar 2015 05:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools/pygrub: Fix extlinux when /boot is a separate partition from / X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a4d28628b35d757faa6e2b18371fa93249165bac Author: Andrew Cooper AuthorDate: Wed Jun 11 19:31:55 2014 +0100 Commit: Ian Jackson CommitDate: Fri Feb 27 15:18:56 2015 +0000 tools/pygrub: Fix extlinux when /boot is a separate partition from / Grub and Grub2 already cope with this. Reported-by: Joseph Hom Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit 0c12e5b7427b4dfd2dfabf21f6b0e6e24bc8e864) Conflicts: tools/pygrub/src/pygrub Signed-off-by: Ian Jackson (cherry picked from commit 9c6425b06a1efdb3f48357313f72c61e003436cc) --- tools/pygrub/src/pygrub | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 2c6ca46..6d09d96 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -431,7 +431,9 @@ class Grub: map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile), ["/boot/isolinux/isolinux.cfg", "/boot/extlinux/extlinux.conf", - "/boot/extlinux.conf"]) + \ + "/boot/extlinux.conf", + "/extlinux/extlinux.conf", + "/extlinux.conf"]) + \ map(lambda x: (x,grub.GrubConf.GrubConfigFile), ["/boot/grub/menu.lst", "/boot/grub/grub.conf", "/grub/menu.lst", "/grub/grub.conf"]) -- 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 Tue Mar 03 05:33:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 05:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfS9-0000H0-5Q; Tue, 03 Mar 2015 05:33:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfS7-0000GV-Ui for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:08 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id A4/EE-25903-39745F45; Tue, 03 Mar 2015 05:33:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1425360785!12485556!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28803 invoked from network); 3 Mar 2015 05:33:06 -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; 3 Mar 2015 05:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfS2-0005mD-TN for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSfS2-0003gC-Q6 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:02 +0000 Date: Tue, 03 Mar 2015 05:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools/pygrub: Fix extlinux when /boot is a separate partition from / X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a4d28628b35d757faa6e2b18371fa93249165bac Author: Andrew Cooper AuthorDate: Wed Jun 11 19:31:55 2014 +0100 Commit: Ian Jackson CommitDate: Fri Feb 27 15:18:56 2015 +0000 tools/pygrub: Fix extlinux when /boot is a separate partition from / Grub and Grub2 already cope with this. Reported-by: Joseph Hom Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit 0c12e5b7427b4dfd2dfabf21f6b0e6e24bc8e864) Conflicts: tools/pygrub/src/pygrub Signed-off-by: Ian Jackson (cherry picked from commit 9c6425b06a1efdb3f48357313f72c61e003436cc) --- tools/pygrub/src/pygrub | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 2c6ca46..6d09d96 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -431,7 +431,9 @@ class Grub: map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile), ["/boot/isolinux/isolinux.cfg", "/boot/extlinux/extlinux.conf", - "/boot/extlinux.conf"]) + \ + "/boot/extlinux.conf", + "/extlinux/extlinux.conf", + "/extlinux.conf"]) + \ map(lambda x: (x,grub.GrubConf.GrubConfigFile), ["/boot/grub/menu.lst", "/boot/grub/grub.conf", "/grub/menu.lst", "/grub/grub.conf"]) -- 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 Tue Mar 03 05:33:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 05:33: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 1YSfSK-0000O8-94; Tue, 03 Mar 2015 05:33:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfSI-0000NW-EN for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:18 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 3D/9A-02745-D9745F45; Tue, 03 Mar 2015 05:33:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425360795!12379037!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25970 invoked from network); 3 Mar 2015 05:33:17 -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; 3 Mar 2015 05:33:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfSF-0005mH-Ki for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSfSF-0003gb-FE for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:15 +0000 Date: Tue, 03 Mar 2015 05:33:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools/pygrub: Make pygrub understand default entry in string format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 29a5fcbdc19c55b0d903b84c469666647cd14399 Author: Boris Ostrovsky AuthorDate: Fri Jun 27 10:07:31 2014 -0400 Commit: Ian Jackson CommitDate: Fri Feb 27 15:18:56 2015 +0000 tools/pygrub: Make pygrub understand default entry in string format Currently pygrub can only correctly parse grub2's default attribute when it is specified as a number. If it is set to ${saved_entry} or ${next_entry} then the first image (i.e. entry number 0) is selected. If any other value is specified (typically this would be the string in menuentry) pygrub will crash. This patch will allow pygrub to interpret default attribute if it is specified as a string (note that in case of submenus only the leaf string will be considered). Also issue a warning if default is set to ${saved_entry} or ${next_entry}. Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell (cherry picked from commit d1b93ea2615bd789ee28901f1f1c05ffb319cb61) (cherry picked from commit 3f9d2e1863a2301a219ed9f34f6857df019555ee) --- tools/pygrub/src/GrubConf.py | 10 +++++----- tools/pygrub/src/pygrub | 21 ++++++++++++++++++++- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py index 9ff8437..62d75ef 100644 --- a/tools/pygrub/src/GrubConf.py +++ b/tools/pygrub/src/GrubConf.py @@ -227,7 +227,7 @@ class _GrubConfigFile(object): if val == "saved": self._default = 0 else: - self._default = int(val) + self._default = val if self._default < 0: raise ValueError, "default must be positive number" @@ -427,11 +427,11 @@ class Grub2ConfigFile(_GrubConfigFile): if self.commands.has_key(com): if self.commands[com] is not None: - if arg.strip() == "${saved_entry}": + arg_strip = arg.strip() + if arg_strip == "${saved_entry}" or arg_strip == "${next_entry}": + logging.warning("grub2's saved_entry/next_entry not supported") arg = "0" - elif arg.strip() == "${next_entry}": - arg = "0" - setattr(self, self.commands[com], arg.strip()) + setattr(self, self.commands[com], arg_strip) else: logging.info("Ignored directive %s" %(com,)) elif com.startswith('set:'): diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 6d09d96..5287c9b 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -463,9 +463,28 @@ class Grub: def run(self): timeout = int(self.cf.timeout) - self.selected_image = self.cf.default + if self.cf.default.isdigit(): + self.selected_image = int(self.cf.default) + else: + # We don't fully support submenus. Look for the leaf value in + # "submenu0>submenu1>...>menuentry" and hope that it's unique. + title = self.cf.default + while 1: + try: + title = re.search('(\S)>(\S.+$)',title).group(2) + except AttributeError: + break + + # Map string to index in images array + self.selected_image = 0 + for i in range(len(self.cf.images)): + if self.cf.images[i].title == title: + self.selected_image = i + break + # If the selected (default) image doesn't exist we select the first entry if self.selected_image > len(self.cf.images): + logging.warning("Default image not found") self.selected_image = 0 self.isdone = False while not self.isdone: -- 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 Tue Mar 03 05:33:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 05:33: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 1YSfSK-0000O8-94; Tue, 03 Mar 2015 05:33:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfSI-0000NW-EN for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:18 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 3D/9A-02745-D9745F45; Tue, 03 Mar 2015 05:33:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425360795!12379037!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25970 invoked from network); 3 Mar 2015 05:33:17 -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; 3 Mar 2015 05:33:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfSF-0005mH-Ki for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSfSF-0003gb-FE for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:15 +0000 Date: Tue, 03 Mar 2015 05:33:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools/pygrub: Make pygrub understand default entry in string format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 29a5fcbdc19c55b0d903b84c469666647cd14399 Author: Boris Ostrovsky AuthorDate: Fri Jun 27 10:07:31 2014 -0400 Commit: Ian Jackson CommitDate: Fri Feb 27 15:18:56 2015 +0000 tools/pygrub: Make pygrub understand default entry in string format Currently pygrub can only correctly parse grub2's default attribute when it is specified as a number. If it is set to ${saved_entry} or ${next_entry} then the first image (i.e. entry number 0) is selected. If any other value is specified (typically this would be the string in menuentry) pygrub will crash. This patch will allow pygrub to interpret default attribute if it is specified as a string (note that in case of submenus only the leaf string will be considered). Also issue a warning if default is set to ${saved_entry} or ${next_entry}. Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell (cherry picked from commit d1b93ea2615bd789ee28901f1f1c05ffb319cb61) (cherry picked from commit 3f9d2e1863a2301a219ed9f34f6857df019555ee) --- tools/pygrub/src/GrubConf.py | 10 +++++----- tools/pygrub/src/pygrub | 21 ++++++++++++++++++++- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py index 9ff8437..62d75ef 100644 --- a/tools/pygrub/src/GrubConf.py +++ b/tools/pygrub/src/GrubConf.py @@ -227,7 +227,7 @@ class _GrubConfigFile(object): if val == "saved": self._default = 0 else: - self._default = int(val) + self._default = val if self._default < 0: raise ValueError, "default must be positive number" @@ -427,11 +427,11 @@ class Grub2ConfigFile(_GrubConfigFile): if self.commands.has_key(com): if self.commands[com] is not None: - if arg.strip() == "${saved_entry}": + arg_strip = arg.strip() + if arg_strip == "${saved_entry}" or arg_strip == "${next_entry}": + logging.warning("grub2's saved_entry/next_entry not supported") arg = "0" - elif arg.strip() == "${next_entry}": - arg = "0" - setattr(self, self.commands[com], arg.strip()) + setattr(self, self.commands[com], arg_strip) else: logging.info("Ignored directive %s" %(com,)) elif com.startswith('set:'): diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 6d09d96..5287c9b 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -463,9 +463,28 @@ class Grub: def run(self): timeout = int(self.cf.timeout) - self.selected_image = self.cf.default + if self.cf.default.isdigit(): + self.selected_image = int(self.cf.default) + else: + # We don't fully support submenus. Look for the leaf value in + # "submenu0>submenu1>...>menuentry" and hope that it's unique. + title = self.cf.default + while 1: + try: + title = re.search('(\S)>(\S.+$)',title).group(2) + except AttributeError: + break + + # Map string to index in images array + self.selected_image = 0 + for i in range(len(self.cf.images)): + if self.cf.images[i].title == title: + self.selected_image = i + break + # If the selected (default) image doesn't exist we select the first entry if self.selected_image > len(self.cf.images): + logging.warning("Default image not found") self.selected_image = 0 self.isdone = False while not self.isdone: -- 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 Tue Mar 03 05:33:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 05:33: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 1YSfSU-0000PY-Bv; Tue, 03 Mar 2015 05:33:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfSS-0000PM-7y for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:28 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 15/40-02753-7A745F45; Tue, 03 Mar 2015 05:33:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1425360806!14146556!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31444 invoked from network); 3 Mar 2015 05:33:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Mar 2015 05:33:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfSP-0005mP-Pt for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSfSP-0003gx-Nz for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:25 +0000 Date: Tue, 03 Mar 2015 05:33:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] pygrub: fix non-interactive parsing of grub1 config files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d04f3746effe23065f28963393dbb1687316822 Author: Simon Rowe AuthorDate: Mon Oct 27 16:00:14 2014 +0000 Commit: Ian Jackson CommitDate: Fri Feb 27 15:18:56 2015 +0000 pygrub: fix non-interactive parsing of grub1 config files Changes to handle non-numeric default attributes for grub2 caused run_grub() to attempt to index into the images list using a string. Pull out the code that handles submenus into a new function and use that to ensure sel is numeric. Reported-by: David Scott Signed-off-by: Simon Rowe Reviewed-by: Boris Ostrovsky Reviewed-and-tested-by: Andrew Cooper Acked-by: Ian Campbell (cherry picked from commit 4ee393f9d6528640c29a0554fdc6cb3e795fb6e8) (cherry picked from commit 7962c936a4637af4c1562ebd6bcf50d5193d936b) --- tools/pygrub/src/pygrub | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 5287c9b..86a53ed 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -460,11 +460,9 @@ class Grub: del f self.cf.parse(buf) - def run(self): - timeout = int(self.cf.timeout) - + def image_index(self): if self.cf.default.isdigit(): - self.selected_image = int(self.cf.default) + sel = int(self.cf.default) else: # We don't fully support submenus. Look for the leaf value in # "submenu0>submenu1>...>menuentry" and hope that it's unique. @@ -476,16 +474,23 @@ class Grub: break # Map string to index in images array - self.selected_image = 0 + sel = 0 for i in range(len(self.cf.images)): if self.cf.images[i].title == title: - self.selected_image = i + sel = i break # If the selected (default) image doesn't exist we select the first entry - if self.selected_image > len(self.cf.images): + if sel > len(self.cf.images): logging.warning("Default image not found") - self.selected_image = 0 + sel = 0 + + return sel + + def run(self): + timeout = int(self.cf.timeout) + self.selected_image = self.image_index() + self.isdone = False while not self.isdone: self.run_main(timeout) @@ -630,7 +635,7 @@ def run_grub(file, entry, fs, cfg_args): if interactive and not list_entries: curses.wrapper(run_main) else: - sel = g.cf.default + sel = g.image_index() # set the entry to boot as requested if entry is not None: -- 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 Tue Mar 03 05:33:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 05:33: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 1YSfSU-0000PY-Bv; Tue, 03 Mar 2015 05:33:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfSS-0000PM-7y for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:28 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 15/40-02753-7A745F45; Tue, 03 Mar 2015 05:33:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1425360806!14146556!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31444 invoked from network); 3 Mar 2015 05:33:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Mar 2015 05:33:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfSP-0005mP-Pt for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSfSP-0003gx-Nz for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:25 +0000 Date: Tue, 03 Mar 2015 05:33:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] pygrub: fix non-interactive parsing of grub1 config files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d04f3746effe23065f28963393dbb1687316822 Author: Simon Rowe AuthorDate: Mon Oct 27 16:00:14 2014 +0000 Commit: Ian Jackson CommitDate: Fri Feb 27 15:18:56 2015 +0000 pygrub: fix non-interactive parsing of grub1 config files Changes to handle non-numeric default attributes for grub2 caused run_grub() to attempt to index into the images list using a string. Pull out the code that handles submenus into a new function and use that to ensure sel is numeric. Reported-by: David Scott Signed-off-by: Simon Rowe Reviewed-by: Boris Ostrovsky Reviewed-and-tested-by: Andrew Cooper Acked-by: Ian Campbell (cherry picked from commit 4ee393f9d6528640c29a0554fdc6cb3e795fb6e8) (cherry picked from commit 7962c936a4637af4c1562ebd6bcf50d5193d936b) --- tools/pygrub/src/pygrub | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 5287c9b..86a53ed 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -460,11 +460,9 @@ class Grub: del f self.cf.parse(buf) - def run(self): - timeout = int(self.cf.timeout) - + def image_index(self): if self.cf.default.isdigit(): - self.selected_image = int(self.cf.default) + sel = int(self.cf.default) else: # We don't fully support submenus. Look for the leaf value in # "submenu0>submenu1>...>menuentry" and hope that it's unique. @@ -476,16 +474,23 @@ class Grub: break # Map string to index in images array - self.selected_image = 0 + sel = 0 for i in range(len(self.cf.images)): if self.cf.images[i].title == title: - self.selected_image = i + sel = i break # If the selected (default) image doesn't exist we select the first entry - if self.selected_image > len(self.cf.images): + if sel > len(self.cf.images): logging.warning("Default image not found") - self.selected_image = 0 + sel = 0 + + return sel + + def run(self): + timeout = int(self.cf.timeout) + self.selected_image = self.image_index() + self.isdone = False while not self.isdone: self.run_main(timeout) @@ -630,7 +635,7 @@ def run_grub(file, entry, fs, cfg_args): if interactive and not list_entries: curses.wrapper(run_main) else: - sel = g.cf.default + sel = g.image_index() # set the entry to boot as requested if entry is not None: -- 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 Tue Mar 03 05:33:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 05:33:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfSd-0000RR-Hh; Tue, 03 Mar 2015 05:33:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfSc-0000R9-Po for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:38 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 9D/99-02997-1B745F45; Tue, 03 Mar 2015 05:33:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1425360816!12444339!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20422 invoked from network); 3 Mar 2015 05:33:37 -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; 3 Mar 2015 05:33:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfSZ-0005mX-Us for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSfSZ-0003hS-TS for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:35 +0000 Date: Tue, 03 Mar 2015 05:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] pygrub: Fix regression from c/s d1b93ea, attempt 2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eb3594ca13e36f4a1826fef1e4bd8f62cd31dc99 Author: Boris Ostrovsky AuthorDate: Tue Nov 25 11:11:50 2014 -0500 Commit: Ian Jackson CommitDate: Fri Feb 27 15:18:56 2015 +0000 pygrub: Fix regression from c/s d1b93ea, attempt 2 c/s d1b93ea causes substantial functional regressions in pygrub's ability to parse bootloader configuration files. c/s d1b93ea itself changed an an interface which previously used exclusively integers, to using strings in the case of a grub configuration with explicit default set, along with changing the code calling the interface to require a string. The default value for "default" remained as an integer. As a result, any Extlinux or Lilo configuration (which drives this interface exclusively with integers), or Grub configuration which doesn't explicitly declare a default will die with an AttributeError when attempting to call "self.cf.default.isdigit()" where "default" is an integer. Sadly, this AttributeError gets swallowed by the blanket ignore in the loop which searches partitions for valid bootloader configurations, causing the issue to be reported as "Unable to find partition containing kernel" We should explicitly check type of "default" in image_index() and process it appropriately. Reported-by: Andrew Cooper Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell (cherry picked from commit 3b279811707dab4bab95c2e952e94ebf4d6badd9) (cherry picked from commit bc0ce24c8f1ba7a80a575d2f6593cc12aaa31e0f) --- tools/pygrub/src/pygrub | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub old mode 100644 new mode 100755 index 86a53ed..fe01118 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -461,7 +461,9 @@ class Grub: self.cf.parse(buf) def image_index(self): - if self.cf.default.isdigit(): + if isinstance(self.cf.default, int): + sel = self.cf.default + elif self.cf.default.isdigit(): sel = int(self.cf.default) else: # We don't fully support submenus. Look for the leaf value in -- 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 Tue Mar 03 05:33:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 05:33:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfSd-0000RR-Hh; Tue, 03 Mar 2015 05:33:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfSc-0000R9-Po for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:38 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 9D/99-02997-1B745F45; Tue, 03 Mar 2015 05:33:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1425360816!12444339!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20422 invoked from network); 3 Mar 2015 05:33:37 -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; 3 Mar 2015 05:33:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSfSZ-0005mX-Us for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSfSZ-0003hS-TS for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 05:33:35 +0000 Date: Tue, 03 Mar 2015 05:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] pygrub: Fix regression from c/s d1b93ea, attempt 2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eb3594ca13e36f4a1826fef1e4bd8f62cd31dc99 Author: Boris Ostrovsky AuthorDate: Tue Nov 25 11:11:50 2014 -0500 Commit: Ian Jackson CommitDate: Fri Feb 27 15:18:56 2015 +0000 pygrub: Fix regression from c/s d1b93ea, attempt 2 c/s d1b93ea causes substantial functional regressions in pygrub's ability to parse bootloader configuration files. c/s d1b93ea itself changed an an interface which previously used exclusively integers, to using strings in the case of a grub configuration with explicit default set, along with changing the code calling the interface to require a string. The default value for "default" remained as an integer. As a result, any Extlinux or Lilo configuration (which drives this interface exclusively with integers), or Grub configuration which doesn't explicitly declare a default will die with an AttributeError when attempting to call "self.cf.default.isdigit()" where "default" is an integer. Sadly, this AttributeError gets swallowed by the blanket ignore in the loop which searches partitions for valid bootloader configurations, causing the issue to be reported as "Unable to find partition containing kernel" We should explicitly check type of "default" in image_index() and process it appropriately. Reported-by: Andrew Cooper Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell (cherry picked from commit 3b279811707dab4bab95c2e952e94ebf4d6badd9) (cherry picked from commit bc0ce24c8f1ba7a80a575d2f6593cc12aaa31e0f) --- tools/pygrub/src/pygrub | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub old mode 100644 new mode 100755 index 86a53ed..fe01118 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -461,7 +461,9 @@ class Grub: self.cf.parse(buf) def image_index(self): - if self.cf.default.isdigit(): + if isinstance(self.cf.default, int): + sel = self.cf.default + elif self.cf.default.isdigit(): sel = int(self.cf.default) else: # We don't fully support submenus. Look for the leaf value in -- 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 Tue Mar 03 12:55:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:55:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmLs-000612-AW; Tue, 03 Mar 2015 12:55:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmLr-00060A-OK for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:07 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id F9/DB-02745-B2FA5F45; Tue, 03 Mar 2015 12:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1425387305!12632363!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13242 invoked from network); 3 Mar 2015 12:55:06 -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; 3 Mar 2015 12:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmLo-0002Wy-4V for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmLn-0003B3-Rt for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:03 +0000 Date: Tue, 03 Mar 2015 12:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/configure: detect $host_vendor of rumprun, not just rumpxen X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d26cf9004b2e1678e4ff8dab11f4deca0293a0db Author: Ian Jackson AuthorDate: Fri Feb 13 16:04:34 2015 +0000 Commit: Ian Jackson CommitDate: Mon Feb 16 14:49:28 2015 +0000 tools/configure: detect $host_vendor of rumprun, not just rumpxen This has been renamed by the rumpkernels upstream. (This patch needs to be backported.) Signed-off-by: Ian Jackson CC: Antti Kantee CC: Martin Lucina CC: Ian Campbell --- tools/configure | 4 ++-- tools/configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/configure b/tools/configure index e7dac75..1c92e83 100755 --- a/tools/configure +++ b/tools/configure @@ -2402,8 +2402,8 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac case $host_vendor in -rumpxen) CONFIG_RUMP=y; rump=true ;; -*) CONFIG_RUMP=n; rump=false ;; +rumpxen|rumprun) CONFIG_RUMP=y; rump=true ;; +*) CONFIG_RUMP=n; rump=false ;; esac diff --git a/tools/configure.ac b/tools/configure.ac index 03dadd7..1835617 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -35,8 +35,8 @@ APPEND_INCLUDES and APPEND_LIB instead when possible.]) AC_CANONICAL_HOST case $host_vendor in -rumpxen) CONFIG_RUMP=y; rump=true ;; -*) CONFIG_RUMP=n; rump=false ;; +rumpxen|rumprun) CONFIG_RUMP=y; rump=true ;; +*) CONFIG_RUMP=n; rump=false ;; esac AC_SUBST(CONFIG_RUMP) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:55:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:55:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmLs-000612-AW; Tue, 03 Mar 2015 12:55:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmLr-00060A-OK for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:07 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id F9/DB-02745-B2FA5F45; Tue, 03 Mar 2015 12:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1425387305!12632363!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13242 invoked from network); 3 Mar 2015 12:55:06 -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; 3 Mar 2015 12:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmLo-0002Wy-4V for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmLn-0003B3-Rt for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:03 +0000 Date: Tue, 03 Mar 2015 12:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/configure: detect $host_vendor of rumprun, not just rumpxen X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d26cf9004b2e1678e4ff8dab11f4deca0293a0db Author: Ian Jackson AuthorDate: Fri Feb 13 16:04:34 2015 +0000 Commit: Ian Jackson CommitDate: Mon Feb 16 14:49:28 2015 +0000 tools/configure: detect $host_vendor of rumprun, not just rumpxen This has been renamed by the rumpkernels upstream. (This patch needs to be backported.) Signed-off-by: Ian Jackson CC: Antti Kantee CC: Martin Lucina CC: Ian Campbell --- tools/configure | 4 ++-- tools/configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/configure b/tools/configure index e7dac75..1c92e83 100755 --- a/tools/configure +++ b/tools/configure @@ -2402,8 +2402,8 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac case $host_vendor in -rumpxen) CONFIG_RUMP=y; rump=true ;; -*) CONFIG_RUMP=n; rump=false ;; +rumpxen|rumprun) CONFIG_RUMP=y; rump=true ;; +*) CONFIG_RUMP=n; rump=false ;; esac diff --git a/tools/configure.ac b/tools/configure.ac index 03dadd7..1835617 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -35,8 +35,8 @@ APPEND_INCLUDES and APPEND_LIB instead when possible.]) AC_CANONICAL_HOST case $host_vendor in -rumpxen) CONFIG_RUMP=y; rump=true ;; -*) CONFIG_RUMP=n; rump=false ;; +rumpxen|rumprun) CONFIG_RUMP=y; rump=true ;; +*) CONFIG_RUMP=n; rump=false ;; esac AC_SUBST(CONFIG_RUMP) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:55:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12: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 1YSmM8-00063w-Dg; Tue, 03 Mar 2015 12: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 1YSmM6-00063d-R0 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:23 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 5F/DD-02756-A3FA5F45; Tue, 03 Mar 2015 12:55:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1425387315!12621117!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17447 invoked from network); 3 Mar 2015 12:55:16 -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; 3 Mar 2015 12:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmLz-0002X3-D6 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmLz-0003BT-6n for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:15 +0000 Date: Tue, 03 Mar 2015 12:55:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: whitespace 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 a9533e536cc9ed75f424a935ab5bfc52f30e1aa4 Author: Andrew Cooper AuthorDate: Tue Feb 17 14:29:48 2015 +0100 Commit: Jan Beulich CommitDate: Tue Feb 17 14:29:48 2015 +0100 x86/shadow: whitespace cleanup Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 490 ++++++++++++------------ xen/arch/x86/mm/shadow/multi.c | 770 +++++++++++++++++++------------------- xen/arch/x86/mm/shadow/multi.h | 36 +- xen/arch/x86/mm/shadow/private.h | 106 +++--- xen/arch/x86/mm/shadow/types.h | 42 +- 5 files changed, 722 insertions(+), 722 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 3630ae0..502e0d8 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -5,7 +5,7 @@ * Parts of this code are Copyright (c) 2006 by XenSource Inc. * Parts of this code are Copyright (c) 2006 by Michael A Fetterman * Parts based on earlier work by Michael A Fetterman, Ian Pratt et al. - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -252,7 +252,7 @@ hvm_emulate_write(enum x86_segment seg, v, addr, p_data, bytes, sh_ctxt); } -static int +static int hvm_emulate_cmpxchg(enum x86_segment seg, unsigned long offset, void *p_old, @@ -329,7 +329,7 @@ pv_emulate_write(enum x86_segment seg, v, offset, p_data, bytes, sh_ctxt); } -static int +static int pv_emulate_cmpxchg(enum x86_segment seg, unsigned long offset, void *p_old, @@ -409,9 +409,9 @@ const struct x86_emulate_ops *shadow_init_emulation( return &hvm_shadow_emulator_ops; } -/* Update an initialized emulation context to prepare for the next +/* Update an initialized emulation context to prepare for the next * instruction */ -void shadow_continue_emulation(struct sh_emulate_ctxt *sh_ctxt, +void shadow_continue_emulation(struct sh_emulate_ctxt *sh_ctxt, struct cpu_user_regs *regs) { struct vcpu *v = current; @@ -437,17 +437,17 @@ void shadow_continue_emulation(struct sh_emulate_ctxt *sh_ctxt, } } } - + #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /**************************************************************************/ -/* Out-of-sync shadows. */ +/* Out-of-sync shadows. */ -/* From time to time, we let a shadowed pagetable page go out of sync - * with its shadow: the guest is allowed to write directly to the page, +/* From time to time, we let a shadowed pagetable page go out of sync + * with its shadow: the guest is allowed to write directly to the page, * and those writes are not synchronously reflected in the shadow. - * This lets us avoid many emulations if the guest is writing a lot to a - * pagetable, but it relaxes a pretty important invariant in the shadow + * This lets us avoid many emulations if the guest is writing a lot to a + * pagetable, but it relaxes a pretty important invariant in the shadow * pagetable design. Therefore, some rules: * * 1. Only L1 pagetables may go out of sync: any page that is shadowed @@ -455,21 +455,21 @@ void shadow_continue_emulation(struct sh_emulate_ctxt *sh_ctxt, * using linear shadow pagetables much less dangerous. * That means that: (a) unsyncing code needs to check for higher-level * shadows, and (b) promotion code needs to resync. - * + * * 2. All shadow operations on a guest page require the page to be brought * back into sync before proceeding. This must be done under the * paging lock so that the page is guaranteed to remain synced until * the operation completes. * - * Exceptions to this rule: the pagefault and invlpg handlers may - * update only one entry on an out-of-sync page without resyncing it. + * Exceptions to this rule: the pagefault and invlpg handlers may + * update only one entry on an out-of-sync page without resyncing it. * * 3. Operations on shadows that do not start from a guest page need to * be aware that they may be handling an out-of-sync shadow. * - * 4. Operations that do not normally take the paging lock (fast-path - * #PF handler, INVLPG) must fall back to a locking, syncing version - * if they see an out-of-sync table. + * 4. Operations that do not normally take the paging lock (fast-path + * #PF handler, INVLPG) must fall back to a locking, syncing version + * if they see an out-of-sync table. * * 5. Operations corresponding to guest TLB flushes (MOV CR3, INVLPG) * must explicitly resync all relevant pages or update their @@ -488,26 +488,26 @@ void shadow_continue_emulation(struct sh_emulate_ctxt *sh_ctxt, #if SHADOW_AUDIT & SHADOW_AUDIT_ENTRIES_FULL -static void sh_oos_audit(struct domain *d) +static void sh_oos_audit(struct domain *d) { int idx, expected_idx, expected_idx_alt; struct page_info *pg; struct vcpu *v; - - for_each_vcpu(d, v) + + for_each_vcpu(d, v) { for ( idx = 0; idx < SHADOW_OOS_PAGES; idx++ ) { mfn_t *oos = v->arch.paging.shadow.oos; if ( !mfn_valid(oos[idx]) ) continue; - + expected_idx = mfn_x(oos[idx]) % SHADOW_OOS_PAGES; expected_idx_alt = ((expected_idx + 1) % SHADOW_OOS_PAGES); if ( idx != expected_idx && idx != expected_idx_alt ) { printk("%s: idx %d contains gmfn %lx, expected at %d or %d.\n", - __func__, idx, mfn_x(oos[idx]), + __func__, idx, mfn_x(oos[idx]), expected_idx, expected_idx_alt); BUG(); } @@ -536,21 +536,21 @@ static void sh_oos_audit(struct domain *d) #endif #if SHADOW_AUDIT & SHADOW_AUDIT_ENTRIES -void oos_audit_hash_is_present(struct domain *d, mfn_t gmfn) +void oos_audit_hash_is_present(struct domain *d, mfn_t gmfn) { int idx; struct vcpu *v; mfn_t *oos; ASSERT(mfn_is_out_of_sync(gmfn)); - - for_each_vcpu(d, v) + + for_each_vcpu(d, v) { oos = v->arch.paging.shadow.oos; idx = mfn_x(gmfn) % SHADOW_OOS_PAGES; if ( mfn_x(oos[idx]) != mfn_x(gmfn) ) idx = (idx + 1) % SHADOW_OOS_PAGES; - + if ( mfn_x(oos[idx]) == mfn_x(gmfn) ) return; } @@ -593,7 +593,7 @@ static inline int oos_fixup_flush_gmfn(struct vcpu *v, mfn_t gmfn, if ( mfn_x(fixup->smfn[i]) != INVALID_MFN ) { sh_remove_write_access_from_sl1p(v, gmfn, - fixup->smfn[i], + fixup->smfn[i], fixup->off[i]); fixup->smfn[i] = _mfn(INVALID_MFN); } @@ -612,8 +612,8 @@ void oos_fixup_add(struct vcpu *v, mfn_t gmfn, struct domain *d = v->domain; perfc_incr(shadow_oos_fixup_add); - - for_each_vcpu(d, v) + + for_each_vcpu(d, v) { oos = v->arch.paging.shadow.oos; oos_fixup = v->arch.paging.shadow.oos_fixup; @@ -638,7 +638,7 @@ void oos_fixup_add(struct vcpu *v, mfn_t gmfn, TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_OOS_FIXUP_EVICT); /* Reuse this slot and remove current writable mapping. */ - sh_remove_write_access_from_sl1p(v, gmfn, + sh_remove_write_access_from_sl1p(v, gmfn, oos_fixup[idx].smfn[next], oos_fixup[idx].off[next]); perfc_incr(shadow_oos_fixup_evict); @@ -681,7 +681,7 @@ static int oos_remove_write_access(struct vcpu *v, mfn_t gmfn, case -1: /* An unfindable writeable typecount has appeared, probably via a - * grant table entry: can't shoot the mapping, so try to unshadow + * grant table entry: can't shoot the mapping, so try to unshadow * the page. If that doesn't work either, the guest is granting * his pagetables and must be killed after all. * This will flush the tlb, so we can return with no worries. */ @@ -715,7 +715,7 @@ static void _sh_resync(struct vcpu *v, mfn_t gmfn, ASSERT(paging_locked_by_me(v->domain)); ASSERT(mfn_is_out_of_sync(gmfn)); /* Guest page must be shadowed *only* as L1 when out of sync. */ - ASSERT(!(mfn_to_page(gmfn)->shadow_flags & SHF_page_type_mask + ASSERT(!(mfn_to_page(gmfn)->shadow_flags & SHF_page_type_mask & ~SHF_L1_ANY)); ASSERT(!sh_page_has_multiple_shadows(mfn_to_page(gmfn))); @@ -751,14 +751,14 @@ static void oos_hash_add(struct vcpu *v, mfn_t gmfn) mfn_t *oos_snapshot = v->arch.paging.shadow.oos_snapshot; struct oos_fixup *oos_fixup = v->arch.paging.shadow.oos_fixup; struct oos_fixup fixup = { .next = 0 }; - + for (i = 0; i < SHADOW_OOS_FIXUPS; i++ ) fixup.smfn[i] = _mfn(INVALID_MFN); idx = mfn_x(gmfn) % SHADOW_OOS_PAGES; oidx = idx; - if ( mfn_valid(oos[idx]) + if ( mfn_valid(oos[idx]) && (mfn_x(oos[idx]) % SHADOW_OOS_PAGES) == idx ) { /* Punt the current occupant into the next slot */ @@ -795,7 +795,7 @@ static void oos_hash_remove(struct vcpu *v, mfn_t gmfn) SHADOW_PRINTK("%pv gmfn %lx\n", v, mfn_x(gmfn)); - for_each_vcpu(d, v) + for_each_vcpu(d, v) { oos = v->arch.paging.shadow.oos; idx = mfn_x(gmfn) % SHADOW_OOS_PAGES; @@ -818,8 +818,8 @@ mfn_t oos_snapshot_lookup(struct vcpu *v, mfn_t gmfn) mfn_t *oos; mfn_t *oos_snapshot; struct domain *d = v->domain; - - for_each_vcpu(d, v) + + for_each_vcpu(d, v) { oos = v->arch.paging.shadow.oos; oos_snapshot = v->arch.paging.shadow.oos_snapshot; @@ -846,7 +846,7 @@ void sh_resync(struct vcpu *v, mfn_t gmfn) struct oos_fixup *oos_fixup; struct domain *d = v->domain; - for_each_vcpu(d, v) + for_each_vcpu(d, v) { oos = v->arch.paging.shadow.oos; oos_fixup = v->arch.paging.shadow.oos_fixup; @@ -854,7 +854,7 @@ void sh_resync(struct vcpu *v, mfn_t gmfn) idx = mfn_x(gmfn) % SHADOW_OOS_PAGES; if ( mfn_x(oos[idx]) != mfn_x(gmfn) ) idx = (idx + 1) % SHADOW_OOS_PAGES; - + if ( mfn_x(oos[idx]) == mfn_x(gmfn) ) { _sh_resync(v, gmfn, &oos_fixup[idx], oos_snapshot[idx]); @@ -905,7 +905,7 @@ void sh_resync_all(struct vcpu *v, int skip, int this, int others) goto resync_others; /* First: resync all of this vcpu's oos pages */ - for ( idx = 0; idx < SHADOW_OOS_PAGES; idx++ ) + for ( idx = 0; idx < SHADOW_OOS_PAGES; idx++ ) if ( mfn_valid(oos[idx]) ) { /* Write-protect and sync contents */ @@ -920,14 +920,14 @@ void sh_resync_all(struct vcpu *v, int skip, int this, int others) /* Second: make all *other* vcpus' oos pages safe. */ for_each_vcpu(v->domain, other) { - if ( v == other ) + if ( v == other ) continue; oos = other->arch.paging.shadow.oos; oos_fixup = other->arch.paging.shadow.oos_fixup; oos_snapshot = other->arch.paging.shadow.oos_snapshot; - for ( idx = 0; idx < SHADOW_OOS_PAGES; idx++ ) + for ( idx = 0; idx < SHADOW_OOS_PAGES; idx++ ) { if ( !mfn_valid(oos[idx]) ) continue; @@ -946,7 +946,7 @@ void sh_resync_all(struct vcpu *v, int skip, int this, int others) _sh_resync(other, oos[idx], &oos_fixup[idx], oos_snapshot[idx]); oos[idx] = _mfn(INVALID_MFN); } - } + } } } @@ -955,19 +955,19 @@ void sh_resync_all(struct vcpu *v, int skip, int this, int others) int sh_unsync(struct vcpu *v, mfn_t gmfn) { struct page_info *pg; - + ASSERT(paging_locked_by_me(v->domain)); SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx\n", v->domain->domain_id, v->vcpu_id, mfn_x(gmfn)); pg = mfn_to_page(gmfn); - + /* Guest page must be shadowed *only* as L1 and *only* once when out - * of sync. Also, get out now if it's already out of sync. + * of sync. Also, get out now if it's already out of sync. * Also, can't safely unsync if some vcpus have paging disabled.*/ - if ( pg->shadow_flags & - ((SHF_page_type_mask & ~SHF_L1_ANY) | SHF_out_of_sync) + if ( pg->shadow_flags & + ((SHF_page_type_mask & ~SHF_L1_ANY) | SHF_out_of_sync) || sh_page_has_multiple_shadows(pg) || is_pv_domain(v->domain) || !v->domain->arch.paging.shadow.oos_active ) @@ -995,9 +995,9 @@ void shadow_promote(struct vcpu *v, mfn_t gmfn, unsigned int type) ASSERT(mfn_valid(gmfn)); -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* Is the page already shadowed and out of sync? */ - if ( page_is_out_of_sync(page) ) + if ( page_is_out_of_sync(page) ) sh_resync(v, gmfn); #endif @@ -1026,13 +1026,13 @@ void shadow_demote(struct vcpu *v, mfn_t gmfn, u32 type) if ( (page->shadow_flags & SHF_page_type_mask) == 0 ) { -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* Was the page out of sync? */ - if ( page_is_out_of_sync(page) ) + if ( page_is_out_of_sync(page) ) { oos_hash_remove(v, gmfn); } -#endif +#endif clear_bit(_PGC_page_table, &page->count_info); } @@ -1050,11 +1050,11 @@ sh_validate_guest_entry(struct vcpu *v, mfn_t gmfn, void *entry, u32 size) struct page_info *page = mfn_to_page(gmfn); paging_mark_dirty(v->domain, mfn_x(gmfn)); - + // Determine which types of shadows are affected, and update each. // // Always validate L1s before L2s to prevent another cpu with a linear - // mapping of this gmfn from seeing a walk that results from + // mapping of this gmfn from seeing a walk that results from // using the new L2 value and the old L1 value. (It is OK for such a // guest to see a walk that uses the old L2 value with the new L1 value, // as hardware could behave this way if one level of the pagewalk occurs @@ -1067,40 +1067,40 @@ sh_validate_guest_entry(struct vcpu *v, mfn_t gmfn, void *entry, u32 size) if ( !(page->count_info & PGC_page_table) ) return 0; /* Not shadowed at all */ - if ( page->shadow_flags & SHF_L1_32 ) + if ( page->shadow_flags & SHF_L1_32 ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl1e, 2) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L2_32 ) + if ( page->shadow_flags & SHF_L2_32 ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl2e, 2) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L1_PAE ) + if ( page->shadow_flags & SHF_L1_PAE ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl1e, 3) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L2_PAE ) + if ( page->shadow_flags & SHF_L2_PAE ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl2e, 3) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L2H_PAE ) + if ( page->shadow_flags & SHF_L2H_PAE ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl2he, 3) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L1_64 ) + if ( page->shadow_flags & SHF_L1_64 ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl1e, 4) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L2_64 ) + if ( page->shadow_flags & SHF_L2_64 ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl2e, 4) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L2H_64 ) + if ( page->shadow_flags & SHF_L2H_64 ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl2he, 4) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L3_64 ) + if ( page->shadow_flags & SHF_L3_64 ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl3e, 4) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L4_64 ) + if ( page->shadow_flags & SHF_L4_64 ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl4e, 4) (v, gmfn, entry, size); - this_cpu(trace_shadow_path_flags) |= (result<<(TRCE_SFLAG_SET_CHANGED)); + this_cpu(trace_shadow_path_flags) |= (result<<(TRCE_SFLAG_SET_CHANGED)); return result; } @@ -1121,12 +1121,12 @@ sh_validate_guest_pt_write(struct vcpu *v, mfn_t gmfn, if ( rc & SHADOW_SET_FLUSH ) /* Need to flush TLBs to pick up shadow PT changes */ flush_tlb_mask(d->domain_dirty_cpumask); - if ( rc & SHADOW_SET_ERROR ) + if ( rc & SHADOW_SET_ERROR ) { - /* This page is probably not a pagetable any more: tear it out of the - * shadows, along with any tables that reference it. - * Since the validate call above will have made a "safe" (i.e. zero) - * shadow entry, we can let the domain live even if we can't fully + /* This page is probably not a pagetable any more: tear it out of the + * shadows, along with any tables that reference it. + * Since the validate call above will have made a "safe" (i.e. zero) + * shadow entry, we can let the domain live even if we can't fully * unshadow the page. */ sh_remove_shadows(v, gmfn, 0, 0); } @@ -1134,7 +1134,7 @@ sh_validate_guest_pt_write(struct vcpu *v, mfn_t gmfn, int shadow_write_guest_entry(struct vcpu *v, intpte_t *p, intpte_t new, mfn_t gmfn) -/* Write a new value into the guest pagetable, and update the shadows +/* Write a new value into the guest pagetable, and update the shadows * appropriately. Returns 0 if we page-faulted, 1 for success. */ { int failed; @@ -1148,7 +1148,7 @@ int shadow_write_guest_entry(struct vcpu *v, intpte_t *p, int shadow_cmpxchg_guest_entry(struct vcpu *v, intpte_t *p, intpte_t *old, intpte_t new, mfn_t gmfn) -/* Cmpxchg a new value into the guest pagetable, and update the shadows +/* Cmpxchg a new value into the guest pagetable, and update the shadows * appropriately. Returns 0 if we page-faulted, 1 if not. * N.B. caller should check the value of "old" to see if the * cmpxchg itself was successful. */ @@ -1166,7 +1166,7 @@ int shadow_cmpxchg_guest_entry(struct vcpu *v, intpte_t *p, /**************************************************************************/ -/* Memory management for shadow pages. */ +/* Memory management for shadow pages. */ /* Allocating shadow pages * ----------------------- @@ -1180,12 +1180,12 @@ int shadow_cmpxchg_guest_entry(struct vcpu *v, intpte_t *p, * PAE/64-bit l2 tables (1GB va each). These multi-page shadows are * not contiguous in memory; functions for handling offsets into them are * defined in shadow/multi.c (shadow_l1_index() etc.) - * + * * This table shows the allocation behaviour of the different modes: * * Xen paging 64b 64b 64b * Guest paging 32b pae 64b - * PV or HVM HVM HVM * + * PV or HVM HVM HVM * * Shadow paging pae pae 64b * * sl1 size 8k 4k 4k @@ -1193,8 +1193,8 @@ int shadow_cmpxchg_guest_entry(struct vcpu *v, intpte_t *p, * sl3 size - - 4k * sl4 size - - 4k * - * In HVM guests, the p2m table is built out of shadow pages, and we provide - * a function for the p2m management to steal pages, in max-order chunks, from + * In HVM guests, the p2m table is built out of shadow pages, and we provide + * a function for the p2m management to steal pages, in max-order chunks, from * the free pool. */ @@ -1221,15 +1221,15 @@ const u8 sh_type_to_size[] = { /* Figure out the least acceptable quantity of shadow memory. * The minimum memory requirement for always being able to free up a * chunk of memory is very small -- only three max-order chunks per - * vcpu to hold the top level shadows and pages with Xen mappings in them. + * vcpu to hold the top level shadows and pages with Xen mappings in them. * * But for a guest to be guaranteed to successfully execute a single * instruction, we must be able to map a large number (about thirty) VAs * at the same time, which means that to guarantee progress, we must * allow for more than ninety allocated pages per vcpu. We round that - * up to 128 pages, or half a megabyte per vcpu, and add 1 more vcpu's + * up to 128 pages, or half a megabyte per vcpu, and add 1 more vcpu's * worth to make sure we never return zero. */ -static unsigned int shadow_min_acceptable_pages(struct domain *d) +static unsigned int shadow_min_acceptable_pages(struct domain *d) { u32 vcpu_count = 1; struct vcpu *v; @@ -1238,7 +1238,7 @@ static unsigned int shadow_min_acceptable_pages(struct domain *d) vcpu_count++; return (vcpu_count * 128); -} +} /* Dispatcher function: call the per-mode function that will unhook the * non-Xen mappings in this top-level shadow mfn. With user_only == 1, @@ -1290,7 +1290,7 @@ static void _shadow_prealloc( int i; if ( d->arch.paging.shadow.free_pages >= pages ) return; - + v = current; if ( v->domain != d ) v = d->vcpu[0]; @@ -1315,13 +1315,13 @@ static void _shadow_prealloc( * mappings. */ perfc_incr(shadow_prealloc_2); - for_each_vcpu(d, v2) + for_each_vcpu(d, v2) for ( i = 0 ; i < 4 ; i++ ) { if ( !pagetable_is_null(v2->arch.shadow_table[i]) ) { TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_PREALLOC_UNHOOK); - shadow_unhook_mappings(v, + shadow_unhook_mappings(v, pagetable_get_mfn(v2->arch.shadow_table[i]), 0); /* See if that freed up enough space */ @@ -1332,7 +1332,7 @@ static void _shadow_prealloc( } } } - + /* Nothing more we can do: all remaining shadows are of pages that * hold Xen mappings for some vcpu. This can never happen. */ SHADOW_ERROR("Can't pre-allocate %u shadow pages!\n" @@ -1356,7 +1356,7 @@ void shadow_prealloc(struct domain *d, u32 type, unsigned int count) /* Deliberately free all the memory we can: this will tear down all of * this domain's shadows */ -static void shadow_blow_tables(struct domain *d) +static void shadow_blow_tables(struct domain *d) { struct page_info *sp, *t; struct vcpu *v = d->vcpu[0]; @@ -1371,12 +1371,12 @@ static void shadow_blow_tables(struct domain *d) smfn = page_to_mfn(sp); sh_unpin(v, smfn); } - + /* Second pass: unhook entries of in-use shadows */ - for_each_vcpu(d, v) + for_each_vcpu(d, v) for ( i = 0 ; i < 4 ; i++ ) if ( !pagetable_is_null(v->arch.shadow_table[i]) ) - shadow_unhook_mappings(v, + shadow_unhook_mappings(v, pagetable_get_mfn(v->arch.shadow_table[i]), 0); /* Make sure everyone sees the unshadowings */ @@ -1441,9 +1441,9 @@ set_next_shadow(struct page_info *sp, struct page_info *next) } /* Allocate another shadow's worth of (contiguous, aligned) pages, - * and fill in the type and backpointer fields of their page_infos. + * and fill in the type and backpointer fields of their page_infos. * Never fails to allocate. */ -mfn_t shadow_alloc(struct domain *d, +mfn_t shadow_alloc(struct domain *d, u32 shadow_type, unsigned long backpointer) { @@ -1485,10 +1485,10 @@ mfn_t shadow_alloc(struct domain *d, INIT_PAGE_LIST_HEAD(&tmp_list); /* Init page info fields and clear the pages */ - for ( i = 0; i < pages ; i++ ) + for ( i = 0; i < pages ; i++ ) { sp = page_list_remove_head(&d->arch.paging.shadow.freelist); - /* Before we overwrite the old contents of this page, + /* Before we overwrite the old contents of this page, * we need to be sure that no TLB holds a pointer to it. */ cpumask_copy(&mask, d->domain_dirty_cpumask); tlbflush_filter(mask, sp->tlbflush_timestamp); @@ -1512,7 +1512,7 @@ mfn_t shadow_alloc(struct domain *d, set_next_shadow(sp, NULL); perfc_incr(shadow_alloc_count); } - if ( shadow_type >= SH_type_min_shadow + if ( shadow_type >= SH_type_min_shadow && shadow_type <= SH_type_max_shadow ) sp->u.sh.head = 1; @@ -1525,7 +1525,7 @@ mfn_t shadow_alloc(struct domain *d, /* Return some shadow pages to the pool. */ void shadow_free(struct domain *d, mfn_t smfn) { - struct page_info *next = NULL, *sp = mfn_to_page(smfn); + struct page_info *next = NULL, *sp = mfn_to_page(smfn); struct page_list_head *pin_list; unsigned int pages; u32 shadow_type; @@ -1540,16 +1540,16 @@ void shadow_free(struct domain *d, mfn_t smfn) pages = shadow_size(shadow_type); pin_list = &d->arch.paging.shadow.pinned_shadows; - for ( i = 0; i < pages; i++ ) + for ( i = 0; i < pages; i++ ) { #if SHADOW_OPTIMIZATIONS & (SHOPT_WRITABLE_HEURISTIC | SHOPT_FAST_EMULATION) struct vcpu *v; - for_each_vcpu(d, v) + for_each_vcpu(d, v) { #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC /* No longer safe to look for a writeable mapping in this shadow */ - if ( v->arch.paging.shadow.last_writeable_pte_smfn - == mfn_x(page_to_mfn(sp)) ) + if ( v->arch.paging.shadow.last_writeable_pte_smfn + == mfn_x(page_to_mfn(sp)) ) v->arch.paging.shadow.last_writeable_pte_smfn = 0; #endif #if SHADOW_OPTIMIZATIONS & SHOPT_FAST_EMULATION @@ -1562,7 +1562,7 @@ void shadow_free(struct domain *d, mfn_t smfn) next = page_list_next(sp, pin_list); /* Strip out the type: this is now a free shadow page */ sp->u.sh.type = sp->u.sh.head = 0; - /* Remember the TLB timestamp so we will know whether to flush + /* Remember the TLB timestamp so we will know whether to flush * TLBs when we reuse the page. Because the destructors leave the * contents of the pages in place, we can delay TLB flushes until * just before the allocator hands the page out again. */ @@ -1584,11 +1584,11 @@ shadow_alloc_p2m_page(struct domain *d) { struct page_info *pg; - /* This is called both from the p2m code (which never holds the + /* This is called both from the p2m code (which never holds the * paging lock) and the log-dirty code (which always does). */ paging_lock_recursive(d); - if ( d->arch.paging.shadow.total_pages + if ( d->arch.paging.shadow.total_pages < shadow_min_acceptable_pages(d) + 1 ) { if ( !d->arch.paging.p2m_alloc_failed ) @@ -1630,9 +1630,9 @@ shadow_free_p2m_page(struct domain *d, struct page_info *pg) } pg->count_info &= ~PGC_count_mask; pg->u.sh.type = SH_type_p2m_table; /* p2m code reuses type-info */ - page_set_owner(pg, NULL); + page_set_owner(pg, NULL); - /* This is called both from the p2m code (which never holds the + /* This is called both from the p2m code (which never holds the * paging lock) and the log-dirty code (which always does). */ paging_lock_recursive(d); @@ -1647,7 +1647,7 @@ shadow_free_p2m_page(struct domain *d, struct page_info *pg) * Input will be rounded up to at least shadow_min_acceptable_pages(), * plus space for the p2m table. * Returns 0 for success, non-zero for failure. */ -static unsigned int sh_set_allocation(struct domain *d, +static unsigned int sh_set_allocation(struct domain *d, unsigned int pages, int *preempted) { @@ -1663,7 +1663,7 @@ static unsigned int sh_set_allocation(struct domain *d, pages = 0; else pages -= d->arch.paging.shadow.p2m_pages; - + /* Don't allocate less than the minimum acceptable, plus one page per * megabyte of RAM (for the p2m table) */ lower_bound = shadow_min_acceptable_pages(d) + (d->tot_pages / 256); @@ -1671,18 +1671,18 @@ static unsigned int sh_set_allocation(struct domain *d, pages = lower_bound; } - SHADOW_PRINTK("current %i target %i\n", + SHADOW_PRINTK("current %i target %i\n", d->arch.paging.shadow.total_pages, pages); for ( ; ; ) { - if ( d->arch.paging.shadow.total_pages < pages ) + if ( d->arch.paging.shadow.total_pages < pages ) { /* Need to allocate more memory from domheap */ sp = (struct page_info *) alloc_domheap_page(NULL, MEMF_node(domain_to_node(d))); - if ( sp == NULL ) - { + if ( sp == NULL ) + { SHADOW_PRINTK("failed to allocate shadow pages.\n"); return -ENOMEM; } @@ -1693,8 +1693,8 @@ static unsigned int sh_set_allocation(struct domain *d, sp->u.sh.count = 0; sp->tlbflush_timestamp = 0; /* Not in any TLB */ page_list_add_tail(sp, &d->arch.paging.shadow.freelist); - } - else if ( d->arch.paging.shadow.total_pages > pages ) + } + else if ( d->arch.paging.shadow.total_pages > pages ) { /* Need to return memory to domheap */ _shadow_prealloc(d, 1); @@ -1734,7 +1734,7 @@ static unsigned int shadow_get_allocation(struct domain *d) /**************************************************************************/ /* Hash table for storing the guest->shadow mappings. - * The table itself is an array of pointers to shadows; the shadows are then + * The table itself is an array of pointers to shadows; the shadows are then * threaded on a singly-linked list of shadows with the same hash value */ #define SHADOW_HASH_BUCKETS 251 @@ -1742,7 +1742,7 @@ static unsigned int shadow_get_allocation(struct domain *d) /* Hash function that takes a gfn or mfn, plus another byte of type info */ typedef u32 key_t; -static inline key_t sh_hash(unsigned long n, unsigned int t) +static inline key_t sh_hash(unsigned long n, unsigned int t) { unsigned char *p = (unsigned char *)&n; key_t k = t; @@ -1801,7 +1801,7 @@ static void sh_hash_audit_bucket(struct domain *d, int bucket) SHADOW_ERROR("MFN %#"PRI_mfn" shadowed (by %#"PRI_mfn")" " and not OOS but has typecount %#lx\n", __backpointer(sp), - mfn_x(page_to_mfn(sp)), + mfn_x(page_to_mfn(sp)), gpg->u.inuse.type_info); BUG(); } @@ -1809,7 +1809,7 @@ static void sh_hash_audit_bucket(struct domain *d, int bucket) } else /* Not an l1 */ #endif - if ( (gpg->u.inuse.type_info & PGT_type_mask) == PGT_writable_page + if ( (gpg->u.inuse.type_info & PGT_type_mask) == PGT_writable_page && (gpg->u.inuse.type_info & PGT_count_mask) != 0 ) { SHADOW_ERROR("MFN %#"PRI_mfn" shadowed (by %#"PRI_mfn")" @@ -1839,7 +1839,7 @@ static void sh_hash_audit(struct domain *d) if ( !(SHADOW_AUDIT_ENABLE) ) return; - for ( i = 0; i < SHADOW_HASH_BUCKETS; i++ ) + for ( i = 0; i < SHADOW_HASH_BUCKETS; i++ ) { sh_hash_audit_bucket(d, i); } @@ -1849,7 +1849,7 @@ static void sh_hash_audit(struct domain *d) #define sh_hash_audit(_d) do {} while(0) #endif /* Hashtable bucket audit */ -/* Allocate and initialise the table itself. +/* Allocate and initialise the table itself. * Returns 0 for success, 1 for error. */ static int shadow_hash_alloc(struct domain *d) { @@ -1906,11 +1906,11 @@ mfn_t shadow_hash_lookup(struct vcpu *v, unsigned long n, unsigned int t) if ( unlikely(d->arch.paging.shadow.hash_walking != 0) ) /* Can't reorder: someone is walking the hash chains */ return page_to_mfn(sp); - else + else { ASSERT(prev); /* Delete sp from the list */ - prev->next_shadow = sp->next_shadow; + prev->next_shadow = sp->next_shadow; /* Re-insert it at the head of the list */ set_next_shadow(sp, d->arch.paging.shadow.hash_table[key]); d->arch.paging.shadow.hash_table[key] = sp; @@ -1930,14 +1930,14 @@ mfn_t shadow_hash_lookup(struct vcpu *v, unsigned long n, unsigned int t) return _mfn(INVALID_MFN); } -void shadow_hash_insert(struct vcpu *v, unsigned long n, unsigned int t, +void shadow_hash_insert(struct vcpu *v, unsigned long n, unsigned int t, mfn_t smfn) /* Put a mapping (n,t)->smfn into the hash table */ { struct domain *d = v->domain; struct page_info *sp; key_t key; - + ASSERT(paging_locked_by_me(d)); ASSERT(d->arch.paging.shadow.hash_table); ASSERT(t); @@ -1947,16 +1947,16 @@ void shadow_hash_insert(struct vcpu *v, unsigned long n, unsigned int t, perfc_incr(shadow_hash_inserts); key = sh_hash(n, t); sh_hash_audit_bucket(d, key); - + /* Insert this shadow at the top of the bucket */ sp = mfn_to_page(smfn); set_next_shadow(sp, d->arch.paging.shadow.hash_table[key]); d->arch.paging.shadow.hash_table[key] = sp; - + sh_hash_audit_bucket(d, key); } -void shadow_hash_delete(struct vcpu *v, unsigned long n, unsigned int t, +void shadow_hash_delete(struct vcpu *v, unsigned long n, unsigned int t, mfn_t smfn) /* Excise the mapping (n,t)->smfn from the hash table */ { @@ -1973,12 +1973,12 @@ void shadow_hash_delete(struct vcpu *v, unsigned long n, unsigned int t, perfc_incr(shadow_hash_deletes); key = sh_hash(n, t); sh_hash_audit_bucket(d, key); - + sp = mfn_to_page(smfn); - if ( d->arch.paging.shadow.hash_table[key] == sp ) + if ( d->arch.paging.shadow.hash_table[key] == sp ) /* Easy case: we're deleting the head item. */ d->arch.paging.shadow.hash_table[key] = next_shadow(sp); - else + else { /* Need to search for the one we want */ x = d->arch.paging.shadow.hash_table[key]; @@ -2001,17 +2001,17 @@ void shadow_hash_delete(struct vcpu *v, unsigned long n, unsigned int t, typedef int (*hash_callback_t)(struct vcpu *v, mfn_t smfn, mfn_t other_mfn); -static void hash_foreach(struct vcpu *v, - unsigned int callback_mask, +static void hash_foreach(struct vcpu *v, + unsigned int callback_mask, const hash_callback_t callbacks[], mfn_t callback_mfn) -/* Walk the hash table looking at the types of the entries and - * calling the appropriate callback function for each entry. +/* Walk the hash table looking at the types of the entries and + * calling the appropriate callback function for each entry. * The mask determines which shadow types we call back for, and the array * of callbacks tells us which function to call. - * Any callback may return non-zero to let us skip the rest of the scan. + * Any callback may return non-zero to let us skip the rest of the scan. * - * WARNING: Callbacks MUST NOT add or remove hash entries unless they + * WARNING: Callbacks MUST NOT add or remove hash entries unless they * then return non-zero to terminate the scan. */ { int i, done = 0; @@ -2028,7 +2028,7 @@ static void hash_foreach(struct vcpu *v, ASSERT(d->arch.paging.shadow.hash_walking == 0); d->arch.paging.shadow.hash_walking = 1; - for ( i = 0; i < SHADOW_HASH_BUCKETS; i++ ) + for ( i = 0; i < SHADOW_HASH_BUCKETS; i++ ) { /* WARNING: This is not safe against changes to the hash table. * The callback *must* return non-zero if it has inserted or @@ -2044,15 +2044,15 @@ static void hash_foreach(struct vcpu *v, if ( done ) break; } } - if ( done ) break; + if ( done ) break; } - d->arch.paging.shadow.hash_walking = 0; + d->arch.paging.shadow.hash_walking = 0; } /**************************************************************************/ /* Destroy a shadow page: simple dispatcher to call the per-type destructor - * which will decrement refcounts appropriately and return memory to the + * which will decrement refcounts appropriately and return memory to the * free pool. */ void sh_destroy_shadow(struct vcpu *v, mfn_t smfn) @@ -2065,13 +2065,13 @@ void sh_destroy_shadow(struct vcpu *v, mfn_t smfn) /* Double-check, if we can, that the shadowed page belongs to this * domain, (by following the back-pointer). */ - ASSERT(t == SH_type_fl1_32_shadow || - t == SH_type_fl1_pae_shadow || - t == SH_type_fl1_64_shadow || - t == SH_type_monitor_table || + ASSERT(t == SH_type_fl1_32_shadow || + t == SH_type_fl1_pae_shadow || + t == SH_type_fl1_64_shadow || + t == SH_type_monitor_table || (is_pv_32on64_vcpu(v) && t == SH_type_l4_64_shadow) || (page_get_owner(mfn_to_page(backpointer(sp))) - == v->domain)); + == v->domain)); /* The down-shifts here are so that the switch statement is on nice * small numbers that the compiler will enjoy */ @@ -2115,7 +2115,7 @@ void sh_destroy_shadow(struct vcpu *v, mfn_t smfn) SHADOW_ERROR("tried to destroy shadow of bad type %08lx\n", (unsigned long)t); BUG(); - } + } } static inline void trace_shadow_wrmap_bf(mfn_t gmfn) @@ -2129,13 +2129,13 @@ static inline void trace_shadow_wrmap_bf(mfn_t gmfn) } /**************************************************************************/ -/* Remove all writeable mappings of a guest frame from the shadow tables - * Returns non-zero if we need to flush TLBs. +/* Remove all writeable mappings of a guest frame from the shadow tables + * Returns non-zero if we need to flush TLBs. * level and fault_addr desribe how we found this to be a pagetable; * level==0 means we have some other reason for revoking write access. * If level==0 we are allowed to fail, returning -1. */ -int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, +int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, unsigned int level, unsigned long fault_addr) { @@ -2180,7 +2180,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, /* Early exit if it's already a pagetable, or otherwise not writeable */ if ( (sh_mfn_is_a_page_table(gmfn) -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* Unless they've been allowed to go out of sync with their shadows */ && !mfn_oos_may_write(gmfn) #endif @@ -2192,11 +2192,11 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, perfc_incr(shadow_writeable); - /* If this isn't a "normal" writeable page, the domain is trying to + /* If this isn't a "normal" writeable page, the domain is trying to * put pagetables in special memory of some kind. We can't allow that. */ if ( (pg->u.inuse.type_info & PGT_type_mask) != PGT_writable_page ) { - SHADOW_ERROR("can't remove write access to mfn %lx, type_info is %" + SHADOW_ERROR("can't remove write access to mfn %lx, type_info is %" PRtype_info "\n", mfn_x(gmfn), mfn_to_page(gmfn)->u.inuse.type_info); domain_crash(v->domain); @@ -2219,7 +2219,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, return 1; \ } \ } while (0) - + if ( v->arch.paging.mode->guest_levels == 2 ) { if ( level == 1 ) @@ -2227,27 +2227,27 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, GUESS(0xC0000000UL + (fault_addr >> 10), 1); /* Linux lowmem: first 896MB is mapped 1-to-1 above 0xC0000000 */ - if ((gfn = mfn_to_gfn(v->domain, gmfn)) < 0x38000 ) + if ((gfn = mfn_to_gfn(v->domain, gmfn)) < 0x38000 ) GUESS(0xC0000000UL + (gfn << PAGE_SHIFT), 4); /* FreeBSD: Linear map at 0xBFC00000 */ if ( level == 1 ) - GUESS(0xBFC00000UL + GUESS(0xBFC00000UL + ((fault_addr & VADDR_MASK) >> 10), 6); } else if ( v->arch.paging.mode->guest_levels == 3 ) { /* 32bit PAE w2k3: linear map at 0xC0000000 */ - switch ( level ) + switch ( level ) { case 1: GUESS(0xC0000000UL + (fault_addr >> 9), 2); break; case 2: GUESS(0xC0600000UL + (fault_addr >> 18), 2); break; } /* Linux lowmem: first 896MB is mapped 1-to-1 above 0xC0000000 */ - if ((gfn = mfn_to_gfn(v->domain, gmfn)) < 0x38000 ) + if ((gfn = mfn_to_gfn(v->domain, gmfn)) < 0x38000 ) GUESS(0xC0000000UL + (gfn << PAGE_SHIFT), 4); - + /* FreeBSD PAE: Linear map at 0xBF800000 */ switch ( level ) { @@ -2260,20 +2260,20 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, else if ( v->arch.paging.mode->guest_levels == 4 ) { /* 64bit w2k3: linear map at 0xfffff68000000000 */ - switch ( level ) + switch ( level ) { - case 1: GUESS(0xfffff68000000000UL + case 1: GUESS(0xfffff68000000000UL + ((fault_addr & VADDR_MASK) >> 9), 3); break; case 2: GUESS(0xfffff6fb40000000UL + ((fault_addr & VADDR_MASK) >> 18), 3); break; - case 3: GUESS(0xfffff6fb7da00000UL + case 3: GUESS(0xfffff6fb7da00000UL + ((fault_addr & VADDR_MASK) >> 27), 3); break; } /* 64bit Linux direct map at 0xffff880000000000; older kernels * had it at 0xffff810000000000, and older kernels yet had it * at 0x0000010000000000UL */ - gfn = mfn_to_gfn(v->domain, gmfn); + gfn = mfn_to_gfn(v->domain, gmfn); GUESS(0xffff880000000000UL + (gfn << PAGE_SHIFT), 4); GUESS(0xffff810000000000UL + (gfn << PAGE_SHIFT), 4); GUESS(0x0000010000000000UL + (gfn << PAGE_SHIFT), 4); @@ -2283,7 +2283,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, * kpm_vbase; 0xfffffe0000000000UL */ GUESS(0xfffffe0000000000UL + (gfn << PAGE_SHIFT), 4); - + /* FreeBSD 64bit: linear map 0xffff800000000000 */ switch ( level ) { @@ -2316,7 +2316,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, mfn_t last_smfn = _mfn(v->arch.paging.shadow.last_writeable_pte_smfn); int shtype = mfn_to_page(last_smfn)->u.sh.type; - if ( callbacks[shtype] ) + if ( callbacks[shtype] ) callbacks[shtype](v, last_smfn, gmfn); if ( (pg->u.inuse.type_info & PGT_count_mask) != old_count ) @@ -2327,7 +2327,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, return 1; #endif /* SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC */ - + /* Brute-force search of all the shadows, by walking the hash */ trace_shadow_wrmap_bf(gmfn); if ( level == 0 ) @@ -2348,20 +2348,20 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, (mfn_to_page(gmfn)->u.inuse.type_info&PGT_count_mask)); domain_crash(v->domain); } - + /* We killed at least one writeable mapping, so must flush TLBs. */ return 1; } -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) int sh_remove_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, mfn_t smfn, unsigned long off) { struct page_info *sp = mfn_to_page(smfn); - + ASSERT(mfn_valid(smfn)); ASSERT(mfn_valid(gmfn)); - + if ( sp->u.sh.type == SH_type_l1_32_shadow || sp->u.sh.type == SH_type_fl1_32_shadow ) { @@ -2379,7 +2379,7 @@ int sh_remove_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, return 0; } -#endif +#endif /**************************************************************************/ /* Remove all mappings of a guest frame from the shadow tables. @@ -2427,9 +2427,9 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) * can be called via put_page_type when we clear a shadow l1e).*/ paging_lock_recursive(v->domain); - /* XXX TODO: + /* XXX TODO: * Heuristics for finding the (probably) single mapping of this gmfn */ - + /* Brute-force search of all the shadows, by walking the hash */ perfc_incr(shadow_mappings_bf); hash_foreach(v, callback_mask, callbacks, gmfn); @@ -2437,8 +2437,8 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) /* If that didn't catch the mapping, something is very wrong */ if ( !sh_check_page_has_no_refs(page) ) { - /* Don't complain if we're in HVM and there are some extra mappings: - * The qemu helper process has an untyped mapping of this dom's RAM + /* Don't complain if we're in HVM and there are some extra mappings: + * The qemu helper process has an untyped mapping of this dom's RAM * and the HVM restore program takes another. * Also allow one typed refcount for xenheap pages, to match * share_xen_page_with_guest(). */ @@ -2448,7 +2448,7 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) == !!is_xen_heap_page(page))) ) { SHADOW_ERROR("can't find all mappings of mfn %lx: " - "c=%08lx t=%08lx\n", mfn_x(gmfn), + "c=%08lx t=%08lx\n", mfn_x(gmfn), page->count_info, page->u.inuse.type_info); } } @@ -2475,7 +2475,7 @@ static int sh_remove_shadow_via_pointer(struct vcpu *v, mfn_t smfn) ASSERT(sp->u.sh.type > 0); ASSERT(sp->u.sh.type < SH_type_max_shadow); ASSERT(sh_type_has_up_pointer(v, sp->u.sh.type)); - + if (sp->up == 0) return 0; pmfn = _mfn(sp->up >> PAGE_SHIFT); ASSERT(mfn_valid(pmfn)); @@ -2483,7 +2483,7 @@ static int sh_remove_shadow_via_pointer(struct vcpu *v, mfn_t smfn) ASSERT(vaddr); vaddr += sp->up & (PAGE_SIZE-1); ASSERT(l1e_get_pfn(*(l1_pgentry_t *)vaddr) == mfn_x(smfn)); - + /* Is this the only reference to this shadow? */ rc = (sp->u.sh.count == 1) ? 1 : 0; @@ -2508,7 +2508,7 @@ static int sh_remove_shadow_via_pointer(struct vcpu *v, mfn_t smfn) break; default: BUG(); /* Some wierd unknown shadow type */ } - + sh_unmap_domain_page(vaddr); if ( rc ) perfc_incr(shadow_up_pointer); @@ -2519,8 +2519,8 @@ static int sh_remove_shadow_via_pointer(struct vcpu *v, mfn_t smfn) } void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) -/* Remove the shadows of this guest page. - * If fast != 0, just try the quick heuristic, which will remove +/* Remove the shadows of this guest page. + * If fast != 0, just try the quick heuristic, which will remove * at most one reference to each shadow of the page. Otherwise, walk * all the shadow tables looking for refs to shadows of this gmfn. * If all != 0, kill the domain if we can't find all the shadows. @@ -2530,7 +2530,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) struct page_info *pg = mfn_to_page(gmfn); mfn_t smfn; unsigned char t; - + /* Dispatch table for getting per-type functions: each level must * be called with the function to remove a lower-level shadow. */ static const hash_callback_t callbacks[SH_type_unused] = { @@ -2642,7 +2642,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) domain_crash(v->domain); } - /* Need to flush TLBs now, so that linear maps are safe next time we + /* Need to flush TLBs now, so that linear maps are safe next time we * take a fault. */ flush_tlb_mask(v->domain->domain_dirty_cpumask); @@ -2656,18 +2656,18 @@ sh_remove_all_shadows_and_parents(struct vcpu *v, mfn_t gmfn) { sh_remove_shadows(v, gmfn, 0, 1); /* XXX TODO: - * Rework this hashtable walker to return a linked-list of all - * the shadows it modified, then do breadth-first recursion - * to find the way up to higher-level tables and unshadow them too. + * Rework this hashtable walker to return a linked-list of all + * the shadows it modified, then do breadth-first recursion + * to find the way up to higher-level tables and unshadow them too. * * The current code (just tearing down each page's shadows as we - * detect that it is not a pagetable) is correct, but very slow. + * detect that it is not a pagetable) is correct, but very slow. * It means extra emulated writes and slows down removal of mappings. */ } /**************************************************************************/ -/* Reset the up-pointers of every L3 shadow to 0. +/* Reset the up-pointers of every L3 shadow to 0. * This is called when l3 shadows stop being pinnable, to clear out all * the list-head bits so the up-pointer field is properly inititalised. */ static int sh_clear_up_pointer(struct vcpu *v, mfn_t smfn, mfn_t unused) @@ -2711,7 +2711,7 @@ static void sh_update_paging_modes(struct vcpu *v) ASSERT(paging_locked_by_me(d)); -#if (SHADOW_OPTIMIZATIONS & SHOPT_VIRTUAL_TLB) +#if (SHADOW_OPTIMIZATIONS & SHOPT_VIRTUAL_TLB) /* Make sure this vcpu has a virtual TLB array allocated */ if ( unlikely(!v->arch.paging.vtlb) ) { @@ -2727,7 +2727,7 @@ static void sh_update_paging_modes(struct vcpu *v) } #endif /* (SHADOW_OPTIMIZATIONS & SHOPT_VIRTUAL_TLB) */ -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) if ( mfn_x(v->arch.paging.shadow.oos_snapshot[0]) == INVALID_MFN ) { int i; @@ -2768,7 +2768,7 @@ static void sh_update_paging_modes(struct vcpu *v) ASSERT(shadow_mode_translate(d)); ASSERT(shadow_mode_external(d)); -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* Need to resync all our pages now, because if a page goes out * of sync with paging enabled and is resynced with paging * disabled, the resync will go wrong. */ @@ -2827,7 +2827,7 @@ static void sh_update_paging_modes(struct vcpu *v) /* Need to make a new monitor table for the new mode */ mfn_t new_mfn, old_mfn; - if ( v != current && vcpu_runnable(v) ) + if ( v != current && vcpu_runnable(v) ) { SHADOW_ERROR("Some third party (d=%u v=%u) is changing " "this HVM vcpu's (d=%u v=%u) paging mode " @@ -2847,7 +2847,7 @@ static void sh_update_paging_modes(struct vcpu *v) SHADOW_PRINTK("new monitor table %"PRI_mfn "\n", mfn_x(new_mfn)); - /* Don't be running on the old monitor table when we + /* Don't be running on the old monitor table when we * pull it down! Switch CR3, and warn the HVM code that * its host cr3 has changed. */ make_cr3(v, mfn_x(new_mfn)); @@ -2914,9 +2914,9 @@ static void sh_new_mode(struct domain *d, u32 new_mode) int shadow_enable(struct domain *d, u32 mode) /* Turn on "permanent" shadow features: external, translate, refcount. * Can only be called once on a domain, and these features cannot be - * disabled. + * disabled. * Returns 0 for success, -errno for failure. */ -{ +{ unsigned int old_pages; struct page_info *pg = NULL; uint32_t *e; @@ -2942,14 +2942,14 @@ int shadow_enable(struct domain *d, u32 mode) if ( old_pages == 0 ) { unsigned int r; - paging_lock(d); + paging_lock(d); r = sh_set_allocation(d, 1024, NULL); /* Use at least 4MB */ if ( r != 0 ) { sh_set_allocation(d, 0, NULL); rv = -ENOMEM; goto out_locked; - } + } paging_unlock(d); } @@ -2957,7 +2957,7 @@ int shadow_enable(struct domain *d, u32 mode) d->arch.paging.alloc_page = shadow_alloc_p2m_page; d->arch.paging.free_page = shadow_free_p2m_page; - /* Init the P2M table. Must be done before we take the paging lock + /* Init the P2M table. Must be done before we take the paging lock * to avoid possible deadlock. */ if ( mode & PG_translate ) { @@ -2970,7 +2970,7 @@ int shadow_enable(struct domain *d, u32 mode) * have paging disabled */ if ( is_hvm_domain(d) ) { - /* Get a single page from the shadow pool. Take it via the + /* Get a single page from the shadow pool. Take it via the * P2M interface to make freeing it simpler afterwards. */ pg = shadow_alloc_p2m_page(d); if ( pg == NULL ) @@ -2979,11 +2979,11 @@ int shadow_enable(struct domain *d, u32 mode) goto out_unlocked; } /* Fill it with 32-bit, non-PAE superpage entries, each mapping 4MB - * of virtual address space onto the same physical address range */ + * of virtual address space onto the same physical address range */ e = __map_domain_page(pg); for ( i = 0; i < PAGE_SIZE / sizeof(*e); i++ ) e[i] = ((0x400000U * i) - | _PAGE_PRESENT | _PAGE_RW | _PAGE_USER + | _PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_PSE); sh_unmap_domain_page(e); pg->u.inuse.type_info = PGT_l2_page_table | 1 | PGT_validated; @@ -3005,8 +3005,8 @@ int shadow_enable(struct domain *d, u32 mode) goto out_locked; } -#if (SHADOW_OPTIMIZATIONS & SHOPT_LINUX_L3_TOPLEVEL) - /* We assume we're dealing with an older 64bit linux guest until we +#if (SHADOW_OPTIMIZATIONS & SHOPT_LINUX_L3_TOPLEVEL) + /* We assume we're dealing with an older 64bit linux guest until we * see the guest use more than one l4 per vcpu. */ d->arch.paging.shadow.opt_flags = SHOPT_LINUX_L3_TOPLEVEL; #endif @@ -3073,7 +3073,7 @@ void shadow_teardown(struct domain *d) } #endif /* (SHADOW_OPTIMIZATIONS & SHOPT_VIRTUAL_TLB) */ -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) { int i; mfn_t *oos_snapshot = v->arch.paging.shadow.oos_snapshot; @@ -3093,24 +3093,24 @@ void shadow_teardown(struct domain *d) SHADOW_PRINTK("teardown of domain %u starts." " Shadow pages total = %u, free = %u, p2m=%u\n", d->domain_id, - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, + d->arch.paging.shadow.total_pages, + d->arch.paging.shadow.free_pages, d->arch.paging.shadow.p2m_pages); /* Destroy all the shadows and release memory to domheap */ sh_set_allocation(d, 0, NULL); /* Release the hash table back to xenheap */ - if (d->arch.paging.shadow.hash_table) + if (d->arch.paging.shadow.hash_table) shadow_hash_teardown(d); /* Should not have any more memory held */ SHADOW_PRINTK("teardown done." " Shadow pages total = %u, free = %u, p2m=%u\n", - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, + d->arch.paging.shadow.total_pages, + d->arch.paging.shadow.free_pages, d->arch.paging.shadow.p2m_pages); ASSERT(d->arch.paging.shadow.total_pages == 0); } - /* Free the non-paged-vcpus pagetable; must happen after we've + /* Free the non-paged-vcpus pagetable; must happen after we've * destroyed any shadows of it or sh_destroy_shadow will get confused. */ if ( !pagetable_is_null(d->arch.paging.shadow.unpaged_pagetable) ) { @@ -3120,7 +3120,7 @@ void shadow_teardown(struct domain *d) if ( !hvm_paging_enabled(v) ) v->arch.guest_table = pagetable_null(); } - unpaged_pagetable = + unpaged_pagetable = pagetable_get_page(d->arch.paging.shadow.unpaged_pagetable); d->arch.paging.shadow.unpaged_pagetable = pagetable_null(); } @@ -3140,7 +3140,7 @@ void shadow_teardown(struct domain *d) paging_unlock(d); /* Must be called outside the lock */ - if ( unpaged_pagetable ) + if ( unpaged_pagetable ) shadow_free_p2m_page(d, unpaged_pagetable); } @@ -3150,11 +3150,11 @@ void shadow_final_teardown(struct domain *d) SHADOW_PRINTK("dom %u final teardown starts." " Shadow pages total = %u, free = %u, p2m=%u\n", d->domain_id, - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, + d->arch.paging.shadow.total_pages, + d->arch.paging.shadow.free_pages, d->arch.paging.shadow.p2m_pages); - /* Double-check that the domain didn't have any shadow memory. + /* Double-check that the domain didn't have any shadow memory. * It is possible for a domain that never got domain_kill()ed * to get here with its shadow allocation intact. */ if ( d->arch.paging.shadow.total_pages != 0 ) @@ -3168,8 +3168,8 @@ void shadow_final_teardown(struct domain *d) SHADOW_PRINTK("dom %u final teardown done." " Shadow pages total = %u, free = %u, p2m=%u\n", d->domain_id, - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, + d->arch.paging.shadow.total_pages, + d->arch.paging.shadow.free_pages, d->arch.paging.shadow.p2m_pages); paging_unlock(d); } @@ -3214,7 +3214,7 @@ static int shadow_one_bit_enable(struct domain *d, u32 mode) return 0; } -static int shadow_one_bit_disable(struct domain *d, u32 mode) +static int shadow_one_bit_disable(struct domain *d, u32 mode) /* Turn off a single shadow mode feature */ { struct vcpu *v; @@ -3234,8 +3234,8 @@ static int shadow_one_bit_disable(struct domain *d, u32 mode) SHADOW_PRINTK("un-shadowing of domain %u starts." " Shadow pages total = %u, free = %u, p2m=%u\n", d->domain_id, - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, + d->arch.paging.shadow.total_pages, + d->arch.paging.shadow.free_pages, d->arch.paging.shadow.p2m_pages); for_each_vcpu(d, v) { @@ -3246,7 +3246,7 @@ static int shadow_one_bit_disable(struct domain *d, u32 mode) else make_cr3(v, pagetable_get_pfn(v->arch.guest_table)); -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) { int i; mfn_t *oos_snapshot = v->arch.paging.shadow.oos_snapshot; @@ -3267,8 +3267,8 @@ static int shadow_one_bit_disable(struct domain *d, u32 mode) SHADOW_PRINTK("un-shadowing of domain %u done." " Shadow pages total = %u, free = %u, p2m=%u\n", d->domain_id, - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, + d->arch.paging.shadow.total_pages, + d->arch.paging.shadow.free_pages, d->arch.paging.shadow.p2m_pages); } @@ -3306,7 +3306,7 @@ static int shadow_test_disable(struct domain *d) /* P2M map manipulations */ /* shadow specific code which should be called when P2M table entry is updated - * with new content. It is responsible for update the entry, as well as other + * with new content. It is responsible for update the entry, as well as other * shadow processing jobs. */ @@ -3329,7 +3329,7 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, { mfn_t mfn = _mfn(l1e_get_pfn(*p)); p2m_type_t p2mt = p2m_flags_to_type(l1e_get_flags(*p)); - if ( (p2m_is_valid(p2mt) || p2m_is_grant(p2mt)) && mfn_valid(mfn) ) + if ( (p2m_is_valid(p2mt) || p2m_is_grant(p2mt)) && mfn_valid(mfn) ) { sh_remove_all_shadows_and_parents(v, mfn); if ( sh_remove_all_mappings(v, mfn) ) @@ -3337,8 +3337,8 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, } } - /* If we're removing a superpage mapping from the p2m, we need to check - * all the pages covered by it. If they're still there in the new + /* If we're removing a superpage mapping from the p2m, we need to check + * all the pages covered by it. If they're still there in the new * scheme, that's OK, but otherwise they must be unshadowed. */ if ( level == 2 && (l1e_get_flags(*p) & _PAGE_PRESENT) && (l1e_get_flags(*p) & _PAGE_PSE) ) @@ -3355,13 +3355,13 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, /* If we're replacing a superpage with a normal L1 page, map it */ if ( (l1e_get_flags(new) & _PAGE_PRESENT) - && !(l1e_get_flags(new) & _PAGE_PSE) + && !(l1e_get_flags(new) & _PAGE_PSE) && mfn_valid(nmfn) ) npte = map_domain_page(mfn_x(nmfn)); - + for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++ ) { - if ( !npte + if ( !npte || !p2m_is_ram(p2m_flags_to_type(l1e_get_flags(npte[i]))) || l1e_get_pfn(npte[i]) != mfn_x(omfn) ) { @@ -3374,7 +3374,7 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, omfn = _mfn(mfn_x(omfn) + 1); } flush_tlb_mask(&flushmask); - + if ( npte ) unmap_domain_page(npte); } @@ -3389,7 +3389,7 @@ shadow_write_p2m_entry(struct domain *d, unsigned long gfn, paging_lock(d); /* If there are any shadows, update them. But if shadow_teardown() - * has already been called then it's not safe to try. */ + * has already been called then it's not safe to try. */ if ( likely(d->arch.paging.shadow.total_pages != 0) ) sh_unshadow_for_p2m_change(d, gfn, p, new, level); @@ -3426,8 +3426,8 @@ static int sh_enable_log_dirty(struct domain *d, bool_t log_global) paging_lock(d); if ( shadow_mode_enabled(d) ) { - /* This domain already has some shadows: need to clear them out - * of the way to make sure that all references to guest memory are + /* This domain already has some shadows: need to clear them out + * of the way to make sure that all references to guest memory are * properly write-protected */ shadow_blow_tables(d); } @@ -3439,7 +3439,7 @@ static int sh_enable_log_dirty(struct domain *d, bool_t log_global) if ( is_pv_32on64_domain(d) ) d->arch.paging.shadow.opt_flags = SHOPT_LINUX_L3_TOPLEVEL; #endif - + ret = shadow_one_bit_enable(d, PG_log_dirty); paging_unlock(d); @@ -3454,12 +3454,12 @@ static int sh_disable_log_dirty(struct domain *d) paging_lock(d); ret = shadow_one_bit_disable(d, PG_log_dirty); paging_unlock(d); - + return ret; } -/* This function is called when we CLEAN log dirty bitmap. See - * paging_log_dirty_op() for details. +/* This function is called when we CLEAN log dirty bitmap. See + * paging_log_dirty_op() for details. */ static void sh_clean_dirty_bitmap(struct domain *d) { @@ -3519,7 +3519,7 @@ int shadow_track_dirty_vram(struct domain *d, * no need to be careful. */ if ( !dirty_vram ) { - /* Throw away all the shadows rather than walking through them + /* Throw away all the shadows rather than walking through them * up to nr times getting rid of mappings of each pfn */ shadow_blow_tables(d); @@ -3665,7 +3665,7 @@ out: /**************************************************************************/ /* Shadow-control XEN_DOMCTL dispatcher */ -int shadow_domctl(struct domain *d, +int shadow_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl) { @@ -3675,7 +3675,7 @@ int shadow_domctl(struct domain *d, { case XEN_DOMCTL_SHADOW_OP_OFF: if ( d->arch.paging.mode == PG_SH_enable ) - if ( (rc = shadow_test_disable(d)) != 0 ) + if ( (rc = shadow_test_disable(d)) != 0 ) return rc; return 0; @@ -3695,7 +3695,7 @@ int shadow_domctl(struct domain *d, case XEN_DOMCTL_SHADOW_OP_SET_ALLOCATION: paging_lock(d); if ( sc->mb == 0 && shadow_mode_enabled(d) ) - { + { /* Can't set the allocation to zero unless the domain stops using * shadow pagetables first */ SHADOW_ERROR("Can't set shadow allocation to zero, domain %u" @@ -3709,7 +3709,7 @@ int shadow_domctl(struct domain *d, /* Not finished. Set up to re-run the call. */ rc = hypercall_create_continuation( __HYPERVISOR_domctl, "h", u_domctl); - else + else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); return rc; @@ -3726,7 +3726,7 @@ int shadow_domctl(struct domain *d, #if SHADOW_AUDIT & SHADOW_AUDIT_ENTRIES_FULL -void shadow_audit_tables(struct vcpu *v) +void shadow_audit_tables(struct vcpu *v) { /* Dispatch table for getting per-type functions */ static const hash_callback_t callbacks[SH_type_unused] = { @@ -3746,7 +3746,7 @@ void shadow_audit_tables(struct vcpu *v) SHADOW_INTERNAL_NAME(sh_audit_l4_table, 4), /* l4_64 */ NULL /* All the rest */ }; - unsigned int mask; + unsigned int mask; if ( !(SHADOW_AUDIT_ENABLE) ) return; @@ -3765,7 +3765,7 @@ void shadow_audit_tables(struct vcpu *v) case 2: mask = (SHF_L1_32|SHF_FL1_32|SHF_L2_32); break; case 3: mask = (SHF_L1_PAE|SHF_FL1_PAE|SHF_L2_PAE |SHF_L2H_PAE); break; - case 4: mask = (SHF_L1_64|SHF_FL1_64|SHF_L2_64 + case 4: mask = (SHF_L1_64|SHF_FL1_64|SHF_L2_64 |SHF_L3_64|SHF_L4_64); break; default: BUG(); } @@ -3782,5 +3782,5 @@ void shadow_audit_tables(struct vcpu *v) * c-file-style: "BSD" * c-basic-offset: 4 * indent-tabs-mode: nil - * End: + * End: */ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 5fc10c9..434df61 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -1,7 +1,7 @@ /****************************************************************************** * arch/x86/mm/shadow/multi.c * - * Simple, mostly-synchronous shadow page tables. + * Simple, mostly-synchronous shadow page tables. * Parts of this code are Copyright (c) 2006 by XenSource Inc. * Parts of this code are Copyright (c) 2006 by Michael A Fetterman * Parts based on earlier work by Michael A Fetterman, Ian Pratt et al. @@ -43,25 +43,25 @@ #include "types.h" /* THINGS TO DO LATER: - * + * * TEARDOWN HEURISTICS - * Also: have a heuristic for when to destroy a previous paging-mode's + * Also: have a heuristic for when to destroy a previous paging-mode's * shadows. When a guest is done with its start-of-day 32-bit tables - * and reuses the memory we want to drop those shadows. Start with - * shadows in a page in two modes as a hint, but beware of clever tricks + * and reuses the memory we want to drop those shadows. Start with + * shadows in a page in two modes as a hint, but beware of clever tricks * like reusing a pagetable for both PAE and 64-bit during boot... * * PAE LINEAR MAPS * Rework shadow_get_l*e() to have the option of using map_domain_page() - * instead of linear maps. Add appropriate unmap_l*e calls in the users. - * Then we can test the speed difference made by linear maps. If the - * map_domain_page() version is OK on PAE, we could maybe allow a lightweight - * l3-and-l2h-only shadow mode for PAE PV guests that would allow them - * to share l2h pages again. + * instead of linear maps. Add appropriate unmap_l*e calls in the users. + * Then we can test the speed difference made by linear maps. If the + * map_domain_page() version is OK on PAE, we could maybe allow a lightweight + * l3-and-l2h-only shadow mode for PAE PV guests that would allow them + * to share l2h pages again. * * PSE disabled / PSE36 * We don't support any modes other than PSE enabled, PSE36 disabled. - * Neither of those would be hard to change, but we'd need to be able to + * Neither of those would be hard to change, but we'd need to be able to * deal with shadows made in one mode and used in another. */ @@ -90,7 +90,7 @@ static char *fetch_type_names[] = { * shadow L1 which maps its "splinters". */ -static inline mfn_t +static inline mfn_t get_fl1_shadow_status(struct vcpu *v, gfn_t gfn) /* Look for FL1 shadows in the hash table */ { @@ -99,7 +99,7 @@ get_fl1_shadow_status(struct vcpu *v, gfn_t gfn) return smfn; } -static inline mfn_t +static inline mfn_t get_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type) /* Look for shadows in the hash table */ { @@ -109,7 +109,7 @@ get_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type) return smfn; } -static inline void +static inline void set_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) /* Put an FL1 shadow into the hash table */ { @@ -120,7 +120,7 @@ set_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) shadow_hash_insert(v, gfn_x(gfn), SH_type_fl1_shadow, smfn); } -static inline void +static inline void set_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) /* Put a shadow into the hash table */ { @@ -143,7 +143,7 @@ set_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) shadow_hash_insert(v, mfn_x(gmfn), shadow_type, smfn); } -static inline void +static inline void delete_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) /* Remove a shadow from the hash table */ { @@ -153,7 +153,7 @@ delete_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) shadow_hash_delete(v, gfn_x(gfn), SH_type_fl1_shadow, smfn); } -static inline void +static inline void delete_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) /* Remove a shadow from the hash table */ { @@ -172,10 +172,10 @@ delete_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) /* Functions for walking the guest page tables */ static inline uint32_t -sh_walk_guest_tables(struct vcpu *v, unsigned long va, walk_t *gw, +sh_walk_guest_tables(struct vcpu *v, unsigned long va, walk_t *gw, uint32_t pfec) { - return guest_walk_tables(v, p2m_get_hostp2m(v->domain), va, gw, pfec, + return guest_walk_tables(v, p2m_get_hostp2m(v->domain), va, gw, pfec, #if GUEST_PAGING_LEVELS == 3 /* PAE */ _mfn(INVALID_MFN), v->arch.paging.shadow.gl3e @@ -323,7 +323,7 @@ gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) #if SHADOW_AUDIT & SHADOW_AUDIT_ENTRIES /* Lightweight audit: pass all the shadows associated with this guest walk * through the audit mechanisms */ -static void sh_audit_gw(struct vcpu *v, walk_t *gw) +static void sh_audit_gw(struct vcpu *v, walk_t *gw) { mfn_t smfn; @@ -332,32 +332,32 @@ static void sh_audit_gw(struct vcpu *v, walk_t *gw) #if GUEST_PAGING_LEVELS >= 4 /* 64-bit only... */ if ( mfn_valid(gw->l4mfn) - && mfn_valid((smfn = get_shadow_status(v, gw->l4mfn, + && mfn_valid((smfn = get_shadow_status(v, gw->l4mfn, SH_type_l4_shadow))) ) (void) sh_audit_l4_table(v, smfn, _mfn(INVALID_MFN)); if ( mfn_valid(gw->l3mfn) - && mfn_valid((smfn = get_shadow_status(v, gw->l3mfn, + && mfn_valid((smfn = get_shadow_status(v, gw->l3mfn, SH_type_l3_shadow))) ) (void) sh_audit_l3_table(v, smfn, _mfn(INVALID_MFN)); #endif /* PAE or 64... */ if ( mfn_valid(gw->l2mfn) ) { - if ( mfn_valid((smfn = get_shadow_status(v, gw->l2mfn, + if ( mfn_valid((smfn = get_shadow_status(v, gw->l2mfn, SH_type_l2_shadow))) ) (void) sh_audit_l2_table(v, smfn, _mfn(INVALID_MFN)); #if GUEST_PAGING_LEVELS == 3 - if ( mfn_valid((smfn = get_shadow_status(v, gw->l2mfn, + if ( mfn_valid((smfn = get_shadow_status(v, gw->l2mfn, SH_type_l2h_shadow))) ) (void) sh_audit_l2_table(v, smfn, _mfn(INVALID_MFN)); #endif } if ( mfn_valid(gw->l1mfn) - && mfn_valid((smfn = get_shadow_status(v, gw->l1mfn, + && mfn_valid((smfn = get_shadow_status(v, gw->l1mfn, SH_type_l1_shadow))) ) (void) sh_audit_l1_table(v, smfn, _mfn(INVALID_MFN)); else if ( (guest_l2e_get_flags(gw->l2e) & _PAGE_PRESENT) && (guest_l2e_get_flags(gw->l2e) & _PAGE_PSE) - && mfn_valid( + && mfn_valid( (smfn = get_fl1_shadow_status(v, guest_l2e_get_gfn(gw->l2e)))) ) (void) sh_audit_fl1_table(v, smfn, _mfn(INVALID_MFN)); } @@ -376,11 +376,11 @@ sh_guest_map_l1e(struct vcpu *v, unsigned long addr, walk_t gw; ASSERT(shadow_mode_translate(v->domain)); - + // XXX -- this is expensive, but it's easy to cobble together... // FIXME! - if ( sh_walk_guest_tables(v, addr, &gw, PFEC_page_present) == 0 + if ( sh_walk_guest_tables(v, addr, &gw, PFEC_page_present) == 0 && mfn_valid(gw.l1mfn) ) { if ( gl1mfn ) @@ -398,7 +398,7 @@ sh_guest_get_eff_l1e(struct vcpu *v, unsigned long addr, void *eff_l1e) walk_t gw; ASSERT(shadow_mode_translate(v->domain)); - + // XXX -- this is expensive, but it's easy to cobble together... // FIXME! @@ -506,12 +506,12 @@ shadow_l4_index(mfn_t *smfn, u32 guest_index) */ static always_inline void -_sh_propagate(struct vcpu *v, +_sh_propagate(struct vcpu *v, guest_intpte_t guest_intpte, - mfn_t target_mfn, + mfn_t target_mfn, void *shadow_entry_ptr, int level, - fetch_type_t ft, + fetch_type_t ft, p2m_type_t p2mt) { guest_l1e_t guest_entry = { guest_intpte }; @@ -537,11 +537,11 @@ _sh_propagate(struct vcpu *v, if ( unlikely(!(gflags & _PAGE_PRESENT)) ) { #if !(SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) - /* If a guest l1 entry is not present, shadow with the magic + /* If a guest l1 entry is not present, shadow with the magic * guest-not-present entry. */ if ( level == 1 ) *sp = sh_l1e_gnp(); - else + else #endif /* !OOS */ *sp = shadow_l1e_empty(); goto done; @@ -562,7 +562,7 @@ _sh_propagate(struct vcpu *v, // return early. // if ( !mfn_valid(target_mfn) - && !(level == 1 && (!shadow_mode_refcounts(d) + && !(level == 1 && (!shadow_mode_refcounts(d) || p2mt == p2m_mmio_direct)) ) { ASSERT((ft == ft_prefetch)); @@ -595,7 +595,7 @@ _sh_propagate(struct vcpu *v, ASSERT(!(sflags & (_PAGE_PAT | _PAGE_PCD | _PAGE_PWT))); /* compute the PAT index for shadow page entry when VT-d is enabled - * and device assigned. + * and device assigned. * 1) direct MMIO: compute the PAT index with gMTRR=UC and gPAT. * 2) if enables snoop control, compute the PAT index as WB. * 3) if disables snoop control, compute the PAT index with @@ -613,7 +613,7 @@ _sh_propagate(struct vcpu *v, gflags, gfn_to_paddr(target_gfn), pfn_to_paddr(mfn_x(target_mfn)), - MTRR_TYPE_UNCACHABLE); + MTRR_TYPE_UNCACHABLE); else if ( iommu_snoop ) sflags |= pat_type_2_pte_flags(PAT_TYPE_WRBACK); else @@ -654,12 +654,12 @@ _sh_propagate(struct vcpu *v, // Only allow the guest write access to a page a) on a demand fault, // or b) if the page is already marked as dirty. // - // (We handle log-dirty entirely inside the shadow code, without using the + // (We handle log-dirty entirely inside the shadow code, without using the // p2m_ram_logdirty p2m type: only HAP uses that.) if ( unlikely((level == 1) && shadow_mode_log_dirty(d)) ) { if ( mfn_valid(target_mfn) ) { - if ( ft & FETCH_TYPE_WRITE ) + if ( ft & FETCH_TYPE_WRITE ) paging_mark_dirty(d, mfn_x(target_mfn)); else if ( !paging_mfn_is_dirty(d, target_mfn) ) sflags &= ~_PAGE_RW; @@ -682,10 +682,10 @@ _sh_propagate(struct vcpu *v, (p2mt == p2m_mmio_direct && rangeset_contains_singleton(mmio_ro_ranges, mfn_x(target_mfn))) ) sflags &= ~_PAGE_RW; - + // protect guest page tables // - if ( unlikely((level == 1) + if ( unlikely((level == 1) && sh_mfn_is_a_page_table(target_mfn) #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC ) /* Unless the page is out of sync and the guest is @@ -699,7 +699,7 @@ _sh_propagate(struct vcpu *v, // PV guests in 64-bit mode use two different page tables for user vs // supervisor permissions, making the guest's _PAGE_USER bit irrelevant. // It is always shadowed as present... - if ( (GUEST_PAGING_LEVELS == 4) && !is_pv_32on64_domain(d) + if ( (GUEST_PAGING_LEVELS == 4) && !is_pv_32on64_domain(d) && is_pv_domain(d) ) { sflags |= _PAGE_USER; @@ -720,7 +720,7 @@ _sh_propagate(struct vcpu *v, #if GUEST_PAGING_LEVELS >= 4 static void -l4e_propagate_from_guest(struct vcpu *v, +l4e_propagate_from_guest(struct vcpu *v, guest_l4e_t gl4e, mfn_t sl3mfn, shadow_l4e_t *sl4e, @@ -732,7 +732,7 @@ l4e_propagate_from_guest(struct vcpu *v, static void l3e_propagate_from_guest(struct vcpu *v, guest_l3e_t gl3e, - mfn_t sl2mfn, + mfn_t sl2mfn, shadow_l3e_t *sl3e, fetch_type_t ft) { @@ -741,7 +741,7 @@ l3e_propagate_from_guest(struct vcpu *v, #endif // GUEST_PAGING_LEVELS >= 4 static void -l2e_propagate_from_guest(struct vcpu *v, +l2e_propagate_from_guest(struct vcpu *v, guest_l2e_t gl2e, mfn_t sl1mfn, shadow_l2e_t *sl2e, @@ -751,11 +751,11 @@ l2e_propagate_from_guest(struct vcpu *v, } static void -l1e_propagate_from_guest(struct vcpu *v, +l1e_propagate_from_guest(struct vcpu *v, guest_l1e_t gl1e, - mfn_t gmfn, + mfn_t gmfn, shadow_l1e_t *sl1e, - fetch_type_t ft, + fetch_type_t ft, p2m_type_t p2mt) { _sh_propagate(v, gl1e.l1, gmfn, sl1e, 1, ft, p2mt); @@ -768,10 +768,10 @@ l1e_propagate_from_guest(struct vcpu *v, * functions which ever write (non-zero) data onto a shadow page. */ -static inline void safe_write_entry(void *dst, void *src) +static inline void safe_write_entry(void *dst, void *src) /* Copy one PTE safely when processors might be running on the * destination pagetable. This does *not* give safety against - * concurrent writes (that's what the paging lock is for), just + * concurrent writes (that's what the paging lock is for), just * stops the hardware picking up partially written entries. */ { volatile unsigned long *d = dst; @@ -784,7 +784,7 @@ static inline void safe_write_entry(void *dst, void *src) } -static inline void +static inline void shadow_write_entries(void *d, void *s, int entries, mfn_t mfn) /* This function does the actual writes to shadow pages. * It must not be called directly, since it doesn't do the bookkeeping @@ -797,10 +797,10 @@ shadow_write_entries(void *d, void *s, int entries, mfn_t mfn) /* Because we mirror access rights at all levels in the shadow, an * l2 (or higher) entry with the RW bit cleared will leave us with - * no write access through the linear map. - * We detect that by writing to the shadow with copy_to_user() and + * no write access through the linear map. + * We detect that by writing to the shadow with copy_to_user() and * using map_domain_page() to get a writeable mapping if we need to. */ - if ( __copy_to_user(d, d, sizeof (unsigned long)) != 0 ) + if ( __copy_to_user(d, d, sizeof (unsigned long)) != 0 ) { perfc_incr(shadow_linear_map_failed); map = sh_map_domain_page(mfn); @@ -874,7 +874,7 @@ shadow_get_page_from_l1e(shadow_l1e_t sl1e, struct domain *d, p2m_type_t type) static void inline shadow_put_page_from_l1e(shadow_l1e_t sl1e, struct domain *d) -{ +{ if ( !shadow_mode_refcounts(d) ) return; @@ -882,9 +882,9 @@ shadow_put_page_from_l1e(shadow_l1e_t sl1e, struct domain *d) } #if GUEST_PAGING_LEVELS >= 4 -static int shadow_set_l4e(struct vcpu *v, - shadow_l4e_t *sl4e, - shadow_l4e_t new_sl4e, +static int shadow_set_l4e(struct vcpu *v, + shadow_l4e_t *sl4e, + shadow_l4e_t new_sl4e, mfn_t sl4mfn) { int flags = 0, ok; @@ -894,13 +894,13 @@ static int shadow_set_l4e(struct vcpu *v, old_sl4e = *sl4e; if ( old_sl4e.l4 == new_sl4e.l4 ) return 0; /* Nothing to do */ - - paddr = ((((paddr_t)mfn_x(sl4mfn)) << PAGE_SHIFT) + + paddr = ((((paddr_t)mfn_x(sl4mfn)) << PAGE_SHIFT) | (((unsigned long)sl4e) & ~PAGE_MASK)); - if ( shadow_l4e_get_flags(new_sl4e) & _PAGE_PRESENT ) + if ( shadow_l4e_get_flags(new_sl4e) & _PAGE_PRESENT ) { - /* About to install a new reference */ + /* About to install a new reference */ mfn_t sl3mfn = shadow_l4e_get_mfn(new_sl4e); ok = sh_get_ref(v, sl3mfn, paddr); /* Are we pinning l3 shadows to handle wierd linux behaviour? */ @@ -917,12 +917,12 @@ static int shadow_set_l4e(struct vcpu *v, shadow_write_entries(sl4e, &new_sl4e, 1, sl4mfn); flags |= SHADOW_SET_CHANGED; - if ( shadow_l4e_get_flags(old_sl4e) & _PAGE_PRESENT ) + if ( shadow_l4e_get_flags(old_sl4e) & _PAGE_PRESENT ) { /* We lost a reference to an old mfn. */ mfn_t osl3mfn = shadow_l4e_get_mfn(old_sl4e); if ( (mfn_x(osl3mfn) != mfn_x(shadow_l4e_get_mfn(new_sl4e))) - || !perms_strictly_increased(shadow_l4e_get_flags(old_sl4e), + || !perms_strictly_increased(shadow_l4e_get_flags(old_sl4e), shadow_l4e_get_flags(new_sl4e)) ) { flags |= SHADOW_SET_FLUSH; @@ -932,9 +932,9 @@ static int shadow_set_l4e(struct vcpu *v, return flags; } -static int shadow_set_l3e(struct vcpu *v, - shadow_l3e_t *sl3e, - shadow_l3e_t new_sl3e, +static int shadow_set_l3e(struct vcpu *v, + shadow_l3e_t *sl3e, + shadow_l3e_t new_sl3e, mfn_t sl3mfn) { int flags = 0; @@ -945,12 +945,12 @@ static int shadow_set_l3e(struct vcpu *v, if ( old_sl3e.l3 == new_sl3e.l3 ) return 0; /* Nothing to do */ - paddr = ((((paddr_t)mfn_x(sl3mfn)) << PAGE_SHIFT) + paddr = ((((paddr_t)mfn_x(sl3mfn)) << PAGE_SHIFT) | (((unsigned long)sl3e) & ~PAGE_MASK)); - + if ( shadow_l3e_get_flags(new_sl3e) & _PAGE_PRESENT ) { - /* About to install a new reference */ + /* About to install a new reference */ if ( !sh_get_ref(v, shadow_l3e_get_mfn(new_sl3e), paddr) ) { domain_crash(v->domain); @@ -962,13 +962,13 @@ static int shadow_set_l3e(struct vcpu *v, shadow_write_entries(sl3e, &new_sl3e, 1, sl3mfn); flags |= SHADOW_SET_CHANGED; - if ( shadow_l3e_get_flags(old_sl3e) & _PAGE_PRESENT ) + if ( shadow_l3e_get_flags(old_sl3e) & _PAGE_PRESENT ) { /* We lost a reference to an old mfn. */ mfn_t osl2mfn = shadow_l3e_get_mfn(old_sl3e); if ( (mfn_x(osl2mfn) != mfn_x(shadow_l3e_get_mfn(new_sl3e))) || - !perms_strictly_increased(shadow_l3e_get_flags(old_sl3e), - shadow_l3e_get_flags(new_sl3e)) ) + !perms_strictly_increased(shadow_l3e_get_flags(old_sl3e), + shadow_l3e_get_flags(new_sl3e)) ) { flags |= SHADOW_SET_FLUSH; } @@ -976,11 +976,11 @@ static int shadow_set_l3e(struct vcpu *v, } return flags; } -#endif /* GUEST_PAGING_LEVELS >= 4 */ +#endif /* GUEST_PAGING_LEVELS >= 4 */ -static int shadow_set_l2e(struct vcpu *v, - shadow_l2e_t *sl2e, - shadow_l2e_t new_sl2e, +static int shadow_set_l2e(struct vcpu *v, + shadow_l2e_t *sl2e, + shadow_l2e_t new_sl2e, mfn_t sl2mfn) { int flags = 0; @@ -990,7 +990,7 @@ static int shadow_set_l2e(struct vcpu *v, #if GUEST_PAGING_LEVELS == 2 /* In 2-on-3 we work with pairs of l2es pointing at two-page * shadows. Reference counting and up-pointers track from the first - * page of the shadow to the first l2e, so make sure that we're + * page of the shadow to the first l2e, so make sure that we're * working with those: * Start with a pair of identical entries */ shadow_l2e_t pair[2] = { new_sl2e, new_sl2e }; @@ -1000,13 +1000,13 @@ static int shadow_set_l2e(struct vcpu *v, ASSERT(sl2e != NULL); old_sl2e = *sl2e; - + if ( old_sl2e.l2 == new_sl2e.l2 ) return 0; /* Nothing to do */ - + paddr = ((((paddr_t)mfn_x(sl2mfn)) << PAGE_SHIFT) | (((unsigned long)sl2e) & ~PAGE_MASK)); - if ( shadow_l2e_get_flags(new_sl2e) & _PAGE_PRESENT ) + if ( shadow_l2e_get_flags(new_sl2e) & _PAGE_PRESENT ) { mfn_t sl1mfn = shadow_l2e_get_mfn(new_sl2e); ASSERT(mfn_to_page(sl1mfn)->u.sh.head); @@ -1028,7 +1028,7 @@ static int shadow_set_l2e(struct vcpu *v, the GFN instead of the GMFN, and it's definitely not OOS. */ if ( (sp->u.sh.type != SH_type_fl1_shadow) && mfn_valid(gl1mfn) - && mfn_is_out_of_sync(gl1mfn) ) + && mfn_is_out_of_sync(gl1mfn) ) sh_resync(v, gl1mfn); } #endif @@ -1047,13 +1047,13 @@ static int shadow_set_l2e(struct vcpu *v, #endif flags |= SHADOW_SET_CHANGED; - if ( shadow_l2e_get_flags(old_sl2e) & _PAGE_PRESENT ) + if ( shadow_l2e_get_flags(old_sl2e) & _PAGE_PRESENT ) { /* We lost a reference to an old mfn. */ mfn_t osl1mfn = shadow_l2e_get_mfn(old_sl2e); if ( (mfn_x(osl1mfn) != mfn_x(shadow_l2e_get_mfn(new_sl2e))) || - !perms_strictly_increased(shadow_l2e_get_flags(old_sl2e), - shadow_l2e_get_flags(new_sl2e)) ) + !perms_strictly_increased(shadow_l2e_get_flags(old_sl2e), + shadow_l2e_get_flags(new_sl2e)) ) { flags |= SHADOW_SET_FLUSH; } @@ -1066,7 +1066,7 @@ static inline void shadow_vram_get_l1e(shadow_l1e_t new_sl1e, shadow_l1e_t *sl1e, mfn_t sl1mfn, struct domain *d) -{ +{ mfn_t mfn = shadow_l1e_get_mfn(new_sl1e); int flags = shadow_l1e_get_flags(new_sl1e); unsigned long gfn; @@ -1085,7 +1085,7 @@ static inline void shadow_vram_get_l1e(shadow_l1e_t new_sl1e, { unsigned long i = gfn - dirty_vram->begin_pfn; struct page_info *page = mfn_to_page(mfn); - + if ( (page->u.inuse.type_info & PGT_count_mask) == 1 ) /* Initial guest reference, record it */ dirty_vram->sl1ma[i] = pfn_to_paddr(mfn_x(sl1mfn)) @@ -1159,8 +1159,8 @@ static inline void shadow_vram_put_l1e(shadow_l1e_t old_sl1e, } } -static int shadow_set_l1e(struct vcpu *v, - shadow_l1e_t *sl1e, +static int shadow_set_l1e(struct vcpu *v, + shadow_l1e_t *sl1e, shadow_l1e_t new_sl1e, p2m_type_t new_type, mfn_t sl1mfn) @@ -1179,15 +1179,15 @@ static int shadow_set_l1e(struct vcpu *v, == (_PAGE_RW|_PAGE_PRESENT)) ) oos_fixup_add(v, new_gmfn, sl1mfn, pgentry_ptr_to_slot(sl1e)); #endif - + old_sl1e = *sl1e; if ( old_sl1e.l1 == new_sl1e.l1 ) return 0; /* Nothing to do */ - + if ( (shadow_l1e_get_flags(new_sl1e) & _PAGE_PRESENT) - && !sh_l1e_is_magic(new_sl1e) ) + && !sh_l1e_is_magic(new_sl1e) ) { - /* About to install a new reference */ + /* About to install a new reference */ if ( shadow_mode_refcounts(d) ) { TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_SHADOW_L1_GET_REF); switch ( shadow_get_page_from_l1e(new_sl1e, d, new_type) ) @@ -1205,45 +1205,45 @@ static int shadow_set_l1e(struct vcpu *v, break; } } - } + } /* Write the new entry */ shadow_write_entries(sl1e, &new_sl1e, 1, sl1mfn); flags |= SHADOW_SET_CHANGED; - if ( (shadow_l1e_get_flags(old_sl1e) & _PAGE_PRESENT) + if ( (shadow_l1e_get_flags(old_sl1e) & _PAGE_PRESENT) && !sh_l1e_is_magic(old_sl1e) ) { /* We lost a reference to an old mfn. */ - /* N.B. Unlike higher-level sets, never need an extra flush - * when writing an l1e. Because it points to the same guest frame + /* N.B. Unlike higher-level sets, never need an extra flush + * when writing an l1e. Because it points to the same guest frame * as the guest l1e did, it's the guest's responsibility to * trigger a flush later. */ - if ( shadow_mode_refcounts(d) ) + if ( shadow_mode_refcounts(d) ) { shadow_vram_put_l1e(old_sl1e, sl1e, sl1mfn, d); shadow_put_page_from_l1e(old_sl1e, d); TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_SHADOW_L1_PUT_REF); - } + } } return flags; } /**************************************************************************/ -/* Macros to walk pagetables. These take the shadow of a pagetable and - * walk every "interesting" entry. That is, they don't touch Xen mappings, - * and for 32-bit l2s shadowed onto PAE or 64-bit, they only touch every +/* Macros to walk pagetables. These take the shadow of a pagetable and + * walk every "interesting" entry. That is, they don't touch Xen mappings, + * and for 32-bit l2s shadowed onto PAE or 64-bit, they only touch every * second entry (since pairs of entries are managed together). For multi-page * shadows they walk all pages. - * - * Arguments are an MFN, the variable to point to each entry, a variable - * to indicate that we are done (we will shortcut to the end of the scan + * + * Arguments are an MFN, the variable to point to each entry, a variable + * to indicate that we are done (we will shortcut to the end of the scan * when _done != 0), a variable to indicate that we should avoid Xen mappings, - * and the code. + * and the code. * - * WARNING: These macros have side-effects. They change the values of both - * the pointer and the MFN. */ + * WARNING: These macros have side-effects. They change the values of both + * the pointer and the MFN. */ static inline void increment_ptr_to_guest_entry(void *ptr) { @@ -1288,7 +1288,7 @@ do { \ #define SHADOW_FOREACH_L1E(_sl1mfn, _sl1e, _gl1p, _done, _code) \ _SHADOW_FOREACH_L1E(_sl1mfn, _sl1e, _gl1p, _done, _code) #endif - + #if GUEST_PAGING_LEVELS == 2 @@ -1335,7 +1335,7 @@ do { \ sh_unmap_domain_page(_sp); \ } while (0) -#else +#else /* 64-bit l2: touch all entries except for PAE compat guests. */ #define SHADOW_FOREACH_L2E(_sl2mfn, _sl2e, _gl2p, _done, _dom, _code) \ @@ -1424,7 +1424,7 @@ void sh_install_xen_entries_in_l4(struct vcpu *v, mfn_t gl4mfn, mfn_t sl4mfn) sl4e = sh_map_domain_page(sl4mfn); BUILD_BUG_ON(sizeof (l4_pgentry_t) != sizeof (shadow_l4e_t)); - + /* Copy the common Xen mappings from the idle domain */ slots = (shadow_mode_external(d) ? ROOT_PAGETABLE_XEN_SLOTS @@ -1458,7 +1458,7 @@ void sh_install_xen_entries_in_l4(struct vcpu *v, mfn_t gl4mfn, mfn_t sl4mfn) shadow_l4e_from_mfn(gl4mfn, __PAGE_HYPERVISOR); } - sh_unmap_domain_page(sl4e); + sh_unmap_domain_page(sl4e); } #endif @@ -1504,12 +1504,12 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) mfn_to_page(smfn)->up = 0; #if GUEST_PAGING_LEVELS == 4 -#if (SHADOW_OPTIMIZATIONS & SHOPT_LINUX_L3_TOPLEVEL) +#if (SHADOW_OPTIMIZATIONS & SHOPT_LINUX_L3_TOPLEVEL) if ( shadow_type == SH_type_l4_64_shadow && unlikely(v->domain->arch.paging.shadow.opt_flags & SHOPT_LINUX_L3_TOPLEVEL) ) { /* We're shadowing a new l4, but we've been assuming the guest uses - * only one l4 per vcpu and context switches using an l4 entry. + * only one l4 per vcpu and context switches using an l4 entry. * Count the number of active l4 shadows. If there are enough * of them, decide that this isn't an old linux guest, and stop * pinning l3es. This is not very quick but it doesn't happen @@ -1522,9 +1522,9 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) if ( sp->u.sh.type == SH_type_l4_64_shadow ) l4count++; } - for_each_vcpu ( v->domain, v2 ) + for_each_vcpu ( v->domain, v2 ) vcpus++; - if ( l4count > 2 * vcpus ) + if ( l4count > 2 * vcpus ) { /* Unpin all the pinned l3 tables, and don't pin any more. */ page_list_for_each_safe(sp, t, &v->domain->arch.paging.shadow.pinned_shadows) @@ -1542,7 +1542,7 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) // Create the Xen mappings... if ( !shadow_mode_external(v->domain) ) { - switch (shadow_type) + switch (shadow_type) { #if GUEST_PAGING_LEVELS == 4 case SH_type_l4_shadow: @@ -1584,7 +1584,7 @@ sh_make_monitor_table(struct vcpu *v) struct domain *d = v->domain; ASSERT(pagetable_get_pfn(v->arch.monitor_table) == 0); - + /* Guarantee we can get the memory we need */ shadow_prealloc(d, SH_type_monitor_table, CONFIG_PAGING_LEVELS); @@ -1599,8 +1599,8 @@ sh_make_monitor_table(struct vcpu *v) mfn_t m3mfn, m2mfn; l4_pgentry_t *l4e; l3_pgentry_t *l3e; - /* Install an l3 table and an l2 table that will hold the shadow - * linear map entries. This overrides the linear map entry that + /* Install an l3 table and an l2 table that will hold the shadow + * linear map entries. This overrides the linear map entry that * was installed by sh_install_xen_entries_in_l4. */ l4e = sh_map_domain_page(m4mfn); @@ -1622,7 +1622,7 @@ sh_make_monitor_table(struct vcpu *v) m3mfn = shadow_alloc(d, SH_type_monitor_table, 0); mfn_to_page(m3mfn)->shadow_flags = 3; l4e[0] = l4e_from_pfn(mfn_x(m3mfn), __PAGE_HYPERVISOR); - + m2mfn = shadow_alloc(d, SH_type_monitor_table, 0); mfn_to_page(m2mfn)->shadow_flags = 2; l3e = sh_map_domain_page(m3mfn); @@ -1647,13 +1647,13 @@ sh_make_monitor_table(struct vcpu *v) * If the necessary tables are not present in the guest, they return NULL. */ /* N.B. The use of GUEST_PAGING_LEVELS here is correct. If the shadow has - * more levels than the guest, the upper levels are always fixed and do not - * reflect any information from the guest, so we do not use these functions + * more levels than the guest, the upper levels are always fixed and do not + * reflect any information from the guest, so we do not use these functions * to access them. */ #if GUEST_PAGING_LEVELS >= 4 -static shadow_l4e_t * shadow_get_and_create_l4e(struct vcpu *v, - walk_t *gw, +static shadow_l4e_t * shadow_get_and_create_l4e(struct vcpu *v, + walk_t *gw, mfn_t *sl4mfn) { /* There is always a shadow of the top level table. Get it. */ @@ -1662,8 +1662,8 @@ static shadow_l4e_t * shadow_get_and_create_l4e(struct vcpu *v, return sh_linear_l4_table(v) + shadow_l4_linear_offset(gw->va); } -static shadow_l3e_t * shadow_get_and_create_l3e(struct vcpu *v, - walk_t *gw, +static shadow_l3e_t * shadow_get_and_create_l3e(struct vcpu *v, + walk_t *gw, mfn_t *sl3mfn, fetch_type_t ft, int *resync) @@ -1674,18 +1674,18 @@ static shadow_l3e_t * shadow_get_and_create_l3e(struct vcpu *v, /* Get the l4e */ sl4e = shadow_get_and_create_l4e(v, gw, &sl4mfn); ASSERT(sl4e != NULL); - if ( shadow_l4e_get_flags(*sl4e) & _PAGE_PRESENT ) + if ( shadow_l4e_get_flags(*sl4e) & _PAGE_PRESENT ) { *sl3mfn = shadow_l4e_get_mfn(*sl4e); ASSERT(mfn_valid(*sl3mfn)); - } - else + } + else { int r; shadow_l4e_t new_sl4e; /* No l3 shadow installed: find and install it. */ *sl3mfn = get_shadow_status(v, gw->l3mfn, SH_type_l3_shadow); - if ( !mfn_valid(*sl3mfn) ) + if ( !mfn_valid(*sl3mfn) ) { /* No l3 shadow of this page exists at all: make one. */ *sl3mfn = sh_make_shadow(v, gw->l3mfn, SH_type_l3_shadow); @@ -1708,8 +1708,8 @@ static shadow_l3e_t * shadow_get_and_create_l3e(struct vcpu *v, #endif /* GUEST_PAGING_LEVELS >= 4 */ -static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, - walk_t *gw, +static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, + walk_t *gw, mfn_t *sl2mfn, fetch_type_t ft, int *resync) @@ -1720,13 +1720,13 @@ static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, if ( !mfn_valid(gw->l2mfn) ) return NULL; /* No guest page. */ /* Get the l3e */ sl3e = shadow_get_and_create_l3e(v, gw, &sl3mfn, ft, resync); - if ( sl3e == NULL ) return NULL; - if ( shadow_l3e_get_flags(*sl3e) & _PAGE_PRESENT ) + if ( sl3e == NULL ) return NULL; + if ( shadow_l3e_get_flags(*sl3e) & _PAGE_PRESENT ) { *sl2mfn = shadow_l3e_get_mfn(*sl3e); ASSERT(mfn_valid(*sl2mfn)); - } - else + } + else { int r; shadow_l3e_t new_sl3e; @@ -1740,7 +1740,7 @@ static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, /* No l2 shadow installed: find and install it. */ *sl2mfn = get_shadow_status(v, gw->l2mfn, t); - if ( !mfn_valid(*sl2mfn) ) + if ( !mfn_valid(*sl2mfn) ) { /* No l2 shadow of this page exists at all: make one. */ *sl2mfn = sh_make_shadow(v, gw->l2mfn, t); @@ -1750,7 +1750,7 @@ static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, r = shadow_set_l3e(v, sl3e, new_sl3e, sl3mfn); ASSERT((r & SHADOW_SET_FLUSH) == 0); if ( r & SHADOW_SET_ERROR ) - return NULL; + return NULL; #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC ) *resync |= 1; @@ -1762,9 +1762,9 @@ static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, #elif GUEST_PAGING_LEVELS == 3 /* PAE... */ /* We never demand-shadow PAE l3es: they are only created in * sh_update_cr3(). Check if the relevant sl3e is present. */ - shadow_l3e_t *sl3e = ((shadow_l3e_t *)&v->arch.paging.shadow.l3table) + shadow_l3e_t *sl3e = ((shadow_l3e_t *)&v->arch.paging.shadow.l3table) + shadow_l3_linear_offset(gw->va); - if ( !(shadow_l3e_get_flags(*sl3e) & _PAGE_PRESENT) ) + if ( !(shadow_l3e_get_flags(*sl3e) & _PAGE_PRESENT) ) return NULL; *sl2mfn = shadow_l3e_get_mfn(*sl3e); ASSERT(mfn_valid(*sl2mfn)); @@ -1778,12 +1778,12 @@ static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, (void) shadow_l2_index(sl2mfn, guest_l2_table_offset(gw->va)); /* Reading the top level table is always valid. */ return sh_linear_l2_table(v) + shadow_l2_linear_offset(gw->va); -#endif +#endif } -static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, - walk_t *gw, +static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, + walk_t *gw, mfn_t *sl1mfn, fetch_type_t ft) { @@ -1797,38 +1797,38 @@ static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, /* Install the sl1 in the l2e if it wasn't there or if we need to * re-do it to fix a PSE dirty bit. */ - if ( shadow_l2e_get_flags(*sl2e) & _PAGE_PRESENT + if ( shadow_l2e_get_flags(*sl2e) & _PAGE_PRESENT && likely(ft != ft_demand_write - || (shadow_l2e_get_flags(*sl2e) & _PAGE_RW) + || (shadow_l2e_get_flags(*sl2e) & _PAGE_RW) || !(guest_l2e_get_flags(gw->l2e) & _PAGE_PSE)) ) { *sl1mfn = shadow_l2e_get_mfn(*sl2e); ASSERT(mfn_valid(*sl1mfn)); - } - else + } + else { shadow_l2e_t new_sl2e; int r, flags = guest_l2e_get_flags(gw->l2e); /* No l1 shadow installed: find and install it. */ if ( !(flags & _PAGE_PRESENT) ) return NULL; /* No guest page. */ - if ( guest_supports_superpages(v) && (flags & _PAGE_PSE) ) + if ( guest_supports_superpages(v) && (flags & _PAGE_PSE) ) { /* Splintering a superpage */ gfn_t l2gfn = guest_l2e_get_gfn(gw->l2e); *sl1mfn = get_fl1_shadow_status(v, l2gfn); - if ( !mfn_valid(*sl1mfn) ) + if ( !mfn_valid(*sl1mfn) ) { /* No fl1 shadow of this superpage exists at all: make one. */ *sl1mfn = make_fl1_shadow(v, l2gfn); } - } - else + } + else { /* Shadowing an actual guest l1 table */ if ( !mfn_valid(gw->l1mfn) ) return NULL; /* No guest page. */ *sl1mfn = get_shadow_status(v, gw->l1mfn, SH_type_l1_shadow); - if ( !mfn_valid(*sl1mfn) ) + if ( !mfn_valid(*sl1mfn) ) { /* No l1 shadow of this page exists at all: make one. */ *sl1mfn = sh_make_shadow(v, gw->l1mfn, SH_type_l1_shadow); @@ -1837,7 +1837,7 @@ static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, /* Install the new sl1 table in the sl2e */ l2e_propagate_from_guest(v, gw->l2e, *sl1mfn, &new_sl2e, ft); r = shadow_set_l2e(v, sl2e, new_sl2e, sl2mfn); - ASSERT((r & SHADOW_SET_FLUSH) == 0); + ASSERT((r & SHADOW_SET_FLUSH) == 0); if ( r & SHADOW_SET_ERROR ) return NULL; @@ -1863,7 +1863,7 @@ static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, /**************************************************************************/ -/* Destructors for shadow tables: +/* Destructors for shadow tables: * Unregister the shadow, decrement refcounts of any entries present in it, * and release the memory. * @@ -1890,16 +1890,16 @@ void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) delete_shadow_status(v, gmfn, t, smfn); shadow_demote(v, gmfn, t); /* Decrement refcounts of all the old entries */ - sl4mfn = smfn; + sl4mfn = smfn; SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, v->domain, { - if ( shadow_l4e_get_flags(*sl4e) & _PAGE_PRESENT ) + if ( shadow_l4e_get_flags(*sl4e) & _PAGE_PRESENT ) { sh_put_ref(v, shadow_l4e_get_mfn(*sl4e), - (((paddr_t)mfn_x(sl4mfn)) << PAGE_SHIFT) + (((paddr_t)mfn_x(sl4mfn)) << PAGE_SHIFT) | ((unsigned long)sl4e & ~PAGE_MASK)); } }); - + /* Put the memory back in the pool */ shadow_free(v->domain, smfn); } @@ -1922,11 +1922,11 @@ void sh_destroy_l3_shadow(struct vcpu *v, mfn_t smfn) shadow_demote(v, gmfn, t); /* Decrement refcounts of all the old entries */ - sl3mfn = smfn; + sl3mfn = smfn; SHADOW_FOREACH_L3E(sl3mfn, sl3e, 0, 0, { - if ( shadow_l3e_get_flags(*sl3e) & _PAGE_PRESENT ) + if ( shadow_l3e_get_flags(*sl3e) & _PAGE_PRESENT ) sh_put_ref(v, shadow_l3e_get_mfn(*sl3e), - (((paddr_t)mfn_x(sl3mfn)) << PAGE_SHIFT) + (((paddr_t)mfn_x(sl3mfn)) << PAGE_SHIFT) | ((unsigned long)sl3e & ~PAGE_MASK)); }); @@ -1961,9 +1961,9 @@ void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) /* Decrement refcounts of all the old entries */ sl2mfn = smfn; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, v->domain, { - if ( shadow_l2e_get_flags(*sl2e) & _PAGE_PRESENT ) + if ( shadow_l2e_get_flags(*sl2e) & _PAGE_PRESENT ) sh_put_ref(v, shadow_l2e_get_mfn(*sl2e), - (((paddr_t)mfn_x(sl2mfn)) << PAGE_SHIFT) + (((paddr_t)mfn_x(sl2mfn)) << PAGE_SHIFT) | ((unsigned long)sl2e & ~PAGE_MASK)); }); @@ -1989,17 +1989,17 @@ void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) gfn_t gfn = _gfn(sp->v.sh.back); delete_fl1_shadow_status(v, gfn, smfn); } - else + else { mfn_t gmfn = backpointer(sp); delete_shadow_status(v, gmfn, t, smfn); shadow_demote(v, gmfn, t); } - + if ( shadow_mode_refcounts(d) ) { /* Decrement refcounts of all the old entries */ - mfn_t sl1mfn = smfn; + mfn_t sl1mfn = smfn; SHADOW_FOREACH_L1E(sl1mfn, sl1e, 0, 0, { if ( (shadow_l1e_get_flags(*sl1e) & _PAGE_PRESENT) && !sh_l1e_is_magic(*sl1e) ) { @@ -2008,7 +2008,7 @@ void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) } }); } - + /* Put the memory back in the pool */ shadow_free(v->domain, smfn); } @@ -2025,8 +2025,8 @@ void sh_destroy_monitor_table(struct vcpu *v, mfn_t mmfn) l4_pgentry_t *l4e = sh_map_domain_page(mmfn); l3_pgentry_t *l3e; int linear_slot = shadow_l4_table_offset(SH_LINEAR_PT_VIRT_START); - - /* Need to destroy the l3 and l2 monitor pages used + + /* Need to destroy the l3 and l2 monitor pages used * for the linear map */ ASSERT(l4e_get_flags(l4e[linear_slot]) & _PAGE_PRESENT); m3mfn = _mfn(l4e_get_pfn(l4e[linear_slot])); @@ -2060,18 +2060,18 @@ void sh_destroy_monitor_table(struct vcpu *v, mfn_t mmfn) /**************************************************************************/ /* Functions to destroy non-Xen mappings in a pagetable hierarchy. * These are called from common code when we are running out of shadow - * memory, and unpinning all the top-level shadows hasn't worked. + * memory, and unpinning all the top-level shadows hasn't worked. * * With user_only == 1, we leave guest kernel-mode mappings in place too, * unhooking only the user-mode mappings * - * This implementation is pretty crude and slow, but we hope that it won't + * This implementation is pretty crude and slow, but we hope that it won't * be called very often. */ #if GUEST_PAGING_LEVELS == 2 void sh_unhook_32b_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) -{ +{ shadow_l2e_t *sl2e; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, v->domain, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) @@ -2109,7 +2109,7 @@ void sh_unhook_64b_mappings(struct vcpu *v, mfn_t sl4mfn, int user_only) * These functions require a pointer to the shadow entry that will be updated. */ -/* These functions take a new guest entry, translate it to shadow and write +/* These functions take a new guest entry, translate it to shadow and write * the shadow entry. * * They return the same bitmaps as the shadow_set_lXe() functions. @@ -2240,7 +2240,7 @@ static int validate_gl2e(struct vcpu *v, void *new_ge, mfn_t sl2mfn, void *se) mfn_t gl1mfn = get_gfn_query_unlocked(v->domain, gfn_x(gl1gfn), &p2mt); if ( p2m_is_ram(p2mt) ) - sl1mfn = get_shadow_status(v, gl1mfn, SH_type_l1_shadow); + sl1mfn = get_shadow_status(v, gl1mfn, SH_type_l1_shadow); else if ( p2mt != p2m_populate_on_demand ) result |= SHADOW_SET_ERROR; } @@ -2275,7 +2275,7 @@ static int validate_gl1e(struct vcpu *v, void *new_ge, mfn_t sl1mfn, void *se) #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) gl1mfn = backpointer(mfn_to_page(sl1mfn)); - if ( mfn_valid(gl1mfn) + if ( mfn_valid(gl1mfn) && mfn_is_out_of_sync(gl1mfn) ) { /* Update the OOS snapshot. */ @@ -2295,7 +2295,7 @@ static int validate_gl1e(struct vcpu *v, void *new_ge, mfn_t sl1mfn, void *se) #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /**************************************************************************/ -/* Special validation function for re-syncing out-of-sync shadows. +/* Special validation function for re-syncing out-of-sync shadows. * Walks the *shadow* page, and for every entry that it finds, * revalidates the guest entry that corresponds to it. * N.B. This function is called with the vcpu that unsynced the page, @@ -2342,10 +2342,10 @@ void sh_resync_l1(struct vcpu *v, mfn_t gl1mfn, mfn_t snpmfn) ASSERT(!(rc & SHADOW_SET_FLUSH)); } -/* Figure out whether it's definitely safe not to sync this l1 table. - * That is: if we can tell that it's only used once, and that the - * toplevel shadow responsible is not one of ours. - * N.B. This function is called with the vcpu that required the resync, +/* Figure out whether it's definitely safe not to sync this l1 table. + * That is: if we can tell that it's only used once, and that the + * toplevel shadow responsible is not one of ours. + * N.B. This function is called with the vcpu that required the resync, * *not* the one that originally unsynced the page, but it is * called in the *mode* of the vcpu that unsynced it. Clear? Good. */ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) @@ -2366,7 +2366,7 @@ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) smfn = _mfn(sp->up >> PAGE_SHIFT); ASSERT(mfn_valid(smfn)); -#if (SHADOW_PAGING_LEVELS == 4) +#if (SHADOW_PAGING_LEVELS == 4) /* up to l3 */ sp = mfn_to_page(smfn); ASSERT(sh_type_has_up_pointer(v, SH_type_l2_shadow)); @@ -2385,15 +2385,15 @@ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) #endif if ( pagetable_get_pfn(v->arch.shadow_table[0]) == mfn_x(smfn) -#if (SHADOW_PAGING_LEVELS == 3) +#if (SHADOW_PAGING_LEVELS == 3) || pagetable_get_pfn(v->arch.shadow_table[1]) == mfn_x(smfn) || pagetable_get_pfn(v->arch.shadow_table[2]) == mfn_x(smfn) - || pagetable_get_pfn(v->arch.shadow_table[3]) == mfn_x(smfn) + || pagetable_get_pfn(v->arch.shadow_table[3]) == mfn_x(smfn) #endif ) return 0; - - /* Only in use in one toplevel shadow, and it's not the one we're + + /* Only in use in one toplevel shadow, and it's not the one we're * running on */ return 1; } @@ -2401,15 +2401,15 @@ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) /**************************************************************************/ -/* Functions which translate and install the shadows of arbitrary guest +/* Functions which translate and install the shadows of arbitrary guest * entries that we have just seen the guest write. */ -static inline int +static inline int sh_map_and_validate(struct vcpu *v, mfn_t gmfn, - void *new_gp, u32 size, u32 sh_type, + void *new_gp, u32 size, u32 sh_type, u32 (*shadow_index)(mfn_t *smfn, u32 idx), - int (*validate_ge)(struct vcpu *v, void *ge, + int (*validate_ge)(struct vcpu *v, void *ge, mfn_t smfn, void *se)) /* Generic function for mapping and validating. */ { @@ -2462,25 +2462,25 @@ sh_map_and_validate_gl4e(struct vcpu *v, mfn_t gl4mfn, void *new_gl4p, u32 size) { #if GUEST_PAGING_LEVELS >= 4 - return sh_map_and_validate(v, gl4mfn, new_gl4p, size, - SH_type_l4_shadow, - shadow_l4_index, + return sh_map_and_validate(v, gl4mfn, new_gl4p, size, + SH_type_l4_shadow, + shadow_l4_index, validate_gl4e); #else // ! GUEST_PAGING_LEVELS >= 4 SHADOW_ERROR("called in wrong paging mode!\n"); BUG(); return 0; -#endif +#endif } - + int sh_map_and_validate_gl3e(struct vcpu *v, mfn_t gl3mfn, void *new_gl3p, u32 size) { #if GUEST_PAGING_LEVELS >= 4 - return sh_map_and_validate(v, gl3mfn, new_gl3p, size, - SH_type_l3_shadow, - shadow_l3_index, + return sh_map_and_validate(v, gl3mfn, new_gl3p, size, + SH_type_l3_shadow, + shadow_l3_index, validate_gl3e); #else // ! GUEST_PAGING_LEVELS >= 4 SHADOW_ERROR("called in wrong paging mode!\n"); @@ -2493,9 +2493,9 @@ int sh_map_and_validate_gl2e(struct vcpu *v, mfn_t gl2mfn, void *new_gl2p, u32 size) { - return sh_map_and_validate(v, gl2mfn, new_gl2p, size, - SH_type_l2_shadow, - shadow_l2_index, + return sh_map_and_validate(v, gl2mfn, new_gl2p, size, + SH_type_l2_shadow, + shadow_l2_index, validate_gl2e); } @@ -2504,9 +2504,9 @@ sh_map_and_validate_gl2he(struct vcpu *v, mfn_t gl2mfn, void *new_gl2p, u32 size) { #if GUEST_PAGING_LEVELS >= 3 - return sh_map_and_validate(v, gl2mfn, new_gl2p, size, - SH_type_l2h_shadow, - shadow_l2_index, + return sh_map_and_validate(v, gl2mfn, new_gl2p, size, + SH_type_l2h_shadow, + shadow_l2_index, validate_gl2e); #else /* Non-PAE guests don't have different kinds of l2 table */ SHADOW_ERROR("called in wrong paging mode!\n"); @@ -2519,9 +2519,9 @@ int sh_map_and_validate_gl1e(struct vcpu *v, mfn_t gl1mfn, void *new_gl1p, u32 size) { - return sh_map_and_validate(v, gl1mfn, new_gl1p, size, - SH_type_l1_shadow, - shadow_l1_index, + return sh_map_and_validate(v, gl1mfn, new_gl1p, size, + SH_type_l1_shadow, + shadow_l1_index, validate_gl1e); } @@ -2572,7 +2572,7 @@ static inline void reset_early_unshadow(struct vcpu *v) /**************************************************************************/ -/* Optimization: Prefetch multiple L1 entries. This is called after we have +/* Optimization: Prefetch multiple L1 entries. This is called after we have * demand-faulted a shadow l1e in the fault handler, to see if it's * worth fetching some more. */ @@ -2582,7 +2582,7 @@ static inline void reset_early_unshadow(struct vcpu *v) /* XXX magic number */ #define PREFETCH_DISTANCE 32 -static void sh_prefetch(struct vcpu *v, walk_t *gw, +static void sh_prefetch(struct vcpu *v, walk_t *gw, shadow_l1e_t *ptr_sl1e, mfn_t sl1mfn) { int i, dist; @@ -2621,7 +2621,7 @@ static void sh_prefetch(struct vcpu *v, walk_t *gw, #endif /* OOS */ } - for ( i = 1; i < dist ; i++ ) + for ( i = 1; i < dist ; i++ ) { /* No point in prefetching if there's already a shadow */ if ( ptr_sl1e[i].l1 != 0 ) @@ -2634,18 +2634,18 @@ static void sh_prefetch(struct vcpu *v, walk_t *gw, /* Not worth continuing if we hit an entry that will need another * fault for A/D-bit propagation anyway */ gflags = guest_l1e_get_flags(gl1e); - if ( (gflags & _PAGE_PRESENT) + if ( (gflags & _PAGE_PRESENT) && (!(gflags & _PAGE_ACCESSED) || ((gflags & _PAGE_RW) && !(gflags & _PAGE_DIRTY))) ) break; - } - else + } + else { /* Fragmented superpage, unless we've been called wrongly */ ASSERT(guest_l2e_get_flags(gw->l2e) & _PAGE_PSE); /* Increment the l1e's GFN by the right number of guest pages */ gl1e = guest_l1e_from_gfn( - _gfn(gfn_x(guest_l1e_get_gfn(gw->l1e)) + i), + _gfn(gfn_x(guest_l1e_get_gfn(gw->l1e)) + i), guest_l1e_get_flags(gw->l1e)); } @@ -2715,7 +2715,7 @@ static inline void trace_shadow_fixup(guest_l1e_t gl1e, __trace_var(event, 0/*!tsc*/, sizeof(d), &d); } } - + static inline void trace_not_shadow_fault(guest_l1e_t gl1e, guest_va_t va) { @@ -2739,7 +2739,7 @@ static inline void trace_not_shadow_fault(guest_l1e_t gl1e, __trace_var(event, 0/*!tsc*/, sizeof(d), &d); } } - + static inline void trace_shadow_emulate_other(u32 event, guest_va_t va, gfn_t gfn) @@ -2807,8 +2807,8 @@ static inline void trace_shadow_emulate(guest_l1e_t gl1e, unsigned long va) * shadow code (and the guest should retry) or 0 if it is not (and the * fault should be handled elsewhere or passed to the guest). */ -static int sh_page_fault(struct vcpu *v, - unsigned long va, +static int sh_page_fault(struct vcpu *v, + unsigned long va, struct cpu_user_regs *regs) { struct domain *d = v->domain; @@ -2848,7 +2848,7 @@ static int sh_page_fault(struct vcpu *v, * Then try to emulate early to avoid lock aquisition. */ if ( v->arch.paging.last_write_emul_ok - && v->arch.paging.shadow.last_emulated_frame == (va >> PAGE_SHIFT) ) + && v->arch.paging.shadow.last_emulated_frame == (va >> PAGE_SHIFT) ) { /* check whether error code is 3, or else fall back to normal path * in case of some validation is required @@ -2858,7 +2858,7 @@ static int sh_page_fault(struct vcpu *v, fast_emul = 1; gmfn = _mfn(v->arch.paging.shadow.last_emulated_mfn); -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* Fall back to the slow path if we're trying to emulate writes to an out of sync page. */ if ( mfn_valid(gmfn) && mfn_is_out_of_sync(gmfn) ) @@ -2886,7 +2886,7 @@ static int sh_page_fault(struct vcpu *v, #if (SHADOW_OPTIMIZATIONS & SHOPT_FAST_FAULT_PATH) if ( (regs->error_code & PFEC_reserved_bit) ) { -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* First, need to check that this isn't an out-of-sync * shadow l1e. If it is, we fall back to the slow path, which * will sync it up again. */ @@ -2902,7 +2902,7 @@ static int sh_page_fault(struct vcpu *v, shadow_l2e_get_mfn(sl2e)))) || unlikely(mfn_is_out_of_sync(gl1mfn)) ) { - /* Hit the slow path as if there had been no + /* Hit the slow path as if there had been no * shadow entry at all, and let it tidy up */ ASSERT(regs->error_code & PFEC_page_present); regs->error_code ^= (PFEC_reserved_bit|PFEC_page_present); @@ -2910,10 +2910,10 @@ static int sh_page_fault(struct vcpu *v, } } #endif /* SHOPT_OUT_OF_SYNC */ - /* The only reasons for reserved bits to be set in shadow entries + /* The only reasons for reserved bits to be set in shadow entries * are the two "magic" shadow_l1e entries. */ - if ( likely((__copy_from_user(&sl1e, - (sh_linear_l1_table(v) + if ( likely((__copy_from_user(&sl1e, + (sh_linear_l1_table(v) + shadow_l1_linear_offset(va)), sizeof(sl1e)) == 0) && sh_l1e_is_magic(sl1e)) ) @@ -2935,8 +2935,8 @@ static int sh_page_fault(struct vcpu *v, { /* Magic MMIO marker: extract gfn for MMIO address */ ASSERT(sh_l1e_is_mmio(sl1e)); - gpa = (((paddr_t)(gfn_x(sh_l1e_mmio_get_gfn(sl1e)))) - << PAGE_SHIFT) + gpa = (((paddr_t)(gfn_x(sh_l1e_mmio_get_gfn(sl1e)))) + << PAGE_SHIFT) | (va & ~PAGE_MASK); } perfc_incr(shadow_fault_fast_mmio); @@ -2949,24 +2949,24 @@ static int sh_page_fault(struct vcpu *v, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 12:55:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12: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 1YSmM8-00063w-Dg; Tue, 03 Mar 2015 12: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 1YSmM6-00063d-R0 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:23 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 5F/DD-02756-A3FA5F45; Tue, 03 Mar 2015 12:55:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1425387315!12621117!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17447 invoked from network); 3 Mar 2015 12:55:16 -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; 3 Mar 2015 12:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmLz-0002X3-D6 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmLz-0003BT-6n for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:15 +0000 Date: Tue, 03 Mar 2015 12:55:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: whitespace 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 a9533e536cc9ed75f424a935ab5bfc52f30e1aa4 Author: Andrew Cooper AuthorDate: Tue Feb 17 14:29:48 2015 +0100 Commit: Jan Beulich CommitDate: Tue Feb 17 14:29:48 2015 +0100 x86/shadow: whitespace cleanup Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 490 ++++++++++++------------ xen/arch/x86/mm/shadow/multi.c | 770 +++++++++++++++++++------------------- xen/arch/x86/mm/shadow/multi.h | 36 +- xen/arch/x86/mm/shadow/private.h | 106 +++--- xen/arch/x86/mm/shadow/types.h | 42 +- 5 files changed, 722 insertions(+), 722 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 3630ae0..502e0d8 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -5,7 +5,7 @@ * Parts of this code are Copyright (c) 2006 by XenSource Inc. * Parts of this code are Copyright (c) 2006 by Michael A Fetterman * Parts based on earlier work by Michael A Fetterman, Ian Pratt et al. - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -252,7 +252,7 @@ hvm_emulate_write(enum x86_segment seg, v, addr, p_data, bytes, sh_ctxt); } -static int +static int hvm_emulate_cmpxchg(enum x86_segment seg, unsigned long offset, void *p_old, @@ -329,7 +329,7 @@ pv_emulate_write(enum x86_segment seg, v, offset, p_data, bytes, sh_ctxt); } -static int +static int pv_emulate_cmpxchg(enum x86_segment seg, unsigned long offset, void *p_old, @@ -409,9 +409,9 @@ const struct x86_emulate_ops *shadow_init_emulation( return &hvm_shadow_emulator_ops; } -/* Update an initialized emulation context to prepare for the next +/* Update an initialized emulation context to prepare for the next * instruction */ -void shadow_continue_emulation(struct sh_emulate_ctxt *sh_ctxt, +void shadow_continue_emulation(struct sh_emulate_ctxt *sh_ctxt, struct cpu_user_regs *regs) { struct vcpu *v = current; @@ -437,17 +437,17 @@ void shadow_continue_emulation(struct sh_emulate_ctxt *sh_ctxt, } } } - + #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /**************************************************************************/ -/* Out-of-sync shadows. */ +/* Out-of-sync shadows. */ -/* From time to time, we let a shadowed pagetable page go out of sync - * with its shadow: the guest is allowed to write directly to the page, +/* From time to time, we let a shadowed pagetable page go out of sync + * with its shadow: the guest is allowed to write directly to the page, * and those writes are not synchronously reflected in the shadow. - * This lets us avoid many emulations if the guest is writing a lot to a - * pagetable, but it relaxes a pretty important invariant in the shadow + * This lets us avoid many emulations if the guest is writing a lot to a + * pagetable, but it relaxes a pretty important invariant in the shadow * pagetable design. Therefore, some rules: * * 1. Only L1 pagetables may go out of sync: any page that is shadowed @@ -455,21 +455,21 @@ void shadow_continue_emulation(struct sh_emulate_ctxt *sh_ctxt, * using linear shadow pagetables much less dangerous. * That means that: (a) unsyncing code needs to check for higher-level * shadows, and (b) promotion code needs to resync. - * + * * 2. All shadow operations on a guest page require the page to be brought * back into sync before proceeding. This must be done under the * paging lock so that the page is guaranteed to remain synced until * the operation completes. * - * Exceptions to this rule: the pagefault and invlpg handlers may - * update only one entry on an out-of-sync page without resyncing it. + * Exceptions to this rule: the pagefault and invlpg handlers may + * update only one entry on an out-of-sync page without resyncing it. * * 3. Operations on shadows that do not start from a guest page need to * be aware that they may be handling an out-of-sync shadow. * - * 4. Operations that do not normally take the paging lock (fast-path - * #PF handler, INVLPG) must fall back to a locking, syncing version - * if they see an out-of-sync table. + * 4. Operations that do not normally take the paging lock (fast-path + * #PF handler, INVLPG) must fall back to a locking, syncing version + * if they see an out-of-sync table. * * 5. Operations corresponding to guest TLB flushes (MOV CR3, INVLPG) * must explicitly resync all relevant pages or update their @@ -488,26 +488,26 @@ void shadow_continue_emulation(struct sh_emulate_ctxt *sh_ctxt, #if SHADOW_AUDIT & SHADOW_AUDIT_ENTRIES_FULL -static void sh_oos_audit(struct domain *d) +static void sh_oos_audit(struct domain *d) { int idx, expected_idx, expected_idx_alt; struct page_info *pg; struct vcpu *v; - - for_each_vcpu(d, v) + + for_each_vcpu(d, v) { for ( idx = 0; idx < SHADOW_OOS_PAGES; idx++ ) { mfn_t *oos = v->arch.paging.shadow.oos; if ( !mfn_valid(oos[idx]) ) continue; - + expected_idx = mfn_x(oos[idx]) % SHADOW_OOS_PAGES; expected_idx_alt = ((expected_idx + 1) % SHADOW_OOS_PAGES); if ( idx != expected_idx && idx != expected_idx_alt ) { printk("%s: idx %d contains gmfn %lx, expected at %d or %d.\n", - __func__, idx, mfn_x(oos[idx]), + __func__, idx, mfn_x(oos[idx]), expected_idx, expected_idx_alt); BUG(); } @@ -536,21 +536,21 @@ static void sh_oos_audit(struct domain *d) #endif #if SHADOW_AUDIT & SHADOW_AUDIT_ENTRIES -void oos_audit_hash_is_present(struct domain *d, mfn_t gmfn) +void oos_audit_hash_is_present(struct domain *d, mfn_t gmfn) { int idx; struct vcpu *v; mfn_t *oos; ASSERT(mfn_is_out_of_sync(gmfn)); - - for_each_vcpu(d, v) + + for_each_vcpu(d, v) { oos = v->arch.paging.shadow.oos; idx = mfn_x(gmfn) % SHADOW_OOS_PAGES; if ( mfn_x(oos[idx]) != mfn_x(gmfn) ) idx = (idx + 1) % SHADOW_OOS_PAGES; - + if ( mfn_x(oos[idx]) == mfn_x(gmfn) ) return; } @@ -593,7 +593,7 @@ static inline int oos_fixup_flush_gmfn(struct vcpu *v, mfn_t gmfn, if ( mfn_x(fixup->smfn[i]) != INVALID_MFN ) { sh_remove_write_access_from_sl1p(v, gmfn, - fixup->smfn[i], + fixup->smfn[i], fixup->off[i]); fixup->smfn[i] = _mfn(INVALID_MFN); } @@ -612,8 +612,8 @@ void oos_fixup_add(struct vcpu *v, mfn_t gmfn, struct domain *d = v->domain; perfc_incr(shadow_oos_fixup_add); - - for_each_vcpu(d, v) + + for_each_vcpu(d, v) { oos = v->arch.paging.shadow.oos; oos_fixup = v->arch.paging.shadow.oos_fixup; @@ -638,7 +638,7 @@ void oos_fixup_add(struct vcpu *v, mfn_t gmfn, TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_OOS_FIXUP_EVICT); /* Reuse this slot and remove current writable mapping. */ - sh_remove_write_access_from_sl1p(v, gmfn, + sh_remove_write_access_from_sl1p(v, gmfn, oos_fixup[idx].smfn[next], oos_fixup[idx].off[next]); perfc_incr(shadow_oos_fixup_evict); @@ -681,7 +681,7 @@ static int oos_remove_write_access(struct vcpu *v, mfn_t gmfn, case -1: /* An unfindable writeable typecount has appeared, probably via a - * grant table entry: can't shoot the mapping, so try to unshadow + * grant table entry: can't shoot the mapping, so try to unshadow * the page. If that doesn't work either, the guest is granting * his pagetables and must be killed after all. * This will flush the tlb, so we can return with no worries. */ @@ -715,7 +715,7 @@ static void _sh_resync(struct vcpu *v, mfn_t gmfn, ASSERT(paging_locked_by_me(v->domain)); ASSERT(mfn_is_out_of_sync(gmfn)); /* Guest page must be shadowed *only* as L1 when out of sync. */ - ASSERT(!(mfn_to_page(gmfn)->shadow_flags & SHF_page_type_mask + ASSERT(!(mfn_to_page(gmfn)->shadow_flags & SHF_page_type_mask & ~SHF_L1_ANY)); ASSERT(!sh_page_has_multiple_shadows(mfn_to_page(gmfn))); @@ -751,14 +751,14 @@ static void oos_hash_add(struct vcpu *v, mfn_t gmfn) mfn_t *oos_snapshot = v->arch.paging.shadow.oos_snapshot; struct oos_fixup *oos_fixup = v->arch.paging.shadow.oos_fixup; struct oos_fixup fixup = { .next = 0 }; - + for (i = 0; i < SHADOW_OOS_FIXUPS; i++ ) fixup.smfn[i] = _mfn(INVALID_MFN); idx = mfn_x(gmfn) % SHADOW_OOS_PAGES; oidx = idx; - if ( mfn_valid(oos[idx]) + if ( mfn_valid(oos[idx]) && (mfn_x(oos[idx]) % SHADOW_OOS_PAGES) == idx ) { /* Punt the current occupant into the next slot */ @@ -795,7 +795,7 @@ static void oos_hash_remove(struct vcpu *v, mfn_t gmfn) SHADOW_PRINTK("%pv gmfn %lx\n", v, mfn_x(gmfn)); - for_each_vcpu(d, v) + for_each_vcpu(d, v) { oos = v->arch.paging.shadow.oos; idx = mfn_x(gmfn) % SHADOW_OOS_PAGES; @@ -818,8 +818,8 @@ mfn_t oos_snapshot_lookup(struct vcpu *v, mfn_t gmfn) mfn_t *oos; mfn_t *oos_snapshot; struct domain *d = v->domain; - - for_each_vcpu(d, v) + + for_each_vcpu(d, v) { oos = v->arch.paging.shadow.oos; oos_snapshot = v->arch.paging.shadow.oos_snapshot; @@ -846,7 +846,7 @@ void sh_resync(struct vcpu *v, mfn_t gmfn) struct oos_fixup *oos_fixup; struct domain *d = v->domain; - for_each_vcpu(d, v) + for_each_vcpu(d, v) { oos = v->arch.paging.shadow.oos; oos_fixup = v->arch.paging.shadow.oos_fixup; @@ -854,7 +854,7 @@ void sh_resync(struct vcpu *v, mfn_t gmfn) idx = mfn_x(gmfn) % SHADOW_OOS_PAGES; if ( mfn_x(oos[idx]) != mfn_x(gmfn) ) idx = (idx + 1) % SHADOW_OOS_PAGES; - + if ( mfn_x(oos[idx]) == mfn_x(gmfn) ) { _sh_resync(v, gmfn, &oos_fixup[idx], oos_snapshot[idx]); @@ -905,7 +905,7 @@ void sh_resync_all(struct vcpu *v, int skip, int this, int others) goto resync_others; /* First: resync all of this vcpu's oos pages */ - for ( idx = 0; idx < SHADOW_OOS_PAGES; idx++ ) + for ( idx = 0; idx < SHADOW_OOS_PAGES; idx++ ) if ( mfn_valid(oos[idx]) ) { /* Write-protect and sync contents */ @@ -920,14 +920,14 @@ void sh_resync_all(struct vcpu *v, int skip, int this, int others) /* Second: make all *other* vcpus' oos pages safe. */ for_each_vcpu(v->domain, other) { - if ( v == other ) + if ( v == other ) continue; oos = other->arch.paging.shadow.oos; oos_fixup = other->arch.paging.shadow.oos_fixup; oos_snapshot = other->arch.paging.shadow.oos_snapshot; - for ( idx = 0; idx < SHADOW_OOS_PAGES; idx++ ) + for ( idx = 0; idx < SHADOW_OOS_PAGES; idx++ ) { if ( !mfn_valid(oos[idx]) ) continue; @@ -946,7 +946,7 @@ void sh_resync_all(struct vcpu *v, int skip, int this, int others) _sh_resync(other, oos[idx], &oos_fixup[idx], oos_snapshot[idx]); oos[idx] = _mfn(INVALID_MFN); } - } + } } } @@ -955,19 +955,19 @@ void sh_resync_all(struct vcpu *v, int skip, int this, int others) int sh_unsync(struct vcpu *v, mfn_t gmfn) { struct page_info *pg; - + ASSERT(paging_locked_by_me(v->domain)); SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx\n", v->domain->domain_id, v->vcpu_id, mfn_x(gmfn)); pg = mfn_to_page(gmfn); - + /* Guest page must be shadowed *only* as L1 and *only* once when out - * of sync. Also, get out now if it's already out of sync. + * of sync. Also, get out now if it's already out of sync. * Also, can't safely unsync if some vcpus have paging disabled.*/ - if ( pg->shadow_flags & - ((SHF_page_type_mask & ~SHF_L1_ANY) | SHF_out_of_sync) + if ( pg->shadow_flags & + ((SHF_page_type_mask & ~SHF_L1_ANY) | SHF_out_of_sync) || sh_page_has_multiple_shadows(pg) || is_pv_domain(v->domain) || !v->domain->arch.paging.shadow.oos_active ) @@ -995,9 +995,9 @@ void shadow_promote(struct vcpu *v, mfn_t gmfn, unsigned int type) ASSERT(mfn_valid(gmfn)); -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* Is the page already shadowed and out of sync? */ - if ( page_is_out_of_sync(page) ) + if ( page_is_out_of_sync(page) ) sh_resync(v, gmfn); #endif @@ -1026,13 +1026,13 @@ void shadow_demote(struct vcpu *v, mfn_t gmfn, u32 type) if ( (page->shadow_flags & SHF_page_type_mask) == 0 ) { -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* Was the page out of sync? */ - if ( page_is_out_of_sync(page) ) + if ( page_is_out_of_sync(page) ) { oos_hash_remove(v, gmfn); } -#endif +#endif clear_bit(_PGC_page_table, &page->count_info); } @@ -1050,11 +1050,11 @@ sh_validate_guest_entry(struct vcpu *v, mfn_t gmfn, void *entry, u32 size) struct page_info *page = mfn_to_page(gmfn); paging_mark_dirty(v->domain, mfn_x(gmfn)); - + // Determine which types of shadows are affected, and update each. // // Always validate L1s before L2s to prevent another cpu with a linear - // mapping of this gmfn from seeing a walk that results from + // mapping of this gmfn from seeing a walk that results from // using the new L2 value and the old L1 value. (It is OK for such a // guest to see a walk that uses the old L2 value with the new L1 value, // as hardware could behave this way if one level of the pagewalk occurs @@ -1067,40 +1067,40 @@ sh_validate_guest_entry(struct vcpu *v, mfn_t gmfn, void *entry, u32 size) if ( !(page->count_info & PGC_page_table) ) return 0; /* Not shadowed at all */ - if ( page->shadow_flags & SHF_L1_32 ) + if ( page->shadow_flags & SHF_L1_32 ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl1e, 2) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L2_32 ) + if ( page->shadow_flags & SHF_L2_32 ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl2e, 2) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L1_PAE ) + if ( page->shadow_flags & SHF_L1_PAE ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl1e, 3) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L2_PAE ) + if ( page->shadow_flags & SHF_L2_PAE ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl2e, 3) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L2H_PAE ) + if ( page->shadow_flags & SHF_L2H_PAE ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl2he, 3) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L1_64 ) + if ( page->shadow_flags & SHF_L1_64 ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl1e, 4) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L2_64 ) + if ( page->shadow_flags & SHF_L2_64 ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl2e, 4) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L2H_64 ) + if ( page->shadow_flags & SHF_L2H_64 ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl2he, 4) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L3_64 ) + if ( page->shadow_flags & SHF_L3_64 ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl3e, 4) (v, gmfn, entry, size); - if ( page->shadow_flags & SHF_L4_64 ) + if ( page->shadow_flags & SHF_L4_64 ) result |= SHADOW_INTERNAL_NAME(sh_map_and_validate_gl4e, 4) (v, gmfn, entry, size); - this_cpu(trace_shadow_path_flags) |= (result<<(TRCE_SFLAG_SET_CHANGED)); + this_cpu(trace_shadow_path_flags) |= (result<<(TRCE_SFLAG_SET_CHANGED)); return result; } @@ -1121,12 +1121,12 @@ sh_validate_guest_pt_write(struct vcpu *v, mfn_t gmfn, if ( rc & SHADOW_SET_FLUSH ) /* Need to flush TLBs to pick up shadow PT changes */ flush_tlb_mask(d->domain_dirty_cpumask); - if ( rc & SHADOW_SET_ERROR ) + if ( rc & SHADOW_SET_ERROR ) { - /* This page is probably not a pagetable any more: tear it out of the - * shadows, along with any tables that reference it. - * Since the validate call above will have made a "safe" (i.e. zero) - * shadow entry, we can let the domain live even if we can't fully + /* This page is probably not a pagetable any more: tear it out of the + * shadows, along with any tables that reference it. + * Since the validate call above will have made a "safe" (i.e. zero) + * shadow entry, we can let the domain live even if we can't fully * unshadow the page. */ sh_remove_shadows(v, gmfn, 0, 0); } @@ -1134,7 +1134,7 @@ sh_validate_guest_pt_write(struct vcpu *v, mfn_t gmfn, int shadow_write_guest_entry(struct vcpu *v, intpte_t *p, intpte_t new, mfn_t gmfn) -/* Write a new value into the guest pagetable, and update the shadows +/* Write a new value into the guest pagetable, and update the shadows * appropriately. Returns 0 if we page-faulted, 1 for success. */ { int failed; @@ -1148,7 +1148,7 @@ int shadow_write_guest_entry(struct vcpu *v, intpte_t *p, int shadow_cmpxchg_guest_entry(struct vcpu *v, intpte_t *p, intpte_t *old, intpte_t new, mfn_t gmfn) -/* Cmpxchg a new value into the guest pagetable, and update the shadows +/* Cmpxchg a new value into the guest pagetable, and update the shadows * appropriately. Returns 0 if we page-faulted, 1 if not. * N.B. caller should check the value of "old" to see if the * cmpxchg itself was successful. */ @@ -1166,7 +1166,7 @@ int shadow_cmpxchg_guest_entry(struct vcpu *v, intpte_t *p, /**************************************************************************/ -/* Memory management for shadow pages. */ +/* Memory management for shadow pages. */ /* Allocating shadow pages * ----------------------- @@ -1180,12 +1180,12 @@ int shadow_cmpxchg_guest_entry(struct vcpu *v, intpte_t *p, * PAE/64-bit l2 tables (1GB va each). These multi-page shadows are * not contiguous in memory; functions for handling offsets into them are * defined in shadow/multi.c (shadow_l1_index() etc.) - * + * * This table shows the allocation behaviour of the different modes: * * Xen paging 64b 64b 64b * Guest paging 32b pae 64b - * PV or HVM HVM HVM * + * PV or HVM HVM HVM * * Shadow paging pae pae 64b * * sl1 size 8k 4k 4k @@ -1193,8 +1193,8 @@ int shadow_cmpxchg_guest_entry(struct vcpu *v, intpte_t *p, * sl3 size - - 4k * sl4 size - - 4k * - * In HVM guests, the p2m table is built out of shadow pages, and we provide - * a function for the p2m management to steal pages, in max-order chunks, from + * In HVM guests, the p2m table is built out of shadow pages, and we provide + * a function for the p2m management to steal pages, in max-order chunks, from * the free pool. */ @@ -1221,15 +1221,15 @@ const u8 sh_type_to_size[] = { /* Figure out the least acceptable quantity of shadow memory. * The minimum memory requirement for always being able to free up a * chunk of memory is very small -- only three max-order chunks per - * vcpu to hold the top level shadows and pages with Xen mappings in them. + * vcpu to hold the top level shadows and pages with Xen mappings in them. * * But for a guest to be guaranteed to successfully execute a single * instruction, we must be able to map a large number (about thirty) VAs * at the same time, which means that to guarantee progress, we must * allow for more than ninety allocated pages per vcpu. We round that - * up to 128 pages, or half a megabyte per vcpu, and add 1 more vcpu's + * up to 128 pages, or half a megabyte per vcpu, and add 1 more vcpu's * worth to make sure we never return zero. */ -static unsigned int shadow_min_acceptable_pages(struct domain *d) +static unsigned int shadow_min_acceptable_pages(struct domain *d) { u32 vcpu_count = 1; struct vcpu *v; @@ -1238,7 +1238,7 @@ static unsigned int shadow_min_acceptable_pages(struct domain *d) vcpu_count++; return (vcpu_count * 128); -} +} /* Dispatcher function: call the per-mode function that will unhook the * non-Xen mappings in this top-level shadow mfn. With user_only == 1, @@ -1290,7 +1290,7 @@ static void _shadow_prealloc( int i; if ( d->arch.paging.shadow.free_pages >= pages ) return; - + v = current; if ( v->domain != d ) v = d->vcpu[0]; @@ -1315,13 +1315,13 @@ static void _shadow_prealloc( * mappings. */ perfc_incr(shadow_prealloc_2); - for_each_vcpu(d, v2) + for_each_vcpu(d, v2) for ( i = 0 ; i < 4 ; i++ ) { if ( !pagetable_is_null(v2->arch.shadow_table[i]) ) { TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_PREALLOC_UNHOOK); - shadow_unhook_mappings(v, + shadow_unhook_mappings(v, pagetable_get_mfn(v2->arch.shadow_table[i]), 0); /* See if that freed up enough space */ @@ -1332,7 +1332,7 @@ static void _shadow_prealloc( } } } - + /* Nothing more we can do: all remaining shadows are of pages that * hold Xen mappings for some vcpu. This can never happen. */ SHADOW_ERROR("Can't pre-allocate %u shadow pages!\n" @@ -1356,7 +1356,7 @@ void shadow_prealloc(struct domain *d, u32 type, unsigned int count) /* Deliberately free all the memory we can: this will tear down all of * this domain's shadows */ -static void shadow_blow_tables(struct domain *d) +static void shadow_blow_tables(struct domain *d) { struct page_info *sp, *t; struct vcpu *v = d->vcpu[0]; @@ -1371,12 +1371,12 @@ static void shadow_blow_tables(struct domain *d) smfn = page_to_mfn(sp); sh_unpin(v, smfn); } - + /* Second pass: unhook entries of in-use shadows */ - for_each_vcpu(d, v) + for_each_vcpu(d, v) for ( i = 0 ; i < 4 ; i++ ) if ( !pagetable_is_null(v->arch.shadow_table[i]) ) - shadow_unhook_mappings(v, + shadow_unhook_mappings(v, pagetable_get_mfn(v->arch.shadow_table[i]), 0); /* Make sure everyone sees the unshadowings */ @@ -1441,9 +1441,9 @@ set_next_shadow(struct page_info *sp, struct page_info *next) } /* Allocate another shadow's worth of (contiguous, aligned) pages, - * and fill in the type and backpointer fields of their page_infos. + * and fill in the type and backpointer fields of their page_infos. * Never fails to allocate. */ -mfn_t shadow_alloc(struct domain *d, +mfn_t shadow_alloc(struct domain *d, u32 shadow_type, unsigned long backpointer) { @@ -1485,10 +1485,10 @@ mfn_t shadow_alloc(struct domain *d, INIT_PAGE_LIST_HEAD(&tmp_list); /* Init page info fields and clear the pages */ - for ( i = 0; i < pages ; i++ ) + for ( i = 0; i < pages ; i++ ) { sp = page_list_remove_head(&d->arch.paging.shadow.freelist); - /* Before we overwrite the old contents of this page, + /* Before we overwrite the old contents of this page, * we need to be sure that no TLB holds a pointer to it. */ cpumask_copy(&mask, d->domain_dirty_cpumask); tlbflush_filter(mask, sp->tlbflush_timestamp); @@ -1512,7 +1512,7 @@ mfn_t shadow_alloc(struct domain *d, set_next_shadow(sp, NULL); perfc_incr(shadow_alloc_count); } - if ( shadow_type >= SH_type_min_shadow + if ( shadow_type >= SH_type_min_shadow && shadow_type <= SH_type_max_shadow ) sp->u.sh.head = 1; @@ -1525,7 +1525,7 @@ mfn_t shadow_alloc(struct domain *d, /* Return some shadow pages to the pool. */ void shadow_free(struct domain *d, mfn_t smfn) { - struct page_info *next = NULL, *sp = mfn_to_page(smfn); + struct page_info *next = NULL, *sp = mfn_to_page(smfn); struct page_list_head *pin_list; unsigned int pages; u32 shadow_type; @@ -1540,16 +1540,16 @@ void shadow_free(struct domain *d, mfn_t smfn) pages = shadow_size(shadow_type); pin_list = &d->arch.paging.shadow.pinned_shadows; - for ( i = 0; i < pages; i++ ) + for ( i = 0; i < pages; i++ ) { #if SHADOW_OPTIMIZATIONS & (SHOPT_WRITABLE_HEURISTIC | SHOPT_FAST_EMULATION) struct vcpu *v; - for_each_vcpu(d, v) + for_each_vcpu(d, v) { #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC /* No longer safe to look for a writeable mapping in this shadow */ - if ( v->arch.paging.shadow.last_writeable_pte_smfn - == mfn_x(page_to_mfn(sp)) ) + if ( v->arch.paging.shadow.last_writeable_pte_smfn + == mfn_x(page_to_mfn(sp)) ) v->arch.paging.shadow.last_writeable_pte_smfn = 0; #endif #if SHADOW_OPTIMIZATIONS & SHOPT_FAST_EMULATION @@ -1562,7 +1562,7 @@ void shadow_free(struct domain *d, mfn_t smfn) next = page_list_next(sp, pin_list); /* Strip out the type: this is now a free shadow page */ sp->u.sh.type = sp->u.sh.head = 0; - /* Remember the TLB timestamp so we will know whether to flush + /* Remember the TLB timestamp so we will know whether to flush * TLBs when we reuse the page. Because the destructors leave the * contents of the pages in place, we can delay TLB flushes until * just before the allocator hands the page out again. */ @@ -1584,11 +1584,11 @@ shadow_alloc_p2m_page(struct domain *d) { struct page_info *pg; - /* This is called both from the p2m code (which never holds the + /* This is called both from the p2m code (which never holds the * paging lock) and the log-dirty code (which always does). */ paging_lock_recursive(d); - if ( d->arch.paging.shadow.total_pages + if ( d->arch.paging.shadow.total_pages < shadow_min_acceptable_pages(d) + 1 ) { if ( !d->arch.paging.p2m_alloc_failed ) @@ -1630,9 +1630,9 @@ shadow_free_p2m_page(struct domain *d, struct page_info *pg) } pg->count_info &= ~PGC_count_mask; pg->u.sh.type = SH_type_p2m_table; /* p2m code reuses type-info */ - page_set_owner(pg, NULL); + page_set_owner(pg, NULL); - /* This is called both from the p2m code (which never holds the + /* This is called both from the p2m code (which never holds the * paging lock) and the log-dirty code (which always does). */ paging_lock_recursive(d); @@ -1647,7 +1647,7 @@ shadow_free_p2m_page(struct domain *d, struct page_info *pg) * Input will be rounded up to at least shadow_min_acceptable_pages(), * plus space for the p2m table. * Returns 0 for success, non-zero for failure. */ -static unsigned int sh_set_allocation(struct domain *d, +static unsigned int sh_set_allocation(struct domain *d, unsigned int pages, int *preempted) { @@ -1663,7 +1663,7 @@ static unsigned int sh_set_allocation(struct domain *d, pages = 0; else pages -= d->arch.paging.shadow.p2m_pages; - + /* Don't allocate less than the minimum acceptable, plus one page per * megabyte of RAM (for the p2m table) */ lower_bound = shadow_min_acceptable_pages(d) + (d->tot_pages / 256); @@ -1671,18 +1671,18 @@ static unsigned int sh_set_allocation(struct domain *d, pages = lower_bound; } - SHADOW_PRINTK("current %i target %i\n", + SHADOW_PRINTK("current %i target %i\n", d->arch.paging.shadow.total_pages, pages); for ( ; ; ) { - if ( d->arch.paging.shadow.total_pages < pages ) + if ( d->arch.paging.shadow.total_pages < pages ) { /* Need to allocate more memory from domheap */ sp = (struct page_info *) alloc_domheap_page(NULL, MEMF_node(domain_to_node(d))); - if ( sp == NULL ) - { + if ( sp == NULL ) + { SHADOW_PRINTK("failed to allocate shadow pages.\n"); return -ENOMEM; } @@ -1693,8 +1693,8 @@ static unsigned int sh_set_allocation(struct domain *d, sp->u.sh.count = 0; sp->tlbflush_timestamp = 0; /* Not in any TLB */ page_list_add_tail(sp, &d->arch.paging.shadow.freelist); - } - else if ( d->arch.paging.shadow.total_pages > pages ) + } + else if ( d->arch.paging.shadow.total_pages > pages ) { /* Need to return memory to domheap */ _shadow_prealloc(d, 1); @@ -1734,7 +1734,7 @@ static unsigned int shadow_get_allocation(struct domain *d) /**************************************************************************/ /* Hash table for storing the guest->shadow mappings. - * The table itself is an array of pointers to shadows; the shadows are then + * The table itself is an array of pointers to shadows; the shadows are then * threaded on a singly-linked list of shadows with the same hash value */ #define SHADOW_HASH_BUCKETS 251 @@ -1742,7 +1742,7 @@ static unsigned int shadow_get_allocation(struct domain *d) /* Hash function that takes a gfn or mfn, plus another byte of type info */ typedef u32 key_t; -static inline key_t sh_hash(unsigned long n, unsigned int t) +static inline key_t sh_hash(unsigned long n, unsigned int t) { unsigned char *p = (unsigned char *)&n; key_t k = t; @@ -1801,7 +1801,7 @@ static void sh_hash_audit_bucket(struct domain *d, int bucket) SHADOW_ERROR("MFN %#"PRI_mfn" shadowed (by %#"PRI_mfn")" " and not OOS but has typecount %#lx\n", __backpointer(sp), - mfn_x(page_to_mfn(sp)), + mfn_x(page_to_mfn(sp)), gpg->u.inuse.type_info); BUG(); } @@ -1809,7 +1809,7 @@ static void sh_hash_audit_bucket(struct domain *d, int bucket) } else /* Not an l1 */ #endif - if ( (gpg->u.inuse.type_info & PGT_type_mask) == PGT_writable_page + if ( (gpg->u.inuse.type_info & PGT_type_mask) == PGT_writable_page && (gpg->u.inuse.type_info & PGT_count_mask) != 0 ) { SHADOW_ERROR("MFN %#"PRI_mfn" shadowed (by %#"PRI_mfn")" @@ -1839,7 +1839,7 @@ static void sh_hash_audit(struct domain *d) if ( !(SHADOW_AUDIT_ENABLE) ) return; - for ( i = 0; i < SHADOW_HASH_BUCKETS; i++ ) + for ( i = 0; i < SHADOW_HASH_BUCKETS; i++ ) { sh_hash_audit_bucket(d, i); } @@ -1849,7 +1849,7 @@ static void sh_hash_audit(struct domain *d) #define sh_hash_audit(_d) do {} while(0) #endif /* Hashtable bucket audit */ -/* Allocate and initialise the table itself. +/* Allocate and initialise the table itself. * Returns 0 for success, 1 for error. */ static int shadow_hash_alloc(struct domain *d) { @@ -1906,11 +1906,11 @@ mfn_t shadow_hash_lookup(struct vcpu *v, unsigned long n, unsigned int t) if ( unlikely(d->arch.paging.shadow.hash_walking != 0) ) /* Can't reorder: someone is walking the hash chains */ return page_to_mfn(sp); - else + else { ASSERT(prev); /* Delete sp from the list */ - prev->next_shadow = sp->next_shadow; + prev->next_shadow = sp->next_shadow; /* Re-insert it at the head of the list */ set_next_shadow(sp, d->arch.paging.shadow.hash_table[key]); d->arch.paging.shadow.hash_table[key] = sp; @@ -1930,14 +1930,14 @@ mfn_t shadow_hash_lookup(struct vcpu *v, unsigned long n, unsigned int t) return _mfn(INVALID_MFN); } -void shadow_hash_insert(struct vcpu *v, unsigned long n, unsigned int t, +void shadow_hash_insert(struct vcpu *v, unsigned long n, unsigned int t, mfn_t smfn) /* Put a mapping (n,t)->smfn into the hash table */ { struct domain *d = v->domain; struct page_info *sp; key_t key; - + ASSERT(paging_locked_by_me(d)); ASSERT(d->arch.paging.shadow.hash_table); ASSERT(t); @@ -1947,16 +1947,16 @@ void shadow_hash_insert(struct vcpu *v, unsigned long n, unsigned int t, perfc_incr(shadow_hash_inserts); key = sh_hash(n, t); sh_hash_audit_bucket(d, key); - + /* Insert this shadow at the top of the bucket */ sp = mfn_to_page(smfn); set_next_shadow(sp, d->arch.paging.shadow.hash_table[key]); d->arch.paging.shadow.hash_table[key] = sp; - + sh_hash_audit_bucket(d, key); } -void shadow_hash_delete(struct vcpu *v, unsigned long n, unsigned int t, +void shadow_hash_delete(struct vcpu *v, unsigned long n, unsigned int t, mfn_t smfn) /* Excise the mapping (n,t)->smfn from the hash table */ { @@ -1973,12 +1973,12 @@ void shadow_hash_delete(struct vcpu *v, unsigned long n, unsigned int t, perfc_incr(shadow_hash_deletes); key = sh_hash(n, t); sh_hash_audit_bucket(d, key); - + sp = mfn_to_page(smfn); - if ( d->arch.paging.shadow.hash_table[key] == sp ) + if ( d->arch.paging.shadow.hash_table[key] == sp ) /* Easy case: we're deleting the head item. */ d->arch.paging.shadow.hash_table[key] = next_shadow(sp); - else + else { /* Need to search for the one we want */ x = d->arch.paging.shadow.hash_table[key]; @@ -2001,17 +2001,17 @@ void shadow_hash_delete(struct vcpu *v, unsigned long n, unsigned int t, typedef int (*hash_callback_t)(struct vcpu *v, mfn_t smfn, mfn_t other_mfn); -static void hash_foreach(struct vcpu *v, - unsigned int callback_mask, +static void hash_foreach(struct vcpu *v, + unsigned int callback_mask, const hash_callback_t callbacks[], mfn_t callback_mfn) -/* Walk the hash table looking at the types of the entries and - * calling the appropriate callback function for each entry. +/* Walk the hash table looking at the types of the entries and + * calling the appropriate callback function for each entry. * The mask determines which shadow types we call back for, and the array * of callbacks tells us which function to call. - * Any callback may return non-zero to let us skip the rest of the scan. + * Any callback may return non-zero to let us skip the rest of the scan. * - * WARNING: Callbacks MUST NOT add or remove hash entries unless they + * WARNING: Callbacks MUST NOT add or remove hash entries unless they * then return non-zero to terminate the scan. */ { int i, done = 0; @@ -2028,7 +2028,7 @@ static void hash_foreach(struct vcpu *v, ASSERT(d->arch.paging.shadow.hash_walking == 0); d->arch.paging.shadow.hash_walking = 1; - for ( i = 0; i < SHADOW_HASH_BUCKETS; i++ ) + for ( i = 0; i < SHADOW_HASH_BUCKETS; i++ ) { /* WARNING: This is not safe against changes to the hash table. * The callback *must* return non-zero if it has inserted or @@ -2044,15 +2044,15 @@ static void hash_foreach(struct vcpu *v, if ( done ) break; } } - if ( done ) break; + if ( done ) break; } - d->arch.paging.shadow.hash_walking = 0; + d->arch.paging.shadow.hash_walking = 0; } /**************************************************************************/ /* Destroy a shadow page: simple dispatcher to call the per-type destructor - * which will decrement refcounts appropriately and return memory to the + * which will decrement refcounts appropriately and return memory to the * free pool. */ void sh_destroy_shadow(struct vcpu *v, mfn_t smfn) @@ -2065,13 +2065,13 @@ void sh_destroy_shadow(struct vcpu *v, mfn_t smfn) /* Double-check, if we can, that the shadowed page belongs to this * domain, (by following the back-pointer). */ - ASSERT(t == SH_type_fl1_32_shadow || - t == SH_type_fl1_pae_shadow || - t == SH_type_fl1_64_shadow || - t == SH_type_monitor_table || + ASSERT(t == SH_type_fl1_32_shadow || + t == SH_type_fl1_pae_shadow || + t == SH_type_fl1_64_shadow || + t == SH_type_monitor_table || (is_pv_32on64_vcpu(v) && t == SH_type_l4_64_shadow) || (page_get_owner(mfn_to_page(backpointer(sp))) - == v->domain)); + == v->domain)); /* The down-shifts here are so that the switch statement is on nice * small numbers that the compiler will enjoy */ @@ -2115,7 +2115,7 @@ void sh_destroy_shadow(struct vcpu *v, mfn_t smfn) SHADOW_ERROR("tried to destroy shadow of bad type %08lx\n", (unsigned long)t); BUG(); - } + } } static inline void trace_shadow_wrmap_bf(mfn_t gmfn) @@ -2129,13 +2129,13 @@ static inline void trace_shadow_wrmap_bf(mfn_t gmfn) } /**************************************************************************/ -/* Remove all writeable mappings of a guest frame from the shadow tables - * Returns non-zero if we need to flush TLBs. +/* Remove all writeable mappings of a guest frame from the shadow tables + * Returns non-zero if we need to flush TLBs. * level and fault_addr desribe how we found this to be a pagetable; * level==0 means we have some other reason for revoking write access. * If level==0 we are allowed to fail, returning -1. */ -int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, +int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, unsigned int level, unsigned long fault_addr) { @@ -2180,7 +2180,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, /* Early exit if it's already a pagetable, or otherwise not writeable */ if ( (sh_mfn_is_a_page_table(gmfn) -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* Unless they've been allowed to go out of sync with their shadows */ && !mfn_oos_may_write(gmfn) #endif @@ -2192,11 +2192,11 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, perfc_incr(shadow_writeable); - /* If this isn't a "normal" writeable page, the domain is trying to + /* If this isn't a "normal" writeable page, the domain is trying to * put pagetables in special memory of some kind. We can't allow that. */ if ( (pg->u.inuse.type_info & PGT_type_mask) != PGT_writable_page ) { - SHADOW_ERROR("can't remove write access to mfn %lx, type_info is %" + SHADOW_ERROR("can't remove write access to mfn %lx, type_info is %" PRtype_info "\n", mfn_x(gmfn), mfn_to_page(gmfn)->u.inuse.type_info); domain_crash(v->domain); @@ -2219,7 +2219,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, return 1; \ } \ } while (0) - + if ( v->arch.paging.mode->guest_levels == 2 ) { if ( level == 1 ) @@ -2227,27 +2227,27 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, GUESS(0xC0000000UL + (fault_addr >> 10), 1); /* Linux lowmem: first 896MB is mapped 1-to-1 above 0xC0000000 */ - if ((gfn = mfn_to_gfn(v->domain, gmfn)) < 0x38000 ) + if ((gfn = mfn_to_gfn(v->domain, gmfn)) < 0x38000 ) GUESS(0xC0000000UL + (gfn << PAGE_SHIFT), 4); /* FreeBSD: Linear map at 0xBFC00000 */ if ( level == 1 ) - GUESS(0xBFC00000UL + GUESS(0xBFC00000UL + ((fault_addr & VADDR_MASK) >> 10), 6); } else if ( v->arch.paging.mode->guest_levels == 3 ) { /* 32bit PAE w2k3: linear map at 0xC0000000 */ - switch ( level ) + switch ( level ) { case 1: GUESS(0xC0000000UL + (fault_addr >> 9), 2); break; case 2: GUESS(0xC0600000UL + (fault_addr >> 18), 2); break; } /* Linux lowmem: first 896MB is mapped 1-to-1 above 0xC0000000 */ - if ((gfn = mfn_to_gfn(v->domain, gmfn)) < 0x38000 ) + if ((gfn = mfn_to_gfn(v->domain, gmfn)) < 0x38000 ) GUESS(0xC0000000UL + (gfn << PAGE_SHIFT), 4); - + /* FreeBSD PAE: Linear map at 0xBF800000 */ switch ( level ) { @@ -2260,20 +2260,20 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, else if ( v->arch.paging.mode->guest_levels == 4 ) { /* 64bit w2k3: linear map at 0xfffff68000000000 */ - switch ( level ) + switch ( level ) { - case 1: GUESS(0xfffff68000000000UL + case 1: GUESS(0xfffff68000000000UL + ((fault_addr & VADDR_MASK) >> 9), 3); break; case 2: GUESS(0xfffff6fb40000000UL + ((fault_addr & VADDR_MASK) >> 18), 3); break; - case 3: GUESS(0xfffff6fb7da00000UL + case 3: GUESS(0xfffff6fb7da00000UL + ((fault_addr & VADDR_MASK) >> 27), 3); break; } /* 64bit Linux direct map at 0xffff880000000000; older kernels * had it at 0xffff810000000000, and older kernels yet had it * at 0x0000010000000000UL */ - gfn = mfn_to_gfn(v->domain, gmfn); + gfn = mfn_to_gfn(v->domain, gmfn); GUESS(0xffff880000000000UL + (gfn << PAGE_SHIFT), 4); GUESS(0xffff810000000000UL + (gfn << PAGE_SHIFT), 4); GUESS(0x0000010000000000UL + (gfn << PAGE_SHIFT), 4); @@ -2283,7 +2283,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, * kpm_vbase; 0xfffffe0000000000UL */ GUESS(0xfffffe0000000000UL + (gfn << PAGE_SHIFT), 4); - + /* FreeBSD 64bit: linear map 0xffff800000000000 */ switch ( level ) { @@ -2316,7 +2316,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, mfn_t last_smfn = _mfn(v->arch.paging.shadow.last_writeable_pte_smfn); int shtype = mfn_to_page(last_smfn)->u.sh.type; - if ( callbacks[shtype] ) + if ( callbacks[shtype] ) callbacks[shtype](v, last_smfn, gmfn); if ( (pg->u.inuse.type_info & PGT_count_mask) != old_count ) @@ -2327,7 +2327,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, return 1; #endif /* SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC */ - + /* Brute-force search of all the shadows, by walking the hash */ trace_shadow_wrmap_bf(gmfn); if ( level == 0 ) @@ -2348,20 +2348,20 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, (mfn_to_page(gmfn)->u.inuse.type_info&PGT_count_mask)); domain_crash(v->domain); } - + /* We killed at least one writeable mapping, so must flush TLBs. */ return 1; } -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) int sh_remove_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, mfn_t smfn, unsigned long off) { struct page_info *sp = mfn_to_page(smfn); - + ASSERT(mfn_valid(smfn)); ASSERT(mfn_valid(gmfn)); - + if ( sp->u.sh.type == SH_type_l1_32_shadow || sp->u.sh.type == SH_type_fl1_32_shadow ) { @@ -2379,7 +2379,7 @@ int sh_remove_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, return 0; } -#endif +#endif /**************************************************************************/ /* Remove all mappings of a guest frame from the shadow tables. @@ -2427,9 +2427,9 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) * can be called via put_page_type when we clear a shadow l1e).*/ paging_lock_recursive(v->domain); - /* XXX TODO: + /* XXX TODO: * Heuristics for finding the (probably) single mapping of this gmfn */ - + /* Brute-force search of all the shadows, by walking the hash */ perfc_incr(shadow_mappings_bf); hash_foreach(v, callback_mask, callbacks, gmfn); @@ -2437,8 +2437,8 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) /* If that didn't catch the mapping, something is very wrong */ if ( !sh_check_page_has_no_refs(page) ) { - /* Don't complain if we're in HVM and there are some extra mappings: - * The qemu helper process has an untyped mapping of this dom's RAM + /* Don't complain if we're in HVM and there are some extra mappings: + * The qemu helper process has an untyped mapping of this dom's RAM * and the HVM restore program takes another. * Also allow one typed refcount for xenheap pages, to match * share_xen_page_with_guest(). */ @@ -2448,7 +2448,7 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) == !!is_xen_heap_page(page))) ) { SHADOW_ERROR("can't find all mappings of mfn %lx: " - "c=%08lx t=%08lx\n", mfn_x(gmfn), + "c=%08lx t=%08lx\n", mfn_x(gmfn), page->count_info, page->u.inuse.type_info); } } @@ -2475,7 +2475,7 @@ static int sh_remove_shadow_via_pointer(struct vcpu *v, mfn_t smfn) ASSERT(sp->u.sh.type > 0); ASSERT(sp->u.sh.type < SH_type_max_shadow); ASSERT(sh_type_has_up_pointer(v, sp->u.sh.type)); - + if (sp->up == 0) return 0; pmfn = _mfn(sp->up >> PAGE_SHIFT); ASSERT(mfn_valid(pmfn)); @@ -2483,7 +2483,7 @@ static int sh_remove_shadow_via_pointer(struct vcpu *v, mfn_t smfn) ASSERT(vaddr); vaddr += sp->up & (PAGE_SIZE-1); ASSERT(l1e_get_pfn(*(l1_pgentry_t *)vaddr) == mfn_x(smfn)); - + /* Is this the only reference to this shadow? */ rc = (sp->u.sh.count == 1) ? 1 : 0; @@ -2508,7 +2508,7 @@ static int sh_remove_shadow_via_pointer(struct vcpu *v, mfn_t smfn) break; default: BUG(); /* Some wierd unknown shadow type */ } - + sh_unmap_domain_page(vaddr); if ( rc ) perfc_incr(shadow_up_pointer); @@ -2519,8 +2519,8 @@ static int sh_remove_shadow_via_pointer(struct vcpu *v, mfn_t smfn) } void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) -/* Remove the shadows of this guest page. - * If fast != 0, just try the quick heuristic, which will remove +/* Remove the shadows of this guest page. + * If fast != 0, just try the quick heuristic, which will remove * at most one reference to each shadow of the page. Otherwise, walk * all the shadow tables looking for refs to shadows of this gmfn. * If all != 0, kill the domain if we can't find all the shadows. @@ -2530,7 +2530,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) struct page_info *pg = mfn_to_page(gmfn); mfn_t smfn; unsigned char t; - + /* Dispatch table for getting per-type functions: each level must * be called with the function to remove a lower-level shadow. */ static const hash_callback_t callbacks[SH_type_unused] = { @@ -2642,7 +2642,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) domain_crash(v->domain); } - /* Need to flush TLBs now, so that linear maps are safe next time we + /* Need to flush TLBs now, so that linear maps are safe next time we * take a fault. */ flush_tlb_mask(v->domain->domain_dirty_cpumask); @@ -2656,18 +2656,18 @@ sh_remove_all_shadows_and_parents(struct vcpu *v, mfn_t gmfn) { sh_remove_shadows(v, gmfn, 0, 1); /* XXX TODO: - * Rework this hashtable walker to return a linked-list of all - * the shadows it modified, then do breadth-first recursion - * to find the way up to higher-level tables and unshadow them too. + * Rework this hashtable walker to return a linked-list of all + * the shadows it modified, then do breadth-first recursion + * to find the way up to higher-level tables and unshadow them too. * * The current code (just tearing down each page's shadows as we - * detect that it is not a pagetable) is correct, but very slow. + * detect that it is not a pagetable) is correct, but very slow. * It means extra emulated writes and slows down removal of mappings. */ } /**************************************************************************/ -/* Reset the up-pointers of every L3 shadow to 0. +/* Reset the up-pointers of every L3 shadow to 0. * This is called when l3 shadows stop being pinnable, to clear out all * the list-head bits so the up-pointer field is properly inititalised. */ static int sh_clear_up_pointer(struct vcpu *v, mfn_t smfn, mfn_t unused) @@ -2711,7 +2711,7 @@ static void sh_update_paging_modes(struct vcpu *v) ASSERT(paging_locked_by_me(d)); -#if (SHADOW_OPTIMIZATIONS & SHOPT_VIRTUAL_TLB) +#if (SHADOW_OPTIMIZATIONS & SHOPT_VIRTUAL_TLB) /* Make sure this vcpu has a virtual TLB array allocated */ if ( unlikely(!v->arch.paging.vtlb) ) { @@ -2727,7 +2727,7 @@ static void sh_update_paging_modes(struct vcpu *v) } #endif /* (SHADOW_OPTIMIZATIONS & SHOPT_VIRTUAL_TLB) */ -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) if ( mfn_x(v->arch.paging.shadow.oos_snapshot[0]) == INVALID_MFN ) { int i; @@ -2768,7 +2768,7 @@ static void sh_update_paging_modes(struct vcpu *v) ASSERT(shadow_mode_translate(d)); ASSERT(shadow_mode_external(d)); -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* Need to resync all our pages now, because if a page goes out * of sync with paging enabled and is resynced with paging * disabled, the resync will go wrong. */ @@ -2827,7 +2827,7 @@ static void sh_update_paging_modes(struct vcpu *v) /* Need to make a new monitor table for the new mode */ mfn_t new_mfn, old_mfn; - if ( v != current && vcpu_runnable(v) ) + if ( v != current && vcpu_runnable(v) ) { SHADOW_ERROR("Some third party (d=%u v=%u) is changing " "this HVM vcpu's (d=%u v=%u) paging mode " @@ -2847,7 +2847,7 @@ static void sh_update_paging_modes(struct vcpu *v) SHADOW_PRINTK("new monitor table %"PRI_mfn "\n", mfn_x(new_mfn)); - /* Don't be running on the old monitor table when we + /* Don't be running on the old monitor table when we * pull it down! Switch CR3, and warn the HVM code that * its host cr3 has changed. */ make_cr3(v, mfn_x(new_mfn)); @@ -2914,9 +2914,9 @@ static void sh_new_mode(struct domain *d, u32 new_mode) int shadow_enable(struct domain *d, u32 mode) /* Turn on "permanent" shadow features: external, translate, refcount. * Can only be called once on a domain, and these features cannot be - * disabled. + * disabled. * Returns 0 for success, -errno for failure. */ -{ +{ unsigned int old_pages; struct page_info *pg = NULL; uint32_t *e; @@ -2942,14 +2942,14 @@ int shadow_enable(struct domain *d, u32 mode) if ( old_pages == 0 ) { unsigned int r; - paging_lock(d); + paging_lock(d); r = sh_set_allocation(d, 1024, NULL); /* Use at least 4MB */ if ( r != 0 ) { sh_set_allocation(d, 0, NULL); rv = -ENOMEM; goto out_locked; - } + } paging_unlock(d); } @@ -2957,7 +2957,7 @@ int shadow_enable(struct domain *d, u32 mode) d->arch.paging.alloc_page = shadow_alloc_p2m_page; d->arch.paging.free_page = shadow_free_p2m_page; - /* Init the P2M table. Must be done before we take the paging lock + /* Init the P2M table. Must be done before we take the paging lock * to avoid possible deadlock. */ if ( mode & PG_translate ) { @@ -2970,7 +2970,7 @@ int shadow_enable(struct domain *d, u32 mode) * have paging disabled */ if ( is_hvm_domain(d) ) { - /* Get a single page from the shadow pool. Take it via the + /* Get a single page from the shadow pool. Take it via the * P2M interface to make freeing it simpler afterwards. */ pg = shadow_alloc_p2m_page(d); if ( pg == NULL ) @@ -2979,11 +2979,11 @@ int shadow_enable(struct domain *d, u32 mode) goto out_unlocked; } /* Fill it with 32-bit, non-PAE superpage entries, each mapping 4MB - * of virtual address space onto the same physical address range */ + * of virtual address space onto the same physical address range */ e = __map_domain_page(pg); for ( i = 0; i < PAGE_SIZE / sizeof(*e); i++ ) e[i] = ((0x400000U * i) - | _PAGE_PRESENT | _PAGE_RW | _PAGE_USER + | _PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_PSE); sh_unmap_domain_page(e); pg->u.inuse.type_info = PGT_l2_page_table | 1 | PGT_validated; @@ -3005,8 +3005,8 @@ int shadow_enable(struct domain *d, u32 mode) goto out_locked; } -#if (SHADOW_OPTIMIZATIONS & SHOPT_LINUX_L3_TOPLEVEL) - /* We assume we're dealing with an older 64bit linux guest until we +#if (SHADOW_OPTIMIZATIONS & SHOPT_LINUX_L3_TOPLEVEL) + /* We assume we're dealing with an older 64bit linux guest until we * see the guest use more than one l4 per vcpu. */ d->arch.paging.shadow.opt_flags = SHOPT_LINUX_L3_TOPLEVEL; #endif @@ -3073,7 +3073,7 @@ void shadow_teardown(struct domain *d) } #endif /* (SHADOW_OPTIMIZATIONS & SHOPT_VIRTUAL_TLB) */ -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) { int i; mfn_t *oos_snapshot = v->arch.paging.shadow.oos_snapshot; @@ -3093,24 +3093,24 @@ void shadow_teardown(struct domain *d) SHADOW_PRINTK("teardown of domain %u starts." " Shadow pages total = %u, free = %u, p2m=%u\n", d->domain_id, - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, + d->arch.paging.shadow.total_pages, + d->arch.paging.shadow.free_pages, d->arch.paging.shadow.p2m_pages); /* Destroy all the shadows and release memory to domheap */ sh_set_allocation(d, 0, NULL); /* Release the hash table back to xenheap */ - if (d->arch.paging.shadow.hash_table) + if (d->arch.paging.shadow.hash_table) shadow_hash_teardown(d); /* Should not have any more memory held */ SHADOW_PRINTK("teardown done." " Shadow pages total = %u, free = %u, p2m=%u\n", - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, + d->arch.paging.shadow.total_pages, + d->arch.paging.shadow.free_pages, d->arch.paging.shadow.p2m_pages); ASSERT(d->arch.paging.shadow.total_pages == 0); } - /* Free the non-paged-vcpus pagetable; must happen after we've + /* Free the non-paged-vcpus pagetable; must happen after we've * destroyed any shadows of it or sh_destroy_shadow will get confused. */ if ( !pagetable_is_null(d->arch.paging.shadow.unpaged_pagetable) ) { @@ -3120,7 +3120,7 @@ void shadow_teardown(struct domain *d) if ( !hvm_paging_enabled(v) ) v->arch.guest_table = pagetable_null(); } - unpaged_pagetable = + unpaged_pagetable = pagetable_get_page(d->arch.paging.shadow.unpaged_pagetable); d->arch.paging.shadow.unpaged_pagetable = pagetable_null(); } @@ -3140,7 +3140,7 @@ void shadow_teardown(struct domain *d) paging_unlock(d); /* Must be called outside the lock */ - if ( unpaged_pagetable ) + if ( unpaged_pagetable ) shadow_free_p2m_page(d, unpaged_pagetable); } @@ -3150,11 +3150,11 @@ void shadow_final_teardown(struct domain *d) SHADOW_PRINTK("dom %u final teardown starts." " Shadow pages total = %u, free = %u, p2m=%u\n", d->domain_id, - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, + d->arch.paging.shadow.total_pages, + d->arch.paging.shadow.free_pages, d->arch.paging.shadow.p2m_pages); - /* Double-check that the domain didn't have any shadow memory. + /* Double-check that the domain didn't have any shadow memory. * It is possible for a domain that never got domain_kill()ed * to get here with its shadow allocation intact. */ if ( d->arch.paging.shadow.total_pages != 0 ) @@ -3168,8 +3168,8 @@ void shadow_final_teardown(struct domain *d) SHADOW_PRINTK("dom %u final teardown done." " Shadow pages total = %u, free = %u, p2m=%u\n", d->domain_id, - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, + d->arch.paging.shadow.total_pages, + d->arch.paging.shadow.free_pages, d->arch.paging.shadow.p2m_pages); paging_unlock(d); } @@ -3214,7 +3214,7 @@ static int shadow_one_bit_enable(struct domain *d, u32 mode) return 0; } -static int shadow_one_bit_disable(struct domain *d, u32 mode) +static int shadow_one_bit_disable(struct domain *d, u32 mode) /* Turn off a single shadow mode feature */ { struct vcpu *v; @@ -3234,8 +3234,8 @@ static int shadow_one_bit_disable(struct domain *d, u32 mode) SHADOW_PRINTK("un-shadowing of domain %u starts." " Shadow pages total = %u, free = %u, p2m=%u\n", d->domain_id, - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, + d->arch.paging.shadow.total_pages, + d->arch.paging.shadow.free_pages, d->arch.paging.shadow.p2m_pages); for_each_vcpu(d, v) { @@ -3246,7 +3246,7 @@ static int shadow_one_bit_disable(struct domain *d, u32 mode) else make_cr3(v, pagetable_get_pfn(v->arch.guest_table)); -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) { int i; mfn_t *oos_snapshot = v->arch.paging.shadow.oos_snapshot; @@ -3267,8 +3267,8 @@ static int shadow_one_bit_disable(struct domain *d, u32 mode) SHADOW_PRINTK("un-shadowing of domain %u done." " Shadow pages total = %u, free = %u, p2m=%u\n", d->domain_id, - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, + d->arch.paging.shadow.total_pages, + d->arch.paging.shadow.free_pages, d->arch.paging.shadow.p2m_pages); } @@ -3306,7 +3306,7 @@ static int shadow_test_disable(struct domain *d) /* P2M map manipulations */ /* shadow specific code which should be called when P2M table entry is updated - * with new content. It is responsible for update the entry, as well as other + * with new content. It is responsible for update the entry, as well as other * shadow processing jobs. */ @@ -3329,7 +3329,7 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, { mfn_t mfn = _mfn(l1e_get_pfn(*p)); p2m_type_t p2mt = p2m_flags_to_type(l1e_get_flags(*p)); - if ( (p2m_is_valid(p2mt) || p2m_is_grant(p2mt)) && mfn_valid(mfn) ) + if ( (p2m_is_valid(p2mt) || p2m_is_grant(p2mt)) && mfn_valid(mfn) ) { sh_remove_all_shadows_and_parents(v, mfn); if ( sh_remove_all_mappings(v, mfn) ) @@ -3337,8 +3337,8 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, } } - /* If we're removing a superpage mapping from the p2m, we need to check - * all the pages covered by it. If they're still there in the new + /* If we're removing a superpage mapping from the p2m, we need to check + * all the pages covered by it. If they're still there in the new * scheme, that's OK, but otherwise they must be unshadowed. */ if ( level == 2 && (l1e_get_flags(*p) & _PAGE_PRESENT) && (l1e_get_flags(*p) & _PAGE_PSE) ) @@ -3355,13 +3355,13 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, /* If we're replacing a superpage with a normal L1 page, map it */ if ( (l1e_get_flags(new) & _PAGE_PRESENT) - && !(l1e_get_flags(new) & _PAGE_PSE) + && !(l1e_get_flags(new) & _PAGE_PSE) && mfn_valid(nmfn) ) npte = map_domain_page(mfn_x(nmfn)); - + for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++ ) { - if ( !npte + if ( !npte || !p2m_is_ram(p2m_flags_to_type(l1e_get_flags(npte[i]))) || l1e_get_pfn(npte[i]) != mfn_x(omfn) ) { @@ -3374,7 +3374,7 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, omfn = _mfn(mfn_x(omfn) + 1); } flush_tlb_mask(&flushmask); - + if ( npte ) unmap_domain_page(npte); } @@ -3389,7 +3389,7 @@ shadow_write_p2m_entry(struct domain *d, unsigned long gfn, paging_lock(d); /* If there are any shadows, update them. But if shadow_teardown() - * has already been called then it's not safe to try. */ + * has already been called then it's not safe to try. */ if ( likely(d->arch.paging.shadow.total_pages != 0) ) sh_unshadow_for_p2m_change(d, gfn, p, new, level); @@ -3426,8 +3426,8 @@ static int sh_enable_log_dirty(struct domain *d, bool_t log_global) paging_lock(d); if ( shadow_mode_enabled(d) ) { - /* This domain already has some shadows: need to clear them out - * of the way to make sure that all references to guest memory are + /* This domain already has some shadows: need to clear them out + * of the way to make sure that all references to guest memory are * properly write-protected */ shadow_blow_tables(d); } @@ -3439,7 +3439,7 @@ static int sh_enable_log_dirty(struct domain *d, bool_t log_global) if ( is_pv_32on64_domain(d) ) d->arch.paging.shadow.opt_flags = SHOPT_LINUX_L3_TOPLEVEL; #endif - + ret = shadow_one_bit_enable(d, PG_log_dirty); paging_unlock(d); @@ -3454,12 +3454,12 @@ static int sh_disable_log_dirty(struct domain *d) paging_lock(d); ret = shadow_one_bit_disable(d, PG_log_dirty); paging_unlock(d); - + return ret; } -/* This function is called when we CLEAN log dirty bitmap. See - * paging_log_dirty_op() for details. +/* This function is called when we CLEAN log dirty bitmap. See + * paging_log_dirty_op() for details. */ static void sh_clean_dirty_bitmap(struct domain *d) { @@ -3519,7 +3519,7 @@ int shadow_track_dirty_vram(struct domain *d, * no need to be careful. */ if ( !dirty_vram ) { - /* Throw away all the shadows rather than walking through them + /* Throw away all the shadows rather than walking through them * up to nr times getting rid of mappings of each pfn */ shadow_blow_tables(d); @@ -3665,7 +3665,7 @@ out: /**************************************************************************/ /* Shadow-control XEN_DOMCTL dispatcher */ -int shadow_domctl(struct domain *d, +int shadow_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl) { @@ -3675,7 +3675,7 @@ int shadow_domctl(struct domain *d, { case XEN_DOMCTL_SHADOW_OP_OFF: if ( d->arch.paging.mode == PG_SH_enable ) - if ( (rc = shadow_test_disable(d)) != 0 ) + if ( (rc = shadow_test_disable(d)) != 0 ) return rc; return 0; @@ -3695,7 +3695,7 @@ int shadow_domctl(struct domain *d, case XEN_DOMCTL_SHADOW_OP_SET_ALLOCATION: paging_lock(d); if ( sc->mb == 0 && shadow_mode_enabled(d) ) - { + { /* Can't set the allocation to zero unless the domain stops using * shadow pagetables first */ SHADOW_ERROR("Can't set shadow allocation to zero, domain %u" @@ -3709,7 +3709,7 @@ int shadow_domctl(struct domain *d, /* Not finished. Set up to re-run the call. */ rc = hypercall_create_continuation( __HYPERVISOR_domctl, "h", u_domctl); - else + else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); return rc; @@ -3726,7 +3726,7 @@ int shadow_domctl(struct domain *d, #if SHADOW_AUDIT & SHADOW_AUDIT_ENTRIES_FULL -void shadow_audit_tables(struct vcpu *v) +void shadow_audit_tables(struct vcpu *v) { /* Dispatch table for getting per-type functions */ static const hash_callback_t callbacks[SH_type_unused] = { @@ -3746,7 +3746,7 @@ void shadow_audit_tables(struct vcpu *v) SHADOW_INTERNAL_NAME(sh_audit_l4_table, 4), /* l4_64 */ NULL /* All the rest */ }; - unsigned int mask; + unsigned int mask; if ( !(SHADOW_AUDIT_ENABLE) ) return; @@ -3765,7 +3765,7 @@ void shadow_audit_tables(struct vcpu *v) case 2: mask = (SHF_L1_32|SHF_FL1_32|SHF_L2_32); break; case 3: mask = (SHF_L1_PAE|SHF_FL1_PAE|SHF_L2_PAE |SHF_L2H_PAE); break; - case 4: mask = (SHF_L1_64|SHF_FL1_64|SHF_L2_64 + case 4: mask = (SHF_L1_64|SHF_FL1_64|SHF_L2_64 |SHF_L3_64|SHF_L4_64); break; default: BUG(); } @@ -3782,5 +3782,5 @@ void shadow_audit_tables(struct vcpu *v) * c-file-style: "BSD" * c-basic-offset: 4 * indent-tabs-mode: nil - * End: + * End: */ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 5fc10c9..434df61 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -1,7 +1,7 @@ /****************************************************************************** * arch/x86/mm/shadow/multi.c * - * Simple, mostly-synchronous shadow page tables. + * Simple, mostly-synchronous shadow page tables. * Parts of this code are Copyright (c) 2006 by XenSource Inc. * Parts of this code are Copyright (c) 2006 by Michael A Fetterman * Parts based on earlier work by Michael A Fetterman, Ian Pratt et al. @@ -43,25 +43,25 @@ #include "types.h" /* THINGS TO DO LATER: - * + * * TEARDOWN HEURISTICS - * Also: have a heuristic for when to destroy a previous paging-mode's + * Also: have a heuristic for when to destroy a previous paging-mode's * shadows. When a guest is done with its start-of-day 32-bit tables - * and reuses the memory we want to drop those shadows. Start with - * shadows in a page in two modes as a hint, but beware of clever tricks + * and reuses the memory we want to drop those shadows. Start with + * shadows in a page in two modes as a hint, but beware of clever tricks * like reusing a pagetable for both PAE and 64-bit during boot... * * PAE LINEAR MAPS * Rework shadow_get_l*e() to have the option of using map_domain_page() - * instead of linear maps. Add appropriate unmap_l*e calls in the users. - * Then we can test the speed difference made by linear maps. If the - * map_domain_page() version is OK on PAE, we could maybe allow a lightweight - * l3-and-l2h-only shadow mode for PAE PV guests that would allow them - * to share l2h pages again. + * instead of linear maps. Add appropriate unmap_l*e calls in the users. + * Then we can test the speed difference made by linear maps. If the + * map_domain_page() version is OK on PAE, we could maybe allow a lightweight + * l3-and-l2h-only shadow mode for PAE PV guests that would allow them + * to share l2h pages again. * * PSE disabled / PSE36 * We don't support any modes other than PSE enabled, PSE36 disabled. - * Neither of those would be hard to change, but we'd need to be able to + * Neither of those would be hard to change, but we'd need to be able to * deal with shadows made in one mode and used in another. */ @@ -90,7 +90,7 @@ static char *fetch_type_names[] = { * shadow L1 which maps its "splinters". */ -static inline mfn_t +static inline mfn_t get_fl1_shadow_status(struct vcpu *v, gfn_t gfn) /* Look for FL1 shadows in the hash table */ { @@ -99,7 +99,7 @@ get_fl1_shadow_status(struct vcpu *v, gfn_t gfn) return smfn; } -static inline mfn_t +static inline mfn_t get_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type) /* Look for shadows in the hash table */ { @@ -109,7 +109,7 @@ get_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type) return smfn; } -static inline void +static inline void set_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) /* Put an FL1 shadow into the hash table */ { @@ -120,7 +120,7 @@ set_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) shadow_hash_insert(v, gfn_x(gfn), SH_type_fl1_shadow, smfn); } -static inline void +static inline void set_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) /* Put a shadow into the hash table */ { @@ -143,7 +143,7 @@ set_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) shadow_hash_insert(v, mfn_x(gmfn), shadow_type, smfn); } -static inline void +static inline void delete_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) /* Remove a shadow from the hash table */ { @@ -153,7 +153,7 @@ delete_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) shadow_hash_delete(v, gfn_x(gfn), SH_type_fl1_shadow, smfn); } -static inline void +static inline void delete_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) /* Remove a shadow from the hash table */ { @@ -172,10 +172,10 @@ delete_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) /* Functions for walking the guest page tables */ static inline uint32_t -sh_walk_guest_tables(struct vcpu *v, unsigned long va, walk_t *gw, +sh_walk_guest_tables(struct vcpu *v, unsigned long va, walk_t *gw, uint32_t pfec) { - return guest_walk_tables(v, p2m_get_hostp2m(v->domain), va, gw, pfec, + return guest_walk_tables(v, p2m_get_hostp2m(v->domain), va, gw, pfec, #if GUEST_PAGING_LEVELS == 3 /* PAE */ _mfn(INVALID_MFN), v->arch.paging.shadow.gl3e @@ -323,7 +323,7 @@ gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) #if SHADOW_AUDIT & SHADOW_AUDIT_ENTRIES /* Lightweight audit: pass all the shadows associated with this guest walk * through the audit mechanisms */ -static void sh_audit_gw(struct vcpu *v, walk_t *gw) +static void sh_audit_gw(struct vcpu *v, walk_t *gw) { mfn_t smfn; @@ -332,32 +332,32 @@ static void sh_audit_gw(struct vcpu *v, walk_t *gw) #if GUEST_PAGING_LEVELS >= 4 /* 64-bit only... */ if ( mfn_valid(gw->l4mfn) - && mfn_valid((smfn = get_shadow_status(v, gw->l4mfn, + && mfn_valid((smfn = get_shadow_status(v, gw->l4mfn, SH_type_l4_shadow))) ) (void) sh_audit_l4_table(v, smfn, _mfn(INVALID_MFN)); if ( mfn_valid(gw->l3mfn) - && mfn_valid((smfn = get_shadow_status(v, gw->l3mfn, + && mfn_valid((smfn = get_shadow_status(v, gw->l3mfn, SH_type_l3_shadow))) ) (void) sh_audit_l3_table(v, smfn, _mfn(INVALID_MFN)); #endif /* PAE or 64... */ if ( mfn_valid(gw->l2mfn) ) { - if ( mfn_valid((smfn = get_shadow_status(v, gw->l2mfn, + if ( mfn_valid((smfn = get_shadow_status(v, gw->l2mfn, SH_type_l2_shadow))) ) (void) sh_audit_l2_table(v, smfn, _mfn(INVALID_MFN)); #if GUEST_PAGING_LEVELS == 3 - if ( mfn_valid((smfn = get_shadow_status(v, gw->l2mfn, + if ( mfn_valid((smfn = get_shadow_status(v, gw->l2mfn, SH_type_l2h_shadow))) ) (void) sh_audit_l2_table(v, smfn, _mfn(INVALID_MFN)); #endif } if ( mfn_valid(gw->l1mfn) - && mfn_valid((smfn = get_shadow_status(v, gw->l1mfn, + && mfn_valid((smfn = get_shadow_status(v, gw->l1mfn, SH_type_l1_shadow))) ) (void) sh_audit_l1_table(v, smfn, _mfn(INVALID_MFN)); else if ( (guest_l2e_get_flags(gw->l2e) & _PAGE_PRESENT) && (guest_l2e_get_flags(gw->l2e) & _PAGE_PSE) - && mfn_valid( + && mfn_valid( (smfn = get_fl1_shadow_status(v, guest_l2e_get_gfn(gw->l2e)))) ) (void) sh_audit_fl1_table(v, smfn, _mfn(INVALID_MFN)); } @@ -376,11 +376,11 @@ sh_guest_map_l1e(struct vcpu *v, unsigned long addr, walk_t gw; ASSERT(shadow_mode_translate(v->domain)); - + // XXX -- this is expensive, but it's easy to cobble together... // FIXME! - if ( sh_walk_guest_tables(v, addr, &gw, PFEC_page_present) == 0 + if ( sh_walk_guest_tables(v, addr, &gw, PFEC_page_present) == 0 && mfn_valid(gw.l1mfn) ) { if ( gl1mfn ) @@ -398,7 +398,7 @@ sh_guest_get_eff_l1e(struct vcpu *v, unsigned long addr, void *eff_l1e) walk_t gw; ASSERT(shadow_mode_translate(v->domain)); - + // XXX -- this is expensive, but it's easy to cobble together... // FIXME! @@ -506,12 +506,12 @@ shadow_l4_index(mfn_t *smfn, u32 guest_index) */ static always_inline void -_sh_propagate(struct vcpu *v, +_sh_propagate(struct vcpu *v, guest_intpte_t guest_intpte, - mfn_t target_mfn, + mfn_t target_mfn, void *shadow_entry_ptr, int level, - fetch_type_t ft, + fetch_type_t ft, p2m_type_t p2mt) { guest_l1e_t guest_entry = { guest_intpte }; @@ -537,11 +537,11 @@ _sh_propagate(struct vcpu *v, if ( unlikely(!(gflags & _PAGE_PRESENT)) ) { #if !(SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) - /* If a guest l1 entry is not present, shadow with the magic + /* If a guest l1 entry is not present, shadow with the magic * guest-not-present entry. */ if ( level == 1 ) *sp = sh_l1e_gnp(); - else + else #endif /* !OOS */ *sp = shadow_l1e_empty(); goto done; @@ -562,7 +562,7 @@ _sh_propagate(struct vcpu *v, // return early. // if ( !mfn_valid(target_mfn) - && !(level == 1 && (!shadow_mode_refcounts(d) + && !(level == 1 && (!shadow_mode_refcounts(d) || p2mt == p2m_mmio_direct)) ) { ASSERT((ft == ft_prefetch)); @@ -595,7 +595,7 @@ _sh_propagate(struct vcpu *v, ASSERT(!(sflags & (_PAGE_PAT | _PAGE_PCD | _PAGE_PWT))); /* compute the PAT index for shadow page entry when VT-d is enabled - * and device assigned. + * and device assigned. * 1) direct MMIO: compute the PAT index with gMTRR=UC and gPAT. * 2) if enables snoop control, compute the PAT index as WB. * 3) if disables snoop control, compute the PAT index with @@ -613,7 +613,7 @@ _sh_propagate(struct vcpu *v, gflags, gfn_to_paddr(target_gfn), pfn_to_paddr(mfn_x(target_mfn)), - MTRR_TYPE_UNCACHABLE); + MTRR_TYPE_UNCACHABLE); else if ( iommu_snoop ) sflags |= pat_type_2_pte_flags(PAT_TYPE_WRBACK); else @@ -654,12 +654,12 @@ _sh_propagate(struct vcpu *v, // Only allow the guest write access to a page a) on a demand fault, // or b) if the page is already marked as dirty. // - // (We handle log-dirty entirely inside the shadow code, without using the + // (We handle log-dirty entirely inside the shadow code, without using the // p2m_ram_logdirty p2m type: only HAP uses that.) if ( unlikely((level == 1) && shadow_mode_log_dirty(d)) ) { if ( mfn_valid(target_mfn) ) { - if ( ft & FETCH_TYPE_WRITE ) + if ( ft & FETCH_TYPE_WRITE ) paging_mark_dirty(d, mfn_x(target_mfn)); else if ( !paging_mfn_is_dirty(d, target_mfn) ) sflags &= ~_PAGE_RW; @@ -682,10 +682,10 @@ _sh_propagate(struct vcpu *v, (p2mt == p2m_mmio_direct && rangeset_contains_singleton(mmio_ro_ranges, mfn_x(target_mfn))) ) sflags &= ~_PAGE_RW; - + // protect guest page tables // - if ( unlikely((level == 1) + if ( unlikely((level == 1) && sh_mfn_is_a_page_table(target_mfn) #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC ) /* Unless the page is out of sync and the guest is @@ -699,7 +699,7 @@ _sh_propagate(struct vcpu *v, // PV guests in 64-bit mode use two different page tables for user vs // supervisor permissions, making the guest's _PAGE_USER bit irrelevant. // It is always shadowed as present... - if ( (GUEST_PAGING_LEVELS == 4) && !is_pv_32on64_domain(d) + if ( (GUEST_PAGING_LEVELS == 4) && !is_pv_32on64_domain(d) && is_pv_domain(d) ) { sflags |= _PAGE_USER; @@ -720,7 +720,7 @@ _sh_propagate(struct vcpu *v, #if GUEST_PAGING_LEVELS >= 4 static void -l4e_propagate_from_guest(struct vcpu *v, +l4e_propagate_from_guest(struct vcpu *v, guest_l4e_t gl4e, mfn_t sl3mfn, shadow_l4e_t *sl4e, @@ -732,7 +732,7 @@ l4e_propagate_from_guest(struct vcpu *v, static void l3e_propagate_from_guest(struct vcpu *v, guest_l3e_t gl3e, - mfn_t sl2mfn, + mfn_t sl2mfn, shadow_l3e_t *sl3e, fetch_type_t ft) { @@ -741,7 +741,7 @@ l3e_propagate_from_guest(struct vcpu *v, #endif // GUEST_PAGING_LEVELS >= 4 static void -l2e_propagate_from_guest(struct vcpu *v, +l2e_propagate_from_guest(struct vcpu *v, guest_l2e_t gl2e, mfn_t sl1mfn, shadow_l2e_t *sl2e, @@ -751,11 +751,11 @@ l2e_propagate_from_guest(struct vcpu *v, } static void -l1e_propagate_from_guest(struct vcpu *v, +l1e_propagate_from_guest(struct vcpu *v, guest_l1e_t gl1e, - mfn_t gmfn, + mfn_t gmfn, shadow_l1e_t *sl1e, - fetch_type_t ft, + fetch_type_t ft, p2m_type_t p2mt) { _sh_propagate(v, gl1e.l1, gmfn, sl1e, 1, ft, p2mt); @@ -768,10 +768,10 @@ l1e_propagate_from_guest(struct vcpu *v, * functions which ever write (non-zero) data onto a shadow page. */ -static inline void safe_write_entry(void *dst, void *src) +static inline void safe_write_entry(void *dst, void *src) /* Copy one PTE safely when processors might be running on the * destination pagetable. This does *not* give safety against - * concurrent writes (that's what the paging lock is for), just + * concurrent writes (that's what the paging lock is for), just * stops the hardware picking up partially written entries. */ { volatile unsigned long *d = dst; @@ -784,7 +784,7 @@ static inline void safe_write_entry(void *dst, void *src) } -static inline void +static inline void shadow_write_entries(void *d, void *s, int entries, mfn_t mfn) /* This function does the actual writes to shadow pages. * It must not be called directly, since it doesn't do the bookkeeping @@ -797,10 +797,10 @@ shadow_write_entries(void *d, void *s, int entries, mfn_t mfn) /* Because we mirror access rights at all levels in the shadow, an * l2 (or higher) entry with the RW bit cleared will leave us with - * no write access through the linear map. - * We detect that by writing to the shadow with copy_to_user() and + * no write access through the linear map. + * We detect that by writing to the shadow with copy_to_user() and * using map_domain_page() to get a writeable mapping if we need to. */ - if ( __copy_to_user(d, d, sizeof (unsigned long)) != 0 ) + if ( __copy_to_user(d, d, sizeof (unsigned long)) != 0 ) { perfc_incr(shadow_linear_map_failed); map = sh_map_domain_page(mfn); @@ -874,7 +874,7 @@ shadow_get_page_from_l1e(shadow_l1e_t sl1e, struct domain *d, p2m_type_t type) static void inline shadow_put_page_from_l1e(shadow_l1e_t sl1e, struct domain *d) -{ +{ if ( !shadow_mode_refcounts(d) ) return; @@ -882,9 +882,9 @@ shadow_put_page_from_l1e(shadow_l1e_t sl1e, struct domain *d) } #if GUEST_PAGING_LEVELS >= 4 -static int shadow_set_l4e(struct vcpu *v, - shadow_l4e_t *sl4e, - shadow_l4e_t new_sl4e, +static int shadow_set_l4e(struct vcpu *v, + shadow_l4e_t *sl4e, + shadow_l4e_t new_sl4e, mfn_t sl4mfn) { int flags = 0, ok; @@ -894,13 +894,13 @@ static int shadow_set_l4e(struct vcpu *v, old_sl4e = *sl4e; if ( old_sl4e.l4 == new_sl4e.l4 ) return 0; /* Nothing to do */ - - paddr = ((((paddr_t)mfn_x(sl4mfn)) << PAGE_SHIFT) + + paddr = ((((paddr_t)mfn_x(sl4mfn)) << PAGE_SHIFT) | (((unsigned long)sl4e) & ~PAGE_MASK)); - if ( shadow_l4e_get_flags(new_sl4e) & _PAGE_PRESENT ) + if ( shadow_l4e_get_flags(new_sl4e) & _PAGE_PRESENT ) { - /* About to install a new reference */ + /* About to install a new reference */ mfn_t sl3mfn = shadow_l4e_get_mfn(new_sl4e); ok = sh_get_ref(v, sl3mfn, paddr); /* Are we pinning l3 shadows to handle wierd linux behaviour? */ @@ -917,12 +917,12 @@ static int shadow_set_l4e(struct vcpu *v, shadow_write_entries(sl4e, &new_sl4e, 1, sl4mfn); flags |= SHADOW_SET_CHANGED; - if ( shadow_l4e_get_flags(old_sl4e) & _PAGE_PRESENT ) + if ( shadow_l4e_get_flags(old_sl4e) & _PAGE_PRESENT ) { /* We lost a reference to an old mfn. */ mfn_t osl3mfn = shadow_l4e_get_mfn(old_sl4e); if ( (mfn_x(osl3mfn) != mfn_x(shadow_l4e_get_mfn(new_sl4e))) - || !perms_strictly_increased(shadow_l4e_get_flags(old_sl4e), + || !perms_strictly_increased(shadow_l4e_get_flags(old_sl4e), shadow_l4e_get_flags(new_sl4e)) ) { flags |= SHADOW_SET_FLUSH; @@ -932,9 +932,9 @@ static int shadow_set_l4e(struct vcpu *v, return flags; } -static int shadow_set_l3e(struct vcpu *v, - shadow_l3e_t *sl3e, - shadow_l3e_t new_sl3e, +static int shadow_set_l3e(struct vcpu *v, + shadow_l3e_t *sl3e, + shadow_l3e_t new_sl3e, mfn_t sl3mfn) { int flags = 0; @@ -945,12 +945,12 @@ static int shadow_set_l3e(struct vcpu *v, if ( old_sl3e.l3 == new_sl3e.l3 ) return 0; /* Nothing to do */ - paddr = ((((paddr_t)mfn_x(sl3mfn)) << PAGE_SHIFT) + paddr = ((((paddr_t)mfn_x(sl3mfn)) << PAGE_SHIFT) | (((unsigned long)sl3e) & ~PAGE_MASK)); - + if ( shadow_l3e_get_flags(new_sl3e) & _PAGE_PRESENT ) { - /* About to install a new reference */ + /* About to install a new reference */ if ( !sh_get_ref(v, shadow_l3e_get_mfn(new_sl3e), paddr) ) { domain_crash(v->domain); @@ -962,13 +962,13 @@ static int shadow_set_l3e(struct vcpu *v, shadow_write_entries(sl3e, &new_sl3e, 1, sl3mfn); flags |= SHADOW_SET_CHANGED; - if ( shadow_l3e_get_flags(old_sl3e) & _PAGE_PRESENT ) + if ( shadow_l3e_get_flags(old_sl3e) & _PAGE_PRESENT ) { /* We lost a reference to an old mfn. */ mfn_t osl2mfn = shadow_l3e_get_mfn(old_sl3e); if ( (mfn_x(osl2mfn) != mfn_x(shadow_l3e_get_mfn(new_sl3e))) || - !perms_strictly_increased(shadow_l3e_get_flags(old_sl3e), - shadow_l3e_get_flags(new_sl3e)) ) + !perms_strictly_increased(shadow_l3e_get_flags(old_sl3e), + shadow_l3e_get_flags(new_sl3e)) ) { flags |= SHADOW_SET_FLUSH; } @@ -976,11 +976,11 @@ static int shadow_set_l3e(struct vcpu *v, } return flags; } -#endif /* GUEST_PAGING_LEVELS >= 4 */ +#endif /* GUEST_PAGING_LEVELS >= 4 */ -static int shadow_set_l2e(struct vcpu *v, - shadow_l2e_t *sl2e, - shadow_l2e_t new_sl2e, +static int shadow_set_l2e(struct vcpu *v, + shadow_l2e_t *sl2e, + shadow_l2e_t new_sl2e, mfn_t sl2mfn) { int flags = 0; @@ -990,7 +990,7 @@ static int shadow_set_l2e(struct vcpu *v, #if GUEST_PAGING_LEVELS == 2 /* In 2-on-3 we work with pairs of l2es pointing at two-page * shadows. Reference counting and up-pointers track from the first - * page of the shadow to the first l2e, so make sure that we're + * page of the shadow to the first l2e, so make sure that we're * working with those: * Start with a pair of identical entries */ shadow_l2e_t pair[2] = { new_sl2e, new_sl2e }; @@ -1000,13 +1000,13 @@ static int shadow_set_l2e(struct vcpu *v, ASSERT(sl2e != NULL); old_sl2e = *sl2e; - + if ( old_sl2e.l2 == new_sl2e.l2 ) return 0; /* Nothing to do */ - + paddr = ((((paddr_t)mfn_x(sl2mfn)) << PAGE_SHIFT) | (((unsigned long)sl2e) & ~PAGE_MASK)); - if ( shadow_l2e_get_flags(new_sl2e) & _PAGE_PRESENT ) + if ( shadow_l2e_get_flags(new_sl2e) & _PAGE_PRESENT ) { mfn_t sl1mfn = shadow_l2e_get_mfn(new_sl2e); ASSERT(mfn_to_page(sl1mfn)->u.sh.head); @@ -1028,7 +1028,7 @@ static int shadow_set_l2e(struct vcpu *v, the GFN instead of the GMFN, and it's definitely not OOS. */ if ( (sp->u.sh.type != SH_type_fl1_shadow) && mfn_valid(gl1mfn) - && mfn_is_out_of_sync(gl1mfn) ) + && mfn_is_out_of_sync(gl1mfn) ) sh_resync(v, gl1mfn); } #endif @@ -1047,13 +1047,13 @@ static int shadow_set_l2e(struct vcpu *v, #endif flags |= SHADOW_SET_CHANGED; - if ( shadow_l2e_get_flags(old_sl2e) & _PAGE_PRESENT ) + if ( shadow_l2e_get_flags(old_sl2e) & _PAGE_PRESENT ) { /* We lost a reference to an old mfn. */ mfn_t osl1mfn = shadow_l2e_get_mfn(old_sl2e); if ( (mfn_x(osl1mfn) != mfn_x(shadow_l2e_get_mfn(new_sl2e))) || - !perms_strictly_increased(shadow_l2e_get_flags(old_sl2e), - shadow_l2e_get_flags(new_sl2e)) ) + !perms_strictly_increased(shadow_l2e_get_flags(old_sl2e), + shadow_l2e_get_flags(new_sl2e)) ) { flags |= SHADOW_SET_FLUSH; } @@ -1066,7 +1066,7 @@ static inline void shadow_vram_get_l1e(shadow_l1e_t new_sl1e, shadow_l1e_t *sl1e, mfn_t sl1mfn, struct domain *d) -{ +{ mfn_t mfn = shadow_l1e_get_mfn(new_sl1e); int flags = shadow_l1e_get_flags(new_sl1e); unsigned long gfn; @@ -1085,7 +1085,7 @@ static inline void shadow_vram_get_l1e(shadow_l1e_t new_sl1e, { unsigned long i = gfn - dirty_vram->begin_pfn; struct page_info *page = mfn_to_page(mfn); - + if ( (page->u.inuse.type_info & PGT_count_mask) == 1 ) /* Initial guest reference, record it */ dirty_vram->sl1ma[i] = pfn_to_paddr(mfn_x(sl1mfn)) @@ -1159,8 +1159,8 @@ static inline void shadow_vram_put_l1e(shadow_l1e_t old_sl1e, } } -static int shadow_set_l1e(struct vcpu *v, - shadow_l1e_t *sl1e, +static int shadow_set_l1e(struct vcpu *v, + shadow_l1e_t *sl1e, shadow_l1e_t new_sl1e, p2m_type_t new_type, mfn_t sl1mfn) @@ -1179,15 +1179,15 @@ static int shadow_set_l1e(struct vcpu *v, == (_PAGE_RW|_PAGE_PRESENT)) ) oos_fixup_add(v, new_gmfn, sl1mfn, pgentry_ptr_to_slot(sl1e)); #endif - + old_sl1e = *sl1e; if ( old_sl1e.l1 == new_sl1e.l1 ) return 0; /* Nothing to do */ - + if ( (shadow_l1e_get_flags(new_sl1e) & _PAGE_PRESENT) - && !sh_l1e_is_magic(new_sl1e) ) + && !sh_l1e_is_magic(new_sl1e) ) { - /* About to install a new reference */ + /* About to install a new reference */ if ( shadow_mode_refcounts(d) ) { TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_SHADOW_L1_GET_REF); switch ( shadow_get_page_from_l1e(new_sl1e, d, new_type) ) @@ -1205,45 +1205,45 @@ static int shadow_set_l1e(struct vcpu *v, break; } } - } + } /* Write the new entry */ shadow_write_entries(sl1e, &new_sl1e, 1, sl1mfn); flags |= SHADOW_SET_CHANGED; - if ( (shadow_l1e_get_flags(old_sl1e) & _PAGE_PRESENT) + if ( (shadow_l1e_get_flags(old_sl1e) & _PAGE_PRESENT) && !sh_l1e_is_magic(old_sl1e) ) { /* We lost a reference to an old mfn. */ - /* N.B. Unlike higher-level sets, never need an extra flush - * when writing an l1e. Because it points to the same guest frame + /* N.B. Unlike higher-level sets, never need an extra flush + * when writing an l1e. Because it points to the same guest frame * as the guest l1e did, it's the guest's responsibility to * trigger a flush later. */ - if ( shadow_mode_refcounts(d) ) + if ( shadow_mode_refcounts(d) ) { shadow_vram_put_l1e(old_sl1e, sl1e, sl1mfn, d); shadow_put_page_from_l1e(old_sl1e, d); TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_SHADOW_L1_PUT_REF); - } + } } return flags; } /**************************************************************************/ -/* Macros to walk pagetables. These take the shadow of a pagetable and - * walk every "interesting" entry. That is, they don't touch Xen mappings, - * and for 32-bit l2s shadowed onto PAE or 64-bit, they only touch every +/* Macros to walk pagetables. These take the shadow of a pagetable and + * walk every "interesting" entry. That is, they don't touch Xen mappings, + * and for 32-bit l2s shadowed onto PAE or 64-bit, they only touch every * second entry (since pairs of entries are managed together). For multi-page * shadows they walk all pages. - * - * Arguments are an MFN, the variable to point to each entry, a variable - * to indicate that we are done (we will shortcut to the end of the scan + * + * Arguments are an MFN, the variable to point to each entry, a variable + * to indicate that we are done (we will shortcut to the end of the scan * when _done != 0), a variable to indicate that we should avoid Xen mappings, - * and the code. + * and the code. * - * WARNING: These macros have side-effects. They change the values of both - * the pointer and the MFN. */ + * WARNING: These macros have side-effects. They change the values of both + * the pointer and the MFN. */ static inline void increment_ptr_to_guest_entry(void *ptr) { @@ -1288,7 +1288,7 @@ do { \ #define SHADOW_FOREACH_L1E(_sl1mfn, _sl1e, _gl1p, _done, _code) \ _SHADOW_FOREACH_L1E(_sl1mfn, _sl1e, _gl1p, _done, _code) #endif - + #if GUEST_PAGING_LEVELS == 2 @@ -1335,7 +1335,7 @@ do { \ sh_unmap_domain_page(_sp); \ } while (0) -#else +#else /* 64-bit l2: touch all entries except for PAE compat guests. */ #define SHADOW_FOREACH_L2E(_sl2mfn, _sl2e, _gl2p, _done, _dom, _code) \ @@ -1424,7 +1424,7 @@ void sh_install_xen_entries_in_l4(struct vcpu *v, mfn_t gl4mfn, mfn_t sl4mfn) sl4e = sh_map_domain_page(sl4mfn); BUILD_BUG_ON(sizeof (l4_pgentry_t) != sizeof (shadow_l4e_t)); - + /* Copy the common Xen mappings from the idle domain */ slots = (shadow_mode_external(d) ? ROOT_PAGETABLE_XEN_SLOTS @@ -1458,7 +1458,7 @@ void sh_install_xen_entries_in_l4(struct vcpu *v, mfn_t gl4mfn, mfn_t sl4mfn) shadow_l4e_from_mfn(gl4mfn, __PAGE_HYPERVISOR); } - sh_unmap_domain_page(sl4e); + sh_unmap_domain_page(sl4e); } #endif @@ -1504,12 +1504,12 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) mfn_to_page(smfn)->up = 0; #if GUEST_PAGING_LEVELS == 4 -#if (SHADOW_OPTIMIZATIONS & SHOPT_LINUX_L3_TOPLEVEL) +#if (SHADOW_OPTIMIZATIONS & SHOPT_LINUX_L3_TOPLEVEL) if ( shadow_type == SH_type_l4_64_shadow && unlikely(v->domain->arch.paging.shadow.opt_flags & SHOPT_LINUX_L3_TOPLEVEL) ) { /* We're shadowing a new l4, but we've been assuming the guest uses - * only one l4 per vcpu and context switches using an l4 entry. + * only one l4 per vcpu and context switches using an l4 entry. * Count the number of active l4 shadows. If there are enough * of them, decide that this isn't an old linux guest, and stop * pinning l3es. This is not very quick but it doesn't happen @@ -1522,9 +1522,9 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) if ( sp->u.sh.type == SH_type_l4_64_shadow ) l4count++; } - for_each_vcpu ( v->domain, v2 ) + for_each_vcpu ( v->domain, v2 ) vcpus++; - if ( l4count > 2 * vcpus ) + if ( l4count > 2 * vcpus ) { /* Unpin all the pinned l3 tables, and don't pin any more. */ page_list_for_each_safe(sp, t, &v->domain->arch.paging.shadow.pinned_shadows) @@ -1542,7 +1542,7 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) // Create the Xen mappings... if ( !shadow_mode_external(v->domain) ) { - switch (shadow_type) + switch (shadow_type) { #if GUEST_PAGING_LEVELS == 4 case SH_type_l4_shadow: @@ -1584,7 +1584,7 @@ sh_make_monitor_table(struct vcpu *v) struct domain *d = v->domain; ASSERT(pagetable_get_pfn(v->arch.monitor_table) == 0); - + /* Guarantee we can get the memory we need */ shadow_prealloc(d, SH_type_monitor_table, CONFIG_PAGING_LEVELS); @@ -1599,8 +1599,8 @@ sh_make_monitor_table(struct vcpu *v) mfn_t m3mfn, m2mfn; l4_pgentry_t *l4e; l3_pgentry_t *l3e; - /* Install an l3 table and an l2 table that will hold the shadow - * linear map entries. This overrides the linear map entry that + /* Install an l3 table and an l2 table that will hold the shadow + * linear map entries. This overrides the linear map entry that * was installed by sh_install_xen_entries_in_l4. */ l4e = sh_map_domain_page(m4mfn); @@ -1622,7 +1622,7 @@ sh_make_monitor_table(struct vcpu *v) m3mfn = shadow_alloc(d, SH_type_monitor_table, 0); mfn_to_page(m3mfn)->shadow_flags = 3; l4e[0] = l4e_from_pfn(mfn_x(m3mfn), __PAGE_HYPERVISOR); - + m2mfn = shadow_alloc(d, SH_type_monitor_table, 0); mfn_to_page(m2mfn)->shadow_flags = 2; l3e = sh_map_domain_page(m3mfn); @@ -1647,13 +1647,13 @@ sh_make_monitor_table(struct vcpu *v) * If the necessary tables are not present in the guest, they return NULL. */ /* N.B. The use of GUEST_PAGING_LEVELS here is correct. If the shadow has - * more levels than the guest, the upper levels are always fixed and do not - * reflect any information from the guest, so we do not use these functions + * more levels than the guest, the upper levels are always fixed and do not + * reflect any information from the guest, so we do not use these functions * to access them. */ #if GUEST_PAGING_LEVELS >= 4 -static shadow_l4e_t * shadow_get_and_create_l4e(struct vcpu *v, - walk_t *gw, +static shadow_l4e_t * shadow_get_and_create_l4e(struct vcpu *v, + walk_t *gw, mfn_t *sl4mfn) { /* There is always a shadow of the top level table. Get it. */ @@ -1662,8 +1662,8 @@ static shadow_l4e_t * shadow_get_and_create_l4e(struct vcpu *v, return sh_linear_l4_table(v) + shadow_l4_linear_offset(gw->va); } -static shadow_l3e_t * shadow_get_and_create_l3e(struct vcpu *v, - walk_t *gw, +static shadow_l3e_t * shadow_get_and_create_l3e(struct vcpu *v, + walk_t *gw, mfn_t *sl3mfn, fetch_type_t ft, int *resync) @@ -1674,18 +1674,18 @@ static shadow_l3e_t * shadow_get_and_create_l3e(struct vcpu *v, /* Get the l4e */ sl4e = shadow_get_and_create_l4e(v, gw, &sl4mfn); ASSERT(sl4e != NULL); - if ( shadow_l4e_get_flags(*sl4e) & _PAGE_PRESENT ) + if ( shadow_l4e_get_flags(*sl4e) & _PAGE_PRESENT ) { *sl3mfn = shadow_l4e_get_mfn(*sl4e); ASSERT(mfn_valid(*sl3mfn)); - } - else + } + else { int r; shadow_l4e_t new_sl4e; /* No l3 shadow installed: find and install it. */ *sl3mfn = get_shadow_status(v, gw->l3mfn, SH_type_l3_shadow); - if ( !mfn_valid(*sl3mfn) ) + if ( !mfn_valid(*sl3mfn) ) { /* No l3 shadow of this page exists at all: make one. */ *sl3mfn = sh_make_shadow(v, gw->l3mfn, SH_type_l3_shadow); @@ -1708,8 +1708,8 @@ static shadow_l3e_t * shadow_get_and_create_l3e(struct vcpu *v, #endif /* GUEST_PAGING_LEVELS >= 4 */ -static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, - walk_t *gw, +static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, + walk_t *gw, mfn_t *sl2mfn, fetch_type_t ft, int *resync) @@ -1720,13 +1720,13 @@ static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, if ( !mfn_valid(gw->l2mfn) ) return NULL; /* No guest page. */ /* Get the l3e */ sl3e = shadow_get_and_create_l3e(v, gw, &sl3mfn, ft, resync); - if ( sl3e == NULL ) return NULL; - if ( shadow_l3e_get_flags(*sl3e) & _PAGE_PRESENT ) + if ( sl3e == NULL ) return NULL; + if ( shadow_l3e_get_flags(*sl3e) & _PAGE_PRESENT ) { *sl2mfn = shadow_l3e_get_mfn(*sl3e); ASSERT(mfn_valid(*sl2mfn)); - } - else + } + else { int r; shadow_l3e_t new_sl3e; @@ -1740,7 +1740,7 @@ static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, /* No l2 shadow installed: find and install it. */ *sl2mfn = get_shadow_status(v, gw->l2mfn, t); - if ( !mfn_valid(*sl2mfn) ) + if ( !mfn_valid(*sl2mfn) ) { /* No l2 shadow of this page exists at all: make one. */ *sl2mfn = sh_make_shadow(v, gw->l2mfn, t); @@ -1750,7 +1750,7 @@ static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, r = shadow_set_l3e(v, sl3e, new_sl3e, sl3mfn); ASSERT((r & SHADOW_SET_FLUSH) == 0); if ( r & SHADOW_SET_ERROR ) - return NULL; + return NULL; #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC ) *resync |= 1; @@ -1762,9 +1762,9 @@ static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, #elif GUEST_PAGING_LEVELS == 3 /* PAE... */ /* We never demand-shadow PAE l3es: they are only created in * sh_update_cr3(). Check if the relevant sl3e is present. */ - shadow_l3e_t *sl3e = ((shadow_l3e_t *)&v->arch.paging.shadow.l3table) + shadow_l3e_t *sl3e = ((shadow_l3e_t *)&v->arch.paging.shadow.l3table) + shadow_l3_linear_offset(gw->va); - if ( !(shadow_l3e_get_flags(*sl3e) & _PAGE_PRESENT) ) + if ( !(shadow_l3e_get_flags(*sl3e) & _PAGE_PRESENT) ) return NULL; *sl2mfn = shadow_l3e_get_mfn(*sl3e); ASSERT(mfn_valid(*sl2mfn)); @@ -1778,12 +1778,12 @@ static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, (void) shadow_l2_index(sl2mfn, guest_l2_table_offset(gw->va)); /* Reading the top level table is always valid. */ return sh_linear_l2_table(v) + shadow_l2_linear_offset(gw->va); -#endif +#endif } -static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, - walk_t *gw, +static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, + walk_t *gw, mfn_t *sl1mfn, fetch_type_t ft) { @@ -1797,38 +1797,38 @@ static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, /* Install the sl1 in the l2e if it wasn't there or if we need to * re-do it to fix a PSE dirty bit. */ - if ( shadow_l2e_get_flags(*sl2e) & _PAGE_PRESENT + if ( shadow_l2e_get_flags(*sl2e) & _PAGE_PRESENT && likely(ft != ft_demand_write - || (shadow_l2e_get_flags(*sl2e) & _PAGE_RW) + || (shadow_l2e_get_flags(*sl2e) & _PAGE_RW) || !(guest_l2e_get_flags(gw->l2e) & _PAGE_PSE)) ) { *sl1mfn = shadow_l2e_get_mfn(*sl2e); ASSERT(mfn_valid(*sl1mfn)); - } - else + } + else { shadow_l2e_t new_sl2e; int r, flags = guest_l2e_get_flags(gw->l2e); /* No l1 shadow installed: find and install it. */ if ( !(flags & _PAGE_PRESENT) ) return NULL; /* No guest page. */ - if ( guest_supports_superpages(v) && (flags & _PAGE_PSE) ) + if ( guest_supports_superpages(v) && (flags & _PAGE_PSE) ) { /* Splintering a superpage */ gfn_t l2gfn = guest_l2e_get_gfn(gw->l2e); *sl1mfn = get_fl1_shadow_status(v, l2gfn); - if ( !mfn_valid(*sl1mfn) ) + if ( !mfn_valid(*sl1mfn) ) { /* No fl1 shadow of this superpage exists at all: make one. */ *sl1mfn = make_fl1_shadow(v, l2gfn); } - } - else + } + else { /* Shadowing an actual guest l1 table */ if ( !mfn_valid(gw->l1mfn) ) return NULL; /* No guest page. */ *sl1mfn = get_shadow_status(v, gw->l1mfn, SH_type_l1_shadow); - if ( !mfn_valid(*sl1mfn) ) + if ( !mfn_valid(*sl1mfn) ) { /* No l1 shadow of this page exists at all: make one. */ *sl1mfn = sh_make_shadow(v, gw->l1mfn, SH_type_l1_shadow); @@ -1837,7 +1837,7 @@ static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, /* Install the new sl1 table in the sl2e */ l2e_propagate_from_guest(v, gw->l2e, *sl1mfn, &new_sl2e, ft); r = shadow_set_l2e(v, sl2e, new_sl2e, sl2mfn); - ASSERT((r & SHADOW_SET_FLUSH) == 0); + ASSERT((r & SHADOW_SET_FLUSH) == 0); if ( r & SHADOW_SET_ERROR ) return NULL; @@ -1863,7 +1863,7 @@ static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, /**************************************************************************/ -/* Destructors for shadow tables: +/* Destructors for shadow tables: * Unregister the shadow, decrement refcounts of any entries present in it, * and release the memory. * @@ -1890,16 +1890,16 @@ void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) delete_shadow_status(v, gmfn, t, smfn); shadow_demote(v, gmfn, t); /* Decrement refcounts of all the old entries */ - sl4mfn = smfn; + sl4mfn = smfn; SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, v->domain, { - if ( shadow_l4e_get_flags(*sl4e) & _PAGE_PRESENT ) + if ( shadow_l4e_get_flags(*sl4e) & _PAGE_PRESENT ) { sh_put_ref(v, shadow_l4e_get_mfn(*sl4e), - (((paddr_t)mfn_x(sl4mfn)) << PAGE_SHIFT) + (((paddr_t)mfn_x(sl4mfn)) << PAGE_SHIFT) | ((unsigned long)sl4e & ~PAGE_MASK)); } }); - + /* Put the memory back in the pool */ shadow_free(v->domain, smfn); } @@ -1922,11 +1922,11 @@ void sh_destroy_l3_shadow(struct vcpu *v, mfn_t smfn) shadow_demote(v, gmfn, t); /* Decrement refcounts of all the old entries */ - sl3mfn = smfn; + sl3mfn = smfn; SHADOW_FOREACH_L3E(sl3mfn, sl3e, 0, 0, { - if ( shadow_l3e_get_flags(*sl3e) & _PAGE_PRESENT ) + if ( shadow_l3e_get_flags(*sl3e) & _PAGE_PRESENT ) sh_put_ref(v, shadow_l3e_get_mfn(*sl3e), - (((paddr_t)mfn_x(sl3mfn)) << PAGE_SHIFT) + (((paddr_t)mfn_x(sl3mfn)) << PAGE_SHIFT) | ((unsigned long)sl3e & ~PAGE_MASK)); }); @@ -1961,9 +1961,9 @@ void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) /* Decrement refcounts of all the old entries */ sl2mfn = smfn; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, v->domain, { - if ( shadow_l2e_get_flags(*sl2e) & _PAGE_PRESENT ) + if ( shadow_l2e_get_flags(*sl2e) & _PAGE_PRESENT ) sh_put_ref(v, shadow_l2e_get_mfn(*sl2e), - (((paddr_t)mfn_x(sl2mfn)) << PAGE_SHIFT) + (((paddr_t)mfn_x(sl2mfn)) << PAGE_SHIFT) | ((unsigned long)sl2e & ~PAGE_MASK)); }); @@ -1989,17 +1989,17 @@ void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) gfn_t gfn = _gfn(sp->v.sh.back); delete_fl1_shadow_status(v, gfn, smfn); } - else + else { mfn_t gmfn = backpointer(sp); delete_shadow_status(v, gmfn, t, smfn); shadow_demote(v, gmfn, t); } - + if ( shadow_mode_refcounts(d) ) { /* Decrement refcounts of all the old entries */ - mfn_t sl1mfn = smfn; + mfn_t sl1mfn = smfn; SHADOW_FOREACH_L1E(sl1mfn, sl1e, 0, 0, { if ( (shadow_l1e_get_flags(*sl1e) & _PAGE_PRESENT) && !sh_l1e_is_magic(*sl1e) ) { @@ -2008,7 +2008,7 @@ void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) } }); } - + /* Put the memory back in the pool */ shadow_free(v->domain, smfn); } @@ -2025,8 +2025,8 @@ void sh_destroy_monitor_table(struct vcpu *v, mfn_t mmfn) l4_pgentry_t *l4e = sh_map_domain_page(mmfn); l3_pgentry_t *l3e; int linear_slot = shadow_l4_table_offset(SH_LINEAR_PT_VIRT_START); - - /* Need to destroy the l3 and l2 monitor pages used + + /* Need to destroy the l3 and l2 monitor pages used * for the linear map */ ASSERT(l4e_get_flags(l4e[linear_slot]) & _PAGE_PRESENT); m3mfn = _mfn(l4e_get_pfn(l4e[linear_slot])); @@ -2060,18 +2060,18 @@ void sh_destroy_monitor_table(struct vcpu *v, mfn_t mmfn) /**************************************************************************/ /* Functions to destroy non-Xen mappings in a pagetable hierarchy. * These are called from common code when we are running out of shadow - * memory, and unpinning all the top-level shadows hasn't worked. + * memory, and unpinning all the top-level shadows hasn't worked. * * With user_only == 1, we leave guest kernel-mode mappings in place too, * unhooking only the user-mode mappings * - * This implementation is pretty crude and slow, but we hope that it won't + * This implementation is pretty crude and slow, but we hope that it won't * be called very often. */ #if GUEST_PAGING_LEVELS == 2 void sh_unhook_32b_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) -{ +{ shadow_l2e_t *sl2e; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, v->domain, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) @@ -2109,7 +2109,7 @@ void sh_unhook_64b_mappings(struct vcpu *v, mfn_t sl4mfn, int user_only) * These functions require a pointer to the shadow entry that will be updated. */ -/* These functions take a new guest entry, translate it to shadow and write +/* These functions take a new guest entry, translate it to shadow and write * the shadow entry. * * They return the same bitmaps as the shadow_set_lXe() functions. @@ -2240,7 +2240,7 @@ static int validate_gl2e(struct vcpu *v, void *new_ge, mfn_t sl2mfn, void *se) mfn_t gl1mfn = get_gfn_query_unlocked(v->domain, gfn_x(gl1gfn), &p2mt); if ( p2m_is_ram(p2mt) ) - sl1mfn = get_shadow_status(v, gl1mfn, SH_type_l1_shadow); + sl1mfn = get_shadow_status(v, gl1mfn, SH_type_l1_shadow); else if ( p2mt != p2m_populate_on_demand ) result |= SHADOW_SET_ERROR; } @@ -2275,7 +2275,7 @@ static int validate_gl1e(struct vcpu *v, void *new_ge, mfn_t sl1mfn, void *se) #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) gl1mfn = backpointer(mfn_to_page(sl1mfn)); - if ( mfn_valid(gl1mfn) + if ( mfn_valid(gl1mfn) && mfn_is_out_of_sync(gl1mfn) ) { /* Update the OOS snapshot. */ @@ -2295,7 +2295,7 @@ static int validate_gl1e(struct vcpu *v, void *new_ge, mfn_t sl1mfn, void *se) #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /**************************************************************************/ -/* Special validation function for re-syncing out-of-sync shadows. +/* Special validation function for re-syncing out-of-sync shadows. * Walks the *shadow* page, and for every entry that it finds, * revalidates the guest entry that corresponds to it. * N.B. This function is called with the vcpu that unsynced the page, @@ -2342,10 +2342,10 @@ void sh_resync_l1(struct vcpu *v, mfn_t gl1mfn, mfn_t snpmfn) ASSERT(!(rc & SHADOW_SET_FLUSH)); } -/* Figure out whether it's definitely safe not to sync this l1 table. - * That is: if we can tell that it's only used once, and that the - * toplevel shadow responsible is not one of ours. - * N.B. This function is called with the vcpu that required the resync, +/* Figure out whether it's definitely safe not to sync this l1 table. + * That is: if we can tell that it's only used once, and that the + * toplevel shadow responsible is not one of ours. + * N.B. This function is called with the vcpu that required the resync, * *not* the one that originally unsynced the page, but it is * called in the *mode* of the vcpu that unsynced it. Clear? Good. */ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) @@ -2366,7 +2366,7 @@ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) smfn = _mfn(sp->up >> PAGE_SHIFT); ASSERT(mfn_valid(smfn)); -#if (SHADOW_PAGING_LEVELS == 4) +#if (SHADOW_PAGING_LEVELS == 4) /* up to l3 */ sp = mfn_to_page(smfn); ASSERT(sh_type_has_up_pointer(v, SH_type_l2_shadow)); @@ -2385,15 +2385,15 @@ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) #endif if ( pagetable_get_pfn(v->arch.shadow_table[0]) == mfn_x(smfn) -#if (SHADOW_PAGING_LEVELS == 3) +#if (SHADOW_PAGING_LEVELS == 3) || pagetable_get_pfn(v->arch.shadow_table[1]) == mfn_x(smfn) || pagetable_get_pfn(v->arch.shadow_table[2]) == mfn_x(smfn) - || pagetable_get_pfn(v->arch.shadow_table[3]) == mfn_x(smfn) + || pagetable_get_pfn(v->arch.shadow_table[3]) == mfn_x(smfn) #endif ) return 0; - - /* Only in use in one toplevel shadow, and it's not the one we're + + /* Only in use in one toplevel shadow, and it's not the one we're * running on */ return 1; } @@ -2401,15 +2401,15 @@ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) /**************************************************************************/ -/* Functions which translate and install the shadows of arbitrary guest +/* Functions which translate and install the shadows of arbitrary guest * entries that we have just seen the guest write. */ -static inline int +static inline int sh_map_and_validate(struct vcpu *v, mfn_t gmfn, - void *new_gp, u32 size, u32 sh_type, + void *new_gp, u32 size, u32 sh_type, u32 (*shadow_index)(mfn_t *smfn, u32 idx), - int (*validate_ge)(struct vcpu *v, void *ge, + int (*validate_ge)(struct vcpu *v, void *ge, mfn_t smfn, void *se)) /* Generic function for mapping and validating. */ { @@ -2462,25 +2462,25 @@ sh_map_and_validate_gl4e(struct vcpu *v, mfn_t gl4mfn, void *new_gl4p, u32 size) { #if GUEST_PAGING_LEVELS >= 4 - return sh_map_and_validate(v, gl4mfn, new_gl4p, size, - SH_type_l4_shadow, - shadow_l4_index, + return sh_map_and_validate(v, gl4mfn, new_gl4p, size, + SH_type_l4_shadow, + shadow_l4_index, validate_gl4e); #else // ! GUEST_PAGING_LEVELS >= 4 SHADOW_ERROR("called in wrong paging mode!\n"); BUG(); return 0; -#endif +#endif } - + int sh_map_and_validate_gl3e(struct vcpu *v, mfn_t gl3mfn, void *new_gl3p, u32 size) { #if GUEST_PAGING_LEVELS >= 4 - return sh_map_and_validate(v, gl3mfn, new_gl3p, size, - SH_type_l3_shadow, - shadow_l3_index, + return sh_map_and_validate(v, gl3mfn, new_gl3p, size, + SH_type_l3_shadow, + shadow_l3_index, validate_gl3e); #else // ! GUEST_PAGING_LEVELS >= 4 SHADOW_ERROR("called in wrong paging mode!\n"); @@ -2493,9 +2493,9 @@ int sh_map_and_validate_gl2e(struct vcpu *v, mfn_t gl2mfn, void *new_gl2p, u32 size) { - return sh_map_and_validate(v, gl2mfn, new_gl2p, size, - SH_type_l2_shadow, - shadow_l2_index, + return sh_map_and_validate(v, gl2mfn, new_gl2p, size, + SH_type_l2_shadow, + shadow_l2_index, validate_gl2e); } @@ -2504,9 +2504,9 @@ sh_map_and_validate_gl2he(struct vcpu *v, mfn_t gl2mfn, void *new_gl2p, u32 size) { #if GUEST_PAGING_LEVELS >= 3 - return sh_map_and_validate(v, gl2mfn, new_gl2p, size, - SH_type_l2h_shadow, - shadow_l2_index, + return sh_map_and_validate(v, gl2mfn, new_gl2p, size, + SH_type_l2h_shadow, + shadow_l2_index, validate_gl2e); #else /* Non-PAE guests don't have different kinds of l2 table */ SHADOW_ERROR("called in wrong paging mode!\n"); @@ -2519,9 +2519,9 @@ int sh_map_and_validate_gl1e(struct vcpu *v, mfn_t gl1mfn, void *new_gl1p, u32 size) { - return sh_map_and_validate(v, gl1mfn, new_gl1p, size, - SH_type_l1_shadow, - shadow_l1_index, + return sh_map_and_validate(v, gl1mfn, new_gl1p, size, + SH_type_l1_shadow, + shadow_l1_index, validate_gl1e); } @@ -2572,7 +2572,7 @@ static inline void reset_early_unshadow(struct vcpu *v) /**************************************************************************/ -/* Optimization: Prefetch multiple L1 entries. This is called after we have +/* Optimization: Prefetch multiple L1 entries. This is called after we have * demand-faulted a shadow l1e in the fault handler, to see if it's * worth fetching some more. */ @@ -2582,7 +2582,7 @@ static inline void reset_early_unshadow(struct vcpu *v) /* XXX magic number */ #define PREFETCH_DISTANCE 32 -static void sh_prefetch(struct vcpu *v, walk_t *gw, +static void sh_prefetch(struct vcpu *v, walk_t *gw, shadow_l1e_t *ptr_sl1e, mfn_t sl1mfn) { int i, dist; @@ -2621,7 +2621,7 @@ static void sh_prefetch(struct vcpu *v, walk_t *gw, #endif /* OOS */ } - for ( i = 1; i < dist ; i++ ) + for ( i = 1; i < dist ; i++ ) { /* No point in prefetching if there's already a shadow */ if ( ptr_sl1e[i].l1 != 0 ) @@ -2634,18 +2634,18 @@ static void sh_prefetch(struct vcpu *v, walk_t *gw, /* Not worth continuing if we hit an entry that will need another * fault for A/D-bit propagation anyway */ gflags = guest_l1e_get_flags(gl1e); - if ( (gflags & _PAGE_PRESENT) + if ( (gflags & _PAGE_PRESENT) && (!(gflags & _PAGE_ACCESSED) || ((gflags & _PAGE_RW) && !(gflags & _PAGE_DIRTY))) ) break; - } - else + } + else { /* Fragmented superpage, unless we've been called wrongly */ ASSERT(guest_l2e_get_flags(gw->l2e) & _PAGE_PSE); /* Increment the l1e's GFN by the right number of guest pages */ gl1e = guest_l1e_from_gfn( - _gfn(gfn_x(guest_l1e_get_gfn(gw->l1e)) + i), + _gfn(gfn_x(guest_l1e_get_gfn(gw->l1e)) + i), guest_l1e_get_flags(gw->l1e)); } @@ -2715,7 +2715,7 @@ static inline void trace_shadow_fixup(guest_l1e_t gl1e, __trace_var(event, 0/*!tsc*/, sizeof(d), &d); } } - + static inline void trace_not_shadow_fault(guest_l1e_t gl1e, guest_va_t va) { @@ -2739,7 +2739,7 @@ static inline void trace_not_shadow_fault(guest_l1e_t gl1e, __trace_var(event, 0/*!tsc*/, sizeof(d), &d); } } - + static inline void trace_shadow_emulate_other(u32 event, guest_va_t va, gfn_t gfn) @@ -2807,8 +2807,8 @@ static inline void trace_shadow_emulate(guest_l1e_t gl1e, unsigned long va) * shadow code (and the guest should retry) or 0 if it is not (and the * fault should be handled elsewhere or passed to the guest). */ -static int sh_page_fault(struct vcpu *v, - unsigned long va, +static int sh_page_fault(struct vcpu *v, + unsigned long va, struct cpu_user_regs *regs) { struct domain *d = v->domain; @@ -2848,7 +2848,7 @@ static int sh_page_fault(struct vcpu *v, * Then try to emulate early to avoid lock aquisition. */ if ( v->arch.paging.last_write_emul_ok - && v->arch.paging.shadow.last_emulated_frame == (va >> PAGE_SHIFT) ) + && v->arch.paging.shadow.last_emulated_frame == (va >> PAGE_SHIFT) ) { /* check whether error code is 3, or else fall back to normal path * in case of some validation is required @@ -2858,7 +2858,7 @@ static int sh_page_fault(struct vcpu *v, fast_emul = 1; gmfn = _mfn(v->arch.paging.shadow.last_emulated_mfn); -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* Fall back to the slow path if we're trying to emulate writes to an out of sync page. */ if ( mfn_valid(gmfn) && mfn_is_out_of_sync(gmfn) ) @@ -2886,7 +2886,7 @@ static int sh_page_fault(struct vcpu *v, #if (SHADOW_OPTIMIZATIONS & SHOPT_FAST_FAULT_PATH) if ( (regs->error_code & PFEC_reserved_bit) ) { -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* First, need to check that this isn't an out-of-sync * shadow l1e. If it is, we fall back to the slow path, which * will sync it up again. */ @@ -2902,7 +2902,7 @@ static int sh_page_fault(struct vcpu *v, shadow_l2e_get_mfn(sl2e)))) || unlikely(mfn_is_out_of_sync(gl1mfn)) ) { - /* Hit the slow path as if there had been no + /* Hit the slow path as if there had been no * shadow entry at all, and let it tidy up */ ASSERT(regs->error_code & PFEC_page_present); regs->error_code ^= (PFEC_reserved_bit|PFEC_page_present); @@ -2910,10 +2910,10 @@ static int sh_page_fault(struct vcpu *v, } } #endif /* SHOPT_OUT_OF_SYNC */ - /* The only reasons for reserved bits to be set in shadow entries + /* The only reasons for reserved bits to be set in shadow entries * are the two "magic" shadow_l1e entries. */ - if ( likely((__copy_from_user(&sl1e, - (sh_linear_l1_table(v) + if ( likely((__copy_from_user(&sl1e, + (sh_linear_l1_table(v) + shadow_l1_linear_offset(va)), sizeof(sl1e)) == 0) && sh_l1e_is_magic(sl1e)) ) @@ -2935,8 +2935,8 @@ static int sh_page_fault(struct vcpu *v, { /* Magic MMIO marker: extract gfn for MMIO address */ ASSERT(sh_l1e_is_mmio(sl1e)); - gpa = (((paddr_t)(gfn_x(sh_l1e_mmio_get_gfn(sl1e)))) - << PAGE_SHIFT) + gpa = (((paddr_t)(gfn_x(sh_l1e_mmio_get_gfn(sl1e)))) + << PAGE_SHIFT) | (va & ~PAGE_MASK); } perfc_incr(shadow_fault_fast_mmio); @@ -2949,24 +2949,24 @@ static int sh_page_fault(struct vcpu *v, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 12:55:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:55: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 1YSmMD-00065R-Kq; Tue, 03 Mar 2015 12:55:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMC-000656-8J for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:28 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 58/F1-03132-F3FA5F45; Tue, 03 Mar 2015 12:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1425387325!5047426!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8665 invoked from network); 3 Mar 2015 12:55:26 -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; 3 Mar 2015 12:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmM9-0002X8-J2 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmM9-0003CY-HU for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:25 +0000 Date: Tue, 03 Mar 2015 12:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: rename hash_foreach() to hash_vcpu_foreach() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6e3e74fea290c15f38babc705794f647dbe7a90e Author: Andrew Cooper AuthorDate: Tue Feb 17 14:31:28 2015 +0100 Commit: Jan Beulich CommitDate: Tue Feb 17 14:31:28 2015 +0100 x86/shadow: rename hash_foreach() to hash_vcpu_foreach() A later change requires the introduction of a domain variant. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 502e0d8..2e4954f 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1999,12 +1999,11 @@ void shadow_hash_delete(struct vcpu *v, unsigned long n, unsigned int t, sh_hash_audit_bucket(d, key); } -typedef int (*hash_callback_t)(struct vcpu *v, mfn_t smfn, mfn_t other_mfn); +typedef int (*hash_vcpu_callback_t)(struct vcpu *v, mfn_t smfn, mfn_t other_mfn); -static void hash_foreach(struct vcpu *v, - unsigned int callback_mask, - const hash_callback_t callbacks[], - mfn_t callback_mfn) +static void hash_vcpu_foreach(struct vcpu *v, unsigned int callback_mask, + const hash_vcpu_callback_t callbacks[], + mfn_t callback_mfn) /* Walk the hash table looking at the types of the entries and * calling the appropriate callback function for each entry. * The mask determines which shadow types we call back for, and the array @@ -2140,7 +2139,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, unsigned long fault_addr) { /* Dispatch table for getting per-type functions */ - static const hash_callback_t callbacks[SH_type_unused] = { + static const hash_vcpu_callback_t callbacks[SH_type_unused] = { NULL, /* none */ SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, 2), /* l1_32 */ SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, 2), /* fl1_32 */ @@ -2334,7 +2333,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, perfc_incr(shadow_writeable_bf_1); else perfc_incr(shadow_writeable_bf); - hash_foreach(v, callback_mask, callbacks, gmfn); + hash_vcpu_foreach(v, callback_mask, callbacks, gmfn); /* If that didn't catch the mapping, then there's some non-pagetable * mapping -- ioreq page, grant mapping, &c. */ @@ -2390,7 +2389,7 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) struct page_info *page = mfn_to_page(gmfn); /* Dispatch table for getting per-type functions */ - static const hash_callback_t callbacks[SH_type_unused] = { + static const hash_vcpu_callback_t callbacks[SH_type_unused] = { NULL, /* none */ SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, 2), /* l1_32 */ SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, 2), /* fl1_32 */ @@ -2432,7 +2431,7 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) /* Brute-force search of all the shadows, by walking the hash */ perfc_incr(shadow_mappings_bf); - hash_foreach(v, callback_mask, callbacks, gmfn); + hash_vcpu_foreach(v, callback_mask, callbacks, gmfn); /* If that didn't catch the mapping, something is very wrong */ if ( !sh_check_page_has_no_refs(page) ) @@ -2533,7 +2532,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) /* Dispatch table for getting per-type functions: each level must * be called with the function to remove a lower-level shadow. */ - static const hash_callback_t callbacks[SH_type_unused] = { + static const hash_vcpu_callback_t callbacks[SH_type_unused] = { NULL, /* none */ NULL, /* l1_32 */ NULL, /* fl1_32 */ @@ -2594,7 +2593,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) perfc_incr(shadow_unshadow); /* Lower-level shadows need to be excised from upper-level shadows. - * This call to hash_foreach() looks dangerous but is in fact OK: each + * This call to hash_vcpu_foreach() looks dangerous but is in fact OK: each * call will remove at most one shadow, and terminate immediately when * it does remove it, so we never walk the hash after doing a deletion. */ #define DO_UNSHADOW(_type) do { \ @@ -2617,7 +2616,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) if( !fast \ && (pg->count_info & PGC_page_table) \ && (pg->shadow_flags & (1 << t)) ) \ - hash_foreach(v, masks[t], callbacks, smfn); \ + hash_vcpu_foreach(v, masks[t], callbacks, smfn); \ } while (0) DO_UNSHADOW(SH_type_l2_32_shadow); @@ -2678,7 +2677,7 @@ static int sh_clear_up_pointer(struct vcpu *v, mfn_t smfn, mfn_t unused) void sh_reset_l3_up_pointers(struct vcpu *v) { - static const hash_callback_t callbacks[SH_type_unused] = { + static const hash_vcpu_callback_t callbacks[SH_type_unused] = { NULL, /* none */ NULL, /* l1_32 */ NULL, /* fl1_32 */ @@ -2698,7 +2697,7 @@ void sh_reset_l3_up_pointers(struct vcpu *v) }; static const unsigned int callback_mask = SHF_L3_64; - hash_foreach(v, callback_mask, callbacks, _mfn(INVALID_MFN)); + hash_vcpu_foreach(v, callback_mask, callbacks, _mfn(INVALID_MFN)); } @@ -3729,7 +3728,7 @@ int shadow_domctl(struct domain *d, void shadow_audit_tables(struct vcpu *v) { /* Dispatch table for getting per-type functions */ - static const hash_callback_t callbacks[SH_type_unused] = { + static const hash_vcpu_callback_t callbacks[SH_type_unused] = { NULL, /* none */ SHADOW_INTERNAL_NAME(sh_audit_l1_table, 2), /* l1_32 */ SHADOW_INTERNAL_NAME(sh_audit_fl1_table, 2), /* fl1_32 */ @@ -3771,7 +3770,7 @@ void shadow_audit_tables(struct vcpu *v) } } - hash_foreach(v, mask, callbacks, _mfn(INVALID_MFN)); + hash_vcpu_foreach(v, mask, callbacks, _mfn(INVALID_MFN)); } #endif /* Shadow audit */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:55:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:55: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 1YSmMD-00065R-Kq; Tue, 03 Mar 2015 12:55:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMC-000656-8J for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:28 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 58/F1-03132-F3FA5F45; Tue, 03 Mar 2015 12:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1425387325!5047426!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8665 invoked from network); 3 Mar 2015 12:55:26 -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; 3 Mar 2015 12:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmM9-0002X8-J2 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmM9-0003CY-HU for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:25 +0000 Date: Tue, 03 Mar 2015 12:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: rename hash_foreach() to hash_vcpu_foreach() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6e3e74fea290c15f38babc705794f647dbe7a90e Author: Andrew Cooper AuthorDate: Tue Feb 17 14:31:28 2015 +0100 Commit: Jan Beulich CommitDate: Tue Feb 17 14:31:28 2015 +0100 x86/shadow: rename hash_foreach() to hash_vcpu_foreach() A later change requires the introduction of a domain variant. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 502e0d8..2e4954f 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1999,12 +1999,11 @@ void shadow_hash_delete(struct vcpu *v, unsigned long n, unsigned int t, sh_hash_audit_bucket(d, key); } -typedef int (*hash_callback_t)(struct vcpu *v, mfn_t smfn, mfn_t other_mfn); +typedef int (*hash_vcpu_callback_t)(struct vcpu *v, mfn_t smfn, mfn_t other_mfn); -static void hash_foreach(struct vcpu *v, - unsigned int callback_mask, - const hash_callback_t callbacks[], - mfn_t callback_mfn) +static void hash_vcpu_foreach(struct vcpu *v, unsigned int callback_mask, + const hash_vcpu_callback_t callbacks[], + mfn_t callback_mfn) /* Walk the hash table looking at the types of the entries and * calling the appropriate callback function for each entry. * The mask determines which shadow types we call back for, and the array @@ -2140,7 +2139,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, unsigned long fault_addr) { /* Dispatch table for getting per-type functions */ - static const hash_callback_t callbacks[SH_type_unused] = { + static const hash_vcpu_callback_t callbacks[SH_type_unused] = { NULL, /* none */ SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, 2), /* l1_32 */ SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, 2), /* fl1_32 */ @@ -2334,7 +2333,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, perfc_incr(shadow_writeable_bf_1); else perfc_incr(shadow_writeable_bf); - hash_foreach(v, callback_mask, callbacks, gmfn); + hash_vcpu_foreach(v, callback_mask, callbacks, gmfn); /* If that didn't catch the mapping, then there's some non-pagetable * mapping -- ioreq page, grant mapping, &c. */ @@ -2390,7 +2389,7 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) struct page_info *page = mfn_to_page(gmfn); /* Dispatch table for getting per-type functions */ - static const hash_callback_t callbacks[SH_type_unused] = { + static const hash_vcpu_callback_t callbacks[SH_type_unused] = { NULL, /* none */ SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, 2), /* l1_32 */ SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, 2), /* fl1_32 */ @@ -2432,7 +2431,7 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) /* Brute-force search of all the shadows, by walking the hash */ perfc_incr(shadow_mappings_bf); - hash_foreach(v, callback_mask, callbacks, gmfn); + hash_vcpu_foreach(v, callback_mask, callbacks, gmfn); /* If that didn't catch the mapping, something is very wrong */ if ( !sh_check_page_has_no_refs(page) ) @@ -2533,7 +2532,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) /* Dispatch table for getting per-type functions: each level must * be called with the function to remove a lower-level shadow. */ - static const hash_callback_t callbacks[SH_type_unused] = { + static const hash_vcpu_callback_t callbacks[SH_type_unused] = { NULL, /* none */ NULL, /* l1_32 */ NULL, /* fl1_32 */ @@ -2594,7 +2593,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) perfc_incr(shadow_unshadow); /* Lower-level shadows need to be excised from upper-level shadows. - * This call to hash_foreach() looks dangerous but is in fact OK: each + * This call to hash_vcpu_foreach() looks dangerous but is in fact OK: each * call will remove at most one shadow, and terminate immediately when * it does remove it, so we never walk the hash after doing a deletion. */ #define DO_UNSHADOW(_type) do { \ @@ -2617,7 +2616,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) if( !fast \ && (pg->count_info & PGC_page_table) \ && (pg->shadow_flags & (1 << t)) ) \ - hash_foreach(v, masks[t], callbacks, smfn); \ + hash_vcpu_foreach(v, masks[t], callbacks, smfn); \ } while (0) DO_UNSHADOW(SH_type_l2_32_shadow); @@ -2678,7 +2677,7 @@ static int sh_clear_up_pointer(struct vcpu *v, mfn_t smfn, mfn_t unused) void sh_reset_l3_up_pointers(struct vcpu *v) { - static const hash_callback_t callbacks[SH_type_unused] = { + static const hash_vcpu_callback_t callbacks[SH_type_unused] = { NULL, /* none */ NULL, /* l1_32 */ NULL, /* fl1_32 */ @@ -2698,7 +2697,7 @@ void sh_reset_l3_up_pointers(struct vcpu *v) }; static const unsigned int callback_mask = SHF_L3_64; - hash_foreach(v, callback_mask, callbacks, _mfn(INVALID_MFN)); + hash_vcpu_foreach(v, callback_mask, callbacks, _mfn(INVALID_MFN)); } @@ -3729,7 +3728,7 @@ int shadow_domctl(struct domain *d, void shadow_audit_tables(struct vcpu *v) { /* Dispatch table for getting per-type functions */ - static const hash_callback_t callbacks[SH_type_unused] = { + static const hash_vcpu_callback_t callbacks[SH_type_unused] = { NULL, /* none */ SHADOW_INTERNAL_NAME(sh_audit_l1_table, 2), /* l1_32 */ SHADOW_INTERNAL_NAME(sh_audit_fl1_table, 2), /* fl1_32 */ @@ -3771,7 +3770,7 @@ void shadow_audit_tables(struct vcpu *v) } } - hash_foreach(v, mask, callbacks, _mfn(INVALID_MFN)); + hash_vcpu_foreach(v, mask, callbacks, _mfn(INVALID_MFN)); } #endif /* Shadow audit */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:55:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:55: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 1YSmMP-00068t-OG; Tue, 03 Mar 2015 12:55:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMO-00068D-3X for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:40 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 17/9B-02991-B4FA5F45; Tue, 03 Mar 2015 12:55:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1425387335!12487442!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23070 invoked from network); 3 Mar 2015 12:55:37 -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; 3 Mar 2015 12:55:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMJ-0002XJ-QA for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmMJ-0003DN-P6 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:35 +0000 Date: Tue, 03 Mar 2015 12:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: introduce 'd' pointers and clean up use of 'v->domain' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f4d5f203778b1369e39f2b9bdda8b7ec53e4003 Author: Andrew Cooper AuthorDate: Tue Feb 17 14:32:37 2015 +0100 Commit: Jan Beulich CommitDate: Tue Feb 17 14:32:37 2015 +0100 x86/shadow: introduce 'd' pointers and clean up use of 'v->domain' All of the introduced domain pointers will eventually be removed, but doing this mechanical cleanup here allows the subsequent patches which change function prototypes to be smaller and more clear. In addition, swap some use of is_pv_32on64_vcpu(v) for is_pv_32on64_domain(d). No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 49 +++++++------ xen/arch/x86/mm/shadow/multi.c | 146 ++++++++++++++++++++++---------------- xen/arch/x86/mm/shadow/private.h | 6 +- 3 files changed, 116 insertions(+), 85 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 2e4954f..3b5ef19 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -665,6 +665,7 @@ void oos_fixup_add(struct vcpu *v, mfn_t gmfn, static int oos_remove_write_access(struct vcpu *v, mfn_t gmfn, struct oos_fixup *fixup) { + struct domain *d = v->domain; int ftlb = 0; ftlb |= oos_fixup_flush_gmfn(v, gmfn, fixup); @@ -690,7 +691,7 @@ static int oos_remove_write_access(struct vcpu *v, mfn_t gmfn, } if ( ftlb ) - flush_tlb_mask(v->domain->domain_dirty_cpumask); + flush_tlb_mask(d->domain_dirty_cpumask); return 0; } @@ -991,6 +992,7 @@ int sh_unsync(struct vcpu *v, mfn_t gmfn) */ void shadow_promote(struct vcpu *v, mfn_t gmfn, unsigned int type) { + struct domain *d = v->domain; struct page_info *page = mfn_to_page(gmfn); ASSERT(mfn_valid(gmfn)); @@ -1004,7 +1006,7 @@ void shadow_promote(struct vcpu *v, mfn_t gmfn, unsigned int type) /* We should never try to promote a gmfn that has writeable mappings */ ASSERT((page->u.inuse.type_info & PGT_type_mask) != PGT_writable_page || (page->u.inuse.type_info & PGT_count_mask) == 0 - || v->domain->is_shutting_down); + || d->is_shutting_down); /* Is the page already shadowed? */ if ( !test_and_set_bit(_PGC_page_table, &page->count_info) ) @@ -2056,6 +2058,7 @@ static void hash_vcpu_foreach(struct vcpu *v, unsigned int callback_mask, void sh_destroy_shadow(struct vcpu *v, mfn_t smfn) { + struct domain *d = v->domain; struct page_info *sp = mfn_to_page(smfn); unsigned int t = sp->u.sh.type; @@ -2068,9 +2071,8 @@ void sh_destroy_shadow(struct vcpu *v, mfn_t smfn) t == SH_type_fl1_pae_shadow || t == SH_type_fl1_64_shadow || t == SH_type_monitor_table || - (is_pv_32on64_vcpu(v) && t == SH_type_l4_64_shadow) || - (page_get_owner(mfn_to_page(backpointer(sp))) - == v->domain)); + (is_pv_32on64_domain(d) && t == SH_type_l4_64_shadow) || + (page_get_owner(mfn_to_page(backpointer(sp))) == d)); /* The down-shifts here are so that the switch statement is on nice * small numbers that the compiler will enjoy */ @@ -2098,7 +2100,7 @@ void sh_destroy_shadow(struct vcpu *v, mfn_t smfn) SHADOW_INTERNAL_NAME(sh_destroy_l1_shadow, 4)(v, smfn); break; case SH_type_l2h_64_shadow: - ASSERT(is_pv_32on64_vcpu(v)); + ASSERT(is_pv_32on64_domain(d)); /* Fall through... */ case SH_type_l2_64_shadow: SHADOW_INTERNAL_NAME(sh_destroy_l2_shadow, 4)(v, smfn); @@ -2166,15 +2168,16 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, | SHF_L1_64 | SHF_FL1_64 ; + struct domain *d = v->domain; struct page_info *pg = mfn_to_page(gmfn); - ASSERT(paging_locked_by_me(v->domain)); + ASSERT(paging_locked_by_me(d)); /* Only remove writable mappings if we are doing shadow refcounts. * In guest refcounting, we trust Xen to already be restricting * all the writes to the guest page tables, so we do not need to * do more. */ - if ( !shadow_mode_refcounts(v->domain) ) + if ( !shadow_mode_refcounts(d) ) return 0; /* Early exit if it's already a pagetable, or otherwise not writeable */ @@ -2198,7 +2201,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, SHADOW_ERROR("can't remove write access to mfn %lx, type_info is %" PRtype_info "\n", mfn_x(gmfn), mfn_to_page(gmfn)->u.inuse.type_info); - domain_crash(v->domain); + domain_crash(d); } #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC @@ -2226,7 +2229,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, GUESS(0xC0000000UL + (fault_addr >> 10), 1); /* Linux lowmem: first 896MB is mapped 1-to-1 above 0xC0000000 */ - if ((gfn = mfn_to_gfn(v->domain, gmfn)) < 0x38000 ) + if ((gfn = mfn_to_gfn(d, gmfn)) < 0x38000 ) GUESS(0xC0000000UL + (gfn << PAGE_SHIFT), 4); /* FreeBSD: Linear map at 0xBFC00000 */ @@ -2244,7 +2247,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, } /* Linux lowmem: first 896MB is mapped 1-to-1 above 0xC0000000 */ - if ((gfn = mfn_to_gfn(v->domain, gmfn)) < 0x38000 ) + if ((gfn = mfn_to_gfn(d, gmfn)) < 0x38000 ) GUESS(0xC0000000UL + (gfn << PAGE_SHIFT), 4); /* FreeBSD PAE: Linear map at 0xBF800000 */ @@ -2272,7 +2275,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, /* 64bit Linux direct map at 0xffff880000000000; older kernels * had it at 0xffff810000000000, and older kernels yet had it * at 0x0000010000000000UL */ - gfn = mfn_to_gfn(v->domain, gmfn); + gfn = mfn_to_gfn(d, gmfn); GUESS(0xffff880000000000UL + (gfn << PAGE_SHIFT), 4); GUESS(0xffff810000000000UL + (gfn << PAGE_SHIFT), 4); GUESS(0x0000010000000000UL + (gfn << PAGE_SHIFT), 4); @@ -2345,7 +2348,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, SHADOW_ERROR("can't remove write access to mfn %lx: guest has " "%lu special-use mappings of it\n", mfn_x(gmfn), (mfn_to_page(gmfn)->u.inuse.type_info&PGT_count_mask)); - domain_crash(v->domain); + domain_crash(d); } /* We killed at least one writeable mapping, so must flush TLBs. */ @@ -2386,6 +2389,7 @@ int sh_remove_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) { + struct domain *d = v->domain; struct page_info *page = mfn_to_page(gmfn); /* Dispatch table for getting per-type functions */ @@ -2424,7 +2428,7 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) /* Although this is an externally visible function, we do not know * whether the paging lock will be held when it is called (since it * can be called via put_page_type when we clear a shadow l1e).*/ - paging_lock_recursive(v->domain); + paging_lock_recursive(d); /* XXX TODO: * Heuristics for finding the (probably) single mapping of this gmfn */ @@ -2441,7 +2445,7 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) * and the HVM restore program takes another. * Also allow one typed refcount for xenheap pages, to match * share_xen_page_with_guest(). */ - if ( !(shadow_mode_external(v->domain) + if ( !(shadow_mode_external(d) && (page->count_info & PGC_count_mask) <= 3 && ((page->u.inuse.type_info & PGT_count_mask) == !!is_xen_heap_page(page))) ) @@ -2452,7 +2456,7 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) } } - paging_unlock(v->domain); + paging_unlock(d); /* We killed at least one mapping, so must flush TLBs. */ return 1; @@ -2526,6 +2530,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) * (all != 0 implies fast == 0) */ { + struct domain *d = v->domain; struct page_info *pg = mfn_to_page(gmfn); mfn_t smfn; unsigned char t; @@ -2577,15 +2582,15 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) /* Although this is an externally visible function, we do not know * whether the paging lock will be held when it is called (since it * can be called via put_page_type when we clear a shadow l1e).*/ - paging_lock_recursive(v->domain); + paging_lock_recursive(d); SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx\n", - v->domain->domain_id, v->vcpu_id, mfn_x(gmfn)); + d->domain_id, v->vcpu_id, mfn_x(gmfn)); /* Bail out now if the page is not shadowed */ if ( (pg->count_info & PGC_page_table) == 0 ) { - paging_unlock(v->domain); + paging_unlock(d); return; } @@ -2638,14 +2643,14 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) SHADOW_ERROR("can't find all shadows of mfn %05lx " "(shadow_flags=%08x)\n", mfn_x(gmfn), pg->shadow_flags); - domain_crash(v->domain); + domain_crash(d); } /* Need to flush TLBs now, so that linear maps are safe next time we * take a fault. */ - flush_tlb_mask(v->domain->domain_dirty_cpumask); + flush_tlb_mask(d->domain_dirty_cpumask); - paging_unlock(v->domain); + paging_unlock(d); } static void diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 434df61..b538997 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -134,7 +134,7 @@ set_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) ASSERT(mfn_to_page(smfn)->u.sh.head); /* 32-on-64 PV guests don't own their l4 pages so can't get_page them */ - if ( !is_pv_32on64_vcpu(v) || shadow_type != SH_type_l4_64_shadow ) + if ( !is_pv_32on64_domain(d) || shadow_type != SH_type_l4_64_shadow ) { res = get_page(mfn_to_page(gmfn), d); ASSERT(res == 1); @@ -157,13 +157,14 @@ static inline void delete_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) /* Remove a shadow from the hash table */ { + struct domain *d = v->domain; SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx, type=%08x, smfn=%05lx\n", - v->domain->domain_id, v->vcpu_id, + d->domain_id, v->vcpu_id, mfn_x(gmfn), shadow_type, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); shadow_hash_delete(v, mfn_x(gmfn), shadow_type, smfn); /* 32-on-64 PV guests don't own their l4 pages; see set_shadow_status */ - if ( !is_pv_32on64_vcpu(v) || shadow_type != SH_type_l4_64_shadow ) + if ( !is_pv_32on64_domain(d) || shadow_type != SH_type_l4_64_shadow ) put_page(mfn_to_page(gmfn)); } @@ -887,6 +888,7 @@ static int shadow_set_l4e(struct vcpu *v, shadow_l4e_t new_sl4e, mfn_t sl4mfn) { + struct domain *d = v->domain; int flags = 0, ok; shadow_l4e_t old_sl4e; paddr_t paddr; @@ -908,7 +910,7 @@ static int shadow_set_l4e(struct vcpu *v, ok |= sh_pin(v, sl3mfn); if ( !ok ) { - domain_crash(v->domain); + domain_crash(d); return SHADOW_SET_ERROR; } } @@ -937,6 +939,7 @@ static int shadow_set_l3e(struct vcpu *v, shadow_l3e_t new_sl3e, mfn_t sl3mfn) { + struct domain *d = v->domain; int flags = 0; shadow_l3e_t old_sl3e; paddr_t paddr; @@ -953,7 +956,7 @@ static int shadow_set_l3e(struct vcpu *v, /* About to install a new reference */ if ( !sh_get_ref(v, shadow_l3e_get_mfn(new_sl3e), paddr) ) { - domain_crash(v->domain); + domain_crash(d); return SHADOW_SET_ERROR; } } @@ -983,6 +986,7 @@ static int shadow_set_l2e(struct vcpu *v, shadow_l2e_t new_sl2e, mfn_t sl2mfn) { + struct domain *d = v->domain; int flags = 0; shadow_l2e_t old_sl2e; paddr_t paddr; @@ -1014,7 +1018,7 @@ static int shadow_set_l2e(struct vcpu *v, /* About to install a new reference */ if ( !sh_get_ref(v, sl1mfn, paddr) ) { - domain_crash(v->domain); + domain_crash(d); return SHADOW_SET_ERROR; } #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) @@ -1495,7 +1499,8 @@ static void sh_install_xen_entries_in_l2h(struct vcpu *v, mfn_t sl2hmfn) static mfn_t sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) { - mfn_t smfn = shadow_alloc(v->domain, shadow_type, mfn_x(gmfn)); + struct domain *d = v->domain; + mfn_t smfn = shadow_alloc(d, shadow_type, mfn_x(gmfn)); SHADOW_DEBUG(MAKE_SHADOW, "(%05lx, %u)=>%05lx\n", mfn_x(gmfn), shadow_type, mfn_x(smfn)); @@ -1506,7 +1511,7 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) #if GUEST_PAGING_LEVELS == 4 #if (SHADOW_OPTIMIZATIONS & SHOPT_LINUX_L3_TOPLEVEL) if ( shadow_type == SH_type_l4_64_shadow && - unlikely(v->domain->arch.paging.shadow.opt_flags & SHOPT_LINUX_L3_TOPLEVEL) ) + unlikely(d->arch.paging.shadow.opt_flags & SHOPT_LINUX_L3_TOPLEVEL) ) { /* We're shadowing a new l4, but we've been assuming the guest uses * only one l4 per vcpu and context switches using an l4 entry. @@ -1517,22 +1522,22 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) struct page_info *sp, *t; struct vcpu *v2; int l4count = 0, vcpus = 0; - page_list_for_each(sp, &v->domain->arch.paging.shadow.pinned_shadows) + page_list_for_each(sp, &d->arch.paging.shadow.pinned_shadows) { if ( sp->u.sh.type == SH_type_l4_64_shadow ) l4count++; } - for_each_vcpu ( v->domain, v2 ) + for_each_vcpu ( d, v2 ) vcpus++; if ( l4count > 2 * vcpus ) { /* Unpin all the pinned l3 tables, and don't pin any more. */ - page_list_for_each_safe(sp, t, &v->domain->arch.paging.shadow.pinned_shadows) + page_list_for_each_safe(sp, t, &d->arch.paging.shadow.pinned_shadows) { if ( sp->u.sh.type == SH_type_l3_64_shadow ) sh_unpin(v, page_to_mfn(sp)); } - v->domain->arch.paging.shadow.opt_flags &= ~SHOPT_LINUX_L3_TOPLEVEL; + d->arch.paging.shadow.opt_flags &= ~SHOPT_LINUX_L3_TOPLEVEL; sh_reset_l3_up_pointers(v); } } @@ -1540,7 +1545,7 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) #endif // Create the Xen mappings... - if ( !shadow_mode_external(v->domain) ) + if ( !shadow_mode_external(d) ) { switch (shadow_type) { @@ -1566,8 +1571,8 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) static mfn_t make_fl1_shadow(struct vcpu *v, gfn_t gfn) { - mfn_t smfn = shadow_alloc(v->domain, SH_type_fl1_shadow, - (unsigned long) gfn_x(gfn)); + struct domain *d = v->domain; + mfn_t smfn = shadow_alloc(d, SH_type_fl1_shadow, gfn_x(gfn)); SHADOW_DEBUG(MAKE_SHADOW, "(%" SH_PRI_gfn ")=>%" PRI_mfn "\n", gfn_x(gfn), mfn_x(smfn)); @@ -1875,6 +1880,7 @@ static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, #if GUEST_PAGING_LEVELS >= 4 void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) { + struct domain *d = v->domain; shadow_l4e_t *sl4e; struct page_info *sp = mfn_to_page(smfn); u32 t = sp->u.sh.type; @@ -1891,7 +1897,7 @@ void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) shadow_demote(v, gmfn, t); /* Decrement refcounts of all the old entries */ sl4mfn = smfn; - SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, v->domain, { + SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, d, { if ( shadow_l4e_get_flags(*sl4e) & _PAGE_PRESENT ) { sh_put_ref(v, shadow_l4e_get_mfn(*sl4e), @@ -1901,11 +1907,12 @@ void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) }); /* Put the memory back in the pool */ - shadow_free(v->domain, smfn); + shadow_free(d, smfn); } void sh_destroy_l3_shadow(struct vcpu *v, mfn_t smfn) { + struct domain *d = v->domain; shadow_l3e_t *sl3e; struct page_info *sp = mfn_to_page(smfn); u32 t = sp->u.sh.type; @@ -1931,13 +1938,14 @@ void sh_destroy_l3_shadow(struct vcpu *v, mfn_t smfn) }); /* Put the memory back in the pool */ - shadow_free(v->domain, smfn); + shadow_free(d, smfn); } #endif /* GUEST_PAGING_LEVELS >= 4 */ void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) { + struct domain *d = v->domain; shadow_l2e_t *sl2e; struct page_info *sp = mfn_to_page(smfn); u32 t = sp->u.sh.type; @@ -1960,7 +1968,7 @@ void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) /* Decrement refcounts of all the old entries */ sl2mfn = smfn; - SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, v->domain, { + SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( shadow_l2e_get_flags(*sl2e) & _PAGE_PRESENT ) sh_put_ref(v, shadow_l2e_get_mfn(*sl2e), (((paddr_t)mfn_x(sl2mfn)) << PAGE_SHIFT) @@ -1968,7 +1976,7 @@ void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) }); /* Put the memory back in the pool */ - shadow_free(v->domain, smfn); + shadow_free(d, smfn); } void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) @@ -2010,7 +2018,7 @@ void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) } /* Put the memory back in the pool */ - shadow_free(v->domain, smfn); + shadow_free(d, smfn); } #if SHADOW_PAGING_LEVELS == GUEST_PAGING_LEVELS @@ -2072,8 +2080,9 @@ void sh_destroy_monitor_table(struct vcpu *v, mfn_t mmfn) void sh_unhook_32b_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) { + struct domain *d = v->domain; shadow_l2e_t *sl2e; - SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, v->domain, { + SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) (void) shadow_set_l2e(v, sl2e, shadow_l2e_empty(), sl2mfn); }); @@ -2084,8 +2093,9 @@ void sh_unhook_32b_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) void sh_unhook_pae_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) /* Walk a PAE l2 shadow, unhooking entries from all the subshadows */ { + struct domain *d = v->domain; shadow_l2e_t *sl2e; - SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, v->domain, { + SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) (void) shadow_set_l2e(v, sl2e, shadow_l2e_empty(), sl2mfn); }); @@ -2095,8 +2105,9 @@ void sh_unhook_pae_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) void sh_unhook_64b_mappings(struct vcpu *v, mfn_t sl4mfn, int user_only) { + struct domain *d = v->domain; shadow_l4e_t *sl4e; - SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, v->domain, { + SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, d, { if ( !user_only || (sl4e->l4 & _PAGE_USER) ) (void) shadow_set_l4e(v, sl4e, shadow_l4e_empty(), sl4mfn); }); @@ -2176,6 +2187,7 @@ static int validate_gl4e(struct vcpu *v, void *new_ge, mfn_t sl4mfn, void *se) static int validate_gl3e(struct vcpu *v, void *new_ge, mfn_t sl3mfn, void *se) { + struct domain *d = v->domain; shadow_l3e_t new_sl3e; guest_l3e_t new_gl3e = *(guest_l3e_t *)new_ge; shadow_l3e_t *sl3p = se; @@ -2188,7 +2200,7 @@ static int validate_gl3e(struct vcpu *v, void *new_ge, mfn_t sl3mfn, void *se) if ( guest_l3e_get_flags(new_gl3e) & _PAGE_PRESENT ) { gfn_t gl2gfn = guest_l3e_get_gfn(new_gl3e); - mfn_t gl2mfn = get_gfn_query_unlocked(v->domain, gfn_x(gl2gfn), &p2mt); + mfn_t gl2mfn = get_gfn_query_unlocked(d, gfn_x(gl2gfn), &p2mt); if ( p2m_is_ram(p2mt) ) sl2mfn = get_shadow_status(v, gl2mfn, SH_type_l2_shadow); else if ( p2mt != p2m_populate_on_demand ) @@ -2208,6 +2220,7 @@ static int validate_gl3e(struct vcpu *v, void *new_ge, mfn_t sl3mfn, void *se) static int validate_gl2e(struct vcpu *v, void *new_ge, mfn_t sl2mfn, void *se) { + struct domain *d = v->domain; shadow_l2e_t new_sl2e; guest_l2e_t new_gl2e = *(guest_l2e_t *)new_ge; shadow_l2e_t *sl2p = se; @@ -2237,8 +2250,7 @@ static int validate_gl2e(struct vcpu *v, void *new_ge, mfn_t sl2mfn, void *se) } else { - mfn_t gl1mfn = get_gfn_query_unlocked(v->domain, gfn_x(gl1gfn), - &p2mt); + mfn_t gl1mfn = get_gfn_query_unlocked(d, gfn_x(gl1gfn), &p2mt); if ( p2m_is_ram(p2mt) ) sl1mfn = get_shadow_status(v, gl1mfn, SH_type_l1_shadow); else if ( p2mt != p2m_populate_on_demand ) @@ -2254,6 +2266,7 @@ static int validate_gl2e(struct vcpu *v, void *new_ge, mfn_t sl2mfn, void *se) static int validate_gl1e(struct vcpu *v, void *new_ge, mfn_t sl1mfn, void *se) { + struct domain *d = v->domain; shadow_l1e_t new_sl1e; guest_l1e_t new_gl1e = *(guest_l1e_t *)new_ge; shadow_l1e_t *sl1p = se; @@ -2268,7 +2281,7 @@ static int validate_gl1e(struct vcpu *v, void *new_ge, mfn_t sl1mfn, void *se) perfc_incr(shadow_validate_gl1e_calls); gfn = guest_l1e_get_gfn(new_gl1e); - gmfn = get_gfn_query_unlocked(v->domain, gfn_x(gfn), &p2mt); + gmfn = get_gfn_query_unlocked(d, gfn_x(gfn), &p2mt); l1e_propagate_from_guest(v, new_gl1e, gmfn, &new_sl1e, ft_prefetch, p2mt); result |= shadow_set_l1e(v, sl1p, new_sl1e, p2mt, sl1mfn); @@ -2302,6 +2315,7 @@ static int validate_gl1e(struct vcpu *v, void *new_ge, mfn_t sl1mfn, void *se) * *not* the one that is causing it to be resynced. */ void sh_resync_l1(struct vcpu *v, mfn_t gl1mfn, mfn_t snpmfn) { + struct domain *d = v->domain; mfn_t sl1mfn; shadow_l1e_t *sl1p; guest_l1e_t *gl1p, *gp, *snp; @@ -2328,7 +2342,7 @@ void sh_resync_l1(struct vcpu *v, mfn_t gl1mfn, mfn_t snpmfn) shadow_l1e_t nsl1e; gfn = guest_l1e_get_gfn(gl1e); - gmfn = get_gfn_query_unlocked(v->domain, gfn_x(gfn), &p2mt); + gmfn = get_gfn_query_unlocked(d, gfn_x(gfn), &p2mt); l1e_propagate_from_guest(v, gl1e, gmfn, &nsl1e, ft_prefetch, p2mt); rc |= shadow_set_l1e(v, sl1p, nsl1e, p2mt, sl1mfn); *snpl1p = gl1e; @@ -2539,6 +2553,7 @@ sh_map_and_validate_gl1e(struct vcpu *v, mfn_t gl1mfn, static inline void check_for_early_unshadow(struct vcpu *v, mfn_t gmfn) { #if SHADOW_OPTIMIZATIONS & SHOPT_EARLY_UNSHADOW + struct domain *d = v->domain; /* If the domain has never made a "dying" op, use the two-writes * heuristic; otherwise, unshadow as soon as we write a zero for a dying * process. @@ -2546,10 +2561,10 @@ static inline void check_for_early_unshadow(struct vcpu *v, mfn_t gmfn) * Don't bother trying to unshadow if it's not a PT, or if it's > l1. */ if ( ( v->arch.paging.shadow.pagetable_dying - || ( !v->domain->arch.paging.shadow.pagetable_dying_op + || ( !d->arch.paging.shadow.pagetable_dying_op && v->arch.paging.shadow.last_emulated_mfn_for_unshadow == mfn_x(gmfn) ) ) && sh_mfn_is_a_page_table(gmfn) - && (!v->domain->arch.paging.shadow.pagetable_dying_op || + && (!d->arch.paging.shadow.pagetable_dying_op || !(mfn_to_page(gmfn)->shadow_flags & (SHF_L2_32|SHF_L2_PAE|SHF_L2H_PAE|SHF_L4_64))) ) { @@ -2585,6 +2600,7 @@ static inline void reset_early_unshadow(struct vcpu *v) static void sh_prefetch(struct vcpu *v, walk_t *gw, shadow_l1e_t *ptr_sl1e, mfn_t sl1mfn) { + struct domain *d = v->domain; int i, dist; gfn_t gfn; mfn_t gmfn; @@ -2651,7 +2667,7 @@ static void sh_prefetch(struct vcpu *v, walk_t *gw, /* Look at the gfn that the l1e is pointing at */ gfn = guest_l1e_get_gfn(gl1e); - gmfn = get_gfn_query_unlocked(v->domain, gfn_x(gfn), &p2mt); + gmfn = get_gfn_query_unlocked(d, gfn_x(gfn), &p2mt); /* Propagate the entry. */ l1e_propagate_from_guest(v, gl1e, gmfn, &sl1e, ft_prefetch, p2mt); @@ -3532,6 +3548,7 @@ sh_invlpg(struct vcpu *v, unsigned long va) #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* Check to see if the SL1 is out of sync. */ { + struct domain *d = v->domain; mfn_t gl1mfn = backpointer(mfn_to_page(sl1mfn)); struct page_info *pg = mfn_to_page(gl1mfn); if ( mfn_valid(gl1mfn) @@ -3539,7 +3556,7 @@ sh_invlpg(struct vcpu *v, unsigned long va) { /* The test above may give false positives, since we don't * hold the paging lock yet. Check again with the lock held. */ - paging_lock(v->domain); + paging_lock(d); /* This must still be a copy-from-user because we didn't * have the paging lock last time we checked, and the @@ -3551,13 +3568,13 @@ sh_invlpg(struct vcpu *v, unsigned long va) sizeof (sl2e)) != 0 ) { perfc_incr(shadow_invlpg_fault); - paging_unlock(v->domain); + paging_unlock(d); return 0; } if ( !(shadow_l2e_get_flags(sl2e) & _PAGE_PRESENT) ) { - paging_unlock(v->domain); + paging_unlock(d); return 0; } @@ -3574,7 +3591,7 @@ sh_invlpg(struct vcpu *v, unsigned long va) (void) shadow_set_l1e(v, sl1, shadow_l1e_empty(), p2m_invalid, sl1mfn); } - paging_unlock(v->domain); + paging_unlock(d); /* Need the invlpg, to pick up the disappeareance of the sl1e */ return 1; } @@ -3850,7 +3867,7 @@ sh_set_toplevel_shadow(struct vcpu *v, if ( sh_pin(v, smfn) == 0 ) { SHADOW_ERROR("can't pin %#lx as toplevel shadow\n", mfn_x(smfn)); - domain_crash(v->domain); + domain_crash(d); } /* Take a ref to this page: it will be released in sh_detach_old_tables() @@ -3858,7 +3875,7 @@ sh_set_toplevel_shadow(struct vcpu *v, if ( !sh_get_ref(v, smfn, 0) ) { SHADOW_ERROR("can't install %#lx as toplevel shadow\n", mfn_x(smfn)); - domain_crash(v->domain); + domain_crash(d); } new_entry = pagetable_from_mfn(smfn); @@ -3879,7 +3896,7 @@ sh_set_toplevel_shadow(struct vcpu *v, if ( !mfn_to_page(old_smfn)->u.sh.pinned && !sh_pin(v, old_smfn) ) { SHADOW_ERROR("can't re-pin %#lx\n", mfn_x(old_smfn)); - domain_crash(v->domain); + domain_crash(d); } sh_put_ref(v, old_smfn, 0); } @@ -4354,11 +4371,12 @@ void sh_clear_shadow_entry(struct vcpu *v, void *ep, mfn_t smfn) int sh_remove_l1_shadow(struct vcpu *v, mfn_t sl2mfn, mfn_t sl1mfn) /* Remove all mappings of this l1 shadow from this l2 shadow */ { + struct domain *d = v->domain; shadow_l2e_t *sl2e; int done = 0; int flags; - SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, done, v->domain, + SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, done, d, { flags = shadow_l2e_get_flags(*sl2e); if ( (flags & _PAGE_PRESENT) @@ -4399,11 +4417,12 @@ int sh_remove_l2_shadow(struct vcpu *v, mfn_t sl3mfn, mfn_t sl2mfn) int sh_remove_l3_shadow(struct vcpu *v, mfn_t sl4mfn, mfn_t sl3mfn) /* Remove all mappings of this l3 shadow from this l4 shadow */ { + struct domain *d = v->domain; shadow_l4e_t *sl4e; int done = 0; int flags; - SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, done, v->domain, + SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, done, d, { flags = shadow_l4e_get_flags(*sl4e); if ( (flags & _PAGE_PRESENT) @@ -4427,6 +4446,7 @@ int sh_remove_l3_shadow(struct vcpu *v, mfn_t sl4mfn, mfn_t sl3mfn) #if GUEST_PAGING_LEVELS == 3 static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) { + struct domain *d = v->domain; int i = 0; int flush = 0; int fast_path = 0; @@ -4444,7 +4464,7 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) fast_path = 1; l3gfn = gpa >> PAGE_SHIFT; - l3mfn = get_gfn_query(v->domain, _gfn(l3gfn), &p2mt); + l3mfn = get_gfn_query(d, _gfn(l3gfn), &p2mt); if ( !mfn_valid(l3mfn) || !p2m_is_ram(p2mt) ) { printk(XENLOG_DEBUG "sh_pagetable_dying: gpa not valid %"PRIpaddr"\n", @@ -4452,7 +4472,7 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) goto out_put_gfn; } - paging_lock(v->domain); + paging_lock(d); if ( !fast_path ) { @@ -4475,7 +4495,7 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) /* retrieving the l2s */ gl2a = guest_l3e_get_paddr(gl3e[i]); gfn = gl2a >> PAGE_SHIFT; - gmfn = get_gfn_query_unlocked(v->domain, gfn, &p2mt); + gmfn = get_gfn_query_unlocked(d, gfn, &p2mt); smfn = shadow_hash_lookup(v, mfn_x(gmfn), SH_type_l2_pae_shadow); } @@ -4488,29 +4508,30 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) } } if ( flush ) - flush_tlb_mask(v->domain->domain_dirty_cpumask); + flush_tlb_mask(d->domain_dirty_cpumask); /* Remember that we've seen the guest use this interface, so we * can rely on it using it in future, instead of guessing at * when processes are being torn down. */ - v->domain->arch.paging.shadow.pagetable_dying_op = 1; + d->arch.paging.shadow.pagetable_dying_op = 1; v->arch.paging.shadow.pagetable_dying = 1; if ( !fast_path ) unmap_domain_page(gl3pa); - paging_unlock(v->domain); + paging_unlock(d); out_put_gfn: - put_gfn(v->domain, l3gfn); + put_gfn(d, l3gfn); } #else static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) { + struct domain *d = v->domain; mfn_t smfn, gmfn; p2m_type_t p2mt; - gmfn = get_gfn_query(v->domain, _gfn(gpa >> PAGE_SHIFT), &p2mt); - paging_lock(v->domain); + gmfn = get_gfn_query(d, _gfn(gpa >> PAGE_SHIFT), &p2mt); + paging_lock(d); #if GUEST_PAGING_LEVELS == 2 smfn = shadow_hash_lookup(v, mfn_x(gmfn), SH_type_l2_32_shadow); @@ -4523,18 +4544,18 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) mfn_to_page(gmfn)->shadow_flags |= SHF_pagetable_dying; shadow_unhook_mappings(v, smfn, 1/* user pages only */); /* Now flush the TLB: we removed toplevel mappings. */ - flush_tlb_mask(v->domain->domain_dirty_cpumask); + flush_tlb_mask(d->domain_dirty_cpumask); } /* Remember that we've seen the guest use this interface, so we * can rely on it using it in future, instead of guessing at * when processes are being torn down. */ - v->domain->arch.paging.shadow.pagetable_dying_op = 1; + d->arch.paging.shadow.pagetable_dying_op = 1; v->arch.paging.shadow.pagetable_dying = 1; - paging_unlock(v->domain); - put_gfn(v->domain, gpa >> PAGE_SHIFT); + paging_unlock(d); + put_gfn(d, gpa >> PAGE_SHIFT); } #endif @@ -4987,6 +5008,7 @@ int sh_audit_fl1_table(struct vcpu *v, mfn_t sl1mfn, mfn_t x) int sh_audit_l2_table(struct vcpu *v, mfn_t sl2mfn, mfn_t x) { + struct domain *d = v->domain; guest_l2e_t *gl2e, *gp; shadow_l2e_t *sl2e; mfn_t mfn, gmfn, gl2mfn; @@ -5006,7 +5028,7 @@ int sh_audit_l2_table(struct vcpu *v, mfn_t sl2mfn, mfn_t x) #endif gl2e = gp = sh_map_domain_page(gl2mfn); - SHADOW_FOREACH_L2E(sl2mfn, sl2e, &gl2e, done, v->domain, { + SHADOW_FOREACH_L2E(sl2mfn, sl2e, &gl2e, done, d, { s = sh_audit_flags(v, 2, guest_l2e_get_flags(*gl2e), shadow_l2e_get_flags(*sl2e)); @@ -5019,7 +5041,7 @@ int sh_audit_l2_table(struct vcpu *v, mfn_t sl2mfn, mfn_t x) gmfn = (guest_l2e_get_flags(*gl2e) & _PAGE_PSE) ? get_fl1_shadow_status(v, gfn) : get_shadow_status(v, - get_gfn_query_unlocked(v->domain, gfn_x(gfn), + get_gfn_query_unlocked(d, gfn_x(gfn), &p2mt), SH_type_l1_shadow); if ( mfn_x(gmfn) != mfn_x(mfn) ) AUDIT_FAIL(2, "bad translation: gfn %" SH_PRI_gfn @@ -5027,7 +5049,7 @@ int sh_audit_l2_table(struct vcpu *v, mfn_t sl2mfn, mfn_t x) " --> %" PRI_mfn " != mfn %" PRI_mfn, gfn_x(gfn), (guest_l2e_get_flags(*gl2e) & _PAGE_PSE) ? 0 - : mfn_x(get_gfn_query_unlocked(v->domain, + : mfn_x(get_gfn_query_unlocked(d, gfn_x(gfn), &p2mt)), mfn_x(gmfn), mfn_x(mfn)); } }); @@ -5038,6 +5060,7 @@ int sh_audit_l2_table(struct vcpu *v, mfn_t sl2mfn, mfn_t x) #if GUEST_PAGING_LEVELS >= 4 int sh_audit_l3_table(struct vcpu *v, mfn_t sl3mfn, mfn_t x) { + struct domain *d = v->domain; guest_l3e_t *gl3e, *gp; shadow_l3e_t *sl3e; mfn_t mfn, gmfn, gl3mfn; @@ -5068,10 +5091,10 @@ int sh_audit_l3_table(struct vcpu *v, mfn_t sl3mfn, mfn_t x) gfn = guest_l3e_get_gfn(*gl3e); mfn = shadow_l3e_get_mfn(*sl3e); gmfn = get_shadow_status(v, get_gfn_query_unlocked( - v->domain, gfn_x(gfn), &p2mt), + d, gfn_x(gfn), &p2mt), ((GUEST_PAGING_LEVELS == 3 || is_pv_32on64_vcpu(v)) - && !shadow_mode_external(v->domain) + && !shadow_mode_external(d) && (guest_index(gl3e) % 4) == 3) ? SH_type_l2h_shadow : SH_type_l2_shadow); @@ -5087,6 +5110,7 @@ int sh_audit_l3_table(struct vcpu *v, mfn_t sl3mfn, mfn_t x) int sh_audit_l4_table(struct vcpu *v, mfn_t sl4mfn, mfn_t x) { + struct domain *d = v->domain; guest_l4e_t *gl4e, *gp; shadow_l4e_t *sl4e; mfn_t mfn, gmfn, gl4mfn; @@ -5106,7 +5130,7 @@ int sh_audit_l4_table(struct vcpu *v, mfn_t sl4mfn, mfn_t x) #endif gl4e = gp = sh_map_domain_page(gl4mfn); - SHADOW_FOREACH_L4E(sl4mfn, sl4e, &gl4e, done, v->domain, + SHADOW_FOREACH_L4E(sl4mfn, sl4e, &gl4e, done, d, { s = sh_audit_flags(v, 4, guest_l4e_get_flags(*gl4e), shadow_l4e_get_flags(*sl4e)); @@ -5117,7 +5141,7 @@ int sh_audit_l4_table(struct vcpu *v, mfn_t sl4mfn, mfn_t x) gfn = guest_l4e_get_gfn(*gl4e); mfn = shadow_l4e_get_mfn(*sl4e); gmfn = get_shadow_status(v, get_gfn_query_unlocked( - v->domain, gfn_x(gfn), &p2mt), + d, gfn_x(gfn), &p2mt), SH_type_l3_shadow); if ( mfn_x(gmfn) != mfn_x(mfn) ) AUDIT_FAIL(4, "bad translation: gfn %" SH_PRI_gfn diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index 4b69626..baa271c 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -646,6 +646,7 @@ prev_pinned_shadow(const struct page_info *page, * Returns 0 for failure, 1 for success. */ static inline int sh_pin(struct vcpu *v, mfn_t smfn) { + struct domain *d = v->domain; struct page_info *sp[4]; struct page_list_head *pin_list; unsigned int i, pages; @@ -658,7 +659,7 @@ static inline int sh_pin(struct vcpu *v, mfn_t smfn) ASSERT(sh_type_is_pinnable(v, sp[0]->u.sh.type)); ASSERT(sp[0]->u.sh.head); - pin_list = &v->domain->arch.paging.shadow.pinned_shadows; + pin_list = &d->arch.paging.shadow.pinned_shadows; if ( already_pinned && sp[0] == page_list_first(pin_list) ) return 1; @@ -695,6 +696,7 @@ static inline int sh_pin(struct vcpu *v, mfn_t smfn) * of pinned shadows, and release the extra ref. */ static inline void sh_unpin(struct vcpu *v, mfn_t smfn) { + struct domain *d = v->domain; struct page_list_head tmp_list, *pin_list; struct page_info *sp, *next; unsigned int i, head_type; @@ -711,7 +713,7 @@ static inline void sh_unpin(struct vcpu *v, mfn_t smfn) /* Cut the sub-list out of the list of pinned shadows, * stitching it back into a list fragment of its own. */ - pin_list = &v->domain->arch.paging.shadow.pinned_shadows; + pin_list = &d->arch.paging.shadow.pinned_shadows; INIT_PAGE_LIST_HEAD(&tmp_list); for ( i = 0; i < shadow_size(head_type); i++ ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 12:55:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:55: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 1YSmMP-00068t-OG; Tue, 03 Mar 2015 12:55:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMO-00068D-3X for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:40 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 17/9B-02991-B4FA5F45; Tue, 03 Mar 2015 12:55:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1425387335!12487442!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23070 invoked from network); 3 Mar 2015 12:55:37 -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; 3 Mar 2015 12:55:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMJ-0002XJ-QA for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmMJ-0003DN-P6 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:35 +0000 Date: Tue, 03 Mar 2015 12:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: introduce 'd' pointers and clean up use of 'v->domain' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f4d5f203778b1369e39f2b9bdda8b7ec53e4003 Author: Andrew Cooper AuthorDate: Tue Feb 17 14:32:37 2015 +0100 Commit: Jan Beulich CommitDate: Tue Feb 17 14:32:37 2015 +0100 x86/shadow: introduce 'd' pointers and clean up use of 'v->domain' All of the introduced domain pointers will eventually be removed, but doing this mechanical cleanup here allows the subsequent patches which change function prototypes to be smaller and more clear. In addition, swap some use of is_pv_32on64_vcpu(v) for is_pv_32on64_domain(d). No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 49 +++++++------ xen/arch/x86/mm/shadow/multi.c | 146 ++++++++++++++++++++++---------------- xen/arch/x86/mm/shadow/private.h | 6 +- 3 files changed, 116 insertions(+), 85 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 2e4954f..3b5ef19 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -665,6 +665,7 @@ void oos_fixup_add(struct vcpu *v, mfn_t gmfn, static int oos_remove_write_access(struct vcpu *v, mfn_t gmfn, struct oos_fixup *fixup) { + struct domain *d = v->domain; int ftlb = 0; ftlb |= oos_fixup_flush_gmfn(v, gmfn, fixup); @@ -690,7 +691,7 @@ static int oos_remove_write_access(struct vcpu *v, mfn_t gmfn, } if ( ftlb ) - flush_tlb_mask(v->domain->domain_dirty_cpumask); + flush_tlb_mask(d->domain_dirty_cpumask); return 0; } @@ -991,6 +992,7 @@ int sh_unsync(struct vcpu *v, mfn_t gmfn) */ void shadow_promote(struct vcpu *v, mfn_t gmfn, unsigned int type) { + struct domain *d = v->domain; struct page_info *page = mfn_to_page(gmfn); ASSERT(mfn_valid(gmfn)); @@ -1004,7 +1006,7 @@ void shadow_promote(struct vcpu *v, mfn_t gmfn, unsigned int type) /* We should never try to promote a gmfn that has writeable mappings */ ASSERT((page->u.inuse.type_info & PGT_type_mask) != PGT_writable_page || (page->u.inuse.type_info & PGT_count_mask) == 0 - || v->domain->is_shutting_down); + || d->is_shutting_down); /* Is the page already shadowed? */ if ( !test_and_set_bit(_PGC_page_table, &page->count_info) ) @@ -2056,6 +2058,7 @@ static void hash_vcpu_foreach(struct vcpu *v, unsigned int callback_mask, void sh_destroy_shadow(struct vcpu *v, mfn_t smfn) { + struct domain *d = v->domain; struct page_info *sp = mfn_to_page(smfn); unsigned int t = sp->u.sh.type; @@ -2068,9 +2071,8 @@ void sh_destroy_shadow(struct vcpu *v, mfn_t smfn) t == SH_type_fl1_pae_shadow || t == SH_type_fl1_64_shadow || t == SH_type_monitor_table || - (is_pv_32on64_vcpu(v) && t == SH_type_l4_64_shadow) || - (page_get_owner(mfn_to_page(backpointer(sp))) - == v->domain)); + (is_pv_32on64_domain(d) && t == SH_type_l4_64_shadow) || + (page_get_owner(mfn_to_page(backpointer(sp))) == d)); /* The down-shifts here are so that the switch statement is on nice * small numbers that the compiler will enjoy */ @@ -2098,7 +2100,7 @@ void sh_destroy_shadow(struct vcpu *v, mfn_t smfn) SHADOW_INTERNAL_NAME(sh_destroy_l1_shadow, 4)(v, smfn); break; case SH_type_l2h_64_shadow: - ASSERT(is_pv_32on64_vcpu(v)); + ASSERT(is_pv_32on64_domain(d)); /* Fall through... */ case SH_type_l2_64_shadow: SHADOW_INTERNAL_NAME(sh_destroy_l2_shadow, 4)(v, smfn); @@ -2166,15 +2168,16 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, | SHF_L1_64 | SHF_FL1_64 ; + struct domain *d = v->domain; struct page_info *pg = mfn_to_page(gmfn); - ASSERT(paging_locked_by_me(v->domain)); + ASSERT(paging_locked_by_me(d)); /* Only remove writable mappings if we are doing shadow refcounts. * In guest refcounting, we trust Xen to already be restricting * all the writes to the guest page tables, so we do not need to * do more. */ - if ( !shadow_mode_refcounts(v->domain) ) + if ( !shadow_mode_refcounts(d) ) return 0; /* Early exit if it's already a pagetable, or otherwise not writeable */ @@ -2198,7 +2201,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, SHADOW_ERROR("can't remove write access to mfn %lx, type_info is %" PRtype_info "\n", mfn_x(gmfn), mfn_to_page(gmfn)->u.inuse.type_info); - domain_crash(v->domain); + domain_crash(d); } #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC @@ -2226,7 +2229,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, GUESS(0xC0000000UL + (fault_addr >> 10), 1); /* Linux lowmem: first 896MB is mapped 1-to-1 above 0xC0000000 */ - if ((gfn = mfn_to_gfn(v->domain, gmfn)) < 0x38000 ) + if ((gfn = mfn_to_gfn(d, gmfn)) < 0x38000 ) GUESS(0xC0000000UL + (gfn << PAGE_SHIFT), 4); /* FreeBSD: Linear map at 0xBFC00000 */ @@ -2244,7 +2247,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, } /* Linux lowmem: first 896MB is mapped 1-to-1 above 0xC0000000 */ - if ((gfn = mfn_to_gfn(v->domain, gmfn)) < 0x38000 ) + if ((gfn = mfn_to_gfn(d, gmfn)) < 0x38000 ) GUESS(0xC0000000UL + (gfn << PAGE_SHIFT), 4); /* FreeBSD PAE: Linear map at 0xBF800000 */ @@ -2272,7 +2275,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, /* 64bit Linux direct map at 0xffff880000000000; older kernels * had it at 0xffff810000000000, and older kernels yet had it * at 0x0000010000000000UL */ - gfn = mfn_to_gfn(v->domain, gmfn); + gfn = mfn_to_gfn(d, gmfn); GUESS(0xffff880000000000UL + (gfn << PAGE_SHIFT), 4); GUESS(0xffff810000000000UL + (gfn << PAGE_SHIFT), 4); GUESS(0x0000010000000000UL + (gfn << PAGE_SHIFT), 4); @@ -2345,7 +2348,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, SHADOW_ERROR("can't remove write access to mfn %lx: guest has " "%lu special-use mappings of it\n", mfn_x(gmfn), (mfn_to_page(gmfn)->u.inuse.type_info&PGT_count_mask)); - domain_crash(v->domain); + domain_crash(d); } /* We killed at least one writeable mapping, so must flush TLBs. */ @@ -2386,6 +2389,7 @@ int sh_remove_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) { + struct domain *d = v->domain; struct page_info *page = mfn_to_page(gmfn); /* Dispatch table for getting per-type functions */ @@ -2424,7 +2428,7 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) /* Although this is an externally visible function, we do not know * whether the paging lock will be held when it is called (since it * can be called via put_page_type when we clear a shadow l1e).*/ - paging_lock_recursive(v->domain); + paging_lock_recursive(d); /* XXX TODO: * Heuristics for finding the (probably) single mapping of this gmfn */ @@ -2441,7 +2445,7 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) * and the HVM restore program takes another. * Also allow one typed refcount for xenheap pages, to match * share_xen_page_with_guest(). */ - if ( !(shadow_mode_external(v->domain) + if ( !(shadow_mode_external(d) && (page->count_info & PGC_count_mask) <= 3 && ((page->u.inuse.type_info & PGT_count_mask) == !!is_xen_heap_page(page))) ) @@ -2452,7 +2456,7 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) } } - paging_unlock(v->domain); + paging_unlock(d); /* We killed at least one mapping, so must flush TLBs. */ return 1; @@ -2526,6 +2530,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) * (all != 0 implies fast == 0) */ { + struct domain *d = v->domain; struct page_info *pg = mfn_to_page(gmfn); mfn_t smfn; unsigned char t; @@ -2577,15 +2582,15 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) /* Although this is an externally visible function, we do not know * whether the paging lock will be held when it is called (since it * can be called via put_page_type when we clear a shadow l1e).*/ - paging_lock_recursive(v->domain); + paging_lock_recursive(d); SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx\n", - v->domain->domain_id, v->vcpu_id, mfn_x(gmfn)); + d->domain_id, v->vcpu_id, mfn_x(gmfn)); /* Bail out now if the page is not shadowed */ if ( (pg->count_info & PGC_page_table) == 0 ) { - paging_unlock(v->domain); + paging_unlock(d); return; } @@ -2638,14 +2643,14 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) SHADOW_ERROR("can't find all shadows of mfn %05lx " "(shadow_flags=%08x)\n", mfn_x(gmfn), pg->shadow_flags); - domain_crash(v->domain); + domain_crash(d); } /* Need to flush TLBs now, so that linear maps are safe next time we * take a fault. */ - flush_tlb_mask(v->domain->domain_dirty_cpumask); + flush_tlb_mask(d->domain_dirty_cpumask); - paging_unlock(v->domain); + paging_unlock(d); } static void diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 434df61..b538997 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -134,7 +134,7 @@ set_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) ASSERT(mfn_to_page(smfn)->u.sh.head); /* 32-on-64 PV guests don't own their l4 pages so can't get_page them */ - if ( !is_pv_32on64_vcpu(v) || shadow_type != SH_type_l4_64_shadow ) + if ( !is_pv_32on64_domain(d) || shadow_type != SH_type_l4_64_shadow ) { res = get_page(mfn_to_page(gmfn), d); ASSERT(res == 1); @@ -157,13 +157,14 @@ static inline void delete_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) /* Remove a shadow from the hash table */ { + struct domain *d = v->domain; SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx, type=%08x, smfn=%05lx\n", - v->domain->domain_id, v->vcpu_id, + d->domain_id, v->vcpu_id, mfn_x(gmfn), shadow_type, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); shadow_hash_delete(v, mfn_x(gmfn), shadow_type, smfn); /* 32-on-64 PV guests don't own their l4 pages; see set_shadow_status */ - if ( !is_pv_32on64_vcpu(v) || shadow_type != SH_type_l4_64_shadow ) + if ( !is_pv_32on64_domain(d) || shadow_type != SH_type_l4_64_shadow ) put_page(mfn_to_page(gmfn)); } @@ -887,6 +888,7 @@ static int shadow_set_l4e(struct vcpu *v, shadow_l4e_t new_sl4e, mfn_t sl4mfn) { + struct domain *d = v->domain; int flags = 0, ok; shadow_l4e_t old_sl4e; paddr_t paddr; @@ -908,7 +910,7 @@ static int shadow_set_l4e(struct vcpu *v, ok |= sh_pin(v, sl3mfn); if ( !ok ) { - domain_crash(v->domain); + domain_crash(d); return SHADOW_SET_ERROR; } } @@ -937,6 +939,7 @@ static int shadow_set_l3e(struct vcpu *v, shadow_l3e_t new_sl3e, mfn_t sl3mfn) { + struct domain *d = v->domain; int flags = 0; shadow_l3e_t old_sl3e; paddr_t paddr; @@ -953,7 +956,7 @@ static int shadow_set_l3e(struct vcpu *v, /* About to install a new reference */ if ( !sh_get_ref(v, shadow_l3e_get_mfn(new_sl3e), paddr) ) { - domain_crash(v->domain); + domain_crash(d); return SHADOW_SET_ERROR; } } @@ -983,6 +986,7 @@ static int shadow_set_l2e(struct vcpu *v, shadow_l2e_t new_sl2e, mfn_t sl2mfn) { + struct domain *d = v->domain; int flags = 0; shadow_l2e_t old_sl2e; paddr_t paddr; @@ -1014,7 +1018,7 @@ static int shadow_set_l2e(struct vcpu *v, /* About to install a new reference */ if ( !sh_get_ref(v, sl1mfn, paddr) ) { - domain_crash(v->domain); + domain_crash(d); return SHADOW_SET_ERROR; } #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) @@ -1495,7 +1499,8 @@ static void sh_install_xen_entries_in_l2h(struct vcpu *v, mfn_t sl2hmfn) static mfn_t sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) { - mfn_t smfn = shadow_alloc(v->domain, shadow_type, mfn_x(gmfn)); + struct domain *d = v->domain; + mfn_t smfn = shadow_alloc(d, shadow_type, mfn_x(gmfn)); SHADOW_DEBUG(MAKE_SHADOW, "(%05lx, %u)=>%05lx\n", mfn_x(gmfn), shadow_type, mfn_x(smfn)); @@ -1506,7 +1511,7 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) #if GUEST_PAGING_LEVELS == 4 #if (SHADOW_OPTIMIZATIONS & SHOPT_LINUX_L3_TOPLEVEL) if ( shadow_type == SH_type_l4_64_shadow && - unlikely(v->domain->arch.paging.shadow.opt_flags & SHOPT_LINUX_L3_TOPLEVEL) ) + unlikely(d->arch.paging.shadow.opt_flags & SHOPT_LINUX_L3_TOPLEVEL) ) { /* We're shadowing a new l4, but we've been assuming the guest uses * only one l4 per vcpu and context switches using an l4 entry. @@ -1517,22 +1522,22 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) struct page_info *sp, *t; struct vcpu *v2; int l4count = 0, vcpus = 0; - page_list_for_each(sp, &v->domain->arch.paging.shadow.pinned_shadows) + page_list_for_each(sp, &d->arch.paging.shadow.pinned_shadows) { if ( sp->u.sh.type == SH_type_l4_64_shadow ) l4count++; } - for_each_vcpu ( v->domain, v2 ) + for_each_vcpu ( d, v2 ) vcpus++; if ( l4count > 2 * vcpus ) { /* Unpin all the pinned l3 tables, and don't pin any more. */ - page_list_for_each_safe(sp, t, &v->domain->arch.paging.shadow.pinned_shadows) + page_list_for_each_safe(sp, t, &d->arch.paging.shadow.pinned_shadows) { if ( sp->u.sh.type == SH_type_l3_64_shadow ) sh_unpin(v, page_to_mfn(sp)); } - v->domain->arch.paging.shadow.opt_flags &= ~SHOPT_LINUX_L3_TOPLEVEL; + d->arch.paging.shadow.opt_flags &= ~SHOPT_LINUX_L3_TOPLEVEL; sh_reset_l3_up_pointers(v); } } @@ -1540,7 +1545,7 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) #endif // Create the Xen mappings... - if ( !shadow_mode_external(v->domain) ) + if ( !shadow_mode_external(d) ) { switch (shadow_type) { @@ -1566,8 +1571,8 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) static mfn_t make_fl1_shadow(struct vcpu *v, gfn_t gfn) { - mfn_t smfn = shadow_alloc(v->domain, SH_type_fl1_shadow, - (unsigned long) gfn_x(gfn)); + struct domain *d = v->domain; + mfn_t smfn = shadow_alloc(d, SH_type_fl1_shadow, gfn_x(gfn)); SHADOW_DEBUG(MAKE_SHADOW, "(%" SH_PRI_gfn ")=>%" PRI_mfn "\n", gfn_x(gfn), mfn_x(smfn)); @@ -1875,6 +1880,7 @@ static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, #if GUEST_PAGING_LEVELS >= 4 void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) { + struct domain *d = v->domain; shadow_l4e_t *sl4e; struct page_info *sp = mfn_to_page(smfn); u32 t = sp->u.sh.type; @@ -1891,7 +1897,7 @@ void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) shadow_demote(v, gmfn, t); /* Decrement refcounts of all the old entries */ sl4mfn = smfn; - SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, v->domain, { + SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, d, { if ( shadow_l4e_get_flags(*sl4e) & _PAGE_PRESENT ) { sh_put_ref(v, shadow_l4e_get_mfn(*sl4e), @@ -1901,11 +1907,12 @@ void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) }); /* Put the memory back in the pool */ - shadow_free(v->domain, smfn); + shadow_free(d, smfn); } void sh_destroy_l3_shadow(struct vcpu *v, mfn_t smfn) { + struct domain *d = v->domain; shadow_l3e_t *sl3e; struct page_info *sp = mfn_to_page(smfn); u32 t = sp->u.sh.type; @@ -1931,13 +1938,14 @@ void sh_destroy_l3_shadow(struct vcpu *v, mfn_t smfn) }); /* Put the memory back in the pool */ - shadow_free(v->domain, smfn); + shadow_free(d, smfn); } #endif /* GUEST_PAGING_LEVELS >= 4 */ void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) { + struct domain *d = v->domain; shadow_l2e_t *sl2e; struct page_info *sp = mfn_to_page(smfn); u32 t = sp->u.sh.type; @@ -1960,7 +1968,7 @@ void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) /* Decrement refcounts of all the old entries */ sl2mfn = smfn; - SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, v->domain, { + SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( shadow_l2e_get_flags(*sl2e) & _PAGE_PRESENT ) sh_put_ref(v, shadow_l2e_get_mfn(*sl2e), (((paddr_t)mfn_x(sl2mfn)) << PAGE_SHIFT) @@ -1968,7 +1976,7 @@ void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) }); /* Put the memory back in the pool */ - shadow_free(v->domain, smfn); + shadow_free(d, smfn); } void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) @@ -2010,7 +2018,7 @@ void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) } /* Put the memory back in the pool */ - shadow_free(v->domain, smfn); + shadow_free(d, smfn); } #if SHADOW_PAGING_LEVELS == GUEST_PAGING_LEVELS @@ -2072,8 +2080,9 @@ void sh_destroy_monitor_table(struct vcpu *v, mfn_t mmfn) void sh_unhook_32b_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) { + struct domain *d = v->domain; shadow_l2e_t *sl2e; - SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, v->domain, { + SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) (void) shadow_set_l2e(v, sl2e, shadow_l2e_empty(), sl2mfn); }); @@ -2084,8 +2093,9 @@ void sh_unhook_32b_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) void sh_unhook_pae_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) /* Walk a PAE l2 shadow, unhooking entries from all the subshadows */ { + struct domain *d = v->domain; shadow_l2e_t *sl2e; - SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, v->domain, { + SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) (void) shadow_set_l2e(v, sl2e, shadow_l2e_empty(), sl2mfn); }); @@ -2095,8 +2105,9 @@ void sh_unhook_pae_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) void sh_unhook_64b_mappings(struct vcpu *v, mfn_t sl4mfn, int user_only) { + struct domain *d = v->domain; shadow_l4e_t *sl4e; - SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, v->domain, { + SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, d, { if ( !user_only || (sl4e->l4 & _PAGE_USER) ) (void) shadow_set_l4e(v, sl4e, shadow_l4e_empty(), sl4mfn); }); @@ -2176,6 +2187,7 @@ static int validate_gl4e(struct vcpu *v, void *new_ge, mfn_t sl4mfn, void *se) static int validate_gl3e(struct vcpu *v, void *new_ge, mfn_t sl3mfn, void *se) { + struct domain *d = v->domain; shadow_l3e_t new_sl3e; guest_l3e_t new_gl3e = *(guest_l3e_t *)new_ge; shadow_l3e_t *sl3p = se; @@ -2188,7 +2200,7 @@ static int validate_gl3e(struct vcpu *v, void *new_ge, mfn_t sl3mfn, void *se) if ( guest_l3e_get_flags(new_gl3e) & _PAGE_PRESENT ) { gfn_t gl2gfn = guest_l3e_get_gfn(new_gl3e); - mfn_t gl2mfn = get_gfn_query_unlocked(v->domain, gfn_x(gl2gfn), &p2mt); + mfn_t gl2mfn = get_gfn_query_unlocked(d, gfn_x(gl2gfn), &p2mt); if ( p2m_is_ram(p2mt) ) sl2mfn = get_shadow_status(v, gl2mfn, SH_type_l2_shadow); else if ( p2mt != p2m_populate_on_demand ) @@ -2208,6 +2220,7 @@ static int validate_gl3e(struct vcpu *v, void *new_ge, mfn_t sl3mfn, void *se) static int validate_gl2e(struct vcpu *v, void *new_ge, mfn_t sl2mfn, void *se) { + struct domain *d = v->domain; shadow_l2e_t new_sl2e; guest_l2e_t new_gl2e = *(guest_l2e_t *)new_ge; shadow_l2e_t *sl2p = se; @@ -2237,8 +2250,7 @@ static int validate_gl2e(struct vcpu *v, void *new_ge, mfn_t sl2mfn, void *se) } else { - mfn_t gl1mfn = get_gfn_query_unlocked(v->domain, gfn_x(gl1gfn), - &p2mt); + mfn_t gl1mfn = get_gfn_query_unlocked(d, gfn_x(gl1gfn), &p2mt); if ( p2m_is_ram(p2mt) ) sl1mfn = get_shadow_status(v, gl1mfn, SH_type_l1_shadow); else if ( p2mt != p2m_populate_on_demand ) @@ -2254,6 +2266,7 @@ static int validate_gl2e(struct vcpu *v, void *new_ge, mfn_t sl2mfn, void *se) static int validate_gl1e(struct vcpu *v, void *new_ge, mfn_t sl1mfn, void *se) { + struct domain *d = v->domain; shadow_l1e_t new_sl1e; guest_l1e_t new_gl1e = *(guest_l1e_t *)new_ge; shadow_l1e_t *sl1p = se; @@ -2268,7 +2281,7 @@ static int validate_gl1e(struct vcpu *v, void *new_ge, mfn_t sl1mfn, void *se) perfc_incr(shadow_validate_gl1e_calls); gfn = guest_l1e_get_gfn(new_gl1e); - gmfn = get_gfn_query_unlocked(v->domain, gfn_x(gfn), &p2mt); + gmfn = get_gfn_query_unlocked(d, gfn_x(gfn), &p2mt); l1e_propagate_from_guest(v, new_gl1e, gmfn, &new_sl1e, ft_prefetch, p2mt); result |= shadow_set_l1e(v, sl1p, new_sl1e, p2mt, sl1mfn); @@ -2302,6 +2315,7 @@ static int validate_gl1e(struct vcpu *v, void *new_ge, mfn_t sl1mfn, void *se) * *not* the one that is causing it to be resynced. */ void sh_resync_l1(struct vcpu *v, mfn_t gl1mfn, mfn_t snpmfn) { + struct domain *d = v->domain; mfn_t sl1mfn; shadow_l1e_t *sl1p; guest_l1e_t *gl1p, *gp, *snp; @@ -2328,7 +2342,7 @@ void sh_resync_l1(struct vcpu *v, mfn_t gl1mfn, mfn_t snpmfn) shadow_l1e_t nsl1e; gfn = guest_l1e_get_gfn(gl1e); - gmfn = get_gfn_query_unlocked(v->domain, gfn_x(gfn), &p2mt); + gmfn = get_gfn_query_unlocked(d, gfn_x(gfn), &p2mt); l1e_propagate_from_guest(v, gl1e, gmfn, &nsl1e, ft_prefetch, p2mt); rc |= shadow_set_l1e(v, sl1p, nsl1e, p2mt, sl1mfn); *snpl1p = gl1e; @@ -2539,6 +2553,7 @@ sh_map_and_validate_gl1e(struct vcpu *v, mfn_t gl1mfn, static inline void check_for_early_unshadow(struct vcpu *v, mfn_t gmfn) { #if SHADOW_OPTIMIZATIONS & SHOPT_EARLY_UNSHADOW + struct domain *d = v->domain; /* If the domain has never made a "dying" op, use the two-writes * heuristic; otherwise, unshadow as soon as we write a zero for a dying * process. @@ -2546,10 +2561,10 @@ static inline void check_for_early_unshadow(struct vcpu *v, mfn_t gmfn) * Don't bother trying to unshadow if it's not a PT, or if it's > l1. */ if ( ( v->arch.paging.shadow.pagetable_dying - || ( !v->domain->arch.paging.shadow.pagetable_dying_op + || ( !d->arch.paging.shadow.pagetable_dying_op && v->arch.paging.shadow.last_emulated_mfn_for_unshadow == mfn_x(gmfn) ) ) && sh_mfn_is_a_page_table(gmfn) - && (!v->domain->arch.paging.shadow.pagetable_dying_op || + && (!d->arch.paging.shadow.pagetable_dying_op || !(mfn_to_page(gmfn)->shadow_flags & (SHF_L2_32|SHF_L2_PAE|SHF_L2H_PAE|SHF_L4_64))) ) { @@ -2585,6 +2600,7 @@ static inline void reset_early_unshadow(struct vcpu *v) static void sh_prefetch(struct vcpu *v, walk_t *gw, shadow_l1e_t *ptr_sl1e, mfn_t sl1mfn) { + struct domain *d = v->domain; int i, dist; gfn_t gfn; mfn_t gmfn; @@ -2651,7 +2667,7 @@ static void sh_prefetch(struct vcpu *v, walk_t *gw, /* Look at the gfn that the l1e is pointing at */ gfn = guest_l1e_get_gfn(gl1e); - gmfn = get_gfn_query_unlocked(v->domain, gfn_x(gfn), &p2mt); + gmfn = get_gfn_query_unlocked(d, gfn_x(gfn), &p2mt); /* Propagate the entry. */ l1e_propagate_from_guest(v, gl1e, gmfn, &sl1e, ft_prefetch, p2mt); @@ -3532,6 +3548,7 @@ sh_invlpg(struct vcpu *v, unsigned long va) #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* Check to see if the SL1 is out of sync. */ { + struct domain *d = v->domain; mfn_t gl1mfn = backpointer(mfn_to_page(sl1mfn)); struct page_info *pg = mfn_to_page(gl1mfn); if ( mfn_valid(gl1mfn) @@ -3539,7 +3556,7 @@ sh_invlpg(struct vcpu *v, unsigned long va) { /* The test above may give false positives, since we don't * hold the paging lock yet. Check again with the lock held. */ - paging_lock(v->domain); + paging_lock(d); /* This must still be a copy-from-user because we didn't * have the paging lock last time we checked, and the @@ -3551,13 +3568,13 @@ sh_invlpg(struct vcpu *v, unsigned long va) sizeof (sl2e)) != 0 ) { perfc_incr(shadow_invlpg_fault); - paging_unlock(v->domain); + paging_unlock(d); return 0; } if ( !(shadow_l2e_get_flags(sl2e) & _PAGE_PRESENT) ) { - paging_unlock(v->domain); + paging_unlock(d); return 0; } @@ -3574,7 +3591,7 @@ sh_invlpg(struct vcpu *v, unsigned long va) (void) shadow_set_l1e(v, sl1, shadow_l1e_empty(), p2m_invalid, sl1mfn); } - paging_unlock(v->domain); + paging_unlock(d); /* Need the invlpg, to pick up the disappeareance of the sl1e */ return 1; } @@ -3850,7 +3867,7 @@ sh_set_toplevel_shadow(struct vcpu *v, if ( sh_pin(v, smfn) == 0 ) { SHADOW_ERROR("can't pin %#lx as toplevel shadow\n", mfn_x(smfn)); - domain_crash(v->domain); + domain_crash(d); } /* Take a ref to this page: it will be released in sh_detach_old_tables() @@ -3858,7 +3875,7 @@ sh_set_toplevel_shadow(struct vcpu *v, if ( !sh_get_ref(v, smfn, 0) ) { SHADOW_ERROR("can't install %#lx as toplevel shadow\n", mfn_x(smfn)); - domain_crash(v->domain); + domain_crash(d); } new_entry = pagetable_from_mfn(smfn); @@ -3879,7 +3896,7 @@ sh_set_toplevel_shadow(struct vcpu *v, if ( !mfn_to_page(old_smfn)->u.sh.pinned && !sh_pin(v, old_smfn) ) { SHADOW_ERROR("can't re-pin %#lx\n", mfn_x(old_smfn)); - domain_crash(v->domain); + domain_crash(d); } sh_put_ref(v, old_smfn, 0); } @@ -4354,11 +4371,12 @@ void sh_clear_shadow_entry(struct vcpu *v, void *ep, mfn_t smfn) int sh_remove_l1_shadow(struct vcpu *v, mfn_t sl2mfn, mfn_t sl1mfn) /* Remove all mappings of this l1 shadow from this l2 shadow */ { + struct domain *d = v->domain; shadow_l2e_t *sl2e; int done = 0; int flags; - SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, done, v->domain, + SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, done, d, { flags = shadow_l2e_get_flags(*sl2e); if ( (flags & _PAGE_PRESENT) @@ -4399,11 +4417,12 @@ int sh_remove_l2_shadow(struct vcpu *v, mfn_t sl3mfn, mfn_t sl2mfn) int sh_remove_l3_shadow(struct vcpu *v, mfn_t sl4mfn, mfn_t sl3mfn) /* Remove all mappings of this l3 shadow from this l4 shadow */ { + struct domain *d = v->domain; shadow_l4e_t *sl4e; int done = 0; int flags; - SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, done, v->domain, + SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, done, d, { flags = shadow_l4e_get_flags(*sl4e); if ( (flags & _PAGE_PRESENT) @@ -4427,6 +4446,7 @@ int sh_remove_l3_shadow(struct vcpu *v, mfn_t sl4mfn, mfn_t sl3mfn) #if GUEST_PAGING_LEVELS == 3 static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) { + struct domain *d = v->domain; int i = 0; int flush = 0; int fast_path = 0; @@ -4444,7 +4464,7 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) fast_path = 1; l3gfn = gpa >> PAGE_SHIFT; - l3mfn = get_gfn_query(v->domain, _gfn(l3gfn), &p2mt); + l3mfn = get_gfn_query(d, _gfn(l3gfn), &p2mt); if ( !mfn_valid(l3mfn) || !p2m_is_ram(p2mt) ) { printk(XENLOG_DEBUG "sh_pagetable_dying: gpa not valid %"PRIpaddr"\n", @@ -4452,7 +4472,7 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) goto out_put_gfn; } - paging_lock(v->domain); + paging_lock(d); if ( !fast_path ) { @@ -4475,7 +4495,7 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) /* retrieving the l2s */ gl2a = guest_l3e_get_paddr(gl3e[i]); gfn = gl2a >> PAGE_SHIFT; - gmfn = get_gfn_query_unlocked(v->domain, gfn, &p2mt); + gmfn = get_gfn_query_unlocked(d, gfn, &p2mt); smfn = shadow_hash_lookup(v, mfn_x(gmfn), SH_type_l2_pae_shadow); } @@ -4488,29 +4508,30 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) } } if ( flush ) - flush_tlb_mask(v->domain->domain_dirty_cpumask); + flush_tlb_mask(d->domain_dirty_cpumask); /* Remember that we've seen the guest use this interface, so we * can rely on it using it in future, instead of guessing at * when processes are being torn down. */ - v->domain->arch.paging.shadow.pagetable_dying_op = 1; + d->arch.paging.shadow.pagetable_dying_op = 1; v->arch.paging.shadow.pagetable_dying = 1; if ( !fast_path ) unmap_domain_page(gl3pa); - paging_unlock(v->domain); + paging_unlock(d); out_put_gfn: - put_gfn(v->domain, l3gfn); + put_gfn(d, l3gfn); } #else static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) { + struct domain *d = v->domain; mfn_t smfn, gmfn; p2m_type_t p2mt; - gmfn = get_gfn_query(v->domain, _gfn(gpa >> PAGE_SHIFT), &p2mt); - paging_lock(v->domain); + gmfn = get_gfn_query(d, _gfn(gpa >> PAGE_SHIFT), &p2mt); + paging_lock(d); #if GUEST_PAGING_LEVELS == 2 smfn = shadow_hash_lookup(v, mfn_x(gmfn), SH_type_l2_32_shadow); @@ -4523,18 +4544,18 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) mfn_to_page(gmfn)->shadow_flags |= SHF_pagetable_dying; shadow_unhook_mappings(v, smfn, 1/* user pages only */); /* Now flush the TLB: we removed toplevel mappings. */ - flush_tlb_mask(v->domain->domain_dirty_cpumask); + flush_tlb_mask(d->domain_dirty_cpumask); } /* Remember that we've seen the guest use this interface, so we * can rely on it using it in future, instead of guessing at * when processes are being torn down. */ - v->domain->arch.paging.shadow.pagetable_dying_op = 1; + d->arch.paging.shadow.pagetable_dying_op = 1; v->arch.paging.shadow.pagetable_dying = 1; - paging_unlock(v->domain); - put_gfn(v->domain, gpa >> PAGE_SHIFT); + paging_unlock(d); + put_gfn(d, gpa >> PAGE_SHIFT); } #endif @@ -4987,6 +5008,7 @@ int sh_audit_fl1_table(struct vcpu *v, mfn_t sl1mfn, mfn_t x) int sh_audit_l2_table(struct vcpu *v, mfn_t sl2mfn, mfn_t x) { + struct domain *d = v->domain; guest_l2e_t *gl2e, *gp; shadow_l2e_t *sl2e; mfn_t mfn, gmfn, gl2mfn; @@ -5006,7 +5028,7 @@ int sh_audit_l2_table(struct vcpu *v, mfn_t sl2mfn, mfn_t x) #endif gl2e = gp = sh_map_domain_page(gl2mfn); - SHADOW_FOREACH_L2E(sl2mfn, sl2e, &gl2e, done, v->domain, { + SHADOW_FOREACH_L2E(sl2mfn, sl2e, &gl2e, done, d, { s = sh_audit_flags(v, 2, guest_l2e_get_flags(*gl2e), shadow_l2e_get_flags(*sl2e)); @@ -5019,7 +5041,7 @@ int sh_audit_l2_table(struct vcpu *v, mfn_t sl2mfn, mfn_t x) gmfn = (guest_l2e_get_flags(*gl2e) & _PAGE_PSE) ? get_fl1_shadow_status(v, gfn) : get_shadow_status(v, - get_gfn_query_unlocked(v->domain, gfn_x(gfn), + get_gfn_query_unlocked(d, gfn_x(gfn), &p2mt), SH_type_l1_shadow); if ( mfn_x(gmfn) != mfn_x(mfn) ) AUDIT_FAIL(2, "bad translation: gfn %" SH_PRI_gfn @@ -5027,7 +5049,7 @@ int sh_audit_l2_table(struct vcpu *v, mfn_t sl2mfn, mfn_t x) " --> %" PRI_mfn " != mfn %" PRI_mfn, gfn_x(gfn), (guest_l2e_get_flags(*gl2e) & _PAGE_PSE) ? 0 - : mfn_x(get_gfn_query_unlocked(v->domain, + : mfn_x(get_gfn_query_unlocked(d, gfn_x(gfn), &p2mt)), mfn_x(gmfn), mfn_x(mfn)); } }); @@ -5038,6 +5060,7 @@ int sh_audit_l2_table(struct vcpu *v, mfn_t sl2mfn, mfn_t x) #if GUEST_PAGING_LEVELS >= 4 int sh_audit_l3_table(struct vcpu *v, mfn_t sl3mfn, mfn_t x) { + struct domain *d = v->domain; guest_l3e_t *gl3e, *gp; shadow_l3e_t *sl3e; mfn_t mfn, gmfn, gl3mfn; @@ -5068,10 +5091,10 @@ int sh_audit_l3_table(struct vcpu *v, mfn_t sl3mfn, mfn_t x) gfn = guest_l3e_get_gfn(*gl3e); mfn = shadow_l3e_get_mfn(*sl3e); gmfn = get_shadow_status(v, get_gfn_query_unlocked( - v->domain, gfn_x(gfn), &p2mt), + d, gfn_x(gfn), &p2mt), ((GUEST_PAGING_LEVELS == 3 || is_pv_32on64_vcpu(v)) - && !shadow_mode_external(v->domain) + && !shadow_mode_external(d) && (guest_index(gl3e) % 4) == 3) ? SH_type_l2h_shadow : SH_type_l2_shadow); @@ -5087,6 +5110,7 @@ int sh_audit_l3_table(struct vcpu *v, mfn_t sl3mfn, mfn_t x) int sh_audit_l4_table(struct vcpu *v, mfn_t sl4mfn, mfn_t x) { + struct domain *d = v->domain; guest_l4e_t *gl4e, *gp; shadow_l4e_t *sl4e; mfn_t mfn, gmfn, gl4mfn; @@ -5106,7 +5130,7 @@ int sh_audit_l4_table(struct vcpu *v, mfn_t sl4mfn, mfn_t x) #endif gl4e = gp = sh_map_domain_page(gl4mfn); - SHADOW_FOREACH_L4E(sl4mfn, sl4e, &gl4e, done, v->domain, + SHADOW_FOREACH_L4E(sl4mfn, sl4e, &gl4e, done, d, { s = sh_audit_flags(v, 4, guest_l4e_get_flags(*gl4e), shadow_l4e_get_flags(*sl4e)); @@ -5117,7 +5141,7 @@ int sh_audit_l4_table(struct vcpu *v, mfn_t sl4mfn, mfn_t x) gfn = guest_l4e_get_gfn(*gl4e); mfn = shadow_l4e_get_mfn(*sl4e); gmfn = get_shadow_status(v, get_gfn_query_unlocked( - v->domain, gfn_x(gfn), &p2mt), + d, gfn_x(gfn), &p2mt), SH_type_l3_shadow); if ( mfn_x(gmfn) != mfn_x(mfn) ) AUDIT_FAIL(4, "bad translation: gfn %" SH_PRI_gfn diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index 4b69626..baa271c 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -646,6 +646,7 @@ prev_pinned_shadow(const struct page_info *page, * Returns 0 for failure, 1 for success. */ static inline int sh_pin(struct vcpu *v, mfn_t smfn) { + struct domain *d = v->domain; struct page_info *sp[4]; struct page_list_head *pin_list; unsigned int i, pages; @@ -658,7 +659,7 @@ static inline int sh_pin(struct vcpu *v, mfn_t smfn) ASSERT(sh_type_is_pinnable(v, sp[0]->u.sh.type)); ASSERT(sp[0]->u.sh.head); - pin_list = &v->domain->arch.paging.shadow.pinned_shadows; + pin_list = &d->arch.paging.shadow.pinned_shadows; if ( already_pinned && sp[0] == page_list_first(pin_list) ) return 1; @@ -695,6 +696,7 @@ static inline int sh_pin(struct vcpu *v, mfn_t smfn) * of pinned shadows, and release the extra ref. */ static inline void sh_unpin(struct vcpu *v, mfn_t smfn) { + struct domain *d = v->domain; struct page_list_head tmp_list, *pin_list; struct page_info *sp, *next; unsigned int i, head_type; @@ -711,7 +713,7 @@ static inline void sh_unpin(struct vcpu *v, mfn_t smfn) /* Cut the sub-list out of the list of pinned shadows, * stitching it back into a list fragment of its own. */ - pin_list = &v->domain->arch.paging.shadow.pinned_shadows; + pin_list = &d->arch.paging.shadow.pinned_shadows; INIT_PAGE_LIST_HEAD(&tmp_list); for ( i = 0; i < shadow_size(head_type); i++ ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 12:55:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12: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 1YSmMX-0006Bu-Ta; Tue, 03 Mar 2015 12:55:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMW-0006B7-98 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:48 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 67/69-25903-35FA5F45; Tue, 03 Mar 2015 12:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1425387346!7224749!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14160 invoked from network); 3 Mar 2015 12:55:47 -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; 3 Mar 2015 12:55:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMU-0002XP-2y for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmMT-0003Dn-UC for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:45 +0000 Date: Tue, 03 Mar 2015 12:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: dump vNUMA information with debug key 'u' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2cd5eff896f6cb2a67dfaf4464fdb4b88c902af4 Author: Elena Ufimsteva AuthorDate: Tue Feb 17 14:33:11 2015 +0100 Commit: Jan Beulich CommitDate: Tue Feb 17 14:33:11 2015 +0100 x86: dump vNUMA information with debug key 'u' Signed-off-by: Elena Ufimsteva Signed-off-by: Wei Liu Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Dario Faggioli --- xen/arch/x86/numa.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 70 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index 628a40a..e500f33 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -16,6 +16,7 @@ #include #include #include +#include static int numa_setup(char *s); custom_param("numa", numa_setup); @@ -363,10 +364,12 @@ EXPORT_SYMBOL(node_data); static void dump_numa(unsigned char key) { s_time_t now = NOW(); - int i; + unsigned int i, j; + int err; struct domain *d; struct page_info *page; unsigned int page_num_node[MAX_NUMNODES]; + const struct vnuma_info *vnuma; printk("'%c' pressed -> dumping numa info (now-0x%X:%08X)\n", key, (u32)(now>>32), (u32)now); @@ -393,6 +396,8 @@ static void dump_numa(unsigned char key) printk("Memory location of each domain:\n"); for_each_domain ( d ) { + process_pending_softirqs(); + printk("Domain %u (total: %u):\n", d->domain_id, d->tot_pages); for_each_online_node ( i ) @@ -408,6 +413,70 @@ static void dump_numa(unsigned char key) for_each_online_node ( i ) printk(" Node %u: %u\n", i, page_num_node[i]); + + if ( !read_trylock(&d->vnuma_rwlock) ) + continue; + + if ( !d->vnuma ) + { + read_unlock(&d->vnuma_rwlock); + continue; + } + + vnuma = d->vnuma; + printk(" %u vnodes, %u vcpus, guest physical layout:\n", + vnuma->nr_vnodes, d->max_vcpus); + for ( i = 0; i < vnuma->nr_vnodes; i++ ) + { + unsigned int start_cpu = ~0U; + + err = snprintf(keyhandler_scratch, 12, "%3u", + vnuma->vnode_to_pnode[i]); + if ( err < 0 || vnuma->vnode_to_pnode[i] == NUMA_NO_NODE ) + strlcpy(keyhandler_scratch, "???", sizeof(keyhandler_scratch)); + + printk(" %3u: pnode %s,", i, keyhandler_scratch); + + printk(" vcpus "); + + for ( j = 0; j < d->max_vcpus; j++ ) + { + if ( !(j & 0x3f) ) + process_pending_softirqs(); + + if ( vnuma->vcpu_to_vnode[j] == i ) + { + if ( start_cpu == ~0U ) + { + printk("%d", j); + start_cpu = j; + } + } + else if ( start_cpu != ~0U ) + { + if ( j - 1 != start_cpu ) + printk("-%d ", j - 1); + else + printk(" "); + start_cpu = ~0U; + } + } + + if ( start_cpu != ~0U && start_cpu != j - 1 ) + printk("-%d", j - 1); + + printk("\n"); + + for ( j = 0; j < vnuma->nr_vmemranges; j++ ) + { + if ( vnuma->vmemrange[j].nid == i ) + printk(" %016"PRIx64" - %016"PRIx64"\n", + vnuma->vmemrange[j].start, + vnuma->vmemrange[j].end); + } + } + + read_unlock(&d->vnuma_rwlock); } rcu_read_unlock(&domlist_read_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 Tue Mar 03 12:55:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12: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 1YSmMX-0006Bu-Ta; Tue, 03 Mar 2015 12:55:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMW-0006B7-98 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:48 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 67/69-25903-35FA5F45; Tue, 03 Mar 2015 12:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1425387346!7224749!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14160 invoked from network); 3 Mar 2015 12:55:47 -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; 3 Mar 2015 12:55:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMU-0002XP-2y for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmMT-0003Dn-UC for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:45 +0000 Date: Tue, 03 Mar 2015 12:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: dump vNUMA information with debug key 'u' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2cd5eff896f6cb2a67dfaf4464fdb4b88c902af4 Author: Elena Ufimsteva AuthorDate: Tue Feb 17 14:33:11 2015 +0100 Commit: Jan Beulich CommitDate: Tue Feb 17 14:33:11 2015 +0100 x86: dump vNUMA information with debug key 'u' Signed-off-by: Elena Ufimsteva Signed-off-by: Wei Liu Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Dario Faggioli --- xen/arch/x86/numa.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 70 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index 628a40a..e500f33 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -16,6 +16,7 @@ #include #include #include +#include static int numa_setup(char *s); custom_param("numa", numa_setup); @@ -363,10 +364,12 @@ EXPORT_SYMBOL(node_data); static void dump_numa(unsigned char key) { s_time_t now = NOW(); - int i; + unsigned int i, j; + int err; struct domain *d; struct page_info *page; unsigned int page_num_node[MAX_NUMNODES]; + const struct vnuma_info *vnuma; printk("'%c' pressed -> dumping numa info (now-0x%X:%08X)\n", key, (u32)(now>>32), (u32)now); @@ -393,6 +396,8 @@ static void dump_numa(unsigned char key) printk("Memory location of each domain:\n"); for_each_domain ( d ) { + process_pending_softirqs(); + printk("Domain %u (total: %u):\n", d->domain_id, d->tot_pages); for_each_online_node ( i ) @@ -408,6 +413,70 @@ static void dump_numa(unsigned char key) for_each_online_node ( i ) printk(" Node %u: %u\n", i, page_num_node[i]); + + if ( !read_trylock(&d->vnuma_rwlock) ) + continue; + + if ( !d->vnuma ) + { + read_unlock(&d->vnuma_rwlock); + continue; + } + + vnuma = d->vnuma; + printk(" %u vnodes, %u vcpus, guest physical layout:\n", + vnuma->nr_vnodes, d->max_vcpus); + for ( i = 0; i < vnuma->nr_vnodes; i++ ) + { + unsigned int start_cpu = ~0U; + + err = snprintf(keyhandler_scratch, 12, "%3u", + vnuma->vnode_to_pnode[i]); + if ( err < 0 || vnuma->vnode_to_pnode[i] == NUMA_NO_NODE ) + strlcpy(keyhandler_scratch, "???", sizeof(keyhandler_scratch)); + + printk(" %3u: pnode %s,", i, keyhandler_scratch); + + printk(" vcpus "); + + for ( j = 0; j < d->max_vcpus; j++ ) + { + if ( !(j & 0x3f) ) + process_pending_softirqs(); + + if ( vnuma->vcpu_to_vnode[j] == i ) + { + if ( start_cpu == ~0U ) + { + printk("%d", j); + start_cpu = j; + } + } + else if ( start_cpu != ~0U ) + { + if ( j - 1 != start_cpu ) + printk("-%d ", j - 1); + else + printk(" "); + start_cpu = ~0U; + } + } + + if ( start_cpu != ~0U && start_cpu != j - 1 ) + printk("-%d", j - 1); + + printk("\n"); + + for ( j = 0; j < vnuma->nr_vmemranges; j++ ) + { + if ( vnuma->vmemrange[j].nid == i ) + printk(" %016"PRIx64" - %016"PRIx64"\n", + vnuma->vmemrange[j].start, + vnuma->vmemrange[j].end); + } + } + + read_unlock(&d->vnuma_rwlock); } rcu_read_unlock(&domlist_read_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 Tue Mar 03 12:56:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12: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 1YSmMi-0006FH-05; Tue, 03 Mar 2015 12:56:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMg-0006F5-SZ for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:59 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id D2/9D-03712-E5FA5F45; Tue, 03 Mar 2015 12:55:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1425387356!12655027!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29705 invoked from network); 3 Mar 2015 12:55:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Mar 2015 12:55:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMe-0002XY-8K for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmMe-0003E9-72 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:56 +0000 Date: Tue, 03 Mar 2015 12:55:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: retrieve vNUMA information from hypervisor X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2edb2d8c4a893d11977a5c4fef6fca2d9e68dcbf Author: Wei Liu AuthorDate: Tue Feb 17 14:34:31 2015 +0100 Commit: Jan Beulich CommitDate: Tue Feb 17 14:34:31 2015 +0100 hvmloader: retrieve vNUMA information from hypervisor Hvmloader issues XENMEM_get_vnumainfo hypercall and stores the information retrieved in scratch space for later use. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- tools/firmware/hvmloader/Makefile | 2 +- tools/firmware/hvmloader/hvmloader.c | 3 + tools/firmware/hvmloader/vnuma.c | 80 ++++++++++++++++++++++++++++++++++ tools/firmware/hvmloader/vnuma.h | 52 ++++++++++++++++++++++ 4 files changed, 136 insertions(+), 1 deletions(-) diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index b759e81..cf967fd 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -29,7 +29,7 @@ LOADADDR = 0x100000 CFLAGS += $(CFLAGS_xeninclude) OBJS = hvmloader.o mp_tables.o util.o smbios.o -OBJS += smp.o cacheattr.o xenbus.o +OBJS += smp.o cacheattr.o xenbus.o vnuma.o OBJS += e820.o pci.o pir.o ctype.o OBJS += hvm_param.o ifeq ($(debug),y) diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index 7b0da38..25b7f08 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -26,6 +26,7 @@ #include "pci_regs.h" #include "apic_regs.h" #include "acpi/acpi2_0.h" +#include "vnuma.h" #include #include @@ -310,6 +311,8 @@ int main(void) if ( acpi_enabled ) { + init_vnuma_info(); + if ( bios->acpi_build_tables ) { printf("Loading ACPI ...\n"); diff --git a/tools/firmware/hvmloader/vnuma.c b/tools/firmware/hvmloader/vnuma.c new file mode 100644 index 0000000..4121cc6 --- /dev/null +++ b/tools/firmware/hvmloader/vnuma.c @@ -0,0 +1,80 @@ +/* + * vnuma.c: obtain vNUMA information from hypervisor + * + * Copyright (c) 2014 Wei Liu, Citrix Systems (R&D) Ltd. + * + * 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 AUTHOR 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 AUTHOR 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. + */ + +#include "util.h" +#include "hypercall.h" +#include "vnuma.h" +#include + +unsigned int nr_vnodes, nr_vmemranges; +unsigned int *vcpu_to_vnode, *vdistance; +xen_vmemrange_t *vmemrange; + +void init_vnuma_info(void) +{ + int rc; + struct xen_vnuma_topology_info vnuma_topo = { .domid = DOMID_SELF }; + + rc = hypercall_memory_op(XENMEM_get_vnumainfo, &vnuma_topo); + if ( rc != -XEN_ENOBUFS ) + return; + + ASSERT(vnuma_topo.nr_vcpus == hvm_info->nr_vcpus); + + vcpu_to_vnode = + scratch_alloc(sizeof(*vcpu_to_vnode) * hvm_info->nr_vcpus, 0); + vdistance = scratch_alloc(sizeof(uint32_t) * vnuma_topo.nr_vnodes * + vnuma_topo.nr_vnodes, 0); + vmemrange = scratch_alloc(sizeof(xen_vmemrange_t) * + vnuma_topo.nr_vmemranges, 0); + + set_xen_guest_handle(vnuma_topo.vdistance.h, vdistance); + set_xen_guest_handle(vnuma_topo.vcpu_to_vnode.h, vcpu_to_vnode); + set_xen_guest_handle(vnuma_topo.vmemrange.h, vmemrange); + + rc = hypercall_memory_op(XENMEM_get_vnumainfo, &vnuma_topo); + + if ( rc < 0 ) + { + printf("Failed to retrieve vNUMA information, rc = %d\n", rc); + return; + } + + nr_vnodes = vnuma_topo.nr_vnodes; + nr_vmemranges = vnuma_topo.nr_vmemranges; +} + + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/firmware/hvmloader/vnuma.h b/tools/firmware/hvmloader/vnuma.h new file mode 100644 index 0000000..63b648a --- /dev/null +++ b/tools/firmware/hvmloader/vnuma.h @@ -0,0 +1,52 @@ +/****************************************************************************** + * vnuma.h + * + * Copyright (c) 2014, Wei Liu + * + * 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; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef __HVMLOADER_VNUMA_H__ +#define __HVMLOADER_VNUMA_H__ + +#include + +extern unsigned int nr_vnodes, nr_vmemranges; +extern unsigned int *vcpu_to_vnode, *vdistance; +extern xen_vmemrange_t *vmemrange; + +void init_vnuma_info(void); + +#endif /* __HVMLOADER_VNUMA_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 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 Tue Mar 03 12:56:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12: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 1YSmMi-0006FH-05; Tue, 03 Mar 2015 12:56:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMg-0006F5-SZ for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:59 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id D2/9D-03712-E5FA5F45; Tue, 03 Mar 2015 12:55:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1425387356!12655027!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29705 invoked from network); 3 Mar 2015 12:55:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Mar 2015 12:55:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMe-0002XY-8K for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmMe-0003E9-72 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:55:56 +0000 Date: Tue, 03 Mar 2015 12:55:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: retrieve vNUMA information from hypervisor X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2edb2d8c4a893d11977a5c4fef6fca2d9e68dcbf Author: Wei Liu AuthorDate: Tue Feb 17 14:34:31 2015 +0100 Commit: Jan Beulich CommitDate: Tue Feb 17 14:34:31 2015 +0100 hvmloader: retrieve vNUMA information from hypervisor Hvmloader issues XENMEM_get_vnumainfo hypercall and stores the information retrieved in scratch space for later use. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- tools/firmware/hvmloader/Makefile | 2 +- tools/firmware/hvmloader/hvmloader.c | 3 + tools/firmware/hvmloader/vnuma.c | 80 ++++++++++++++++++++++++++++++++++ tools/firmware/hvmloader/vnuma.h | 52 ++++++++++++++++++++++ 4 files changed, 136 insertions(+), 1 deletions(-) diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index b759e81..cf967fd 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -29,7 +29,7 @@ LOADADDR = 0x100000 CFLAGS += $(CFLAGS_xeninclude) OBJS = hvmloader.o mp_tables.o util.o smbios.o -OBJS += smp.o cacheattr.o xenbus.o +OBJS += smp.o cacheattr.o xenbus.o vnuma.o OBJS += e820.o pci.o pir.o ctype.o OBJS += hvm_param.o ifeq ($(debug),y) diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index 7b0da38..25b7f08 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -26,6 +26,7 @@ #include "pci_regs.h" #include "apic_regs.h" #include "acpi/acpi2_0.h" +#include "vnuma.h" #include #include @@ -310,6 +311,8 @@ int main(void) if ( acpi_enabled ) { + init_vnuma_info(); + if ( bios->acpi_build_tables ) { printf("Loading ACPI ...\n"); diff --git a/tools/firmware/hvmloader/vnuma.c b/tools/firmware/hvmloader/vnuma.c new file mode 100644 index 0000000..4121cc6 --- /dev/null +++ b/tools/firmware/hvmloader/vnuma.c @@ -0,0 +1,80 @@ +/* + * vnuma.c: obtain vNUMA information from hypervisor + * + * Copyright (c) 2014 Wei Liu, Citrix Systems (R&D) Ltd. + * + * 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 AUTHOR 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 AUTHOR 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. + */ + +#include "util.h" +#include "hypercall.h" +#include "vnuma.h" +#include + +unsigned int nr_vnodes, nr_vmemranges; +unsigned int *vcpu_to_vnode, *vdistance; +xen_vmemrange_t *vmemrange; + +void init_vnuma_info(void) +{ + int rc; + struct xen_vnuma_topology_info vnuma_topo = { .domid = DOMID_SELF }; + + rc = hypercall_memory_op(XENMEM_get_vnumainfo, &vnuma_topo); + if ( rc != -XEN_ENOBUFS ) + return; + + ASSERT(vnuma_topo.nr_vcpus == hvm_info->nr_vcpus); + + vcpu_to_vnode = + scratch_alloc(sizeof(*vcpu_to_vnode) * hvm_info->nr_vcpus, 0); + vdistance = scratch_alloc(sizeof(uint32_t) * vnuma_topo.nr_vnodes * + vnuma_topo.nr_vnodes, 0); + vmemrange = scratch_alloc(sizeof(xen_vmemrange_t) * + vnuma_topo.nr_vmemranges, 0); + + set_xen_guest_handle(vnuma_topo.vdistance.h, vdistance); + set_xen_guest_handle(vnuma_topo.vcpu_to_vnode.h, vcpu_to_vnode); + set_xen_guest_handle(vnuma_topo.vmemrange.h, vmemrange); + + rc = hypercall_memory_op(XENMEM_get_vnumainfo, &vnuma_topo); + + if ( rc < 0 ) + { + printf("Failed to retrieve vNUMA information, rc = %d\n", rc); + return; + } + + nr_vnodes = vnuma_topo.nr_vnodes; + nr_vmemranges = vnuma_topo.nr_vmemranges; +} + + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/firmware/hvmloader/vnuma.h b/tools/firmware/hvmloader/vnuma.h new file mode 100644 index 0000000..63b648a --- /dev/null +++ b/tools/firmware/hvmloader/vnuma.h @@ -0,0 +1,52 @@ +/****************************************************************************** + * vnuma.h + * + * Copyright (c) 2014, Wei Liu + * + * 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; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef __HVMLOADER_VNUMA_H__ +#define __HVMLOADER_VNUMA_H__ + +#include + +extern unsigned int nr_vnodes, nr_vmemranges; +extern unsigned int *vcpu_to_vnode, *vdistance; +extern xen_vmemrange_t *vmemrange; + +void init_vnuma_info(void); + +#endif /* __HVMLOADER_VNUMA_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 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 Tue Mar 03 12:56:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12: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 1YSmMu-0006Jm-3I; Tue, 03 Mar 2015 12:56:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMs-0006Ig-GS for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:10 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id CE/FE-31919-96FA5F45; Tue, 03 Mar 2015 12:56:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1425387366!14245275!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17125 invoked from network); 3 Mar 2015 12:56:07 -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; 3 Mar 2015 12:56:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMo-0002Y6-DI for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmMo-0003Ei-Bt for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:06 +0000 Date: Tue, 03 Mar 2015 12:56:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: construct SRAT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e9c8ef535b4b0ec64e9fecf2b264f617d3586fd9 Author: Wei Liu AuthorDate: Tue Feb 17 14:35:08 2015 +0100 Commit: Jan Beulich CommitDate: Tue Feb 17 14:35:08 2015 +0100 hvmloader: construct SRAT Signed-off-by: Wei Liu Acked-by: Jan Beulich --- tools/firmware/hvmloader/acpi/acpi2_0.h | 53 +++++++++++++++++++++++ tools/firmware/hvmloader/acpi/build.c | 69 +++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 0 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/acpi2_0.h b/tools/firmware/hvmloader/acpi/acpi2_0.h index 7b22d80..6169213 100644 --- a/tools/firmware/hvmloader/acpi/acpi2_0.h +++ b/tools/firmware/hvmloader/acpi/acpi2_0.h @@ -364,6 +364,57 @@ struct acpi_20_madt_intsrcovr { }; /* + * System Resource Affinity Table header definition (SRAT) + */ +struct acpi_20_srat { + struct acpi_header header; + uint32_t table_revision; + uint32_t reserved2[2]; +}; + +#define ACPI_SRAT_TABLE_REVISION 1 + +/* + * System Resource Affinity Table structure types. + */ +#define ACPI_PROCESSOR_AFFINITY 0x0 +#define ACPI_MEMORY_AFFINITY 0x1 +struct acpi_20_srat_processor { + uint8_t type; + uint8_t length; + uint8_t domain; + uint8_t apic_id; + uint32_t flags; + uint8_t sapic_id; + uint8_t domain_hi[3]; + uint32_t reserved; +}; + +/* + * Local APIC Affinity Flags. All other bits are reserved and must be 0. + */ +#define ACPI_LOCAL_APIC_AFFIN_ENABLED (1 << 0) + +struct acpi_20_srat_memory { + uint8_t type; + uint8_t length; + uint32_t domain; + uint16_t reserved; + uint64_t base_address; + uint64_t mem_length; + uint32_t reserved2; + uint32_t flags; + uint64_t reserved3; +}; + +/* + * Memory Affinity Flags. All other bits are reserved and must be 0. + */ +#define ACPI_MEM_AFFIN_ENABLED (1 << 0) +#define ACPI_MEM_AFFIN_HOTPLUGGABLE (1 << 1) +#define ACPI_MEM_AFFIN_NONVOLATILE (1 << 2) + +/* * Table Signatures. */ #define ACPI_2_0_RSDP_SIGNATURE ASCII64('R','S','D',' ','P','T','R',' ') @@ -375,6 +426,7 @@ struct acpi_20_madt_intsrcovr { #define ACPI_2_0_TCPA_SIGNATURE ASCII32('T','C','P','A') #define ACPI_2_0_HPET_SIGNATURE ASCII32('H','P','E','T') #define ACPI_2_0_WAET_SIGNATURE ASCII32('W','A','E','T') +#define ACPI_2_0_SRAT_SIGNATURE ASCII32('S','R','A','T') /* * Table revision numbers. @@ -388,6 +440,7 @@ struct acpi_20_madt_intsrcovr { #define ACPI_2_0_HPET_REVISION 0x01 #define ACPI_2_0_WAET_REVISION 0x01 #define ACPI_1_0_FADT_REVISION 0x01 +#define ACPI_2_0_SRAT_REVISION 0x01 #pragma pack () diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index 1431296..828fab5 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -23,6 +23,7 @@ #include "ssdt_pm.h" #include "../config.h" #include "../util.h" +#include "../vnuma.h" #include #include @@ -203,6 +204,63 @@ static struct acpi_20_waet *construct_waet(void) return waet; } +static struct acpi_20_srat *construct_srat(void) +{ + struct acpi_20_srat *srat; + struct acpi_20_srat_processor *processor; + struct acpi_20_srat_memory *memory; + unsigned int size; + void *p; + unsigned int i; + + size = sizeof(*srat) + sizeof(*processor) * hvm_info->nr_vcpus + + sizeof(*memory) * nr_vmemranges; + + p = mem_alloc(size, 16); + if ( !p ) + return NULL; + + srat = memset(p, 0, size); + srat->header.signature = ACPI_2_0_SRAT_SIGNATURE; + srat->header.revision = ACPI_2_0_SRAT_REVISION; + fixed_strcpy(srat->header.oem_id, ACPI_OEM_ID); + fixed_strcpy(srat->header.oem_table_id, ACPI_OEM_TABLE_ID); + srat->header.oem_revision = ACPI_OEM_REVISION; + srat->header.creator_id = ACPI_CREATOR_ID; + srat->header.creator_revision = ACPI_CREATOR_REVISION; + srat->table_revision = ACPI_SRAT_TABLE_REVISION; + + processor = (struct acpi_20_srat_processor *)(srat + 1); + for ( i = 0; i < hvm_info->nr_vcpus; i++ ) + { + processor->type = ACPI_PROCESSOR_AFFINITY; + processor->length = sizeof(*processor); + processor->domain = vcpu_to_vnode[i]; + processor->apic_id = LAPIC_ID(i); + processor->flags = ACPI_LOCAL_APIC_AFFIN_ENABLED; + processor++; + } + + memory = (struct acpi_20_srat_memory *)processor; + for ( i = 0; i < nr_vmemranges; i++ ) + { + memory->type = ACPI_MEMORY_AFFINITY; + memory->length = sizeof(*memory); + memory->domain = vmemrange[i].nid; + memory->flags = ACPI_MEM_AFFIN_ENABLED; + memory->base_address = vmemrange[i].start; + memory->mem_length = vmemrange[i].end - vmemrange[i].start; + memory++; + } + + ASSERT(((unsigned long)memory) - ((unsigned long)p) == size); + + srat->header.length = size; + set_checksum(srat, offsetof(struct acpi_header, checksum), size); + + return srat; +} + static int construct_passthrough_tables(unsigned long *table_ptrs, int nr_tables) { @@ -346,6 +404,17 @@ static int construct_secondary_tables(unsigned long *table_ptrs, } } + /* SRAT */ + if ( nr_vnodes > 0 ) + { + struct acpi_20_srat *srat = construct_srat(); + + if ( srat ) + table_ptrs[nr_tables++] = (unsigned long)srat; + else + printf("Failed to build SRAT, skipping...\n"); + } + /* Load any additional tables passed through. */ nr_tables += construct_passthrough_tables(table_ptrs, nr_tables); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:56:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12: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 1YSmMu-0006Jm-3I; Tue, 03 Mar 2015 12:56:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMs-0006Ig-GS for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:10 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id CE/FE-31919-96FA5F45; Tue, 03 Mar 2015 12:56:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1425387366!14245275!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17125 invoked from network); 3 Mar 2015 12:56:07 -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; 3 Mar 2015 12:56:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMo-0002Y6-DI for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmMo-0003Ei-Bt for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:06 +0000 Date: Tue, 03 Mar 2015 12:56:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: construct SRAT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e9c8ef535b4b0ec64e9fecf2b264f617d3586fd9 Author: Wei Liu AuthorDate: Tue Feb 17 14:35:08 2015 +0100 Commit: Jan Beulich CommitDate: Tue Feb 17 14:35:08 2015 +0100 hvmloader: construct SRAT Signed-off-by: Wei Liu Acked-by: Jan Beulich --- tools/firmware/hvmloader/acpi/acpi2_0.h | 53 +++++++++++++++++++++++ tools/firmware/hvmloader/acpi/build.c | 69 +++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 0 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/acpi2_0.h b/tools/firmware/hvmloader/acpi/acpi2_0.h index 7b22d80..6169213 100644 --- a/tools/firmware/hvmloader/acpi/acpi2_0.h +++ b/tools/firmware/hvmloader/acpi/acpi2_0.h @@ -364,6 +364,57 @@ struct acpi_20_madt_intsrcovr { }; /* + * System Resource Affinity Table header definition (SRAT) + */ +struct acpi_20_srat { + struct acpi_header header; + uint32_t table_revision; + uint32_t reserved2[2]; +}; + +#define ACPI_SRAT_TABLE_REVISION 1 + +/* + * System Resource Affinity Table structure types. + */ +#define ACPI_PROCESSOR_AFFINITY 0x0 +#define ACPI_MEMORY_AFFINITY 0x1 +struct acpi_20_srat_processor { + uint8_t type; + uint8_t length; + uint8_t domain; + uint8_t apic_id; + uint32_t flags; + uint8_t sapic_id; + uint8_t domain_hi[3]; + uint32_t reserved; +}; + +/* + * Local APIC Affinity Flags. All other bits are reserved and must be 0. + */ +#define ACPI_LOCAL_APIC_AFFIN_ENABLED (1 << 0) + +struct acpi_20_srat_memory { + uint8_t type; + uint8_t length; + uint32_t domain; + uint16_t reserved; + uint64_t base_address; + uint64_t mem_length; + uint32_t reserved2; + uint32_t flags; + uint64_t reserved3; +}; + +/* + * Memory Affinity Flags. All other bits are reserved and must be 0. + */ +#define ACPI_MEM_AFFIN_ENABLED (1 << 0) +#define ACPI_MEM_AFFIN_HOTPLUGGABLE (1 << 1) +#define ACPI_MEM_AFFIN_NONVOLATILE (1 << 2) + +/* * Table Signatures. */ #define ACPI_2_0_RSDP_SIGNATURE ASCII64('R','S','D',' ','P','T','R',' ') @@ -375,6 +426,7 @@ struct acpi_20_madt_intsrcovr { #define ACPI_2_0_TCPA_SIGNATURE ASCII32('T','C','P','A') #define ACPI_2_0_HPET_SIGNATURE ASCII32('H','P','E','T') #define ACPI_2_0_WAET_SIGNATURE ASCII32('W','A','E','T') +#define ACPI_2_0_SRAT_SIGNATURE ASCII32('S','R','A','T') /* * Table revision numbers. @@ -388,6 +440,7 @@ struct acpi_20_madt_intsrcovr { #define ACPI_2_0_HPET_REVISION 0x01 #define ACPI_2_0_WAET_REVISION 0x01 #define ACPI_1_0_FADT_REVISION 0x01 +#define ACPI_2_0_SRAT_REVISION 0x01 #pragma pack () diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index 1431296..828fab5 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -23,6 +23,7 @@ #include "ssdt_pm.h" #include "../config.h" #include "../util.h" +#include "../vnuma.h" #include #include @@ -203,6 +204,63 @@ static struct acpi_20_waet *construct_waet(void) return waet; } +static struct acpi_20_srat *construct_srat(void) +{ + struct acpi_20_srat *srat; + struct acpi_20_srat_processor *processor; + struct acpi_20_srat_memory *memory; + unsigned int size; + void *p; + unsigned int i; + + size = sizeof(*srat) + sizeof(*processor) * hvm_info->nr_vcpus + + sizeof(*memory) * nr_vmemranges; + + p = mem_alloc(size, 16); + if ( !p ) + return NULL; + + srat = memset(p, 0, size); + srat->header.signature = ACPI_2_0_SRAT_SIGNATURE; + srat->header.revision = ACPI_2_0_SRAT_REVISION; + fixed_strcpy(srat->header.oem_id, ACPI_OEM_ID); + fixed_strcpy(srat->header.oem_table_id, ACPI_OEM_TABLE_ID); + srat->header.oem_revision = ACPI_OEM_REVISION; + srat->header.creator_id = ACPI_CREATOR_ID; + srat->header.creator_revision = ACPI_CREATOR_REVISION; + srat->table_revision = ACPI_SRAT_TABLE_REVISION; + + processor = (struct acpi_20_srat_processor *)(srat + 1); + for ( i = 0; i < hvm_info->nr_vcpus; i++ ) + { + processor->type = ACPI_PROCESSOR_AFFINITY; + processor->length = sizeof(*processor); + processor->domain = vcpu_to_vnode[i]; + processor->apic_id = LAPIC_ID(i); + processor->flags = ACPI_LOCAL_APIC_AFFIN_ENABLED; + processor++; + } + + memory = (struct acpi_20_srat_memory *)processor; + for ( i = 0; i < nr_vmemranges; i++ ) + { + memory->type = ACPI_MEMORY_AFFINITY; + memory->length = sizeof(*memory); + memory->domain = vmemrange[i].nid; + memory->flags = ACPI_MEM_AFFIN_ENABLED; + memory->base_address = vmemrange[i].start; + memory->mem_length = vmemrange[i].end - vmemrange[i].start; + memory++; + } + + ASSERT(((unsigned long)memory) - ((unsigned long)p) == size); + + srat->header.length = size; + set_checksum(srat, offsetof(struct acpi_header, checksum), size); + + return srat; +} + static int construct_passthrough_tables(unsigned long *table_ptrs, int nr_tables) { @@ -346,6 +404,17 @@ static int construct_secondary_tables(unsigned long *table_ptrs, } } + /* SRAT */ + if ( nr_vnodes > 0 ) + { + struct acpi_20_srat *srat = construct_srat(); + + if ( srat ) + table_ptrs[nr_tables++] = (unsigned long)srat; + else + printf("Failed to build SRAT, skipping...\n"); + } + /* Load any additional tables passed through. */ nr_tables += construct_passthrough_tables(table_ptrs, nr_tables); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:56:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:56: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 1YSmN3-0006N5-6C; Tue, 03 Mar 2015 12:56:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmN1-0006Lu-FK for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:19 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 17/B2-03164-27FA5F45; Tue, 03 Mar 2015 12:56:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425387376!12654076!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17337 invoked from network); 3 Mar 2015 12:56:17 -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; 3 Mar 2015 12:56:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMy-0002YC-J3 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmMy-0003Fe-Gd for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:16 +0000 Date: Tue, 03 Mar 2015 12:56:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: construct SLIT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4677e007d7d4ee46f2ed428dce95ca630230e480 Author: Wei Liu AuthorDate: Tue Feb 17 14:36:03 2015 +0100 Commit: Jan Beulich CommitDate: Tue Feb 17 14:36:03 2015 +0100 hvmloader: construct SLIT Signed-off-by: Wei Liu Acked-by: Jan Beulich Reviewed-by: Andrew Cooper --- tools/firmware/hvmloader/acpi/acpi2_0.h | 8 ++++++ tools/firmware/hvmloader/acpi/build.c | 39 ++++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/acpi2_0.h b/tools/firmware/hvmloader/acpi/acpi2_0.h index 6169213..d698095 100644 --- a/tools/firmware/hvmloader/acpi/acpi2_0.h +++ b/tools/firmware/hvmloader/acpi/acpi2_0.h @@ -414,6 +414,12 @@ struct acpi_20_srat_memory { #define ACPI_MEM_AFFIN_HOTPLUGGABLE (1 << 1) #define ACPI_MEM_AFFIN_NONVOLATILE (1 << 2) +struct acpi_20_slit { + struct acpi_header header; + uint64_t localities; + uint8_t entry[0]; +}; + /* * Table Signatures. */ @@ -427,6 +433,7 @@ struct acpi_20_srat_memory { #define ACPI_2_0_HPET_SIGNATURE ASCII32('H','P','E','T') #define ACPI_2_0_WAET_SIGNATURE ASCII32('W','A','E','T') #define ACPI_2_0_SRAT_SIGNATURE ASCII32('S','R','A','T') +#define ACPI_2_0_SLIT_SIGNATURE ASCII32('S','L','I','T') /* * Table revision numbers. @@ -441,6 +448,7 @@ struct acpi_20_srat_memory { #define ACPI_2_0_WAET_REVISION 0x01 #define ACPI_1_0_FADT_REVISION 0x01 #define ACPI_2_0_SRAT_REVISION 0x01 +#define ACPI_2_0_SLIT_REVISION 0x01 #pragma pack () diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index 828fab5..3276df2 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -261,6 +261,38 @@ static struct acpi_20_srat *construct_srat(void) return srat; } +static struct acpi_20_slit *construct_slit(void) +{ + struct acpi_20_slit *slit; + unsigned int i, num, size; + + num = nr_vnodes * nr_vnodes; + size = sizeof(*slit) + num * sizeof(uint8_t); + + slit = mem_alloc(size, 16); + if ( !slit ) + return NULL; + + memset(slit, 0, size); + slit->header.signature = ACPI_2_0_SLIT_SIGNATURE; + slit->header.revision = ACPI_2_0_SLIT_REVISION; + fixed_strcpy(slit->header.oem_id, ACPI_OEM_ID); + fixed_strcpy(slit->header.oem_table_id, ACPI_OEM_TABLE_ID); + slit->header.oem_revision = ACPI_OEM_REVISION; + slit->header.creator_id = ACPI_CREATOR_ID; + slit->header.creator_revision = ACPI_CREATOR_REVISION; + + for ( i = 0; i < num; i++ ) + slit->entry[i] = vdistance[i]; + + slit->localities = nr_vnodes; + + slit->header.length = size; + set_checksum(slit, offsetof(struct acpi_header, checksum), size); + + return slit; +} + static int construct_passthrough_tables(unsigned long *table_ptrs, int nr_tables) { @@ -404,15 +436,20 @@ static int construct_secondary_tables(unsigned long *table_ptrs, } } - /* SRAT */ + /* SRAT and SLIT */ if ( nr_vnodes > 0 ) { struct acpi_20_srat *srat = construct_srat(); + struct acpi_20_slit *slit = construct_slit(); if ( srat ) table_ptrs[nr_tables++] = (unsigned long)srat; else printf("Failed to build SRAT, skipping...\n"); + if ( slit ) + table_ptrs[nr_tables++] = (unsigned long)slit; + else + printf("Failed to build SLIT, skipping...\n"); } /* Load any additional tables passed through. */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:56:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:56: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 1YSmN3-0006N5-6C; Tue, 03 Mar 2015 12:56:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmN1-0006Lu-FK for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:19 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 17/B2-03164-27FA5F45; Tue, 03 Mar 2015 12:56:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425387376!12654076!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17337 invoked from network); 3 Mar 2015 12:56:17 -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; 3 Mar 2015 12:56:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmMy-0002YC-J3 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmMy-0003Fe-Gd for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:16 +0000 Date: Tue, 03 Mar 2015 12:56:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: construct SLIT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4677e007d7d4ee46f2ed428dce95ca630230e480 Author: Wei Liu AuthorDate: Tue Feb 17 14:36:03 2015 +0100 Commit: Jan Beulich CommitDate: Tue Feb 17 14:36:03 2015 +0100 hvmloader: construct SLIT Signed-off-by: Wei Liu Acked-by: Jan Beulich Reviewed-by: Andrew Cooper --- tools/firmware/hvmloader/acpi/acpi2_0.h | 8 ++++++ tools/firmware/hvmloader/acpi/build.c | 39 ++++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/acpi2_0.h b/tools/firmware/hvmloader/acpi/acpi2_0.h index 6169213..d698095 100644 --- a/tools/firmware/hvmloader/acpi/acpi2_0.h +++ b/tools/firmware/hvmloader/acpi/acpi2_0.h @@ -414,6 +414,12 @@ struct acpi_20_srat_memory { #define ACPI_MEM_AFFIN_HOTPLUGGABLE (1 << 1) #define ACPI_MEM_AFFIN_NONVOLATILE (1 << 2) +struct acpi_20_slit { + struct acpi_header header; + uint64_t localities; + uint8_t entry[0]; +}; + /* * Table Signatures. */ @@ -427,6 +433,7 @@ struct acpi_20_srat_memory { #define ACPI_2_0_HPET_SIGNATURE ASCII32('H','P','E','T') #define ACPI_2_0_WAET_SIGNATURE ASCII32('W','A','E','T') #define ACPI_2_0_SRAT_SIGNATURE ASCII32('S','R','A','T') +#define ACPI_2_0_SLIT_SIGNATURE ASCII32('S','L','I','T') /* * Table revision numbers. @@ -441,6 +448,7 @@ struct acpi_20_srat_memory { #define ACPI_2_0_WAET_REVISION 0x01 #define ACPI_1_0_FADT_REVISION 0x01 #define ACPI_2_0_SRAT_REVISION 0x01 +#define ACPI_2_0_SLIT_REVISION 0x01 #pragma pack () diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index 828fab5..3276df2 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -261,6 +261,38 @@ static struct acpi_20_srat *construct_srat(void) return srat; } +static struct acpi_20_slit *construct_slit(void) +{ + struct acpi_20_slit *slit; + unsigned int i, num, size; + + num = nr_vnodes * nr_vnodes; + size = sizeof(*slit) + num * sizeof(uint8_t); + + slit = mem_alloc(size, 16); + if ( !slit ) + return NULL; + + memset(slit, 0, size); + slit->header.signature = ACPI_2_0_SLIT_SIGNATURE; + slit->header.revision = ACPI_2_0_SLIT_REVISION; + fixed_strcpy(slit->header.oem_id, ACPI_OEM_ID); + fixed_strcpy(slit->header.oem_table_id, ACPI_OEM_TABLE_ID); + slit->header.oem_revision = ACPI_OEM_REVISION; + slit->header.creator_id = ACPI_CREATOR_ID; + slit->header.creator_revision = ACPI_CREATOR_REVISION; + + for ( i = 0; i < num; i++ ) + slit->entry[i] = vdistance[i]; + + slit->localities = nr_vnodes; + + slit->header.length = size; + set_checksum(slit, offsetof(struct acpi_header, checksum), size); + + return slit; +} + static int construct_passthrough_tables(unsigned long *table_ptrs, int nr_tables) { @@ -404,15 +436,20 @@ static int construct_secondary_tables(unsigned long *table_ptrs, } } - /* SRAT */ + /* SRAT and SLIT */ if ( nr_vnodes > 0 ) { struct acpi_20_srat *srat = construct_srat(); + struct acpi_20_slit *slit = construct_slit(); if ( srat ) table_ptrs[nr_tables++] = (unsigned long)srat; else printf("Failed to build SRAT, skipping...\n"); + if ( slit ) + table_ptrs[nr_tables++] = (unsigned long)slit; + else + printf("Failed to build SLIT, skipping...\n"); } /* Load any additional tables passed through. */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:56:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12: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 1YSmND-0006Ri-9U; Tue, 03 Mar 2015 12:56:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNB-0006Pi-9B for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:29 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 17/C1-02994-C7FA5F45; Tue, 03 Mar 2015 12:56:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1425387387!7225012!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21540 invoked from network); 3 Mar 2015 12:56:27 -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; 3 Mar 2015 12:56:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmN8-0002YI-Pb for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmN8-0003G1-Oi for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:26 +0000 Date: Tue, 03 Mar 2015 12:56:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/Coverity: audit of MISSING_BREAK defects X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4f3d3612e6e1311440f0c268a7bf950d3c760839 Author: Andrew Cooper AuthorDate: Tue Feb 17 14:36:26 2015 +0100 Commit: Jan Beulich CommitDate: Tue Feb 17 14:36:26 2015 +0100 xen/Coverity: audit of MISSING_BREAK defects Coverity uses several heuristics to identify when one case statement legitimately falls through into the next, and a comment as the final item in a case statement is one heuristic (the assumption being that it is a justification for the fallthrough). Use this to perform an audit of defects and hide the legitimate fallthroughs. No functional change. All identified fallthroughs are legitimate. Signed-off-by: Andrew Cooper Coverity-IDs: 1055483, 1055484, 1055486 - 1055488, 1055490 - 1055496, 1055498 - 1055500, 1055501, 1220091 Reviewed-by: Don Koch Acked-by: Jan Beulich --- xen/arch/x86/hvm/emulate.c | 1 + xen/arch/x86/hvm/svm/svm.c | 1 + xen/arch/x86/hvm/vlapic.c | 1 + xen/arch/x86/mm.c | 2 ++ xen/arch/x86/traps.c | 3 +++ xen/arch/x86/x86_64/compat/mm.c | 1 + xen/common/lib.c | 4 ++++ xen/common/schedule.c | 1 + 8 files changed, 14 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 636c909..c657bc6 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -161,6 +161,7 @@ static int hvmemul_do_io( put_page(ram_page); return X86EMUL_RETRY; } + /* fallthrough */ default: if ( ram_page ) put_page(ram_page); diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index a7655bd..018dd70 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2378,6 +2378,7 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) case NESTEDHVM_VMEXIT_ERROR: break; } + /* fallthrough */ case NESTEDHVM_VMEXIT_ERROR: gdprintk(XENLOG_ERR, "nestedsvm_check_intercepts() returned NESTEDHVM_VMEXIT_ERROR\n"); diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 5da6d8f..cee8699 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -762,6 +762,7 @@ static int vlapic_reg_write(struct vcpu *v, vlapic->hw.tdt_msr = 0; } vlapic->pt.irq = val & APIC_VECTOR_MASK; + /* fallthrough */ case APIC_LVTTHMR: /* LVT Thermal Monitor */ case APIC_LVTPC: /* LVT Performance Counter */ case APIC_LVT0: /* LVT LINT0 Reg */ diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index d4965da..12e5006 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2771,6 +2771,7 @@ int new_guest_cr3(unsigned long mfn) { case -EINTR: rc = -ERESTART; + /* fallthrough */ case -ERESTART: curr->arch.old_guest_table = page; break; @@ -3126,6 +3127,7 @@ long do_mmuext_op( { case -EINTR: rc = -ERESTART; + /* fallthrough */ case -ERESTART: curr->arch.old_guest_table = page; okay = 0; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index f5516dc..057a7af 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1739,7 +1739,9 @@ static int guest_io_okay( port>>3, 2) ) { default: x.bytes[0] = ~0; + /* fallthrough */ case 1: x.bytes[1] = ~0; + /* fallthrough */ case 0: break; } TOGGLE_MODE(); @@ -3320,6 +3322,7 @@ static void pci_serr_error(const struct cpu_user_regs *regs) { case 'd': /* 'dom0' */ nmi_hwdom_report(_XEN_NMIREASON_pci_serr); + /* fallthrough */ case 'i': /* 'ignore' */ /* Would like to print a diagnostic here but can't call printk() from NMI context -- raise a softirq instead. */ diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c index f90f611..1491ce3 100644 --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -292,6 +292,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops, break; case MMUEXT_NEW_USER_BASEPTR: rc = -EINVAL; + /* fallthrough */ case MMUEXT_TLB_FLUSH_LOCAL: case MMUEXT_TLB_FLUSH_MULTI: case MMUEXT_TLB_FLUSH_ALL: diff --git a/xen/common/lib.c b/xen/common/lib.c index 89c74ad..ae0bbb3 100644 --- a/xen/common/lib.c +++ b/xen/common/lib.c @@ -461,12 +461,16 @@ unsigned long long parse_size_and_unit(const char *s, const char **ps) { case 'T': case 't': ret <<= 10; + /* fallthrough */ case 'G': case 'g': ret <<= 10; + /* fallthrough */ case 'M': case 'm': ret <<= 10; + /* fallthrough */ case 'K': case 'k': ret <<= 10; + /* fallthrough */ case 'B': case 'b': s1++; break; diff --git a/xen/common/schedule.c b/xen/common/schedule.c index b73177f..ef79847 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -1179,6 +1179,7 @@ static void schedule(void) { case TASKLET_enqueued: set_bit(_TASKLET_scheduled, tasklet_work); + /* fallthrough */ case TASKLET_enqueued|TASKLET_scheduled: tasklet_work_scheduled = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 12:56:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12: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 1YSmND-0006Ri-9U; Tue, 03 Mar 2015 12:56:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNB-0006Pi-9B for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:29 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 17/C1-02994-C7FA5F45; Tue, 03 Mar 2015 12:56:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1425387387!7225012!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21540 invoked from network); 3 Mar 2015 12:56:27 -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; 3 Mar 2015 12:56:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmN8-0002YI-Pb for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmN8-0003G1-Oi for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:26 +0000 Date: Tue, 03 Mar 2015 12:56:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/Coverity: audit of MISSING_BREAK defects X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4f3d3612e6e1311440f0c268a7bf950d3c760839 Author: Andrew Cooper AuthorDate: Tue Feb 17 14:36:26 2015 +0100 Commit: Jan Beulich CommitDate: Tue Feb 17 14:36:26 2015 +0100 xen/Coverity: audit of MISSING_BREAK defects Coverity uses several heuristics to identify when one case statement legitimately falls through into the next, and a comment as the final item in a case statement is one heuristic (the assumption being that it is a justification for the fallthrough). Use this to perform an audit of defects and hide the legitimate fallthroughs. No functional change. All identified fallthroughs are legitimate. Signed-off-by: Andrew Cooper Coverity-IDs: 1055483, 1055484, 1055486 - 1055488, 1055490 - 1055496, 1055498 - 1055500, 1055501, 1220091 Reviewed-by: Don Koch Acked-by: Jan Beulich --- xen/arch/x86/hvm/emulate.c | 1 + xen/arch/x86/hvm/svm/svm.c | 1 + xen/arch/x86/hvm/vlapic.c | 1 + xen/arch/x86/mm.c | 2 ++ xen/arch/x86/traps.c | 3 +++ xen/arch/x86/x86_64/compat/mm.c | 1 + xen/common/lib.c | 4 ++++ xen/common/schedule.c | 1 + 8 files changed, 14 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 636c909..c657bc6 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -161,6 +161,7 @@ static int hvmemul_do_io( put_page(ram_page); return X86EMUL_RETRY; } + /* fallthrough */ default: if ( ram_page ) put_page(ram_page); diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index a7655bd..018dd70 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2378,6 +2378,7 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) case NESTEDHVM_VMEXIT_ERROR: break; } + /* fallthrough */ case NESTEDHVM_VMEXIT_ERROR: gdprintk(XENLOG_ERR, "nestedsvm_check_intercepts() returned NESTEDHVM_VMEXIT_ERROR\n"); diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 5da6d8f..cee8699 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -762,6 +762,7 @@ static int vlapic_reg_write(struct vcpu *v, vlapic->hw.tdt_msr = 0; } vlapic->pt.irq = val & APIC_VECTOR_MASK; + /* fallthrough */ case APIC_LVTTHMR: /* LVT Thermal Monitor */ case APIC_LVTPC: /* LVT Performance Counter */ case APIC_LVT0: /* LVT LINT0 Reg */ diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index d4965da..12e5006 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2771,6 +2771,7 @@ int new_guest_cr3(unsigned long mfn) { case -EINTR: rc = -ERESTART; + /* fallthrough */ case -ERESTART: curr->arch.old_guest_table = page; break; @@ -3126,6 +3127,7 @@ long do_mmuext_op( { case -EINTR: rc = -ERESTART; + /* fallthrough */ case -ERESTART: curr->arch.old_guest_table = page; okay = 0; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index f5516dc..057a7af 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1739,7 +1739,9 @@ static int guest_io_okay( port>>3, 2) ) { default: x.bytes[0] = ~0; + /* fallthrough */ case 1: x.bytes[1] = ~0; + /* fallthrough */ case 0: break; } TOGGLE_MODE(); @@ -3320,6 +3322,7 @@ static void pci_serr_error(const struct cpu_user_regs *regs) { case 'd': /* 'dom0' */ nmi_hwdom_report(_XEN_NMIREASON_pci_serr); + /* fallthrough */ case 'i': /* 'ignore' */ /* Would like to print a diagnostic here but can't call printk() from NMI context -- raise a softirq instead. */ diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c index f90f611..1491ce3 100644 --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -292,6 +292,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops, break; case MMUEXT_NEW_USER_BASEPTR: rc = -EINVAL; + /* fallthrough */ case MMUEXT_TLB_FLUSH_LOCAL: case MMUEXT_TLB_FLUSH_MULTI: case MMUEXT_TLB_FLUSH_ALL: diff --git a/xen/common/lib.c b/xen/common/lib.c index 89c74ad..ae0bbb3 100644 --- a/xen/common/lib.c +++ b/xen/common/lib.c @@ -461,12 +461,16 @@ unsigned long long parse_size_and_unit(const char *s, const char **ps) { case 'T': case 't': ret <<= 10; + /* fallthrough */ case 'G': case 'g': ret <<= 10; + /* fallthrough */ case 'M': case 'm': ret <<= 10; + /* fallthrough */ case 'K': case 'k': ret <<= 10; + /* fallthrough */ case 'B': case 'b': s1++; break; diff --git a/xen/common/schedule.c b/xen/common/schedule.c index b73177f..ef79847 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -1179,6 +1179,7 @@ static void schedule(void) { case TASKLET_enqueued: set_bit(_TASKLET_scheduled, tasklet_work); + /* fallthrough */ case TASKLET_enqueued|TASKLET_scheduled: tasklet_work_scheduled = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 12:56:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:56: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 1YSmNM-0006Vd-F5; Tue, 03 Mar 2015 12:56:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNL-0006V3-Ay for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:39 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id BC/6B-03736-68FA5F45; Tue, 03 Mar 2015 12:56:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1425387397!5047906!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21105 invoked from network); 3 Mar 2015 12:56:38 -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; 3 Mar 2015 12:56:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNI-0002YQ-Vd for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmNI-0003Gh-UO for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:36 +0000 Date: Tue, 03 Mar 2015 12:56:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v2: Don't crash the hypervisor if the SGI target mode is invalid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 97c4e77538f24786dc7521cdffb2b4d6e3dad7ed Author: Julien Grall AuthorDate: Fri Jan 23 14:15:07 2015 +0000 Commit: Ian Campbell CommitDate: Wed Feb 18 10:26:13 2015 +0000 xen/arm: vgic-v2: Don't crash the hypervisor if the SGI target mode is invalid The GICv2 spec reserved the value 0b11 for GICD_SGIR.TargetListFilter. Even if it's an invalid value, a malicious guest could write this value and threfore crash the hypervisor. Replace the BUG() by logging the error and inject a data abort to the guest. This was introduced by commit ea37fd21110b6fbcf9257f814076a243d3873cb7 "xen/arm: split vgic driver into generic and vgic-v2 driver". This is CVE-2015-0268 / XSA-117. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 515faf7..3b87f54 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -257,7 +257,10 @@ static int vgic_v2_to_sgi(struct vcpu *v, register_t sgir) sgi_mode = SGI_TARGET_SELF; break; default: - BUG(); + printk(XENLOG_G_DEBUG + "%pv: vGICD: unhandled GICD_SGIR write %"PRIregister" with wrong mode\n", + v, sgir); + return 0; } return vgic_to_sgi(v, sgir, sgi_mode, virq, vcpu_mask); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:56:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:56: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 1YSmNM-0006Vd-F5; Tue, 03 Mar 2015 12:56:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNL-0006V3-Ay for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:39 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id BC/6B-03736-68FA5F45; Tue, 03 Mar 2015 12:56:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1425387397!5047906!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21105 invoked from network); 3 Mar 2015 12:56:38 -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; 3 Mar 2015 12:56:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNI-0002YQ-Vd for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmNI-0003Gh-UO for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:36 +0000 Date: Tue, 03 Mar 2015 12:56:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v2: Don't crash the hypervisor if the SGI target mode is invalid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 97c4e77538f24786dc7521cdffb2b4d6e3dad7ed Author: Julien Grall AuthorDate: Fri Jan 23 14:15:07 2015 +0000 Commit: Ian Campbell CommitDate: Wed Feb 18 10:26:13 2015 +0000 xen/arm: vgic-v2: Don't crash the hypervisor if the SGI target mode is invalid The GICv2 spec reserved the value 0b11 for GICD_SGIR.TargetListFilter. Even if it's an invalid value, a malicious guest could write this value and threfore crash the hypervisor. Replace the BUG() by logging the error and inject a data abort to the guest. This was introduced by commit ea37fd21110b6fbcf9257f814076a243d3873cb7 "xen/arm: split vgic driver into generic and vgic-v2 driver". This is CVE-2015-0268 / XSA-117. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 515faf7..3b87f54 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -257,7 +257,10 @@ static int vgic_v2_to_sgi(struct vcpu *v, register_t sgir) sgi_mode = SGI_TARGET_SELF; break; default: - BUG(); + printk(XENLOG_G_DEBUG + "%pv: vGICD: unhandled GICD_SGIR write %"PRIregister" with wrong mode\n", + v, sgir); + return 0; } return vgic_to_sgi(v, sgir, sgi_mode, virq, vcpu_mask); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:56:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:56:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNX-0006aw-I0; Tue, 03 Mar 2015 12:56:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNW-0006aU-AG for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:50 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 2F/98-02804-19FA5F45; Tue, 03 Mar 2015 12:56:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1425387407!7340221!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22563 invoked from network); 3 Mar 2015 12:56: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; 3 Mar 2015 12:56:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNT-0002YY-50 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmNT-0003H3-49 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:47 +0000 Date: Tue, 03 Mar 2015 12:56:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] introduce and use relaxed cpumask bitops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4aaca0e9cd09ea86df2d86a0ccbfbcdfb2c37453 Author: Jan Beulich AuthorDate: Wed Feb 18 16:55:17 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 16:55:17 2015 +0100 introduce and use relaxed cpumask bitops Using atomic (LOCKed on x86) bitops for certain of the operations on cpumask_t is overkill when the variables aren't concurrently accessible (e.g. local function variables, or due to explicit locking). Introduce alternatives using non-atomic bitops and use them where appropriate. Note that this - adds a volatile qualifier to cpumask_test_and_{clear,set}_cpu() (should have been there from the beginning, like is the case for cpumask_{clear,set}_cpu()) - replaces several cpumask_clear()+cpumask_set_cpu(, n) pairs by the simpler cpumask_copy(, cpumask_of(n)) (or just cpumask_of(n) if we can do without copying) Signed-off-by: Jan Beulich Acked-by: George Dunlap Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/arch/x86/hpet.c | 4 ++-- xen/arch/x86/irq.c | 2 +- xen/arch/x86/mm.c | 2 +- xen/arch/x86/platform_hypercall.c | 2 +- xen/arch/x86/time.c | 2 +- xen/common/core_parking.c | 20 ++++++++------------ xen/common/cpu.c | 2 +- xen/common/page_alloc.c | 4 ++-- xen/common/sched_credit.c | 12 ++++++------ xen/common/sched_rt.c | 7 ++----- xen/common/softirq.c | 6 +++--- xen/include/xen/cpumask.h | 24 ++++++++++++++++++++++-- 12 files changed, 50 insertions(+), 37 deletions(-) diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index 7aa740f..8f36f6f 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -158,7 +158,7 @@ static void evt_do_broadcast(cpumask_t *mask) { unsigned int cpu = smp_processor_id(); - if ( cpumask_test_and_clear_cpu(cpu, mask) ) + if ( __cpumask_test_and_clear_cpu(cpu, mask) ) raise_softirq(TIMER_SOFTIRQ); cpuidle_wakeup_mwait(mask); @@ -197,7 +197,7 @@ again: continue; if ( deadline <= now ) - cpumask_set_cpu(cpu, &mask); + __cpumask_set_cpu(cpu, &mask); else if ( deadline < next_event ) next_event = deadline; } diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index f214072..92e1854 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1450,7 +1450,7 @@ void desc_guest_eoi(struct irq_desc *desc, struct pirq *pirq) cpumask_copy(&cpu_eoi_map, action->cpu_eoi_map); - if ( cpumask_test_and_clear_cpu(smp_processor_id(), &cpu_eoi_map) ) + if ( __cpumask_test_and_clear_cpu(smp_processor_id(), &cpu_eoi_map) ) { __set_eoi_ready(desc); spin_unlock(&desc->lock); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 12e5006..9ab7a26 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3218,7 +3218,7 @@ long do_mmuext_op( for_each_online_cpu(cpu) if ( !cpumask_intersects(&mask, per_cpu(cpu_sibling_mask, cpu)) ) - cpumask_set_cpu(cpu, &mask); + __cpumask_set_cpu(cpu, &mask); flush_mask(&mask, FLUSH_CACHE); } else diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index b427852..c725501 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -489,7 +489,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE_PARAM(xen_platform_op_t) u_xenpf_op) if ( !idletime ) { - cpumask_clear_cpu(cpu, cpumap); + __cpumask_clear_cpu(cpu, cpumap); continue; } diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index b609938..becff99 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -179,7 +179,7 @@ static void smp_send_timer_broadcast_ipi(void) if ( cpumask_test_cpu(cpu, &mask) ) { - cpumask_clear_cpu(cpu, &mask); + __cpumask_clear_cpu(cpu, &mask); raise_softirq(TIMER_SOFTIRQ); } diff --git a/xen/common/core_parking.c b/xen/common/core_parking.c index 3190fb7..de269e0 100644 --- a/xen/common/core_parking.c +++ b/xen/common/core_parking.c @@ -75,11 +75,10 @@ static unsigned int core_parking_performance(unsigned int event) if ( core_weight < core_tmp ) { core_weight = core_tmp; - cpumask_clear(&core_candidate_map); - cpumask_set_cpu(cpu, &core_candidate_map); + cpumask_copy(&core_candidate_map, cpumask_of(cpu)); } else if ( core_weight == core_tmp ) - cpumask_set_cpu(cpu, &core_candidate_map); + __cpumask_set_cpu(cpu, &core_candidate_map); } for_each_cpu(cpu, &core_candidate_map) @@ -88,11 +87,10 @@ static unsigned int core_parking_performance(unsigned int event) if ( sibling_weight < sibling_tmp ) { sibling_weight = sibling_tmp; - cpumask_clear(&sibling_candidate_map); - cpumask_set_cpu(cpu, &sibling_candidate_map); + cpumask_copy(&sibling_candidate_map, cpumask_of(cpu)); } else if ( sibling_weight == sibling_tmp ) - cpumask_set_cpu(cpu, &sibling_candidate_map); + __cpumask_set_cpu(cpu, &sibling_candidate_map); } cpu = cpumask_first(&sibling_candidate_map); @@ -135,11 +133,10 @@ static unsigned int core_parking_power(unsigned int event) if ( core_weight > core_tmp ) { core_weight = core_tmp; - cpumask_clear(&core_candidate_map); - cpumask_set_cpu(cpu, &core_candidate_map); + cpumask_copy(&core_candidate_map, cpumask_of(cpu)); } else if ( core_weight == core_tmp ) - cpumask_set_cpu(cpu, &core_candidate_map); + __cpumask_set_cpu(cpu, &core_candidate_map); } for_each_cpu(cpu, &core_candidate_map) @@ -148,11 +145,10 @@ static unsigned int core_parking_power(unsigned int event) if ( sibling_weight > sibling_tmp ) { sibling_weight = sibling_tmp; - cpumask_clear(&sibling_candidate_map); - cpumask_set_cpu(cpu, &sibling_candidate_map); + cpumask_copy(&sibling_candidate_map, cpumask_of(cpu)); } else if ( sibling_weight == sibling_tmp ) - cpumask_set_cpu(cpu, &sibling_candidate_map); + __cpumask_set_cpu(cpu, &sibling_candidate_map); } cpu = cpumask_first(&sibling_candidate_map); diff --git a/xen/common/cpu.c b/xen/common/cpu.c index 630881e..47e8b5b 100644 --- a/xen/common/cpu.c +++ b/xen/common/cpu.c @@ -192,7 +192,7 @@ int disable_nonboot_cpus(void) break; } - cpumask_set_cpu(cpu, &frozen_cpus); + __cpumask_set_cpu(cpu, &frozen_cpus); } BUG_ON(!error && (num_online_cpus() != 1)); diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index be6821b..3c27af9 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1337,7 +1337,7 @@ static int __init find_non_smt(unsigned int node, cpumask_t *dest) if ( cpumask_intersects(dest, per_cpu(cpu_sibling_mask, i)) ) continue; cpu = cpumask_first(per_cpu(cpu_sibling_mask, i)); - cpumask_set_cpu(cpu, dest); + __cpumask_set_cpu(cpu, dest); } return cpumask_weight(dest); } @@ -1449,7 +1449,7 @@ void __init scrub_heap_pages(void) cpus = find_non_smt(best_node, &node_cpus); if ( cpus == 0 ) { - cpumask_set_cpu(smp_processor_id(), &node_cpus); + __cpumask_set_cpu(smp_processor_id(), &node_cpus); cpus = 1; } /* We already have the node information from round #0. */ diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 8b02b7b..156b43b 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -372,7 +372,7 @@ __runq_tickle(unsigned int cpu, struct csched_vcpu *new) { if ( cur->pri != CSCHED_PRI_IDLE ) SCHED_STAT_CRANK(tickle_idlers_none); - cpumask_set_cpu(cpu, &mask); + __cpumask_set_cpu(cpu, &mask); } else if ( !idlers_empty ) { @@ -422,7 +422,7 @@ __runq_tickle(unsigned int cpu, struct csched_vcpu *new) SCHED_VCPU_STAT_CRANK(cur, migrate_r); SCHED_STAT_CRANK(migrate_kicked_away); set_bit(_VPF_migrating, &cur->vcpu->pause_flags); - cpumask_set_cpu(cpu, &mask); + __cpumask_set_cpu(cpu, &mask); } else if ( !new_idlers_empty ) { @@ -432,7 +432,7 @@ __runq_tickle(unsigned int cpu, struct csched_vcpu *new) { this_cpu(last_tickle_cpu) = cpumask_cycle(this_cpu(last_tickle_cpu), &idle_mask); - cpumask_set_cpu(this_cpu(last_tickle_cpu), &mask); + __cpumask_set_cpu(this_cpu(last_tickle_cpu), &mask); } else cpumask_or(&mask, &mask, &idle_mask); @@ -675,7 +675,7 @@ _csched_cpu_pick(const struct scheduler *ops, struct vcpu *vc, bool_t commit) */ cpumask_and(&idlers, &cpu_online_map, CSCHED_PRIV(ops)->idlers); if ( vc->processor == cpu && IS_RUNQ_IDLE(cpu) ) - cpumask_set_cpu(cpu, &idlers); + __cpumask_set_cpu(cpu, &idlers); cpumask_and(&cpus, &cpus, &idlers); /* @@ -692,7 +692,7 @@ _csched_cpu_pick(const struct scheduler *ops, struct vcpu *vc, bool_t commit) */ if ( !cpumask_test_cpu(cpu, &cpus) && !cpumask_empty(&cpus) ) cpu = cpumask_cycle(cpu, &cpus); - cpumask_clear_cpu(cpu, &cpus); + __cpumask_clear_cpu(cpu, &cpus); while ( !cpumask_empty(&cpus) ) { @@ -1536,7 +1536,7 @@ csched_load_balance(struct csched_private *prv, int cpu, /* Find out what the !idle are in this node */ cpumask_andnot(&workers, online, prv->idlers); cpumask_and(&workers, &workers, &node_to_cpumask(peer_node)); - cpumask_clear_cpu(cpu, &workers); + __cpumask_clear_cpu(cpu, &workers); peer_cpu = cpumask_first(&workers); if ( peer_cpu >= nr_cpu_ids ) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index e70d6c7..df4adac 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -663,7 +663,7 @@ burn_budget(const struct scheduler *ops, struct rt_vcpu *svc, s_time_t now) * lock is grabbed before calling this function */ static struct rt_vcpu * -__runq_pick(const struct scheduler *ops, cpumask_t *mask) +__runq_pick(const struct scheduler *ops, const cpumask_t *mask) { struct list_head *runq = rt_runq(ops); struct list_head *iter; @@ -780,10 +780,7 @@ rt_schedule(const struct scheduler *ops, s_time_t now, bool_t tasklet_work_sched } else { - cpumask_t cur_cpu; - cpumask_clear(&cur_cpu); - cpumask_set_cpu(cpu, &cur_cpu); - snext = __runq_pick(ops, &cur_cpu); + snext = __runq_pick(ops, cpumask_of(cpu)); if ( snext == NULL ) snext = rt_vcpu(idle_vcpu[cpu]); diff --git a/xen/common/softirq.c b/xen/common/softirq.c index 22e417a..bb79aac 100644 --- a/xen/common/softirq.c +++ b/xen/common/softirq.c @@ -88,7 +88,7 @@ void cpumask_raise_softirq(const cpumask_t *mask, unsigned int nr) if ( !test_and_set_bit(nr, &softirq_pending(cpu)) && cpu != this_cpu && !arch_skip_send_event_check(cpu) ) - cpumask_set_cpu(cpu, raise_mask); + __cpumask_set_cpu(cpu, raise_mask); if ( raise_mask == &send_mask ) smp_send_event_check_mask(raise_mask); @@ -106,7 +106,7 @@ void cpu_raise_softirq(unsigned int cpu, unsigned int nr) if ( !per_cpu(batching, this_cpu) || in_irq() ) smp_send_event_check_cpu(cpu); else - set_bit(nr, &per_cpu(batch_mask, this_cpu)); + __cpumask_set_cpu(nr, &per_cpu(batch_mask, this_cpu)); } void cpu_raise_softirq_batch_begin(void) @@ -122,7 +122,7 @@ void cpu_raise_softirq_batch_finish(void) ASSERT(per_cpu(batching, this_cpu)); for_each_cpu ( cpu, mask ) if ( !softirq_pending(cpu) ) - cpumask_clear_cpu(cpu, mask); + __cpumask_clear_cpu(cpu, mask); smp_send_event_check_mask(mask); cpumask_clear(mask); --per_cpu(batching, this_cpu); diff --git a/xen/include/xen/cpumask.h b/xen/include/xen/cpumask.h index 850b4a2..0e7108c 100644 --- a/xen/include/xen/cpumask.h +++ b/xen/include/xen/cpumask.h @@ -103,11 +103,21 @@ static inline void cpumask_set_cpu(int cpu, volatile cpumask_t *dstp) set_bit(cpumask_check(cpu), dstp->bits); } +static inline void __cpumask_set_cpu(int cpu, cpumask_t *dstp) +{ + __set_bit(cpumask_check(cpu), dstp->bits); +} + static inline void cpumask_clear_cpu(int cpu, volatile cpumask_t *dstp) { clear_bit(cpumask_check(cpu), dstp->bits); } +static inline void __cpumask_clear_cpu(int cpu, cpumask_t *dstp) +{ + __clear_bit(cpumask_check(cpu), dstp->bits); +} + static inline void cpumask_setall(cpumask_t *dstp) { bitmap_fill(dstp->bits, nr_cpumask_bits); @@ -122,16 +132,26 @@ static inline void cpumask_clear(cpumask_t *dstp) #define cpumask_test_cpu(cpu, cpumask) \ test_bit(cpumask_check(cpu), (cpumask)->bits) -static inline int cpumask_test_and_set_cpu(int cpu, cpumask_t *addr) +static inline int cpumask_test_and_set_cpu(int cpu, volatile cpumask_t *addr) { return test_and_set_bit(cpumask_check(cpu), addr->bits); } -static inline int cpumask_test_and_clear_cpu(int cpu, cpumask_t *addr) +static inline int __cpumask_test_and_set_cpu(int cpu, cpumask_t *addr) +{ + return __test_and_set_bit(cpumask_check(cpu), addr->bits); +} + +static inline int cpumask_test_and_clear_cpu(int cpu, volatile cpumask_t *addr) { return test_and_clear_bit(cpumask_check(cpu), addr->bits); } +static inline int __cpumask_test_and_clear_cpu(int cpu, cpumask_t *addr) +{ + return __test_and_clear_bit(cpumask_check(cpu), addr->bits); +} + static inline void cpumask_and(cpumask_t *dstp, const cpumask_t *src1p, const cpumask_t *src2p) { -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:56:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:56:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNX-0006aw-I0; Tue, 03 Mar 2015 12:56:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNW-0006aU-AG for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:50 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 2F/98-02804-19FA5F45; Tue, 03 Mar 2015 12:56:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1425387407!7340221!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22563 invoked from network); 3 Mar 2015 12:56: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; 3 Mar 2015 12:56:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNT-0002YY-50 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmNT-0003H3-49 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:47 +0000 Date: Tue, 03 Mar 2015 12:56:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] introduce and use relaxed cpumask bitops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4aaca0e9cd09ea86df2d86a0ccbfbcdfb2c37453 Author: Jan Beulich AuthorDate: Wed Feb 18 16:55:17 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 16:55:17 2015 +0100 introduce and use relaxed cpumask bitops Using atomic (LOCKed on x86) bitops for certain of the operations on cpumask_t is overkill when the variables aren't concurrently accessible (e.g. local function variables, or due to explicit locking). Introduce alternatives using non-atomic bitops and use them where appropriate. Note that this - adds a volatile qualifier to cpumask_test_and_{clear,set}_cpu() (should have been there from the beginning, like is the case for cpumask_{clear,set}_cpu()) - replaces several cpumask_clear()+cpumask_set_cpu(, n) pairs by the simpler cpumask_copy(, cpumask_of(n)) (or just cpumask_of(n) if we can do without copying) Signed-off-by: Jan Beulich Acked-by: George Dunlap Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/arch/x86/hpet.c | 4 ++-- xen/arch/x86/irq.c | 2 +- xen/arch/x86/mm.c | 2 +- xen/arch/x86/platform_hypercall.c | 2 +- xen/arch/x86/time.c | 2 +- xen/common/core_parking.c | 20 ++++++++------------ xen/common/cpu.c | 2 +- xen/common/page_alloc.c | 4 ++-- xen/common/sched_credit.c | 12 ++++++------ xen/common/sched_rt.c | 7 ++----- xen/common/softirq.c | 6 +++--- xen/include/xen/cpumask.h | 24 ++++++++++++++++++++++-- 12 files changed, 50 insertions(+), 37 deletions(-) diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index 7aa740f..8f36f6f 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -158,7 +158,7 @@ static void evt_do_broadcast(cpumask_t *mask) { unsigned int cpu = smp_processor_id(); - if ( cpumask_test_and_clear_cpu(cpu, mask) ) + if ( __cpumask_test_and_clear_cpu(cpu, mask) ) raise_softirq(TIMER_SOFTIRQ); cpuidle_wakeup_mwait(mask); @@ -197,7 +197,7 @@ again: continue; if ( deadline <= now ) - cpumask_set_cpu(cpu, &mask); + __cpumask_set_cpu(cpu, &mask); else if ( deadline < next_event ) next_event = deadline; } diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index f214072..92e1854 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1450,7 +1450,7 @@ void desc_guest_eoi(struct irq_desc *desc, struct pirq *pirq) cpumask_copy(&cpu_eoi_map, action->cpu_eoi_map); - if ( cpumask_test_and_clear_cpu(smp_processor_id(), &cpu_eoi_map) ) + if ( __cpumask_test_and_clear_cpu(smp_processor_id(), &cpu_eoi_map) ) { __set_eoi_ready(desc); spin_unlock(&desc->lock); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 12e5006..9ab7a26 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3218,7 +3218,7 @@ long do_mmuext_op( for_each_online_cpu(cpu) if ( !cpumask_intersects(&mask, per_cpu(cpu_sibling_mask, cpu)) ) - cpumask_set_cpu(cpu, &mask); + __cpumask_set_cpu(cpu, &mask); flush_mask(&mask, FLUSH_CACHE); } else diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index b427852..c725501 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -489,7 +489,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE_PARAM(xen_platform_op_t) u_xenpf_op) if ( !idletime ) { - cpumask_clear_cpu(cpu, cpumap); + __cpumask_clear_cpu(cpu, cpumap); continue; } diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index b609938..becff99 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -179,7 +179,7 @@ static void smp_send_timer_broadcast_ipi(void) if ( cpumask_test_cpu(cpu, &mask) ) { - cpumask_clear_cpu(cpu, &mask); + __cpumask_clear_cpu(cpu, &mask); raise_softirq(TIMER_SOFTIRQ); } diff --git a/xen/common/core_parking.c b/xen/common/core_parking.c index 3190fb7..de269e0 100644 --- a/xen/common/core_parking.c +++ b/xen/common/core_parking.c @@ -75,11 +75,10 @@ static unsigned int core_parking_performance(unsigned int event) if ( core_weight < core_tmp ) { core_weight = core_tmp; - cpumask_clear(&core_candidate_map); - cpumask_set_cpu(cpu, &core_candidate_map); + cpumask_copy(&core_candidate_map, cpumask_of(cpu)); } else if ( core_weight == core_tmp ) - cpumask_set_cpu(cpu, &core_candidate_map); + __cpumask_set_cpu(cpu, &core_candidate_map); } for_each_cpu(cpu, &core_candidate_map) @@ -88,11 +87,10 @@ static unsigned int core_parking_performance(unsigned int event) if ( sibling_weight < sibling_tmp ) { sibling_weight = sibling_tmp; - cpumask_clear(&sibling_candidate_map); - cpumask_set_cpu(cpu, &sibling_candidate_map); + cpumask_copy(&sibling_candidate_map, cpumask_of(cpu)); } else if ( sibling_weight == sibling_tmp ) - cpumask_set_cpu(cpu, &sibling_candidate_map); + __cpumask_set_cpu(cpu, &sibling_candidate_map); } cpu = cpumask_first(&sibling_candidate_map); @@ -135,11 +133,10 @@ static unsigned int core_parking_power(unsigned int event) if ( core_weight > core_tmp ) { core_weight = core_tmp; - cpumask_clear(&core_candidate_map); - cpumask_set_cpu(cpu, &core_candidate_map); + cpumask_copy(&core_candidate_map, cpumask_of(cpu)); } else if ( core_weight == core_tmp ) - cpumask_set_cpu(cpu, &core_candidate_map); + __cpumask_set_cpu(cpu, &core_candidate_map); } for_each_cpu(cpu, &core_candidate_map) @@ -148,11 +145,10 @@ static unsigned int core_parking_power(unsigned int event) if ( sibling_weight > sibling_tmp ) { sibling_weight = sibling_tmp; - cpumask_clear(&sibling_candidate_map); - cpumask_set_cpu(cpu, &sibling_candidate_map); + cpumask_copy(&sibling_candidate_map, cpumask_of(cpu)); } else if ( sibling_weight == sibling_tmp ) - cpumask_set_cpu(cpu, &sibling_candidate_map); + __cpumask_set_cpu(cpu, &sibling_candidate_map); } cpu = cpumask_first(&sibling_candidate_map); diff --git a/xen/common/cpu.c b/xen/common/cpu.c index 630881e..47e8b5b 100644 --- a/xen/common/cpu.c +++ b/xen/common/cpu.c @@ -192,7 +192,7 @@ int disable_nonboot_cpus(void) break; } - cpumask_set_cpu(cpu, &frozen_cpus); + __cpumask_set_cpu(cpu, &frozen_cpus); } BUG_ON(!error && (num_online_cpus() != 1)); diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index be6821b..3c27af9 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1337,7 +1337,7 @@ static int __init find_non_smt(unsigned int node, cpumask_t *dest) if ( cpumask_intersects(dest, per_cpu(cpu_sibling_mask, i)) ) continue; cpu = cpumask_first(per_cpu(cpu_sibling_mask, i)); - cpumask_set_cpu(cpu, dest); + __cpumask_set_cpu(cpu, dest); } return cpumask_weight(dest); } @@ -1449,7 +1449,7 @@ void __init scrub_heap_pages(void) cpus = find_non_smt(best_node, &node_cpus); if ( cpus == 0 ) { - cpumask_set_cpu(smp_processor_id(), &node_cpus); + __cpumask_set_cpu(smp_processor_id(), &node_cpus); cpus = 1; } /* We already have the node information from round #0. */ diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 8b02b7b..156b43b 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -372,7 +372,7 @@ __runq_tickle(unsigned int cpu, struct csched_vcpu *new) { if ( cur->pri != CSCHED_PRI_IDLE ) SCHED_STAT_CRANK(tickle_idlers_none); - cpumask_set_cpu(cpu, &mask); + __cpumask_set_cpu(cpu, &mask); } else if ( !idlers_empty ) { @@ -422,7 +422,7 @@ __runq_tickle(unsigned int cpu, struct csched_vcpu *new) SCHED_VCPU_STAT_CRANK(cur, migrate_r); SCHED_STAT_CRANK(migrate_kicked_away); set_bit(_VPF_migrating, &cur->vcpu->pause_flags); - cpumask_set_cpu(cpu, &mask); + __cpumask_set_cpu(cpu, &mask); } else if ( !new_idlers_empty ) { @@ -432,7 +432,7 @@ __runq_tickle(unsigned int cpu, struct csched_vcpu *new) { this_cpu(last_tickle_cpu) = cpumask_cycle(this_cpu(last_tickle_cpu), &idle_mask); - cpumask_set_cpu(this_cpu(last_tickle_cpu), &mask); + __cpumask_set_cpu(this_cpu(last_tickle_cpu), &mask); } else cpumask_or(&mask, &mask, &idle_mask); @@ -675,7 +675,7 @@ _csched_cpu_pick(const struct scheduler *ops, struct vcpu *vc, bool_t commit) */ cpumask_and(&idlers, &cpu_online_map, CSCHED_PRIV(ops)->idlers); if ( vc->processor == cpu && IS_RUNQ_IDLE(cpu) ) - cpumask_set_cpu(cpu, &idlers); + __cpumask_set_cpu(cpu, &idlers); cpumask_and(&cpus, &cpus, &idlers); /* @@ -692,7 +692,7 @@ _csched_cpu_pick(const struct scheduler *ops, struct vcpu *vc, bool_t commit) */ if ( !cpumask_test_cpu(cpu, &cpus) && !cpumask_empty(&cpus) ) cpu = cpumask_cycle(cpu, &cpus); - cpumask_clear_cpu(cpu, &cpus); + __cpumask_clear_cpu(cpu, &cpus); while ( !cpumask_empty(&cpus) ) { @@ -1536,7 +1536,7 @@ csched_load_balance(struct csched_private *prv, int cpu, /* Find out what the !idle are in this node */ cpumask_andnot(&workers, online, prv->idlers); cpumask_and(&workers, &workers, &node_to_cpumask(peer_node)); - cpumask_clear_cpu(cpu, &workers); + __cpumask_clear_cpu(cpu, &workers); peer_cpu = cpumask_first(&workers); if ( peer_cpu >= nr_cpu_ids ) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index e70d6c7..df4adac 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -663,7 +663,7 @@ burn_budget(const struct scheduler *ops, struct rt_vcpu *svc, s_time_t now) * lock is grabbed before calling this function */ static struct rt_vcpu * -__runq_pick(const struct scheduler *ops, cpumask_t *mask) +__runq_pick(const struct scheduler *ops, const cpumask_t *mask) { struct list_head *runq = rt_runq(ops); struct list_head *iter; @@ -780,10 +780,7 @@ rt_schedule(const struct scheduler *ops, s_time_t now, bool_t tasklet_work_sched } else { - cpumask_t cur_cpu; - cpumask_clear(&cur_cpu); - cpumask_set_cpu(cpu, &cur_cpu); - snext = __runq_pick(ops, &cur_cpu); + snext = __runq_pick(ops, cpumask_of(cpu)); if ( snext == NULL ) snext = rt_vcpu(idle_vcpu[cpu]); diff --git a/xen/common/softirq.c b/xen/common/softirq.c index 22e417a..bb79aac 100644 --- a/xen/common/softirq.c +++ b/xen/common/softirq.c @@ -88,7 +88,7 @@ void cpumask_raise_softirq(const cpumask_t *mask, unsigned int nr) if ( !test_and_set_bit(nr, &softirq_pending(cpu)) && cpu != this_cpu && !arch_skip_send_event_check(cpu) ) - cpumask_set_cpu(cpu, raise_mask); + __cpumask_set_cpu(cpu, raise_mask); if ( raise_mask == &send_mask ) smp_send_event_check_mask(raise_mask); @@ -106,7 +106,7 @@ void cpu_raise_softirq(unsigned int cpu, unsigned int nr) if ( !per_cpu(batching, this_cpu) || in_irq() ) smp_send_event_check_cpu(cpu); else - set_bit(nr, &per_cpu(batch_mask, this_cpu)); + __cpumask_set_cpu(nr, &per_cpu(batch_mask, this_cpu)); } void cpu_raise_softirq_batch_begin(void) @@ -122,7 +122,7 @@ void cpu_raise_softirq_batch_finish(void) ASSERT(per_cpu(batching, this_cpu)); for_each_cpu ( cpu, mask ) if ( !softirq_pending(cpu) ) - cpumask_clear_cpu(cpu, mask); + __cpumask_clear_cpu(cpu, mask); smp_send_event_check_mask(mask); cpumask_clear(mask); --per_cpu(batching, this_cpu); diff --git a/xen/include/xen/cpumask.h b/xen/include/xen/cpumask.h index 850b4a2..0e7108c 100644 --- a/xen/include/xen/cpumask.h +++ b/xen/include/xen/cpumask.h @@ -103,11 +103,21 @@ static inline void cpumask_set_cpu(int cpu, volatile cpumask_t *dstp) set_bit(cpumask_check(cpu), dstp->bits); } +static inline void __cpumask_set_cpu(int cpu, cpumask_t *dstp) +{ + __set_bit(cpumask_check(cpu), dstp->bits); +} + static inline void cpumask_clear_cpu(int cpu, volatile cpumask_t *dstp) { clear_bit(cpumask_check(cpu), dstp->bits); } +static inline void __cpumask_clear_cpu(int cpu, cpumask_t *dstp) +{ + __clear_bit(cpumask_check(cpu), dstp->bits); +} + static inline void cpumask_setall(cpumask_t *dstp) { bitmap_fill(dstp->bits, nr_cpumask_bits); @@ -122,16 +132,26 @@ static inline void cpumask_clear(cpumask_t *dstp) #define cpumask_test_cpu(cpu, cpumask) \ test_bit(cpumask_check(cpu), (cpumask)->bits) -static inline int cpumask_test_and_set_cpu(int cpu, cpumask_t *addr) +static inline int cpumask_test_and_set_cpu(int cpu, volatile cpumask_t *addr) { return test_and_set_bit(cpumask_check(cpu), addr->bits); } -static inline int cpumask_test_and_clear_cpu(int cpu, cpumask_t *addr) +static inline int __cpumask_test_and_set_cpu(int cpu, cpumask_t *addr) +{ + return __test_and_set_bit(cpumask_check(cpu), addr->bits); +} + +static inline int cpumask_test_and_clear_cpu(int cpu, volatile cpumask_t *addr) { return test_and_clear_bit(cpumask_check(cpu), addr->bits); } +static inline int __cpumask_test_and_clear_cpu(int cpu, cpumask_t *addr) +{ + return __test_and_clear_bit(cpumask_check(cpu), addr->bits); +} + static inline void cpumask_and(cpumask_t *dstp, const cpumask_t *src1p, const cpumask_t *src2p) { -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:57:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:57: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 1YSmNg-0006el-Lm; Tue, 03 Mar 2015 12:57:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNg-0006eZ-5i for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:00 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 4D/E9-03163-B9FA5F45; Tue, 03 Mar 2015 12:56:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425387417!12654414!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26936 invoked from network); 3 Mar 2015 12:56: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; 3 Mar 2015 12:56:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNd-0002Yj-AY for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmNd-0003HR-9g for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:57 +0000 Date: Tue, 03 Mar 2015 12:56:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] domctl: do away with tool stack based retrying X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 15e0aac6fe76be6a710a8e6d3da610d437903266 Author: Jan Beulich AuthorDate: Wed Feb 18 16:57:02 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 16:57:02 2015 +0100 domctl: do away with tool stack based retrying XEN_DOMCTL_destroydomain so far is being special cased in libxc to reinvoke the operation when getting back EAGAIN. Quite a few other domctl-s have gained continuations, so I see no reason not to use them here too. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/libxc/xc_domain.c | 6 +----- xen/common/domain.c | 6 +----- xen/common/domctl.c | 7 ++++--- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index b864872..845d1d7 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -112,14 +112,10 @@ int xc_domain_unpause(xc_interface *xch, int xc_domain_destroy(xc_interface *xch, uint32_t domid) { - int ret; DECLARE_DOMCTL; domctl.cmd = XEN_DOMCTL_destroydomain; domctl.domain = (domid_t)domid; - do { - ret = do_domctl(xch, &domctl); - } while ( ret && (errno == EAGAIN) ); - return ret; + return do_domctl(xch, &domctl); } int xc_domain_shutdown(xc_interface *xch, diff --git a/xen/common/domain.c b/xen/common/domain.c index 0b05681..aa78fd7 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -617,13 +617,9 @@ int domain_kill(struct domain *d) case DOMDYING_dying: rc = domain_relinquish_resources(d); if ( rc != 0 ) - { - if ( rc == -ERESTART ) - rc = -EAGAIN; break; - } if ( cpupool_move_domain(d, cpupool0) ) - return -EAGAIN; + return -ERESTART; for_each_vcpu ( d, v ) unmap_vcpu_info(v); d->is_dying = DOMDYING_dead; diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 33ecd45..4a42c66 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -692,10 +692,11 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; case XEN_DOMCTL_destroydomain: - { ret = domain_kill(d); - } - break; + if ( ret == -ERESTART ) + ret = hypercall_create_continuation( + __HYPERVISOR_domctl, "h", u_domctl); + break; case XEN_DOMCTL_setnodeaffinity: { -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:57:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:57: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 1YSmNg-0006el-Lm; Tue, 03 Mar 2015 12:57:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNg-0006eZ-5i for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:00 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 4D/E9-03163-B9FA5F45; Tue, 03 Mar 2015 12:56:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425387417!12654414!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26936 invoked from network); 3 Mar 2015 12:56: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; 3 Mar 2015 12:56:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNd-0002Yj-AY for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmNd-0003HR-9g for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:56:57 +0000 Date: Tue, 03 Mar 2015 12:56:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] domctl: do away with tool stack based retrying X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 15e0aac6fe76be6a710a8e6d3da610d437903266 Author: Jan Beulich AuthorDate: Wed Feb 18 16:57:02 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 16:57:02 2015 +0100 domctl: do away with tool stack based retrying XEN_DOMCTL_destroydomain so far is being special cased in libxc to reinvoke the operation when getting back EAGAIN. Quite a few other domctl-s have gained continuations, so I see no reason not to use them here too. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/libxc/xc_domain.c | 6 +----- xen/common/domain.c | 6 +----- xen/common/domctl.c | 7 ++++--- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index b864872..845d1d7 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -112,14 +112,10 @@ int xc_domain_unpause(xc_interface *xch, int xc_domain_destroy(xc_interface *xch, uint32_t domid) { - int ret; DECLARE_DOMCTL; domctl.cmd = XEN_DOMCTL_destroydomain; domctl.domain = (domid_t)domid; - do { - ret = do_domctl(xch, &domctl); - } while ( ret && (errno == EAGAIN) ); - return ret; + return do_domctl(xch, &domctl); } int xc_domain_shutdown(xc_interface *xch, diff --git a/xen/common/domain.c b/xen/common/domain.c index 0b05681..aa78fd7 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -617,13 +617,9 @@ int domain_kill(struct domain *d) case DOMDYING_dying: rc = domain_relinquish_resources(d); if ( rc != 0 ) - { - if ( rc == -ERESTART ) - rc = -EAGAIN; break; - } if ( cpupool_move_domain(d, cpupool0) ) - return -EAGAIN; + return -ERESTART; for_each_vcpu ( d, v ) unmap_vcpu_info(v); d->is_dying = DOMDYING_dead; diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 33ecd45..4a42c66 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -692,10 +692,11 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; case XEN_DOMCTL_destroydomain: - { ret = domain_kill(d); - } - break; + if ( ret == -ERESTART ) + ret = hypercall_create_continuation( + __HYPERVISOR_domctl, "h", u_domctl); + break; case XEN_DOMCTL_setnodeaffinity: { -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:57:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:57: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 1YSmNu-0006kw-SN; Tue, 03 Mar 2015 12:57:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNt-0006kY-GL for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:13 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id CF/AD-10964-8AFA5F45; Tue, 03 Mar 2015 12:57:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1425387430!14243351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24836 invoked from network); 3 Mar 2015 12:57:11 -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; 3 Mar 2015 12:57:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNn-0002ZI-G0 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmNn-0003Hx-FB for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:07 +0000 Date: Tue, 03 Mar 2015 12:57:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: move MAX_INST_LEN into x86_emulate.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7d6ba754d39d3e71963b2224f91541dd5289946 Author: Don Slutz AuthorDate: Wed Feb 18 17:00:47 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 17:00:47 2015 +0100 x86/hvm: move MAX_INST_LEN into x86_emulate.h Change some hard coded 15 into MAX_INST_LEN. Signed-off-by: Don Slutz Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/svm/emulate.c | 2 -- xen/arch/x86/hvm/svm/svm.c | 4 ++-- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/x86_emulate/x86_emulate.c | 3 ++- xen/arch/x86/x86_emulate/x86_emulate.h | 2 ++ 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/svm/emulate.c b/xen/arch/x86/hvm/svm/emulate.c index 37a1ece..6f5c8d3 100644 --- a/xen/arch/x86/hvm/svm/emulate.c +++ b/xen/arch/x86/hvm/svm/emulate.c @@ -27,8 +27,6 @@ #include #include -#define MAX_INST_LEN 15 - static unsigned int is_prefix(u8 opc) { switch ( opc ) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 018dd70..d82b434 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -106,7 +106,7 @@ void __update_guest_eip(struct cpu_user_regs *regs, unsigned int inst_len) if ( unlikely(inst_len == 0) ) return; - if ( unlikely(inst_len > 15) ) + if ( unlikely(inst_len > MAX_INST_LEN) ) { gdprintk(XENLOG_ERR, "Bad instruction length %u\n", inst_len); svm_crash_or_fault(curr); @@ -859,7 +859,7 @@ static unsigned int svm_get_insn_bytes(struct vcpu *v, uint8_t *buf) if ( len != 0 ) { /* Latch and clear the cached instruction. */ - memcpy(buf, vmcb->guest_ins, 15); + memcpy(buf, vmcb->guest_ins, MAX_INST_LEN); v->arch.hvm_svm.cached_insn_len = 0; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 357ef6c..e1c55ce 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1854,7 +1854,7 @@ static int get_instruction_length(void) unsigned long len; __vmread(VM_EXIT_INSTRUCTION_LEN, &len); /* Safe: callers audited */ - BUG_ON((len < 1) || (len > 15)); + BUG_ON((len < 1) || (len > MAX_INST_LEN)); return len; } diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index f13f07d..5e9e040 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -579,7 +579,8 @@ do{ asm volatile ( \ ({ unsigned long _x = 0, _eip = _regs.eip; \ if ( !mode_64bit() ) _eip = (uint32_t)_eip; /* ignore upper dword */ \ _regs.eip += (_size); /* real hardware doesn't truncate */ \ - generate_exception_if((uint8_t)(_regs.eip - ctxt->regs->eip) > 15, \ + generate_exception_if((uint8_t)(_regs.eip - \ + ctxt->regs->eip) > MAX_INST_LEN, \ EXC_GP, 0); \ rc = ops->insn_fetch(x86_seg_cs, _eip, &_x, (_size), ctxt); \ if ( rc ) goto done; \ diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index bdce861..593b31e 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -24,6 +24,8 @@ #ifndef __X86_EMULATE_H__ #define __X86_EMULATE_H__ +#define MAX_INST_LEN 15 + struct x86_emulate_ctxt; /* Comprehensive enumeration of x86 segment registers. */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:57:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:57: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 1YSmNu-0006kw-SN; Tue, 03 Mar 2015 12:57:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNt-0006kY-GL for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:13 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id CF/AD-10964-8AFA5F45; Tue, 03 Mar 2015 12:57:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1425387430!14243351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24836 invoked from network); 3 Mar 2015 12:57:11 -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; 3 Mar 2015 12:57:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNn-0002ZI-G0 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmNn-0003Hx-FB for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:07 +0000 Date: Tue, 03 Mar 2015 12:57:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: move MAX_INST_LEN into x86_emulate.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7d6ba754d39d3e71963b2224f91541dd5289946 Author: Don Slutz AuthorDate: Wed Feb 18 17:00:47 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 17:00:47 2015 +0100 x86/hvm: move MAX_INST_LEN into x86_emulate.h Change some hard coded 15 into MAX_INST_LEN. Signed-off-by: Don Slutz Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/svm/emulate.c | 2 -- xen/arch/x86/hvm/svm/svm.c | 4 ++-- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/x86_emulate/x86_emulate.c | 3 ++- xen/arch/x86/x86_emulate/x86_emulate.h | 2 ++ 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/svm/emulate.c b/xen/arch/x86/hvm/svm/emulate.c index 37a1ece..6f5c8d3 100644 --- a/xen/arch/x86/hvm/svm/emulate.c +++ b/xen/arch/x86/hvm/svm/emulate.c @@ -27,8 +27,6 @@ #include #include -#define MAX_INST_LEN 15 - static unsigned int is_prefix(u8 opc) { switch ( opc ) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 018dd70..d82b434 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -106,7 +106,7 @@ void __update_guest_eip(struct cpu_user_regs *regs, unsigned int inst_len) if ( unlikely(inst_len == 0) ) return; - if ( unlikely(inst_len > 15) ) + if ( unlikely(inst_len > MAX_INST_LEN) ) { gdprintk(XENLOG_ERR, "Bad instruction length %u\n", inst_len); svm_crash_or_fault(curr); @@ -859,7 +859,7 @@ static unsigned int svm_get_insn_bytes(struct vcpu *v, uint8_t *buf) if ( len != 0 ) { /* Latch and clear the cached instruction. */ - memcpy(buf, vmcb->guest_ins, 15); + memcpy(buf, vmcb->guest_ins, MAX_INST_LEN); v->arch.hvm_svm.cached_insn_len = 0; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 357ef6c..e1c55ce 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1854,7 +1854,7 @@ static int get_instruction_length(void) unsigned long len; __vmread(VM_EXIT_INSTRUCTION_LEN, &len); /* Safe: callers audited */ - BUG_ON((len < 1) || (len > 15)); + BUG_ON((len < 1) || (len > MAX_INST_LEN)); return len; } diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index f13f07d..5e9e040 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -579,7 +579,8 @@ do{ asm volatile ( \ ({ unsigned long _x = 0, _eip = _regs.eip; \ if ( !mode_64bit() ) _eip = (uint32_t)_eip; /* ignore upper dword */ \ _regs.eip += (_size); /* real hardware doesn't truncate */ \ - generate_exception_if((uint8_t)(_regs.eip - ctxt->regs->eip) > 15, \ + generate_exception_if((uint8_t)(_regs.eip - \ + ctxt->regs->eip) > MAX_INST_LEN, \ EXC_GP, 0); \ rc = ops->insn_fetch(x86_seg_cs, _eip, &_x, (_size), ctxt); \ if ( rc ) goto done; \ diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index bdce861..593b31e 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -24,6 +24,8 @@ #ifndef __X86_EMULATE_H__ #define __X86_EMULATE_H__ +#define MAX_INST_LEN 15 + struct x86_emulate_ctxt; /* Comprehensive enumeration of x86 segment registers. */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:57:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:57: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 1YSmO2-0006n7-0q; Tue, 03 Mar 2015 12:57:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmO1-0006mi-34 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:21 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 49/60-02745-0BFA5F45; Tue, 03 Mar 2015 12:57:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1425387438!12550095!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16737 invoked from network); 3 Mar 2015 12:57:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 3 Mar 2015 12:57:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNx-0002ZM-PW for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmNx-0003J4-L1 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:17 +0000 Date: Tue, 03 Mar 2015 12:57:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: adjust rdtsc inline assembly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 28309debeb31815053eca5ec8b8f37228314911a Author: Andrew Cooper AuthorDate: Wed Feb 18 17:02:18 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 17:02:18 2015 +0100 x86: adjust rdtsc inline assembly Currently there are three related rdtsc macros, all of which are lowercase and not obviously macros, which write by value to their parameters. This is non-intuitive to program which, being contrary to C semantics for code appearing to be a regular function call. It is also causes Coverity to conclude that __udelay() has an infinite loop, as all of its loop conditions are constant. Two of these macros (rdtsc() and rdtscl()) have only a handful of uses while the vast majority of code uses the rdtscll() variant. rdtsc() and rdtscll() are equivalent, while rdtscl() discards the high word. Replace all 3 macros with a static inline which returns the complete tsc. Most of this patch is a mechanical change of - rdtscll($FOO); + $FOO = rdtsc(); And a diff of the generated assembly confirms that this is no change at all. The single use of the old rdtsc() in emulate_privileged_op() is altered to use the new rdtsc() and the rdmsr_writeback path to set eax/edx appropriately. The pair of use of rdtscl() in __udelay() are extended to use full 64bit values, which makes the overflow edge condition (and early exit from the loop) far rarer. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/apic.c | 4 ++-- xen/arch/x86/cpu/mcheck/mce.c | 2 +- xen/arch/x86/delay.c | 4 ++-- xen/arch/x86/hvm/hvm.c | 4 ++-- xen/arch/x86/hvm/save.c | 4 ++-- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/platform_hypercall.c | 4 ++-- xen/arch/x86/smpboot.c | 2 +- xen/arch/x86/time.c | 34 ++++++++++++++++------------------ xen/arch/x86/traps.c | 5 ++++- xen/include/asm-x86/msr.h | 15 ++++++--------- xen/include/asm-x86/time.h | 4 +--- 12 files changed, 40 insertions(+), 44 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 39cd9e5..3217bdf 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1148,7 +1148,7 @@ static int __init calibrate_APIC_clock(void) * We wrapped around just now. Let's start: */ if (cpu_has_tsc) - rdtscll(t1); + t1 = rdtsc(); tt1 = apic_read(APIC_TMCCT); /* @@ -1159,7 +1159,7 @@ static int __init calibrate_APIC_clock(void) tt2 = apic_read(APIC_TMCCT); if (cpu_has_tsc) - rdtscll(t2); + t2 = rdtsc(); /* * The APIC bus clock counter is 32 bits only, it diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 05a86fb..3a3b4dc 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -235,7 +235,7 @@ static void mca_init_bank(enum mca_source who, if (who == MCA_CMCI_HANDLER) { mib->mc_ctrl2 = mca_rdmsr(MSR_IA32_MC0_CTL2 + bank); - rdtscll(mib->mc_tsc); + mib->mc_tsc = rdtsc(); } } diff --git a/xen/arch/x86/delay.c b/xen/arch/x86/delay.c index bc1772e..ef6bc5d 100644 --- a/xen/arch/x86/delay.c +++ b/xen/arch/x86/delay.c @@ -21,10 +21,10 @@ void __udelay(unsigned long usecs) unsigned long ticks = usecs * (cpu_khz / 1000); unsigned long s, e; - rdtscl(s); + s = rdtsc(); do { rep_nop(); - rdtscl(e); + e = rdtsc(); } while ((e-s) < ticks); } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index a52c6e0..72e383f 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -292,7 +292,7 @@ void hvm_set_guest_tsc_fixed(struct vcpu *v, u64 guest_tsc, u64 at_tsc) } else { - rdtscll(tsc); + tsc = rdtsc(); } delta_tsc = guest_tsc - tsc; @@ -326,7 +326,7 @@ u64 hvm_get_guest_tsc_fixed(struct vcpu *v, uint64_t at_tsc) } else { - rdtscll(tsc); + tsc = rdtsc(); } return tsc + v->arch.hvm_vcpu.cache_tsc_offset; diff --git a/xen/arch/x86/hvm/save.c b/xen/arch/x86/hvm/save.c index 6af19be..61f780d 100644 --- a/xen/arch/x86/hvm/save.c +++ b/xen/arch/x86/hvm/save.c @@ -36,7 +36,7 @@ void arch_hvm_save(struct domain *d, struct hvm_save_header *hdr) hdr->gtsc_khz = d->arch.tsc_khz; /* Time when saving started */ - rdtscll(d->arch.hvm_domain.sync_tsc); + d->arch.hvm_domain.sync_tsc = rdtsc(); } int arch_hvm_load(struct domain *d, struct hvm_save_header *hdr) @@ -71,7 +71,7 @@ int arch_hvm_load(struct domain *d, struct hvm_save_header *hdr) hvm_set_rdtsc_exiting(d, 1); /* Time when restore started */ - rdtscll(d->arch.hvm_domain.sync_tsc); + d->arch.hvm_domain.sync_tsc = rdtsc(); /* VGA state is not saved/restored, so we nobble the cache. */ d->arch.hvm_domain.stdvga.cache = 0; diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index d82b434..b6e77cd 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -805,7 +805,7 @@ static void svm_set_tsc_offset(struct vcpu *v, u64 offset, u64 at_tsc) if ( at_tsc ) host_tsc = at_tsc; else - rdtscll(host_tsc); + host_tsc = rdtsc(); offset = svm_get_tsc_offset(host_tsc, guest_tsc, vcpu_tsc_ratio(v)); } diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index c725501..334d474 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -146,7 +146,7 @@ static void resource_access(void *info) { unsigned long flags = 0; /* - * If next entry is MSR_IA32_TSC read, then the actual rdtscll + * If next entry is MSR_IA32_TSC read, then the actual rdtsc * is performed together with current entry, with IRQ disabled. */ bool_t read_tsc = (i < ra->nr_done - 1 && @@ -159,7 +159,7 @@ static void resource_access(void *info) if ( unlikely(read_tsc) ) { - rdtscll(tsc); + tsc = rdtsc(); local_irq_restore(flags); } } diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index c54be7e..7ae561c 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -142,7 +142,7 @@ static void synchronize_tsc_master(unsigned int slave) for ( i = 1; i <= 5; i++ ) { - rdtscll(tsc_value); + tsc_value = rdtsc(); wmb(); atomic_inc(&tsc_count); while ( atomic_read(&tsc_count) != (i<<1) ) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index becff99..bbb7e6c 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -261,10 +261,10 @@ static u64 init_pit_and_calibrate_tsc(void) outb(CALIBRATE_LATCH & 0xff, PIT_CH2); /* LSB of count */ outb(CALIBRATE_LATCH >> 8, PIT_CH2); /* MSB of count */ - rdtscll(start); + start = rdtsc(); for ( count = 0; (inb(0x61) & 0x20) == 0; count++ ) continue; - rdtscll(end); + end = rdtsc(); /* Error if the CTC doesn't behave itself. */ if ( count == 0 ) @@ -764,7 +764,7 @@ s_time_t get_s_time_fixed(u64 at_tsc) if ( at_tsc ) tsc = at_tsc; else - rdtscll(tsc); + tsc = rdtsc(); delta = tsc - t->local_tsc_stamp; now = t->stime_local_stamp + scale_delta(delta, &t->tsc_scale); @@ -971,7 +971,7 @@ int cpu_frequency_change(u64 freq) /* TSC-extrapolated time may be bogus after frequency change. */ /*t->stime_local_stamp = get_s_time();*/ t->stime_local_stamp = t->stime_master_stamp; - rdtscll(curr_tsc); + curr_tsc = rdtsc(); t->local_tsc_stamp = curr_tsc; set_time_scale(&t->tsc_scale, freq); local_irq_enable(); @@ -1307,7 +1307,7 @@ static void time_calibration_tsc_rendezvous(void *_r) if ( r->master_stime == 0 ) { r->master_stime = read_platform_stime(); - rdtscll(r->master_tsc_stamp); + r->master_tsc_stamp = rdtsc(); } atomic_inc(&r->semaphore); @@ -1333,7 +1333,7 @@ static void time_calibration_tsc_rendezvous(void *_r) } } - rdtscll(c->local_tsc_stamp); + c->local_tsc_stamp = rdtsc(); c->stime_local_stamp = get_s_time(); c->stime_master_stamp = r->master_stime; @@ -1363,7 +1363,7 @@ static void time_calibration_std_rendezvous(void *_r) mb(); /* receive signal /then/ read r->master_stime */ } - rdtscll(c->local_tsc_stamp); + c->local_tsc_stamp = rdtsc(); c->stime_local_stamp = get_s_time(); c->stime_master_stamp = r->master_stime; @@ -1397,7 +1397,7 @@ void init_percpu_time(void) t->tsc_scale = per_cpu(cpu_time, 0).tsc_scale; local_irq_save(flags); - rdtscll(t->local_tsc_stamp); + t->local_tsc_stamp = rdtsc(); now = read_platform_stime(); local_irq_restore(flags); @@ -1426,13 +1426,13 @@ static void __init tsc_check_writability(void) if ( boot_cpu_has(X86_FEATURE_TSC_RELIABLE) ) return; - rdtscll(tsc); + tsc = rdtsc(); if ( wrmsr_safe(MSR_IA32_TSC, 0) == 0 ) { - uint64_t tmp, tmp2; - rdtscll(tmp2); + uint64_t tmp, tmp2 = rdtsc(); + write_tsc(tsc | (1ULL << 32)); - rdtscll(tmp); + tmp = rdtsc(); if ( ABS((s64)tmp - (s64)tmp2) < (1LL << 31) ) what = "only partially"; } @@ -1868,7 +1868,7 @@ void tsc_get_info(struct domain *d, uint32_t *tsc_mode, *gtsc_khz = d->arch.tsc_khz; break; } - rdtscll(tsc); + tsc = rdtsc(); *elapsed_nsec = scale_delta(tsc, &d->arch.vtsc_to_ns); *gtsc_khz = cpu_khz; break; @@ -1880,7 +1880,7 @@ void tsc_get_info(struct domain *d, uint32_t *tsc_mode, } else { - rdtscll(tsc); + tsc = rdtsc(); *elapsed_nsec = scale_delta(tsc, &d->arch.vtsc_to_ns) - d->arch.vtsc_offset; *gtsc_khz = 0; /* ignored by tsc_set_info */ @@ -1973,9 +1973,7 @@ void tsc_set_info(struct domain *d, else { /* when using native TSC, offset is nsec relative to power-on * of physical machine */ - uint64_t tsc = 0; - rdtscll(tsc); - d->arch.vtsc_offset = scale_delta(tsc,&d->arch.vtsc_to_ns) - + d->arch.vtsc_offset = scale_delta(rdtsc(), &d->arch.vtsc_to_ns) - elapsed_nsec; } break; @@ -1994,7 +1992,7 @@ void tsc_set_info(struct domain *d, * call set_tsc_offset() later from hvm_vcpu_reset_state() and they * will sync their TSC to BSP's sync_tsc. */ - rdtscll(d->arch.hvm_domain.sync_tsc); + d->arch.hvm_domain.sync_tsc = rdtsc(); hvm_funcs.set_tsc_offset(d->vcpu[0], d->vcpu[0]->arch.hvm_vcpu.cache_tsc_offset, d->arch.hvm_domain.sync_tsc); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 057a7af..14e2563 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2663,7 +2663,10 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) if ( v->domain->arch.vtsc ) pv_soft_rdtsc(v, regs, 0); else - rdtsc(regs->eax, regs->edx); + { + val = rdtsc(); + goto rdmsr_writeback; + } break; case 0x32: /* RDMSR */ diff --git a/xen/include/asm-x86/msr.h b/xen/include/asm-x86/msr.h index 52cae4b..4f233d5 100644 --- a/xen/include/asm-x86/msr.h +++ b/xen/include/asm-x86/msr.h @@ -71,17 +71,14 @@ static inline int wrmsr_safe(unsigned int msr, uint64_t val) return _rc; } -#define rdtsc(low,high) \ - __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high)) +static inline uint64_t rdtsc(void) +{ + uint32_t low, high; -#define rdtscl(low) \ - __asm__ __volatile__("rdtsc" : "=a" (low) : : "edx") + __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high)); -#define rdtscll(val) do { \ - unsigned int _eax, _edx; \ - asm volatile("rdtsc" : "=a" (_eax), "=d" (_edx)); \ - (val) = ((unsigned long)_eax) | (((unsigned long)_edx)<<32); \ -} while(0) + return ((uint64_t)high << 32) | low; +} #define __write_tsc(val) wrmsrl(MSR_IA32_TSC, val) #define write_tsc(val) ({ \ diff --git a/xen/include/asm-x86/time.h b/xen/include/asm-x86/time.h index c4d82f6..39d6bf3 100644 --- a/xen/include/asm-x86/time.h +++ b/xen/include/asm-x86/time.h @@ -28,9 +28,7 @@ extern bool_t disable_tsc_sync; static inline cycles_t get_cycles(void) { - cycles_t c; - rdtscll(c); - return c; + return rdtsc(); } unsigned long -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:57:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:57: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 1YSmO2-0006n7-0q; Tue, 03 Mar 2015 12:57:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmO1-0006mi-34 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:21 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 49/60-02745-0BFA5F45; Tue, 03 Mar 2015 12:57:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1425387438!12550095!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16737 invoked from network); 3 Mar 2015 12:57:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 3 Mar 2015 12:57:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmNx-0002ZM-PW for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmNx-0003J4-L1 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:17 +0000 Date: Tue, 03 Mar 2015 12:57:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: adjust rdtsc inline assembly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 28309debeb31815053eca5ec8b8f37228314911a Author: Andrew Cooper AuthorDate: Wed Feb 18 17:02:18 2015 +0100 Commit: Jan Beulich CommitDate: Wed Feb 18 17:02:18 2015 +0100 x86: adjust rdtsc inline assembly Currently there are three related rdtsc macros, all of which are lowercase and not obviously macros, which write by value to their parameters. This is non-intuitive to program which, being contrary to C semantics for code appearing to be a regular function call. It is also causes Coverity to conclude that __udelay() has an infinite loop, as all of its loop conditions are constant. Two of these macros (rdtsc() and rdtscl()) have only a handful of uses while the vast majority of code uses the rdtscll() variant. rdtsc() and rdtscll() are equivalent, while rdtscl() discards the high word. Replace all 3 macros with a static inline which returns the complete tsc. Most of this patch is a mechanical change of - rdtscll($FOO); + $FOO = rdtsc(); And a diff of the generated assembly confirms that this is no change at all. The single use of the old rdtsc() in emulate_privileged_op() is altered to use the new rdtsc() and the rdmsr_writeback path to set eax/edx appropriately. The pair of use of rdtscl() in __udelay() are extended to use full 64bit values, which makes the overflow edge condition (and early exit from the loop) far rarer. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/apic.c | 4 ++-- xen/arch/x86/cpu/mcheck/mce.c | 2 +- xen/arch/x86/delay.c | 4 ++-- xen/arch/x86/hvm/hvm.c | 4 ++-- xen/arch/x86/hvm/save.c | 4 ++-- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/platform_hypercall.c | 4 ++-- xen/arch/x86/smpboot.c | 2 +- xen/arch/x86/time.c | 34 ++++++++++++++++------------------ xen/arch/x86/traps.c | 5 ++++- xen/include/asm-x86/msr.h | 15 ++++++--------- xen/include/asm-x86/time.h | 4 +--- 12 files changed, 40 insertions(+), 44 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 39cd9e5..3217bdf 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1148,7 +1148,7 @@ static int __init calibrate_APIC_clock(void) * We wrapped around just now. Let's start: */ if (cpu_has_tsc) - rdtscll(t1); + t1 = rdtsc(); tt1 = apic_read(APIC_TMCCT); /* @@ -1159,7 +1159,7 @@ static int __init calibrate_APIC_clock(void) tt2 = apic_read(APIC_TMCCT); if (cpu_has_tsc) - rdtscll(t2); + t2 = rdtsc(); /* * The APIC bus clock counter is 32 bits only, it diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 05a86fb..3a3b4dc 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -235,7 +235,7 @@ static void mca_init_bank(enum mca_source who, if (who == MCA_CMCI_HANDLER) { mib->mc_ctrl2 = mca_rdmsr(MSR_IA32_MC0_CTL2 + bank); - rdtscll(mib->mc_tsc); + mib->mc_tsc = rdtsc(); } } diff --git a/xen/arch/x86/delay.c b/xen/arch/x86/delay.c index bc1772e..ef6bc5d 100644 --- a/xen/arch/x86/delay.c +++ b/xen/arch/x86/delay.c @@ -21,10 +21,10 @@ void __udelay(unsigned long usecs) unsigned long ticks = usecs * (cpu_khz / 1000); unsigned long s, e; - rdtscl(s); + s = rdtsc(); do { rep_nop(); - rdtscl(e); + e = rdtsc(); } while ((e-s) < ticks); } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index a52c6e0..72e383f 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -292,7 +292,7 @@ void hvm_set_guest_tsc_fixed(struct vcpu *v, u64 guest_tsc, u64 at_tsc) } else { - rdtscll(tsc); + tsc = rdtsc(); } delta_tsc = guest_tsc - tsc; @@ -326,7 +326,7 @@ u64 hvm_get_guest_tsc_fixed(struct vcpu *v, uint64_t at_tsc) } else { - rdtscll(tsc); + tsc = rdtsc(); } return tsc + v->arch.hvm_vcpu.cache_tsc_offset; diff --git a/xen/arch/x86/hvm/save.c b/xen/arch/x86/hvm/save.c index 6af19be..61f780d 100644 --- a/xen/arch/x86/hvm/save.c +++ b/xen/arch/x86/hvm/save.c @@ -36,7 +36,7 @@ void arch_hvm_save(struct domain *d, struct hvm_save_header *hdr) hdr->gtsc_khz = d->arch.tsc_khz; /* Time when saving started */ - rdtscll(d->arch.hvm_domain.sync_tsc); + d->arch.hvm_domain.sync_tsc = rdtsc(); } int arch_hvm_load(struct domain *d, struct hvm_save_header *hdr) @@ -71,7 +71,7 @@ int arch_hvm_load(struct domain *d, struct hvm_save_header *hdr) hvm_set_rdtsc_exiting(d, 1); /* Time when restore started */ - rdtscll(d->arch.hvm_domain.sync_tsc); + d->arch.hvm_domain.sync_tsc = rdtsc(); /* VGA state is not saved/restored, so we nobble the cache. */ d->arch.hvm_domain.stdvga.cache = 0; diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index d82b434..b6e77cd 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -805,7 +805,7 @@ static void svm_set_tsc_offset(struct vcpu *v, u64 offset, u64 at_tsc) if ( at_tsc ) host_tsc = at_tsc; else - rdtscll(host_tsc); + host_tsc = rdtsc(); offset = svm_get_tsc_offset(host_tsc, guest_tsc, vcpu_tsc_ratio(v)); } diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index c725501..334d474 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -146,7 +146,7 @@ static void resource_access(void *info) { unsigned long flags = 0; /* - * If next entry is MSR_IA32_TSC read, then the actual rdtscll + * If next entry is MSR_IA32_TSC read, then the actual rdtsc * is performed together with current entry, with IRQ disabled. */ bool_t read_tsc = (i < ra->nr_done - 1 && @@ -159,7 +159,7 @@ static void resource_access(void *info) if ( unlikely(read_tsc) ) { - rdtscll(tsc); + tsc = rdtsc(); local_irq_restore(flags); } } diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index c54be7e..7ae561c 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -142,7 +142,7 @@ static void synchronize_tsc_master(unsigned int slave) for ( i = 1; i <= 5; i++ ) { - rdtscll(tsc_value); + tsc_value = rdtsc(); wmb(); atomic_inc(&tsc_count); while ( atomic_read(&tsc_count) != (i<<1) ) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index becff99..bbb7e6c 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -261,10 +261,10 @@ static u64 init_pit_and_calibrate_tsc(void) outb(CALIBRATE_LATCH & 0xff, PIT_CH2); /* LSB of count */ outb(CALIBRATE_LATCH >> 8, PIT_CH2); /* MSB of count */ - rdtscll(start); + start = rdtsc(); for ( count = 0; (inb(0x61) & 0x20) == 0; count++ ) continue; - rdtscll(end); + end = rdtsc(); /* Error if the CTC doesn't behave itself. */ if ( count == 0 ) @@ -764,7 +764,7 @@ s_time_t get_s_time_fixed(u64 at_tsc) if ( at_tsc ) tsc = at_tsc; else - rdtscll(tsc); + tsc = rdtsc(); delta = tsc - t->local_tsc_stamp; now = t->stime_local_stamp + scale_delta(delta, &t->tsc_scale); @@ -971,7 +971,7 @@ int cpu_frequency_change(u64 freq) /* TSC-extrapolated time may be bogus after frequency change. */ /*t->stime_local_stamp = get_s_time();*/ t->stime_local_stamp = t->stime_master_stamp; - rdtscll(curr_tsc); + curr_tsc = rdtsc(); t->local_tsc_stamp = curr_tsc; set_time_scale(&t->tsc_scale, freq); local_irq_enable(); @@ -1307,7 +1307,7 @@ static void time_calibration_tsc_rendezvous(void *_r) if ( r->master_stime == 0 ) { r->master_stime = read_platform_stime(); - rdtscll(r->master_tsc_stamp); + r->master_tsc_stamp = rdtsc(); } atomic_inc(&r->semaphore); @@ -1333,7 +1333,7 @@ static void time_calibration_tsc_rendezvous(void *_r) } } - rdtscll(c->local_tsc_stamp); + c->local_tsc_stamp = rdtsc(); c->stime_local_stamp = get_s_time(); c->stime_master_stamp = r->master_stime; @@ -1363,7 +1363,7 @@ static void time_calibration_std_rendezvous(void *_r) mb(); /* receive signal /then/ read r->master_stime */ } - rdtscll(c->local_tsc_stamp); + c->local_tsc_stamp = rdtsc(); c->stime_local_stamp = get_s_time(); c->stime_master_stamp = r->master_stime; @@ -1397,7 +1397,7 @@ void init_percpu_time(void) t->tsc_scale = per_cpu(cpu_time, 0).tsc_scale; local_irq_save(flags); - rdtscll(t->local_tsc_stamp); + t->local_tsc_stamp = rdtsc(); now = read_platform_stime(); local_irq_restore(flags); @@ -1426,13 +1426,13 @@ static void __init tsc_check_writability(void) if ( boot_cpu_has(X86_FEATURE_TSC_RELIABLE) ) return; - rdtscll(tsc); + tsc = rdtsc(); if ( wrmsr_safe(MSR_IA32_TSC, 0) == 0 ) { - uint64_t tmp, tmp2; - rdtscll(tmp2); + uint64_t tmp, tmp2 = rdtsc(); + write_tsc(tsc | (1ULL << 32)); - rdtscll(tmp); + tmp = rdtsc(); if ( ABS((s64)tmp - (s64)tmp2) < (1LL << 31) ) what = "only partially"; } @@ -1868,7 +1868,7 @@ void tsc_get_info(struct domain *d, uint32_t *tsc_mode, *gtsc_khz = d->arch.tsc_khz; break; } - rdtscll(tsc); + tsc = rdtsc(); *elapsed_nsec = scale_delta(tsc, &d->arch.vtsc_to_ns); *gtsc_khz = cpu_khz; break; @@ -1880,7 +1880,7 @@ void tsc_get_info(struct domain *d, uint32_t *tsc_mode, } else { - rdtscll(tsc); + tsc = rdtsc(); *elapsed_nsec = scale_delta(tsc, &d->arch.vtsc_to_ns) - d->arch.vtsc_offset; *gtsc_khz = 0; /* ignored by tsc_set_info */ @@ -1973,9 +1973,7 @@ void tsc_set_info(struct domain *d, else { /* when using native TSC, offset is nsec relative to power-on * of physical machine */ - uint64_t tsc = 0; - rdtscll(tsc); - d->arch.vtsc_offset = scale_delta(tsc,&d->arch.vtsc_to_ns) - + d->arch.vtsc_offset = scale_delta(rdtsc(), &d->arch.vtsc_to_ns) - elapsed_nsec; } break; @@ -1994,7 +1992,7 @@ void tsc_set_info(struct domain *d, * call set_tsc_offset() later from hvm_vcpu_reset_state() and they * will sync their TSC to BSP's sync_tsc. */ - rdtscll(d->arch.hvm_domain.sync_tsc); + d->arch.hvm_domain.sync_tsc = rdtsc(); hvm_funcs.set_tsc_offset(d->vcpu[0], d->vcpu[0]->arch.hvm_vcpu.cache_tsc_offset, d->arch.hvm_domain.sync_tsc); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 057a7af..14e2563 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2663,7 +2663,10 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) if ( v->domain->arch.vtsc ) pv_soft_rdtsc(v, regs, 0); else - rdtsc(regs->eax, regs->edx); + { + val = rdtsc(); + goto rdmsr_writeback; + } break; case 0x32: /* RDMSR */ diff --git a/xen/include/asm-x86/msr.h b/xen/include/asm-x86/msr.h index 52cae4b..4f233d5 100644 --- a/xen/include/asm-x86/msr.h +++ b/xen/include/asm-x86/msr.h @@ -71,17 +71,14 @@ static inline int wrmsr_safe(unsigned int msr, uint64_t val) return _rc; } -#define rdtsc(low,high) \ - __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high)) +static inline uint64_t rdtsc(void) +{ + uint32_t low, high; -#define rdtscl(low) \ - __asm__ __volatile__("rdtsc" : "=a" (low) : : "edx") + __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high)); -#define rdtscll(val) do { \ - unsigned int _eax, _edx; \ - asm volatile("rdtsc" : "=a" (_eax), "=d" (_edx)); \ - (val) = ((unsigned long)_eax) | (((unsigned long)_edx)<<32); \ -} while(0) + return ((uint64_t)high << 32) | low; +} #define __write_tsc(val) wrmsrl(MSR_IA32_TSC, val) #define write_tsc(val) ({ \ diff --git a/xen/include/asm-x86/time.h b/xen/include/asm-x86/time.h index c4d82f6..39d6bf3 100644 --- a/xen/include/asm-x86/time.h +++ b/xen/include/asm-x86/time.h @@ -28,9 +28,7 @@ extern bool_t disable_tsc_sync; static inline cycles_t get_cycles(void) { - cycles_t c; - rdtscll(c); - return c; + return rdtsc(); } unsigned long -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:57:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:57: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 1YSmOC-0006pu-3a; Tue, 03 Mar 2015 12:57:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOA-0006pe-FO for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:30 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 54/7F-02995-9BFA5F45; Tue, 03 Mar 2015 12:57:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1425387448!12615191!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4486 invoked from network); 3 Mar 2015 12:57:29 -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; 3 Mar 2015 12:57:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmO7-0002ZV-Tg for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmO7-0003JR-Ss for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:27 +0000 Date: Tue, 03 Mar 2015 12:57:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: arm: use INVALID_P2M_ENTRY X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b37ed959d331d26b52585d367d7f18450fcca45 Author: Wei Liu AuthorDate: Fri Feb 6 12:37:50 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:27:00 2015 +0000 libxc: arm: use INVALID_P2M_ENTRY Albeit INVALID_P2M_ENTRY and INVALID_MFN are both ~0UL, conceptually speaking we should use INVALID_P2M_ENTRY for setting P2M values. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Stefano Stabellini CC: Julien Grall Acked-by: Ian Campbell Acked-by: Stefano Stabellini --- tools/libxc/xc_dom_arm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index 9b31b1f..c7feca7 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -453,7 +453,7 @@ int arch_setup_meminit(struct xc_dom_image *dom) if ( dom->p2m_host == NULL ) return -EINVAL; for ( pfn = 0; pfn < p2m_size; pfn++ ) - dom->p2m_host[pfn] = INVALID_MFN; + dom->p2m_host[pfn] = INVALID_P2M_ENTRY; /* setup initial p2m and allocate guest memory */ for ( i = 0; dom->rambank_size[i] && i < GUEST_RAM_BANKS; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 12:57:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:57: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 1YSmOC-0006pu-3a; Tue, 03 Mar 2015 12:57:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOA-0006pe-FO for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:30 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 54/7F-02995-9BFA5F45; Tue, 03 Mar 2015 12:57:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1425387448!12615191!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4486 invoked from network); 3 Mar 2015 12:57:29 -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; 3 Mar 2015 12:57:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmO7-0002ZV-Tg for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmO7-0003JR-Ss for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:27 +0000 Date: Tue, 03 Mar 2015 12:57:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: arm: use INVALID_P2M_ENTRY X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b37ed959d331d26b52585d367d7f18450fcca45 Author: Wei Liu AuthorDate: Fri Feb 6 12:37:50 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:27:00 2015 +0000 libxc: arm: use INVALID_P2M_ENTRY Albeit INVALID_P2M_ENTRY and INVALID_MFN are both ~0UL, conceptually speaking we should use INVALID_P2M_ENTRY for setting P2M values. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Stefano Stabellini CC: Julien Grall Acked-by: Ian Campbell Acked-by: Stefano Stabellini --- tools/libxc/xc_dom_arm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index 9b31b1f..c7feca7 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -453,7 +453,7 @@ int arch_setup_meminit(struct xc_dom_image *dom) if ( dom->p2m_host == NULL ) return -EINVAL; for ( pfn = 0; pfn < p2m_size; pfn++ ) - dom->p2m_host[pfn] = INVALID_MFN; + dom->p2m_host[pfn] = INVALID_P2M_ENTRY; /* setup initial p2m and allocate guest memory */ for ( i = 0; dom->rambank_size[i] && i < GUEST_RAM_BANKS; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 12:57:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:57:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOM-0006rf-6J; Tue, 03 Mar 2015 12:57:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOK-0006rL-Ic for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:40 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 77/32-31919-3CFA5F45; Tue, 03 Mar 2015 12:57:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1425387458!8871746!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27092 invoked from network); 3 Mar 2015 12:57:39 -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; 3 Mar 2015 12:57:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOI-0002Zd-2l for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmOI-0003Jr-1W for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:38 +0000 Date: Tue, 03 Mar 2015 12:57:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/ocaml: remove uint32 use added by 674ad2b X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2b4778b3f35dd67b12ed9dad1c65b28e71bbe9d1 Author: Michael Young AuthorDate: Sun Feb 8 15:54:23 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:28:43 2015 +0000 tools/ocaml: remove uint32 use added by 674ad2b In 674ad2b (xenstore: extend the xenstore ring with a 'closing' signal) two uses of uint32 are added to tools/ocaml/libs/xb/xs_ring_stubs.c . As of ocaml 4.03.0+dev the uint32 type is no longer supported. This patch replaces the uses of uint32 with uint32_t . Signed-off-by: Michael Young Acked-by: David Scott --- tools/ocaml/libs/xb/xs_ring_stubs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c b/tools/ocaml/libs/xb/xs_ring_stubs.c index fc9b0c5..fd561a2 100644 --- a/tools/ocaml/libs/xb/xs_ring_stubs.c +++ b/tools/ocaml/libs/xb/xs_ring_stubs.c @@ -55,7 +55,7 @@ CAMLprim value ml_interface_read(value ml_interface, cons = *(volatile uint32_t*)&intf->req_cons; prod = *(volatile uint32_t*)&intf->req_prod; - connection = *(volatile uint32*)&intf->connection; + connection = *(volatile uint32_t*)&intf->connection; if (connection != XENSTORE_CONNECTED) caml_raise_constant(*caml_named_value("Xb.Reconnect")); @@ -105,7 +105,7 @@ CAMLprim value ml_interface_write(value ml_interface, cons = *(volatile uint32_t*)&intf->rsp_cons; prod = *(volatile uint32_t*)&intf->rsp_prod; - connection = *(volatile uint32*)&intf->connection; + connection = *(volatile uint32_t*)&intf->connection; if (connection != XENSTORE_CONNECTED) caml_raise_constant(*caml_named_value("Xb.Reconnect")); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:57:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:57:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOM-0006rf-6J; Tue, 03 Mar 2015 12:57:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOK-0006rL-Ic for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:40 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 77/32-31919-3CFA5F45; Tue, 03 Mar 2015 12:57:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1425387458!8871746!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27092 invoked from network); 3 Mar 2015 12:57:39 -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; 3 Mar 2015 12:57:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOI-0002Zd-2l for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmOI-0003Jr-1W for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:38 +0000 Date: Tue, 03 Mar 2015 12:57:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/ocaml: remove uint32 use added by 674ad2b X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2b4778b3f35dd67b12ed9dad1c65b28e71bbe9d1 Author: Michael Young AuthorDate: Sun Feb 8 15:54:23 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:28:43 2015 +0000 tools/ocaml: remove uint32 use added by 674ad2b In 674ad2b (xenstore: extend the xenstore ring with a 'closing' signal) two uses of uint32 are added to tools/ocaml/libs/xb/xs_ring_stubs.c . As of ocaml 4.03.0+dev the uint32 type is no longer supported. This patch replaces the uses of uint32 with uint32_t . Signed-off-by: Michael Young Acked-by: David Scott --- tools/ocaml/libs/xb/xs_ring_stubs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c b/tools/ocaml/libs/xb/xs_ring_stubs.c index fc9b0c5..fd561a2 100644 --- a/tools/ocaml/libs/xb/xs_ring_stubs.c +++ b/tools/ocaml/libs/xb/xs_ring_stubs.c @@ -55,7 +55,7 @@ CAMLprim value ml_interface_read(value ml_interface, cons = *(volatile uint32_t*)&intf->req_cons; prod = *(volatile uint32_t*)&intf->req_prod; - connection = *(volatile uint32*)&intf->connection; + connection = *(volatile uint32_t*)&intf->connection; if (connection != XENSTORE_CONNECTED) caml_raise_constant(*caml_named_value("Xb.Reconnect")); @@ -105,7 +105,7 @@ CAMLprim value ml_interface_write(value ml_interface, cons = *(volatile uint32_t*)&intf->rsp_cons; prod = *(volatile uint32_t*)&intf->rsp_prod; - connection = *(volatile uint32*)&intf->connection; + connection = *(volatile uint32_t*)&intf->connection; if (connection != XENSTORE_CONNECTED) caml_raise_constant(*caml_named_value("Xb.Reconnect")); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:57:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:57: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 1YSmOW-0006t4-8s; Tue, 03 Mar 2015 12:57:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOU-0006su-PQ for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:50 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 84/52-03165-ECFA5F45; Tue, 03 Mar 2015 12:57:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1425387468!12621534!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29016 invoked from network); 3 Mar 2015 12:57:49 -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; 3 Mar 2015 12:57:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOS-0002Zj-9b for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmOS-0003Kc-75 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:48 +0000 Date: Tue, 03 Mar 2015 12:57:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: require at least pixman 0.21.8 for qemu-xen X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 85bae367e73021b8e74e46ee7594bdd4f82e144f Author: Olaf Hering AuthorDate: Wed Feb 11 16:00:44 2015 +0100 Commit: Ian Campbell CommitDate: Thu Feb 19 16:32:04 2015 +0000 tools: require at least pixman 0.21.8 for qemu-xen Avoid late build failure in openSUSE 11.4, it has just pixman-0.20: .... [ 211s] ERROR: pixman >= 0.21.8 not present. Your options: [ 211s] (1) Preferred: Install the pixman devel package (any recent [ 211s] distro should have packages as Xorg needs pixman too). [ 211s] (2) Fetch the pixman submodule, using: [ 211s] git submodule update --init pixman .... Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- tools/configure | 18 +++++++++--------- tools/configure.ac | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/configure b/tools/configure index 1c92e83..a752acd 100755 --- a/tools/configure +++ b/tools/configure @@ -7724,12 +7724,12 @@ if test -n "$pixman_CFLAGS"; then pkg_cv_pixman_CFLAGS="$pixman_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "pixman-1") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1 >= 0.21.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "pixman-1 >= 0.21.8") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_pixman_CFLAGS=`$PKG_CONFIG --cflags "pixman-1" 2>/dev/null` + pkg_cv_pixman_CFLAGS=`$PKG_CONFIG --cflags "pixman-1 >= 0.21.8" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -7741,12 +7741,12 @@ if test -n "$pixman_LIBS"; then pkg_cv_pixman_LIBS="$pixman_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "pixman-1") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1 >= 0.21.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "pixman-1 >= 0.21.8") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_pixman_LIBS=`$PKG_CONFIG --libs "pixman-1" 2>/dev/null` + pkg_cv_pixman_LIBS=`$PKG_CONFIG --libs "pixman-1 >= 0.21.8" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -7767,14 +7767,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - pixman_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pixman-1" 2>&1` + pixman_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pixman-1 >= 0.21.8" 2>&1` else - pixman_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pixman-1" 2>&1` + pixman_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pixman-1 >= 0.21.8" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$pixman_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (pixman-1) were not met: + as_fn_error $? "Package requirements (pixman-1 >= 0.21.8) were not met: $pixman_PKG_ERRORS diff --git a/tools/configure.ac b/tools/configure.ac index 1835617..d31c2f3 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -320,7 +320,7 @@ esac dnl The following are only required when upstream QEMU is built AS_IF([test "x$qemu_xen" = "xy"], [ PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12]) -PKG_CHECK_MODULES(pixman, pixman-1) +PKG_CHECK_MODULES(pixman, [pixman-1 >= 0.21.8]) ]) AX_CHECK_FETCHER -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:57:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:57: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 1YSmOW-0006t4-8s; Tue, 03 Mar 2015 12:57:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOU-0006su-PQ for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:50 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 84/52-03165-ECFA5F45; Tue, 03 Mar 2015 12:57:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1425387468!12621534!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29016 invoked from network); 3 Mar 2015 12:57:49 -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; 3 Mar 2015 12:57:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOS-0002Zj-9b for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmOS-0003Kc-75 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:48 +0000 Date: Tue, 03 Mar 2015 12:57:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: require at least pixman 0.21.8 for qemu-xen X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 85bae367e73021b8e74e46ee7594bdd4f82e144f Author: Olaf Hering AuthorDate: Wed Feb 11 16:00:44 2015 +0100 Commit: Ian Campbell CommitDate: Thu Feb 19 16:32:04 2015 +0000 tools: require at least pixman 0.21.8 for qemu-xen Avoid late build failure in openSUSE 11.4, it has just pixman-0.20: .... [ 211s] ERROR: pixman >= 0.21.8 not present. Your options: [ 211s] (1) Preferred: Install the pixman devel package (any recent [ 211s] distro should have packages as Xorg needs pixman too). [ 211s] (2) Fetch the pixman submodule, using: [ 211s] git submodule update --init pixman .... Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- tools/configure | 18 +++++++++--------- tools/configure.ac | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/configure b/tools/configure index 1c92e83..a752acd 100755 --- a/tools/configure +++ b/tools/configure @@ -7724,12 +7724,12 @@ if test -n "$pixman_CFLAGS"; then pkg_cv_pixman_CFLAGS="$pixman_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "pixman-1") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1 >= 0.21.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "pixman-1 >= 0.21.8") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_pixman_CFLAGS=`$PKG_CONFIG --cflags "pixman-1" 2>/dev/null` + pkg_cv_pixman_CFLAGS=`$PKG_CONFIG --cflags "pixman-1 >= 0.21.8" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -7741,12 +7741,12 @@ if test -n "$pixman_LIBS"; then pkg_cv_pixman_LIBS="$pixman_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "pixman-1") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1 >= 0.21.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "pixman-1 >= 0.21.8") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_pixman_LIBS=`$PKG_CONFIG --libs "pixman-1" 2>/dev/null` + pkg_cv_pixman_LIBS=`$PKG_CONFIG --libs "pixman-1 >= 0.21.8" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -7767,14 +7767,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - pixman_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pixman-1" 2>&1` + pixman_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pixman-1 >= 0.21.8" 2>&1` else - pixman_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pixman-1" 2>&1` + pixman_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pixman-1 >= 0.21.8" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$pixman_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (pixman-1) were not met: + as_fn_error $? "Package requirements (pixman-1 >= 0.21.8) were not met: $pixman_PKG_ERRORS diff --git a/tools/configure.ac b/tools/configure.ac index 1835617..d31c2f3 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -320,7 +320,7 @@ esac dnl The following are only required when upstream QEMU is built AS_IF([test "x$qemu_xen" = "xy"], [ PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12]) -PKG_CHECK_MODULES(pixman, pixman-1) +PKG_CHECK_MODULES(pixman, [pixman-1 >= 0.21.8]) ]) AX_CHECK_FETCHER -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:58:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:58: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 1YSmOg-0006uU-Bh; Tue, 03 Mar 2015 12:58:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOe-0006uF-SG for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:00 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 10/B2-03165-8DFA5F45; Tue, 03 Mar 2015 12:58:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1425387478!8508845!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3903 invoked from network); 3 Mar 2015 12:57:59 -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; 3 Mar 2015 12:57:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOc-0002Zs-FV for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmOc-0003L0-Dg for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:58 +0000 Date: Tue, 03 Mar 2015 12:57:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm64: more useful logging on bad trap. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2a9204bf9c0aaadf64434e8b45da9bb5a1784ee1 Author: Ian Campbell AuthorDate: Wed Feb 18 17:01:55 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:48:52 2015 +0000 xen: arm64: more useful logging on bad trap. Dump the register state before panicing so we have some clue where the issue occurred. Also decode the ESR register a bit to save having to grab a pen and paper. ESR_EL2 is a 32-bit register, so use SYSREG_READ32 not ..._READ64, as we already do correctly in the main trap handler. While here notice that do_trap_serror is never called and remove it. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall Tested-by: Jintack Lim Cc: jintack@cs.columbia.edu [ ijc -- add missing \n to first printk ] --- xen/arch/arm/arm64/traps.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/arm64/traps.c b/xen/arch/arm/arm64/traps.c index 1693b5d..5a90cfa 100644 --- a/xen/arch/arm/arm64/traps.c +++ b/xen/arch/arm/arm64/traps.c @@ -24,11 +24,6 @@ #include -asmlinkage void do_trap_serror(struct cpu_user_regs *regs) -{ - panic("Unhandled serror trap"); -} - static const char *handler[]= { "Synchronous Abort", "IRQ", @@ -38,11 +33,14 @@ static const char *handler[]= { asmlinkage void do_bad_mode(struct cpu_user_regs *regs, int reason) { - uint64_t esr = READ_SYSREG64(ESR_EL2); - printk("Bad mode in %s handler detected, code 0x%08"PRIx64"\n", - handler[reason], esr); + union hsr hsr = { .bits = READ_SYSREG32(ESR_EL2) }; + + printk("Bad mode in %s handler detected\n", handler[reason]); + printk("ESR=0x%08"PRIx32": EC=%"PRIx32", IL=%"PRIx32", ISS=%"PRIx32"\n", + hsr.bits, hsr.ec, hsr.len, hsr.iss); local_irq_disable(); + show_execution_state(regs); panic("bad mode"); } -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:58:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:58: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 1YSmOg-0006uU-Bh; Tue, 03 Mar 2015 12:58:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOe-0006uF-SG for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:00 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 10/B2-03165-8DFA5F45; Tue, 03 Mar 2015 12:58:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1425387478!8508845!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3903 invoked from network); 3 Mar 2015 12:57:59 -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; 3 Mar 2015 12:57:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOc-0002Zs-FV for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmOc-0003L0-Dg for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:57:58 +0000 Date: Tue, 03 Mar 2015 12:57:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm64: more useful logging on bad trap. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2a9204bf9c0aaadf64434e8b45da9bb5a1784ee1 Author: Ian Campbell AuthorDate: Wed Feb 18 17:01:55 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:48:52 2015 +0000 xen: arm64: more useful logging on bad trap. Dump the register state before panicing so we have some clue where the issue occurred. Also decode the ESR register a bit to save having to grab a pen and paper. ESR_EL2 is a 32-bit register, so use SYSREG_READ32 not ..._READ64, as we already do correctly in the main trap handler. While here notice that do_trap_serror is never called and remove it. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall Tested-by: Jintack Lim Cc: jintack@cs.columbia.edu [ ijc -- add missing \n to first printk ] --- xen/arch/arm/arm64/traps.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/arm64/traps.c b/xen/arch/arm/arm64/traps.c index 1693b5d..5a90cfa 100644 --- a/xen/arch/arm/arm64/traps.c +++ b/xen/arch/arm/arm64/traps.c @@ -24,11 +24,6 @@ #include -asmlinkage void do_trap_serror(struct cpu_user_regs *regs) -{ - panic("Unhandled serror trap"); -} - static const char *handler[]= { "Synchronous Abort", "IRQ", @@ -38,11 +33,14 @@ static const char *handler[]= { asmlinkage void do_bad_mode(struct cpu_user_regs *regs, int reason) { - uint64_t esr = READ_SYSREG64(ESR_EL2); - printk("Bad mode in %s handler detected, code 0x%08"PRIx64"\n", - handler[reason], esr); + union hsr hsr = { .bits = READ_SYSREG32(ESR_EL2) }; + + printk("Bad mode in %s handler detected\n", handler[reason]); + printk("ESR=0x%08"PRIx32": EC=%"PRIx32", IL=%"PRIx32", ISS=%"PRIx32"\n", + hsr.bits, hsr.ec, hsr.len, hsr.iss); local_irq_disable(); + show_execution_state(regs); panic("bad mode"); } -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:58:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:58:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOq-0006wO-Hw; Tue, 03 Mar 2015 12:58:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOp-0006w3-6T for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:11 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 99/80-02898-2EFA5F45; Tue, 03 Mar 2015 12:58:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1425387488!12590219!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8706 invoked from network); 3 Mar 2015 12:58: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; 3 Mar 2015 12:58:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOm-0002aQ-Kk for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmOm-0003LY-Is for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:08 +0000 Date: Tue, 03 Mar 2015 12:58:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: update to seabios rel-1.8.0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6dacedd707c20212006e4e100443aa8cc8997d8c Author: Ian Campbell AuthorDate: Thu Feb 19 08:37:44 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:50:05 2015 +0000 tools: update to seabios rel-1.8.0 Signed-off-by: Ian Campbell Acked-by: Wei Liu --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index d12ad91..27b0997 100644 --- a/Config.mk +++ b/Config.mk @@ -253,9 +253,9 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 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. +SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 +# Wed Feb 18 12:49:59 2015 -0500 +# docs: Note v1.8.0 release ETHERBOOT_NICS ?= rtl8139 8086100e -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:58:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:58:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOq-0006wO-Hw; Tue, 03 Mar 2015 12:58:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOp-0006w3-6T for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:11 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 99/80-02898-2EFA5F45; Tue, 03 Mar 2015 12:58:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1425387488!12590219!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8706 invoked from network); 3 Mar 2015 12:58: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; 3 Mar 2015 12:58:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOm-0002aQ-Kk for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmOm-0003LY-Is for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:08 +0000 Date: Tue, 03 Mar 2015 12:58:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: update to seabios rel-1.8.0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6dacedd707c20212006e4e100443aa8cc8997d8c Author: Ian Campbell AuthorDate: Thu Feb 19 08:37:44 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:50:05 2015 +0000 tools: update to seabios rel-1.8.0 Signed-off-by: Ian Campbell Acked-by: Wei Liu --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index d12ad91..27b0997 100644 --- a/Config.mk +++ b/Config.mk @@ -253,9 +253,9 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 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. +SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 +# Wed Feb 18 12:49:59 2015 -0500 +# docs: Note v1.8.0 release ETHERBOOT_NICS ?= rtl8139 8086100e -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:58:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:58: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 1YSmP0-0006xq-LA; Tue, 03 Mar 2015 12:58:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOz-0006xe-5k for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:21 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 02/98-03511-CEFA5F45; Tue, 03 Mar 2015 12:58:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1425387499!12629630!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18512 invoked from network); 3 Mar 2015 12:58:19 -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; 3 Mar 2015 12:58:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOw-0002aW-Tl for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmOw-0003MQ-Oz for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:18 +0000 Date: Tue, 03 Mar 2015 12:58:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Do not use remus teardown paths for non-remus 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 d04b137ea76571e9e5f90625a7d96c4eb964a223 Author: Andrew Cooper AuthorDate: Thu Feb 19 12:43:57 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:54:01 2015 +0000 tools/libxl: Do not use remus teardown paths for non-remus guests It causes a suspend failure to emit libxl: error: libxl_dom.c:2035:remus_teardown_done: Remus: failed to teardown device for guest with domid 17, rc -3 for all domains, including those not using remus at all. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 48d661a..a16d4a1 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -2007,7 +2007,7 @@ static void domain_suspend_done(libxl__egc *egc, dss->guest_evtchn.port, &dss->guest_evtchn_lockfd); if (!dss->remus) { - remus_teardown_done(egc, &dss->rds, rc); + dss->callback(egc, dss, rc); 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 Tue Mar 03 12:58:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:58: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 1YSmP0-0006xq-LA; Tue, 03 Mar 2015 12:58:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOz-0006xe-5k for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:21 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 02/98-03511-CEFA5F45; Tue, 03 Mar 2015 12:58:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1425387499!12629630!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18512 invoked from network); 3 Mar 2015 12:58:19 -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; 3 Mar 2015 12:58:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmOw-0002aW-Tl for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmOw-0003MQ-Oz for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:18 +0000 Date: Tue, 03 Mar 2015 12:58:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Do not use remus teardown paths for non-remus 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 d04b137ea76571e9e5f90625a7d96c4eb964a223 Author: Andrew Cooper AuthorDate: Thu Feb 19 12:43:57 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:54:01 2015 +0000 tools/libxl: Do not use remus teardown paths for non-remus guests It causes a suspend failure to emit libxl: error: libxl_dom.c:2035:remus_teardown_done: Remus: failed to teardown device for guest with domid 17, rc -3 for all domains, including those not using remus at all. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 48d661a..a16d4a1 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -2007,7 +2007,7 @@ static void domain_suspend_done(libxl__egc *egc, dss->guest_evtchn.port, &dss->guest_evtchn_lockfd); if (!dss->remus) { - remus_teardown_done(egc, &dss->rds, rc); + dss->callback(egc, dss, rc); 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 Tue Mar 03 12:58:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:58:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPA-0006zD-Nl; Tue, 03 Mar 2015 12:58:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmP9-0006yz-BN for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:31 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 18/19-03511-6FFA5F45; Tue, 03 Mar 2015 12:58:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1425387509!12612420!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9332 invoked from network); 3 Mar 2015 12:58:30 -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; 3 Mar 2015 12:58:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmP7-0002ae-1t for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmP7-0003Mt-0Y for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:29 +0000 Date: Tue, 03 Mar 2015 12:58:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Correctly set GICD_TYPER.IDbits X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8206d052eb11061d7b6cada566c0804c14001fec Author: Julien Grall AuthorDate: Mon Feb 16 14:50:41 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:54:01 2015 +0000 xen/arm: vgic-v3: Correctly set GICD_TYPER.IDbits From Linux 3.19, the GICv3 drivers is using GICD_TYPER.IDbits to check the validity of the hardware interrupt number. The field IDBits in the register GICD_TYPER is used to know the number of interrupt identifiers (SPI, PPIs, SGIs, LPIs) supported by GIC Stream Protocol Interface. This field contains the number of interrupt identifier bits minus one. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v3.c | 11 +++++++++++ xen/include/asm-arm/gic_v3_defs.h | 3 +++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index bece189..72b22ee 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -679,11 +679,22 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) vgic_unlock(v); return 1; case GICD_TYPER: + { + /* + * Number of interrupt identifier bits supported by the GIC + * Stream Protocol Interface + */ + unsigned int irq_bits = get_count_order(vgic_num_irqs(v->domain)); + if ( dabt.size != DABT_WORD ) goto bad_width; /* No secure world support for guests. */ *r = (((v->domain->max_vcpus << 5) & GICD_TYPE_CPUS ) | ((v->domain->arch.vgic.nr_spis / 32) & GICD_TYPE_LINES)); + + *r |= (irq_bits - 1) << GICD_TYPE_ID_BITS_SHIFT; + return 1; + } case GICD_STATUSR: /* * Optional, Not implemented for now. diff --git a/xen/include/asm-arm/gic_v3_defs.h b/xen/include/asm-arm/gic_v3_defs.h index 13adb53..b8a1c2e 100644 --- a/xen/include/asm-arm/gic_v3_defs.h +++ b/xen/include/asm-arm/gic_v3_defs.h @@ -45,6 +45,9 @@ #define GICC_SRE_EL2_DIB (1UL << 2) #define GICC_SRE_EL2_ENEL1 (1UL << 3) +/* Additional bits in GICD_TYPER defined by GICv3 */ +#define GICD_TYPE_ID_BITS_SHIFT 19 + #define GICD_CTLR_RWP (1UL << 31) #define GICD_CTLR_ARE_NS (1U << 4) #define GICD_CTLR_ENABLE_G1A (1U << 1) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:58:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:58:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPA-0006zD-Nl; Tue, 03 Mar 2015 12:58:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmP9-0006yz-BN for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:31 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 18/19-03511-6FFA5F45; Tue, 03 Mar 2015 12:58:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1425387509!12612420!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9332 invoked from network); 3 Mar 2015 12:58:30 -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; 3 Mar 2015 12:58:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmP7-0002ae-1t for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmP7-0003Mt-0Y for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:29 +0000 Date: Tue, 03 Mar 2015 12:58:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Correctly set GICD_TYPER.IDbits X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8206d052eb11061d7b6cada566c0804c14001fec Author: Julien Grall AuthorDate: Mon Feb 16 14:50:41 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:54:01 2015 +0000 xen/arm: vgic-v3: Correctly set GICD_TYPER.IDbits From Linux 3.19, the GICv3 drivers is using GICD_TYPER.IDbits to check the validity of the hardware interrupt number. The field IDBits in the register GICD_TYPER is used to know the number of interrupt identifiers (SPI, PPIs, SGIs, LPIs) supported by GIC Stream Protocol Interface. This field contains the number of interrupt identifier bits minus one. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v3.c | 11 +++++++++++ xen/include/asm-arm/gic_v3_defs.h | 3 +++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index bece189..72b22ee 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -679,11 +679,22 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) vgic_unlock(v); return 1; case GICD_TYPER: + { + /* + * Number of interrupt identifier bits supported by the GIC + * Stream Protocol Interface + */ + unsigned int irq_bits = get_count_order(vgic_num_irqs(v->domain)); + if ( dabt.size != DABT_WORD ) goto bad_width; /* No secure world support for guests. */ *r = (((v->domain->max_vcpus << 5) & GICD_TYPE_CPUS ) | ((v->domain->arch.vgic.nr_spis / 32) & GICD_TYPE_LINES)); + + *r |= (irq_bits - 1) << GICD_TYPE_ID_BITS_SHIFT; + return 1; + } case GICD_STATUSR: /* * Optional, Not implemented for now. diff --git a/xen/include/asm-arm/gic_v3_defs.h b/xen/include/asm-arm/gic_v3_defs.h index 13adb53..b8a1c2e 100644 --- a/xen/include/asm-arm/gic_v3_defs.h +++ b/xen/include/asm-arm/gic_v3_defs.h @@ -45,6 +45,9 @@ #define GICC_SRE_EL2_DIB (1UL << 2) #define GICC_SRE_EL2_ENEL1 (1UL << 3) +/* Additional bits in GICD_TYPER defined by GICv3 */ +#define GICD_TYPE_ID_BITS_SHIFT 19 + #define GICD_CTLR_RWP (1UL << 31) #define GICD_CTLR_ARE_NS (1U << 4) #define GICD_CTLR_ENABLE_G1A (1U << 1) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:58:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:58: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 1YSmPM-00070m-Qy; Tue, 03 Mar 2015 12:58:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPL-00070Y-7a for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:43 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 37/FF-03164-100B5F45; Tue, 03 Mar 2015 12:58:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1425387519!14253640!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12016 invoked from network); 3 Mar 2015 12:58: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; 3 Mar 2015 12:58:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPH-0002ak-6K for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmPH-0003NO-5X for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:39 +0000 Date: Tue, 03 Mar 2015 12:58:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Correctly set GICD_TYPER.CPUNumber X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 834551bace5cfda7ca5ebbdc2ec9fd18f002e4ce Author: Julien Grall AuthorDate: Mon Feb 16 14:50:42 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:54:01 2015 +0000 xen/arm: vgic-v3: Correctly set GICD_TYPER.CPUNumber On GICv3, the value (CPUNumber + 1) indicates the number of processor that may be used as interrupts targets when ARE bit is zero. The maximum is 8 processors. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v3.c | 7 ++++++- xen/include/asm-arm/gic.h | 1 + 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 72b22ee..e0a7d5b 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -685,10 +685,15 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) * Stream Protocol Interface */ unsigned int irq_bits = get_count_order(vgic_num_irqs(v->domain)); + /* + * Number of processors that may be used as interrupt targets when ARE + * bit is zero. The maximum is 8. + */ + unsigned int ncpus = min_t(unsigned int, v->domain->max_vcpus, 8); if ( dabt.size != DABT_WORD ) goto bad_width; /* No secure world support for guests. */ - *r = (((v->domain->max_vcpus << 5) & GICD_TYPE_CPUS ) | + *r = ((ncpus - 1) << GICD_TYPE_CPUS_SHIFT | ((v->domain->arch.vgic.nr_spis / 32) & GICD_TYPE_LINES)); *r |= (irq_bits - 1) << GICD_TYPE_ID_BITS_SHIFT; diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 187dc46..0396a8e 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -93,6 +93,7 @@ #define GICD_CTL_ENABLE 0x1 #define GICD_TYPE_LINES 0x01f +#define GICD_TYPE_CPUS_SHIFT 5 #define GICD_TYPE_CPUS 0x0e0 #define GICD_TYPE_SEC 0x400 -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:58:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:58: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 1YSmPM-00070m-Qy; Tue, 03 Mar 2015 12:58:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPL-00070Y-7a for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:43 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 37/FF-03164-100B5F45; Tue, 03 Mar 2015 12:58:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1425387519!14253640!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12016 invoked from network); 3 Mar 2015 12:58: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; 3 Mar 2015 12:58:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPH-0002ak-6K for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmPH-0003NO-5X for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:39 +0000 Date: Tue, 03 Mar 2015 12:58:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Correctly set GICD_TYPER.CPUNumber X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 834551bace5cfda7ca5ebbdc2ec9fd18f002e4ce Author: Julien Grall AuthorDate: Mon Feb 16 14:50:42 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:54:01 2015 +0000 xen/arm: vgic-v3: Correctly set GICD_TYPER.CPUNumber On GICv3, the value (CPUNumber + 1) indicates the number of processor that may be used as interrupts targets when ARE bit is zero. The maximum is 8 processors. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v3.c | 7 ++++++- xen/include/asm-arm/gic.h | 1 + 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 72b22ee..e0a7d5b 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -685,10 +685,15 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) * Stream Protocol Interface */ unsigned int irq_bits = get_count_order(vgic_num_irqs(v->domain)); + /* + * Number of processors that may be used as interrupt targets when ARE + * bit is zero. The maximum is 8. + */ + unsigned int ncpus = min_t(unsigned int, v->domain->max_vcpus, 8); if ( dabt.size != DABT_WORD ) goto bad_width; /* No secure world support for guests. */ - *r = (((v->domain->max_vcpus << 5) & GICD_TYPE_CPUS ) | + *r = ((ncpus - 1) << GICD_TYPE_CPUS_SHIFT | ((v->domain->arch.vgic.nr_spis / 32) & GICD_TYPE_LINES)); *r |= (irq_bits - 1) << GICD_TYPE_ID_BITS_SHIFT; diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 187dc46..0396a8e 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -93,6 +93,7 @@ #define GICD_CTL_ENABLE 0x1 #define GICD_TYPE_LINES 0x01f +#define GICD_TYPE_CPUS_SHIFT 5 #define GICD_TYPE_CPUS 0x0e0 #define GICD_TYPE_SEC 0x400 -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:58:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:58: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 1YSmPV-00072I-Vn; Tue, 03 Mar 2015 12:58:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPT-00071r-QS for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:51 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 95/E8-03164-B00B5F45; Tue, 03 Mar 2015 12:58:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1425387529!10175812!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2337 invoked from network); 3 Mar 2015 12:58:50 -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; 3 Mar 2015 12:58:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPR-0002aq-BN for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmPR-0003Nk-9p for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:49 +0000 Date: Tue, 03 Mar 2015 12:58:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Correctly handle GICD_CTLR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d91d64e24b0248db44e394cdeabd6a6f68c8cb2 Author: Julien Grall AuthorDate: Mon Feb 16 14:50:43 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:54:01 2015 +0000 xen/arm: vgic-v3: Correctly handle GICD_CTLR As backward GICv2 compatibility is not supported in the vGICv3 driver, the bit ARE_NS is RAO/WI. Furthermore, when ARE_NS is set, the guest can only modify EnableGrp1A. At same time take the vgic_lock to write into domain.arch.vgic.ctrl. It was already taken during read. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v3.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index e0a7d5b..9115199 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -45,6 +45,12 @@ #define GICV3_GICR_PIDR2 GICV3_GICD_PIDR2 #define GICV3_GICR_PIDR4 GICV3_GICD_PIDR4 +/* + * GICD_CTLR default value: + * - No GICv2 compatibility => ARE = 1 + */ +#define VGICD_CTLR_DEFAULT (GICD_CTLR_ARE_NS) + static struct vcpu *vgic_v3_irouter_to_vcpu(struct vcpu *v, uint64_t irouter) { irouter &= ~(GICD_IROUTER_SPI_MODE_ANY); @@ -838,8 +844,15 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) { case GICD_CTLR: if ( dabt.size != DABT_WORD ) goto bad_width; - /* Ignore all but the enable bit */ - v->domain->arch.vgic.ctlr = (*r) & GICD_CTL_ENABLE; + + vgic_lock(v); + /* Only EnableGrp1A can be changed */ + if ( *r & GICD_CTLR_ENABLE_G1A ) + v->domain->arch.vgic.ctlr |= GICD_CTLR_ENABLE_G1A; + else + v->domain->arch.vgic.ctlr &= ~GICD_CTLR_ENABLE_G1A; + vgic_unlock(v); + return 1; case GICD_TYPER: /* RO -- write ignored */ @@ -1100,6 +1113,8 @@ static int vgic_v3_domain_init(struct domain *d) register_mmio_handler(d, &vgic_rdistr_mmio_handler, d->arch.vgic.rbase[i], d->arch.vgic.rbase_size[i]); + d->arch.vgic.ctlr = VGICD_CTLR_DEFAULT; + return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 12:58:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:58: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 1YSmPV-00072I-Vn; Tue, 03 Mar 2015 12:58:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPT-00071r-QS for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:51 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 95/E8-03164-B00B5F45; Tue, 03 Mar 2015 12:58:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1425387529!10175812!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2337 invoked from network); 3 Mar 2015 12:58:50 -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; 3 Mar 2015 12:58:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPR-0002aq-BN for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmPR-0003Nk-9p for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:49 +0000 Date: Tue, 03 Mar 2015 12:58:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Correctly handle GICD_CTLR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d91d64e24b0248db44e394cdeabd6a6f68c8cb2 Author: Julien Grall AuthorDate: Mon Feb 16 14:50:43 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:54:01 2015 +0000 xen/arm: vgic-v3: Correctly handle GICD_CTLR As backward GICv2 compatibility is not supported in the vGICv3 driver, the bit ARE_NS is RAO/WI. Furthermore, when ARE_NS is set, the guest can only modify EnableGrp1A. At same time take the vgic_lock to write into domain.arch.vgic.ctrl. It was already taken during read. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v3.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index e0a7d5b..9115199 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -45,6 +45,12 @@ #define GICV3_GICR_PIDR2 GICV3_GICD_PIDR2 #define GICV3_GICR_PIDR4 GICV3_GICD_PIDR4 +/* + * GICD_CTLR default value: + * - No GICv2 compatibility => ARE = 1 + */ +#define VGICD_CTLR_DEFAULT (GICD_CTLR_ARE_NS) + static struct vcpu *vgic_v3_irouter_to_vcpu(struct vcpu *v, uint64_t irouter) { irouter &= ~(GICD_IROUTER_SPI_MODE_ANY); @@ -838,8 +844,15 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) { case GICD_CTLR: if ( dabt.size != DABT_WORD ) goto bad_width; - /* Ignore all but the enable bit */ - v->domain->arch.vgic.ctlr = (*r) & GICD_CTL_ENABLE; + + vgic_lock(v); + /* Only EnableGrp1A can be changed */ + if ( *r & GICD_CTLR_ENABLE_G1A ) + v->domain->arch.vgic.ctlr |= GICD_CTLR_ENABLE_G1A; + else + v->domain->arch.vgic.ctlr &= ~GICD_CTLR_ENABLE_G1A; + vgic_unlock(v); + return 1; case GICD_TYPER: /* RO -- write ignored */ @@ -1100,6 +1113,8 @@ static int vgic_v3_domain_init(struct domain *d) register_mmio_handler(d, &vgic_rdistr_mmio_handler, d->arch.vgic.rbase[i], d->arch.vgic.rbase_size[i]); + d->arch.vgic.ctlr = VGICD_CTLR_DEFAULT; + return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 12:59:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:59: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 1YSmPg-00073g-2I; Tue, 03 Mar 2015 12:59:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPe-00073T-Cs for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:02 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id E8/4A-03511-510B5F45; Tue, 03 Mar 2015 12:59:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1425387539!12673412!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7480 invoked from network); 3 Mar 2015 12:59:00 -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; 3 Mar 2015 12:59:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPb-0002b2-GH for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmPb-0003OD-F9 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:59 +0000 Date: Tue, 03 Mar 2015 12:58:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Correctly handle RAZ/WI registers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5e6958a7ee57982fc2f37e1f5c76d0d4e66d7e3b Author: Julien Grall AuthorDate: Mon Feb 16 14:50:44 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:55:17 2015 +0000 xen/arm: vgic-v3: Correctly handle RAZ/WI registers Some of the registers are accessible via multiple size (see GICD_IPRIORITYR*). Those registers are incorrectly implemented when they should be RAZ. Only word-access size are currently allowed for them. The paragraph 5.3.1 in the GICv3 spec (PRD03-GENC-010745 24.0) indicates the different access-sizes supported for each register. The current vGICv3 driver is not ready for 32 bits guest and will require some rework. So, for now, only supporting access-size of a system not supporting aarch32. To avoid further issues, introduce different label following the access-size of the registers: - read_as_zero_64 and write_ignore_64: Used for registers accessible via a double-word. - read_as_zero_32 and write_ignore_32: Used for registers accessible via a word. - read_as_zero: Used when we don't have to check the access size. The latter is used when the access size has already been checked in the register emulation and/or when the register offset is reserved/implementation defined. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v3.c | 98 ++++++++++++++++++++++++++--------------------- 1 files changed, 54 insertions(+), 44 deletions(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 9115199..1145972 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -101,7 +101,7 @@ static int __vgic_v3_rdistr_rd_mmio_read(struct vcpu *v, mmio_info_t *info, { case GICR_CTLR: /* We have not implemented LPI's, read zero */ - goto read_as_zero; + goto read_as_zero_32; case GICR_IIDR: if ( dabt.size != DABT_WORD ) goto bad_width; *r = GICV3_GICR_IIDR_VAL; @@ -117,10 +117,10 @@ static int __vgic_v3_rdistr_rd_mmio_read(struct vcpu *v, mmio_info_t *info, return 1; case GICR_STATUSR: /* Not implemented */ - goto read_as_zero; + goto read_as_zero_32; case GICR_WAKER: /* Power management is not implemented */ - goto read_as_zero; + goto read_as_zero_32; case GICR_SETLPIR: /* WO. Read as zero */ goto read_as_zero_64; @@ -165,14 +165,14 @@ static int __vgic_v3_rdistr_rd_mmio_read(struct vcpu *v, mmio_info_t *info, return 1; case GICR_PIDR3: /* Manufacture/customer defined */ - goto read_as_zero; + goto read_as_zero_32; case GICR_PIDR4: if ( dabt.size != DABT_WORD ) goto bad_width; *r = GICV3_GICR_PIDR4; return 1; case GICR_PIDR5 ... GICR_PIDR7: /* Reserved0 */ - goto read_as_zero; + goto read_as_zero_32; default: printk(XENLOG_G_ERR "%pv: vGICR: read r%d offset %#08x\n not found", @@ -190,7 +190,7 @@ read_as_zero_64: *r = 0; return 1; -read_as_zero: +read_as_zero_32: if ( dabt.size != DABT_WORD ) goto bad_width; *r = 0; return 1; @@ -207,19 +207,19 @@ static int __vgic_v3_rdistr_rd_mmio_write(struct vcpu *v, mmio_info_t *info, { case GICR_CTLR: /* LPI's not implemented */ - goto write_ignore; + goto write_ignore_32; case GICR_IIDR: /* RO */ - goto write_ignore; + goto write_ignore_32; case GICR_TYPER: /* RO */ goto write_ignore_64; case GICR_STATUSR: /* Not implemented */ - goto write_ignore; + goto write_ignore_32; case GICR_WAKER: /* Power mgmt not implemented */ - goto write_ignore; + goto write_ignore_32; case GICR_SETLPIR: /* LPI is not implemented */ goto write_ignore_64; @@ -240,7 +240,7 @@ static int __vgic_v3_rdistr_rd_mmio_write(struct vcpu *v, mmio_info_t *info, goto write_ignore_64; case GICR_SYNCR: /* RO */ - goto write_ignore; + goto write_ignore_32; case GICR_MOVLPIR: /* LPI is not implemented */ goto write_ignore_64; @@ -249,7 +249,7 @@ static int __vgic_v3_rdistr_rd_mmio_write(struct vcpu *v, mmio_info_t *info, goto write_ignore_64; case GICR_PIDR7... GICR_PIDR0: /* RO */ - goto write_ignore; + goto write_ignore_32; default: printk(XENLOG_G_ERR "%pv: vGICR: write r%d offset %#08x\n not found", v, dabt.reg, gicr_reg); @@ -266,7 +266,7 @@ write_ignore_64: if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; return 1; -write_ignore: +write_ignore_32: if ( dabt.size != DABT_WORD ) goto bad_width; return 1; } @@ -284,6 +284,7 @@ static int __vgic_v3_distr_common_mmio_read(struct vcpu *v, mmio_info_t *info, { case GICD_IGROUPR ... GICD_IGROUPRN: /* We do not implement security extensions for guests, read zero */ + if ( dabt.size != DABT_WORD ) goto bad_width; goto read_as_zero; case GICD_ISENABLER ... GICD_ISENABLERN: if ( dabt.size != DABT_WORD ) goto bad_width; @@ -368,7 +369,6 @@ bad_width: return 0; read_as_zero: - if ( dabt.size != DABT_WORD ) goto bad_width; *r = 0; return 1; } @@ -387,7 +387,7 @@ static int __vgic_v3_distr_common_mmio_write(struct vcpu *v, mmio_info_t *info, { case GICD_IGROUPR ... GICD_IGROUPRN: /* We do not implement security extensions for guests, write ignore */ - goto write_ignore; + goto write_ignore_32; case GICD_ISENABLER ... GICD_ISENABLERN: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, reg - GICD_ISENABLER, DABT_WORD); @@ -456,7 +456,7 @@ static int __vgic_v3_distr_common_mmio_write(struct vcpu *v, mmio_info_t *info, vgic_unlock_rank(v, rank, flags); return 1; case GICD_ICFGR: /* Restricted to configure SGIs */ - goto write_ignore; + goto write_ignore_32; case GICD_ICFGR + 4 ... GICD_ICFGRN: /* PPI + SPIs */ /* ICFGR1 for PPI's, which is implementation defined if ICFGR1 is programmable or not. We chose to program */ @@ -481,8 +481,9 @@ bad_width: domain_crash_synchronous(); return 0; -write_ignore: +write_ignore_32: if ( dabt.size != DABT_WORD ) goto bad_width; +write_ignore: return 1; } @@ -499,7 +500,7 @@ static int vgic_v3_rdistr_sgi_mmio_read(struct vcpu *v, mmio_info_t *info, { case GICR_IGRPMODR0: /* We do not implement security extensions for guests, read zero */ - goto read_as_zero; + goto read_as_zero_32; case GICR_IGROUPR0: case GICR_ISENABLER0: case GICR_ICENABLER0: @@ -543,8 +544,9 @@ bad_width: domain_crash_synchronous(); return 0; -read_as_zero: +read_as_zero_32: if ( dabt.size != DABT_WORD ) goto bad_width; +read_as_zero: *r = 0; return 1; } @@ -562,7 +564,7 @@ static int vgic_v3_rdistr_sgi_mmio_write(struct vcpu *v, mmio_info_t *info, { case GICR_IGRPMODR0: /* We do not implement security extensions for guests, write ignore */ - goto write_ignore; + goto write_ignore_32; case GICR_IGROUPR0: case GICR_ISENABLER0: case GICR_ICENABLER0: @@ -595,7 +597,7 @@ static int vgic_v3_rdistr_sgi_mmio_write(struct vcpu *v, mmio_info_t *info, return 1; case GICR_NSACR: /* We do not implement security extensions for guests, write ignore */ - goto write_ignore; + goto write_ignore_32; default: printk(XENLOG_G_ERR "%pv: vGICR: SGI: write r%d offset %#08x\n not found", @@ -610,8 +612,9 @@ bad_width: domain_crash_synchronous(); return 0; -write_ignore: +write_ignore_32: if ( dabt.size != DABT_WORD ) goto bad_width; +write_ignore: return 1; } @@ -711,7 +714,7 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) * Optional, Not implemented for now. * Update to support guest debugging. */ - goto read_as_zero; + goto read_as_zero_32; case GICD_IIDR: if ( dabt.size != DABT_WORD ) goto bad_width; *r = GICV3_GICD_IIDR_VAL; @@ -719,7 +722,7 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case 0x020 ... 0x03c: case 0xc000 ... 0xffcc: /* Implementation defined -- read as zero */ - goto read_as_zero; + goto read_as_zero_32; case GICD_IGROUPR ... GICD_IGROUPRN: case GICD_ISENABLER ... GICD_ISENABLERN: case GICD_ICENABLER ... GICD_ICENABLERN: @@ -757,16 +760,16 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_NSACR ... GICD_NSACRN: /* We do not implement security extensions for guests, read zero */ - goto read_as_zero; + goto read_as_zero_32; case GICD_SGIR: /* Read as ICH_SGIR system register with SRE set. So ignore */ - goto read_as_zero; + goto read_as_zero_32; case GICD_CPENDSGIR ... GICD_CPENDSGIRN: /* Replaced with GICR_ICPENDR0. So ignore write */ - goto read_as_zero; + goto read_as_zero_32; case GICD_SPENDSGIR ... GICD_SPENDSGIRN: /* Replaced with GICR_ISPENDR0. So ignore write */ - goto read_as_zero; + goto read_as_zero_32; case GICD_PIDR0: /* GICv3 identification value */ if ( dabt.size != DABT_WORD ) goto bad_width; @@ -784,7 +787,7 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_PIDR3: /* GICv3 identification value. Manufacturer/Customer defined */ - goto read_as_zero; + goto read_as_zero_32; case GICD_PIDR4: /* GICv3 identification value */ if ( dabt.size != DABT_WORD ) goto bad_width; @@ -792,7 +795,7 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_PIDR5 ... GICD_PIDR7: /* Reserved0 */ - goto read_as_zero; + goto read_as_zero_32; case 0x00c: case 0x044: case 0x04c: @@ -821,10 +824,14 @@ read_as_zero_64: *r = 0; return 1; -read_as_zero: +read_as_zero_32: if ( dabt.size != DABT_WORD ) goto bad_width; *r = 0; return 1; + +read_as_zero: + *r = 0; + return 1; } static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) @@ -856,32 +863,32 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) return 1; case GICD_TYPER: /* RO -- write ignored */ - goto write_ignore; + goto write_ignore_32; case GICD_IIDR: /* RO -- write ignored */ - goto write_ignore; + goto write_ignore_32; case GICD_STATUSR: /* RO -- write ignored */ - goto write_ignore; + goto write_ignore_32; case GICD_SETSPI_NSR: /* Message based SPI is not implemented */ - goto write_ignore; + goto write_ignore_32; case GICD_CLRSPI_NSR: /* Message based SPI is not implemented */ - goto write_ignore; + goto write_ignore_32; case GICD_SETSPI_SR: /* Message based SPI is not implemented */ - goto write_ignore; + goto write_ignore_32; case GICD_CLRSPI_SR: /* Message based SPI is not implemented */ - goto write_ignore; + goto write_ignore_32; case 0x020 ... 0x03c: case 0xc000 ... 0xffcc: /* Implementation defined -- write ignored */ printk(XENLOG_G_DEBUG "%pv: vGICD: WI on implementation defined register offset %#08x\n", v, gicd_reg); - goto write_ignore; + goto write_ignore_32; case GICD_IGROUPR ... GICD_IGROUPRN: case GICD_ISENABLER ... GICD_ISENABLERN: case GICD_ICENABLER ... GICD_ICENABLERN: @@ -901,7 +908,7 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; rank = vgic_rank_offset(v, 64, gicd_reg - GICD_IROUTER, DABT_DOUBLE_WORD); - if ( rank == NULL ) goto write_ignore_64; + if ( rank == NULL ) goto write_ignore; BUG_ON(v->domain->max_vcpus > 8); new_irouter = *r; vgic_lock_rank(v, rank, flags); @@ -944,10 +951,10 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) return 1; case GICD_NSACR ... GICD_NSACRN: /* We do not implement security extensions for guests, write ignore */ - goto write_ignore; + goto write_ignore_32; case GICD_SGIR: /* it is accessed as system register in GICv3 */ - goto write_ignore; + goto write_ignore_32; case GICD_CPENDSGIR ... GICD_CPENDSGIRN: /* Replaced with GICR_ICPENDR0. So ignore write */ if ( dabt.size != DABT_WORD ) goto bad_width; @@ -958,7 +965,7 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) return 0; case GICD_PIDR7... GICD_PIDR0: /* RO -- write ignore */ - goto write_ignore; + goto write_ignore_32; case 0x00c: case 0x044: case 0x04c: @@ -984,13 +991,16 @@ bad_width: domain_crash_synchronous(); return 0; -write_ignore: +write_ignore_32: if ( dabt.size != DABT_WORD ) goto bad_width; return 1; write_ignore_64: if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; return 1; + +write_ignore: + return 1; } static int vgic_v3_to_sgi(struct vcpu *v, register_t sgir) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:59:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:59: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 1YSmPg-00073g-2I; Tue, 03 Mar 2015 12:59:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPe-00073T-Cs for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:02 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id E8/4A-03511-510B5F45; Tue, 03 Mar 2015 12:59:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1425387539!12673412!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7480 invoked from network); 3 Mar 2015 12:59:00 -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; 3 Mar 2015 12:59:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPb-0002b2-GH for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmPb-0003OD-F9 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:58:59 +0000 Date: Tue, 03 Mar 2015 12:58:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Correctly handle RAZ/WI registers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5e6958a7ee57982fc2f37e1f5c76d0d4e66d7e3b Author: Julien Grall AuthorDate: Mon Feb 16 14:50:44 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:55:17 2015 +0000 xen/arm: vgic-v3: Correctly handle RAZ/WI registers Some of the registers are accessible via multiple size (see GICD_IPRIORITYR*). Those registers are incorrectly implemented when they should be RAZ. Only word-access size are currently allowed for them. The paragraph 5.3.1 in the GICv3 spec (PRD03-GENC-010745 24.0) indicates the different access-sizes supported for each register. The current vGICv3 driver is not ready for 32 bits guest and will require some rework. So, for now, only supporting access-size of a system not supporting aarch32. To avoid further issues, introduce different label following the access-size of the registers: - read_as_zero_64 and write_ignore_64: Used for registers accessible via a double-word. - read_as_zero_32 and write_ignore_32: Used for registers accessible via a word. - read_as_zero: Used when we don't have to check the access size. The latter is used when the access size has already been checked in the register emulation and/or when the register offset is reserved/implementation defined. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v3.c | 98 ++++++++++++++++++++++++++--------------------- 1 files changed, 54 insertions(+), 44 deletions(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 9115199..1145972 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -101,7 +101,7 @@ static int __vgic_v3_rdistr_rd_mmio_read(struct vcpu *v, mmio_info_t *info, { case GICR_CTLR: /* We have not implemented LPI's, read zero */ - goto read_as_zero; + goto read_as_zero_32; case GICR_IIDR: if ( dabt.size != DABT_WORD ) goto bad_width; *r = GICV3_GICR_IIDR_VAL; @@ -117,10 +117,10 @@ static int __vgic_v3_rdistr_rd_mmio_read(struct vcpu *v, mmio_info_t *info, return 1; case GICR_STATUSR: /* Not implemented */ - goto read_as_zero; + goto read_as_zero_32; case GICR_WAKER: /* Power management is not implemented */ - goto read_as_zero; + goto read_as_zero_32; case GICR_SETLPIR: /* WO. Read as zero */ goto read_as_zero_64; @@ -165,14 +165,14 @@ static int __vgic_v3_rdistr_rd_mmio_read(struct vcpu *v, mmio_info_t *info, return 1; case GICR_PIDR3: /* Manufacture/customer defined */ - goto read_as_zero; + goto read_as_zero_32; case GICR_PIDR4: if ( dabt.size != DABT_WORD ) goto bad_width; *r = GICV3_GICR_PIDR4; return 1; case GICR_PIDR5 ... GICR_PIDR7: /* Reserved0 */ - goto read_as_zero; + goto read_as_zero_32; default: printk(XENLOG_G_ERR "%pv: vGICR: read r%d offset %#08x\n not found", @@ -190,7 +190,7 @@ read_as_zero_64: *r = 0; return 1; -read_as_zero: +read_as_zero_32: if ( dabt.size != DABT_WORD ) goto bad_width; *r = 0; return 1; @@ -207,19 +207,19 @@ static int __vgic_v3_rdistr_rd_mmio_write(struct vcpu *v, mmio_info_t *info, { case GICR_CTLR: /* LPI's not implemented */ - goto write_ignore; + goto write_ignore_32; case GICR_IIDR: /* RO */ - goto write_ignore; + goto write_ignore_32; case GICR_TYPER: /* RO */ goto write_ignore_64; case GICR_STATUSR: /* Not implemented */ - goto write_ignore; + goto write_ignore_32; case GICR_WAKER: /* Power mgmt not implemented */ - goto write_ignore; + goto write_ignore_32; case GICR_SETLPIR: /* LPI is not implemented */ goto write_ignore_64; @@ -240,7 +240,7 @@ static int __vgic_v3_rdistr_rd_mmio_write(struct vcpu *v, mmio_info_t *info, goto write_ignore_64; case GICR_SYNCR: /* RO */ - goto write_ignore; + goto write_ignore_32; case GICR_MOVLPIR: /* LPI is not implemented */ goto write_ignore_64; @@ -249,7 +249,7 @@ static int __vgic_v3_rdistr_rd_mmio_write(struct vcpu *v, mmio_info_t *info, goto write_ignore_64; case GICR_PIDR7... GICR_PIDR0: /* RO */ - goto write_ignore; + goto write_ignore_32; default: printk(XENLOG_G_ERR "%pv: vGICR: write r%d offset %#08x\n not found", v, dabt.reg, gicr_reg); @@ -266,7 +266,7 @@ write_ignore_64: if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; return 1; -write_ignore: +write_ignore_32: if ( dabt.size != DABT_WORD ) goto bad_width; return 1; } @@ -284,6 +284,7 @@ static int __vgic_v3_distr_common_mmio_read(struct vcpu *v, mmio_info_t *info, { case GICD_IGROUPR ... GICD_IGROUPRN: /* We do not implement security extensions for guests, read zero */ + if ( dabt.size != DABT_WORD ) goto bad_width; goto read_as_zero; case GICD_ISENABLER ... GICD_ISENABLERN: if ( dabt.size != DABT_WORD ) goto bad_width; @@ -368,7 +369,6 @@ bad_width: return 0; read_as_zero: - if ( dabt.size != DABT_WORD ) goto bad_width; *r = 0; return 1; } @@ -387,7 +387,7 @@ static int __vgic_v3_distr_common_mmio_write(struct vcpu *v, mmio_info_t *info, { case GICD_IGROUPR ... GICD_IGROUPRN: /* We do not implement security extensions for guests, write ignore */ - goto write_ignore; + goto write_ignore_32; case GICD_ISENABLER ... GICD_ISENABLERN: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, reg - GICD_ISENABLER, DABT_WORD); @@ -456,7 +456,7 @@ static int __vgic_v3_distr_common_mmio_write(struct vcpu *v, mmio_info_t *info, vgic_unlock_rank(v, rank, flags); return 1; case GICD_ICFGR: /* Restricted to configure SGIs */ - goto write_ignore; + goto write_ignore_32; case GICD_ICFGR + 4 ... GICD_ICFGRN: /* PPI + SPIs */ /* ICFGR1 for PPI's, which is implementation defined if ICFGR1 is programmable or not. We chose to program */ @@ -481,8 +481,9 @@ bad_width: domain_crash_synchronous(); return 0; -write_ignore: +write_ignore_32: if ( dabt.size != DABT_WORD ) goto bad_width; +write_ignore: return 1; } @@ -499,7 +500,7 @@ static int vgic_v3_rdistr_sgi_mmio_read(struct vcpu *v, mmio_info_t *info, { case GICR_IGRPMODR0: /* We do not implement security extensions for guests, read zero */ - goto read_as_zero; + goto read_as_zero_32; case GICR_IGROUPR0: case GICR_ISENABLER0: case GICR_ICENABLER0: @@ -543,8 +544,9 @@ bad_width: domain_crash_synchronous(); return 0; -read_as_zero: +read_as_zero_32: if ( dabt.size != DABT_WORD ) goto bad_width; +read_as_zero: *r = 0; return 1; } @@ -562,7 +564,7 @@ static int vgic_v3_rdistr_sgi_mmio_write(struct vcpu *v, mmio_info_t *info, { case GICR_IGRPMODR0: /* We do not implement security extensions for guests, write ignore */ - goto write_ignore; + goto write_ignore_32; case GICR_IGROUPR0: case GICR_ISENABLER0: case GICR_ICENABLER0: @@ -595,7 +597,7 @@ static int vgic_v3_rdistr_sgi_mmio_write(struct vcpu *v, mmio_info_t *info, return 1; case GICR_NSACR: /* We do not implement security extensions for guests, write ignore */ - goto write_ignore; + goto write_ignore_32; default: printk(XENLOG_G_ERR "%pv: vGICR: SGI: write r%d offset %#08x\n not found", @@ -610,8 +612,9 @@ bad_width: domain_crash_synchronous(); return 0; -write_ignore: +write_ignore_32: if ( dabt.size != DABT_WORD ) goto bad_width; +write_ignore: return 1; } @@ -711,7 +714,7 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) * Optional, Not implemented for now. * Update to support guest debugging. */ - goto read_as_zero; + goto read_as_zero_32; case GICD_IIDR: if ( dabt.size != DABT_WORD ) goto bad_width; *r = GICV3_GICD_IIDR_VAL; @@ -719,7 +722,7 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case 0x020 ... 0x03c: case 0xc000 ... 0xffcc: /* Implementation defined -- read as zero */ - goto read_as_zero; + goto read_as_zero_32; case GICD_IGROUPR ... GICD_IGROUPRN: case GICD_ISENABLER ... GICD_ISENABLERN: case GICD_ICENABLER ... GICD_ICENABLERN: @@ -757,16 +760,16 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_NSACR ... GICD_NSACRN: /* We do not implement security extensions for guests, read zero */ - goto read_as_zero; + goto read_as_zero_32; case GICD_SGIR: /* Read as ICH_SGIR system register with SRE set. So ignore */ - goto read_as_zero; + goto read_as_zero_32; case GICD_CPENDSGIR ... GICD_CPENDSGIRN: /* Replaced with GICR_ICPENDR0. So ignore write */ - goto read_as_zero; + goto read_as_zero_32; case GICD_SPENDSGIR ... GICD_SPENDSGIRN: /* Replaced with GICR_ISPENDR0. So ignore write */ - goto read_as_zero; + goto read_as_zero_32; case GICD_PIDR0: /* GICv3 identification value */ if ( dabt.size != DABT_WORD ) goto bad_width; @@ -784,7 +787,7 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_PIDR3: /* GICv3 identification value. Manufacturer/Customer defined */ - goto read_as_zero; + goto read_as_zero_32; case GICD_PIDR4: /* GICv3 identification value */ if ( dabt.size != DABT_WORD ) goto bad_width; @@ -792,7 +795,7 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_PIDR5 ... GICD_PIDR7: /* Reserved0 */ - goto read_as_zero; + goto read_as_zero_32; case 0x00c: case 0x044: case 0x04c: @@ -821,10 +824,14 @@ read_as_zero_64: *r = 0; return 1; -read_as_zero: +read_as_zero_32: if ( dabt.size != DABT_WORD ) goto bad_width; *r = 0; return 1; + +read_as_zero: + *r = 0; + return 1; } static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) @@ -856,32 +863,32 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) return 1; case GICD_TYPER: /* RO -- write ignored */ - goto write_ignore; + goto write_ignore_32; case GICD_IIDR: /* RO -- write ignored */ - goto write_ignore; + goto write_ignore_32; case GICD_STATUSR: /* RO -- write ignored */ - goto write_ignore; + goto write_ignore_32; case GICD_SETSPI_NSR: /* Message based SPI is not implemented */ - goto write_ignore; + goto write_ignore_32; case GICD_CLRSPI_NSR: /* Message based SPI is not implemented */ - goto write_ignore; + goto write_ignore_32; case GICD_SETSPI_SR: /* Message based SPI is not implemented */ - goto write_ignore; + goto write_ignore_32; case GICD_CLRSPI_SR: /* Message based SPI is not implemented */ - goto write_ignore; + goto write_ignore_32; case 0x020 ... 0x03c: case 0xc000 ... 0xffcc: /* Implementation defined -- write ignored */ printk(XENLOG_G_DEBUG "%pv: vGICD: WI on implementation defined register offset %#08x\n", v, gicd_reg); - goto write_ignore; + goto write_ignore_32; case GICD_IGROUPR ... GICD_IGROUPRN: case GICD_ISENABLER ... GICD_ISENABLERN: case GICD_ICENABLER ... GICD_ICENABLERN: @@ -901,7 +908,7 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; rank = vgic_rank_offset(v, 64, gicd_reg - GICD_IROUTER, DABT_DOUBLE_WORD); - if ( rank == NULL ) goto write_ignore_64; + if ( rank == NULL ) goto write_ignore; BUG_ON(v->domain->max_vcpus > 8); new_irouter = *r; vgic_lock_rank(v, rank, flags); @@ -944,10 +951,10 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) return 1; case GICD_NSACR ... GICD_NSACRN: /* We do not implement security extensions for guests, write ignore */ - goto write_ignore; + goto write_ignore_32; case GICD_SGIR: /* it is accessed as system register in GICv3 */ - goto write_ignore; + goto write_ignore_32; case GICD_CPENDSGIR ... GICD_CPENDSGIRN: /* Replaced with GICR_ICPENDR0. So ignore write */ if ( dabt.size != DABT_WORD ) goto bad_width; @@ -958,7 +965,7 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) return 0; case GICD_PIDR7... GICD_PIDR0: /* RO -- write ignore */ - goto write_ignore; + goto write_ignore_32; case 0x00c: case 0x044: case 0x04c: @@ -984,13 +991,16 @@ bad_width: domain_crash_synchronous(); return 0; -write_ignore: +write_ignore_32: if ( dabt.size != DABT_WORD ) goto bad_width; return 1; write_ignore_64: if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; return 1; + +write_ignore: + return 1; } static int vgic_v3_to_sgi(struct vcpu *v, register_t sgir) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:59:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:59: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 1YSmPq-00075W-7K; Tue, 03 Mar 2015 12:59:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPp-00075J-4N for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:13 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id E9/F2-10942-020B5F45; Tue, 03 Mar 2015 12:59:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1425387549!12590672!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20176 invoked from network); 3 Mar 2015 12:59:11 -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; 3 Mar 2015 12:59:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPl-0002ba-LV for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmPl-0003Ok-Kg for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:09 +0000 Date: Tue, 03 Mar 2015 12:59:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Correctly implement read into GICR_NSACR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cfef895c52cb2e82cc92916abd8769d0500763bd Author: Julien Grall AuthorDate: Mon Feb 16 14:50:45 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:55:28 2015 +0000 xen/arm: vgic-v3: Correctly implement read into GICR_NSACR The 32-bit register GICR_NSACR is RAZ/WI on non-secure state. Therefore we should not inject a data abort to the guest. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v3.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 1145972..2c14717 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -530,8 +530,9 @@ static int vgic_v3_rdistr_sgi_mmio_read(struct vcpu *v, mmio_info_t *info, vgic_unlock_rank(v, rank, flags); return 1; case GICR_NSACR: - if ( dabt.size != DABT_WORD ) goto bad_width; - return 1; + /* We do not implement security extensions for guests, read zero */ + goto read_as_zero_32; + default: printk(XENLOG_G_ERR "%pv: vGICR: SGI: read r%d offset %#08x\n not found", -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:59:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:59: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 1YSmPq-00075W-7K; Tue, 03 Mar 2015 12:59:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPp-00075J-4N for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:13 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id E9/F2-10942-020B5F45; Tue, 03 Mar 2015 12:59:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1425387549!12590672!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20176 invoked from network); 3 Mar 2015 12:59:11 -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; 3 Mar 2015 12:59:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPl-0002ba-LV for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmPl-0003Ok-Kg for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:09 +0000 Date: Tue, 03 Mar 2015 12:59:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Correctly implement read into GICR_NSACR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cfef895c52cb2e82cc92916abd8769d0500763bd Author: Julien Grall AuthorDate: Mon Feb 16 14:50:45 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:55:28 2015 +0000 xen/arm: vgic-v3: Correctly implement read into GICR_NSACR The 32-bit register GICR_NSACR is RAZ/WI on non-secure state. Therefore we should not inject a data abort to the guest. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v3.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 1145972..2c14717 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -530,8 +530,9 @@ static int vgic_v3_rdistr_sgi_mmio_read(struct vcpu *v, mmio_info_t *info, vgic_unlock_rank(v, rank, flags); return 1; case GICR_NSACR: - if ( dabt.size != DABT_WORD ) goto bad_width; - return 1; + /* We do not implement security extensions for guests, read zero */ + goto read_as_zero_32; + default: printk(XENLOG_G_ERR "%pv: vGICR: SGI: read r%d offset %#08x\n not found", -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:59:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:59: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 1YSmPz-00076l-AT; Tue, 03 Mar 2015 12:59:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPy-00076b-JG for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:22 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id A8/C9-02884-920B5F45; Tue, 03 Mar 2015 12:59:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1425387560!12590745!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21771 invoked from network); 3 Mar 2015 12:59:21 -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; 3 Mar 2015 12:59:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPv-0002bg-SD for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmPv-0003Pr-Pl for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:19 +0000 Date: Tue, 03 Mar 2015 12:59:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Set stride during domain initialization X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4636e9fb40130240b74da0148ea96307cc251800 Author: Julien Grall AuthorDate: Mon Feb 16 14:50:46 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:55:28 2015 +0000 xen/arm: vgic-v3: Set stride during domain initialization The stride may not be set if the hardware GIC is using the default layout. It happens on the Foundation model. On GICv3, the default stride is 2 * 64K. Therefore it's possible to avoid checking at every redistributor MMIO access if the stride is not set. Because domU uses a static stride configuration this only happens for dom0, so we can move this code in gicv_v3_init. Take the opportunity to move the stride setting a bit earlier because the loop to set regions will require the stride. Also, use 2 * 64K rather than 128K and explain the reason. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic-v3.c | 11 ++++++++++- xen/arch/arm/vgic-v3.c | 12 ++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 47452ca..7b33ff7 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -897,12 +897,21 @@ static int gicv_v3_init(struct domain *d) { d->arch.vgic.dbase = gicv3.dbase; d->arch.vgic.dbase_size = gicv3.dbase_size; + + d->arch.vgic.rdist_stride = gicv3.rdist_stride; + /* + * If the stride is not set, the default stride for GICv3 is 2 * 64K: + * - first 64k page for Control and Physical LPIs + * - second 64k page for Control and Generation of SGIs + */ + if ( !d->arch.vgic.rdist_stride ) + d->arch.vgic.rdist_stride = 2 * SZ_64K; + for ( i = 0; i < gicv3.rdist_count; i++ ) { d->arch.vgic.rbase[i] = gicv3.rdist_regions[i].base; d->arch.vgic.rbase_size[i] = gicv3.rdist_regions[i].size; } - d->arch.vgic.rdist_stride = gicv3.rdist_stride; d->arch.vgic.rdist_count = gicv3.rdist_count; } else diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 2c14717..c5a743a 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -625,11 +625,7 @@ static int vgic_v3_rdistr_mmio_read(struct vcpu *v, mmio_info_t *info) perfc_incr(vgicr_reads); - if ( v->domain->arch.vgic.rdist_stride != 0 ) - offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); - else - /* If stride is not set. Default 128K */ - offset = info->gpa & (SZ_128K - 1); + offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); if ( offset < SZ_64K ) return __vgic_v3_rdistr_rd_mmio_read(v, info, offset); @@ -649,11 +645,7 @@ static int vgic_v3_rdistr_mmio_write(struct vcpu *v, mmio_info_t *info) perfc_incr(vgicr_writes); - if ( v->domain->arch.vgic.rdist_stride != 0 ) - offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); - else - /* If stride is not set. Default 128K */ - offset = info->gpa & (SZ_128K - 1); + offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); if ( offset < SZ_64K ) return __vgic_v3_rdistr_rd_mmio_write(v, info, offset); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:59:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:59: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 1YSmPz-00076l-AT; Tue, 03 Mar 2015 12:59:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPy-00076b-JG for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:22 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id A8/C9-02884-920B5F45; Tue, 03 Mar 2015 12:59:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1425387560!12590745!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21771 invoked from network); 3 Mar 2015 12:59:21 -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; 3 Mar 2015 12:59:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmPv-0002bg-SD for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmPv-0003Pr-Pl for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:19 +0000 Date: Tue, 03 Mar 2015 12:59:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Set stride during domain initialization X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4636e9fb40130240b74da0148ea96307cc251800 Author: Julien Grall AuthorDate: Mon Feb 16 14:50:46 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:55:28 2015 +0000 xen/arm: vgic-v3: Set stride during domain initialization The stride may not be set if the hardware GIC is using the default layout. It happens on the Foundation model. On GICv3, the default stride is 2 * 64K. Therefore it's possible to avoid checking at every redistributor MMIO access if the stride is not set. Because domU uses a static stride configuration this only happens for dom0, so we can move this code in gicv_v3_init. Take the opportunity to move the stride setting a bit earlier because the loop to set regions will require the stride. Also, use 2 * 64K rather than 128K and explain the reason. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic-v3.c | 11 ++++++++++- xen/arch/arm/vgic-v3.c | 12 ++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 47452ca..7b33ff7 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -897,12 +897,21 @@ static int gicv_v3_init(struct domain *d) { d->arch.vgic.dbase = gicv3.dbase; d->arch.vgic.dbase_size = gicv3.dbase_size; + + d->arch.vgic.rdist_stride = gicv3.rdist_stride; + /* + * If the stride is not set, the default stride for GICv3 is 2 * 64K: + * - first 64k page for Control and Physical LPIs + * - second 64k page for Control and Generation of SGIs + */ + if ( !d->arch.vgic.rdist_stride ) + d->arch.vgic.rdist_stride = 2 * SZ_64K; + for ( i = 0; i < gicv3.rdist_count; i++ ) { d->arch.vgic.rbase[i] = gicv3.rdist_regions[i].base; d->arch.vgic.rbase_size[i] = gicv3.rdist_regions[i].size; } - d->arch.vgic.rdist_stride = gicv3.rdist_stride; d->arch.vgic.rdist_count = gicv3.rdist_count; } else diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 2c14717..c5a743a 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -625,11 +625,7 @@ static int vgic_v3_rdistr_mmio_read(struct vcpu *v, mmio_info_t *info) perfc_incr(vgicr_reads); - if ( v->domain->arch.vgic.rdist_stride != 0 ) - offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); - else - /* If stride is not set. Default 128K */ - offset = info->gpa & (SZ_128K - 1); + offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); if ( offset < SZ_64K ) return __vgic_v3_rdistr_rd_mmio_read(v, info, offset); @@ -649,11 +645,7 @@ static int vgic_v3_rdistr_mmio_write(struct vcpu *v, mmio_info_t *info) perfc_incr(vgicr_writes); - if ( v->domain->arch.vgic.rdist_stride != 0 ) - offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); - else - /* If stride is not set. Default 128K */ - offset = info->gpa & (SZ_128K - 1); + offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); if ( offset < SZ_64K ) return __vgic_v3_rdistr_rd_mmio_write(v, info, offset); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:59:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:59: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 1YSmQ9-00078J-DL; Tue, 03 Mar 2015 12:59:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQ8-00078A-Lu for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:32 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 1B/7C-02896-330B5F45; Tue, 03 Mar 2015 12:59:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1425387570!12667609!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17698 invoked from network); 3 Mar 2015 12:59:31 -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; 3 Mar 2015 12:59:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQ6-0002bm-2R for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmQ6-0003QF-1V for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:30 +0000 Date: Tue, 03 Mar 2015 12:59:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Use a struct to describe contiguous rdist regions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 196f4ef4e9972a8847598c5317db731598315ddc Author: Julien Grall AuthorDate: Mon Feb 16 14:50:47 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:55:39 2015 +0000 xen/arm: vgic-v3: Use a struct to describe contiguous rdist regions Also update the different comment to make clear that we register one MMIO region per contiguous regions and not per re-distributor. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic-v3.c | 20 ++++++++++---------- xen/arch/arm/vgic-v3.c | 11 ++++++----- xen/include/asm-arm/domain.h | 11 +++++++---- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 7b33ff7..fdfda0b 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -909,10 +909,10 @@ static int gicv_v3_init(struct domain *d) for ( i = 0; i < gicv3.rdist_count; i++ ) { - d->arch.vgic.rbase[i] = gicv3.rdist_regions[i].base; - d->arch.vgic.rbase_size[i] = gicv3.rdist_regions[i].size; + d->arch.vgic.rdist_regions[i].base = gicv3.rdist_regions[i].base; + d->arch.vgic.rdist_regions[i].size = gicv3.rdist_regions[i].size; } - d->arch.vgic.rdist_count = gicv3.rdist_count; + d->arch.vgic.nr_regions = gicv3.rdist_count; } else { @@ -922,13 +922,13 @@ static int gicv_v3_init(struct domain *d) /* XXX: Only one Re-distributor region mapped for the guest */ BUILD_BUG_ON(GUEST_GICV3_RDIST_REGIONS != 1); - d->arch.vgic.rdist_count = GUEST_GICV3_RDIST_REGIONS; + d->arch.vgic.nr_regions = GUEST_GICV3_RDIST_REGIONS; d->arch.vgic.rdist_stride = GUEST_GICV3_RDIST_STRIDE; /* The first redistributor should contain enough space for all CPUs */ BUILD_BUG_ON((GUEST_GICV3_GICR0_SIZE / GUEST_GICV3_RDIST_STRIDE) < MAX_VIRT_CPUS); - d->arch.vgic.rbase[0] = GUEST_GICV3_GICR0_BASE; - d->arch.vgic.rbase_size[0] = GUEST_GICV3_GICR0_SIZE; + d->arch.vgic.rdist_regions[0].base = GUEST_GICV3_GICR0_BASE; + d->arch.vgic.rdist_regions[0].size = GUEST_GICV3_GICR0_SIZE; } return 0; @@ -1107,7 +1107,7 @@ static int gicv3_make_dt_node(const struct domain *d, * CPU interface and virtual cpu interfaces accessesed as System registers * So cells are created only for Distributor and rdist regions */ - len = len * (d->arch.vgic.rdist_count + 1); + len = len * (d->arch.vgic.nr_regions + 1); new_cells = xzalloc_bytes(len); if ( new_cells == NULL ) return -FDT_ERR_XEN(ENOMEM); @@ -1116,9 +1116,9 @@ static int gicv3_make_dt_node(const struct domain *d, dt_set_range(&tmp, node, d->arch.vgic.dbase, d->arch.vgic.dbase_size); - for ( i = 0; i < d->arch.vgic.rdist_count; i++ ) - dt_set_range(&tmp, node, d->arch.vgic.rbase[i], - d->arch.vgic.rbase_size[i]); + for ( i = 0; i < d->arch.vgic.nr_regions; i++ ) + dt_set_range(&tmp, node, d->arch.vgic.rdist_regions[i].base, + d->arch.vgic.rdist_regions[i].size); res = fdt_property(fdt, "reg", new_cells, len); xfree(new_cells); diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index c5a743a..1d0e52d 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -1108,13 +1108,14 @@ static int vgic_v3_domain_init(struct domain *d) d->arch.vgic.dbase_size); /* - * Register mmio handler per redistributor region but not for - * every sgi rdist region which is per core. - * The redistributor region encompasses per core sgi region. + * Register mmio handler per contiguous region occupied by the + * redistributors. The handler will take care to choose which + * redistributor is targeted. */ - for ( i = 0; i < d->arch.vgic.rdist_count; i++ ) + for ( i = 0; i < d->arch.vgic.nr_regions; i++ ) register_mmio_handler(d, &vgic_rdistr_mmio_handler, - d->arch.vgic.rbase[i], d->arch.vgic.rbase_size[i]); + d->arch.vgic.rdist_regions[i].base, + d->arch.vgic.rdist_regions[i].size); d->arch.vgic.ctlr = VGICD_CTLR_DEFAULT; diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 9018c6a..3eaa7f0 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -102,10 +102,13 @@ struct arch_domain #ifdef CONFIG_ARM_64 /* GIC V3 addressing */ paddr_t dbase_size; /* Distributor base size */ - paddr_t rbase[MAX_RDIST_COUNT]; /* Re-Distributor base address */ - paddr_t rbase_size[MAX_RDIST_COUNT]; /* Re-Distributor size */ - uint32_t rdist_stride; /* Re-Distributor stride */ - int rdist_count; /* No. of Re-Distributors */ + /* List of contiguous occupied by the redistributors */ + struct vgic_rdist_region { + paddr_t base; /* Base address */ + paddr_t size; /* Size */ + } rdist_regions[MAX_RDIST_COUNT]; + int nr_regions; /* Number of rdist regions */ + uint32_t rdist_stride; /* Re-Distributor stride */ #endif } vgic; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:59:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:59: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 1YSmQ9-00078J-DL; Tue, 03 Mar 2015 12:59:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQ8-00078A-Lu for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:32 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 1B/7C-02896-330B5F45; Tue, 03 Mar 2015 12:59:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1425387570!12667609!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17698 invoked from network); 3 Mar 2015 12:59:31 -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; 3 Mar 2015 12:59:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQ6-0002bm-2R for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmQ6-0003QF-1V for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:30 +0000 Date: Tue, 03 Mar 2015 12:59:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Use a struct to describe contiguous rdist regions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 196f4ef4e9972a8847598c5317db731598315ddc Author: Julien Grall AuthorDate: Mon Feb 16 14:50:47 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:55:39 2015 +0000 xen/arm: vgic-v3: Use a struct to describe contiguous rdist regions Also update the different comment to make clear that we register one MMIO region per contiguous regions and not per re-distributor. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic-v3.c | 20 ++++++++++---------- xen/arch/arm/vgic-v3.c | 11 ++++++----- xen/include/asm-arm/domain.h | 11 +++++++---- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 7b33ff7..fdfda0b 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -909,10 +909,10 @@ static int gicv_v3_init(struct domain *d) for ( i = 0; i < gicv3.rdist_count; i++ ) { - d->arch.vgic.rbase[i] = gicv3.rdist_regions[i].base; - d->arch.vgic.rbase_size[i] = gicv3.rdist_regions[i].size; + d->arch.vgic.rdist_regions[i].base = gicv3.rdist_regions[i].base; + d->arch.vgic.rdist_regions[i].size = gicv3.rdist_regions[i].size; } - d->arch.vgic.rdist_count = gicv3.rdist_count; + d->arch.vgic.nr_regions = gicv3.rdist_count; } else { @@ -922,13 +922,13 @@ static int gicv_v3_init(struct domain *d) /* XXX: Only one Re-distributor region mapped for the guest */ BUILD_BUG_ON(GUEST_GICV3_RDIST_REGIONS != 1); - d->arch.vgic.rdist_count = GUEST_GICV3_RDIST_REGIONS; + d->arch.vgic.nr_regions = GUEST_GICV3_RDIST_REGIONS; d->arch.vgic.rdist_stride = GUEST_GICV3_RDIST_STRIDE; /* The first redistributor should contain enough space for all CPUs */ BUILD_BUG_ON((GUEST_GICV3_GICR0_SIZE / GUEST_GICV3_RDIST_STRIDE) < MAX_VIRT_CPUS); - d->arch.vgic.rbase[0] = GUEST_GICV3_GICR0_BASE; - d->arch.vgic.rbase_size[0] = GUEST_GICV3_GICR0_SIZE; + d->arch.vgic.rdist_regions[0].base = GUEST_GICV3_GICR0_BASE; + d->arch.vgic.rdist_regions[0].size = GUEST_GICV3_GICR0_SIZE; } return 0; @@ -1107,7 +1107,7 @@ static int gicv3_make_dt_node(const struct domain *d, * CPU interface and virtual cpu interfaces accessesed as System registers * So cells are created only for Distributor and rdist regions */ - len = len * (d->arch.vgic.rdist_count + 1); + len = len * (d->arch.vgic.nr_regions + 1); new_cells = xzalloc_bytes(len); if ( new_cells == NULL ) return -FDT_ERR_XEN(ENOMEM); @@ -1116,9 +1116,9 @@ static int gicv3_make_dt_node(const struct domain *d, dt_set_range(&tmp, node, d->arch.vgic.dbase, d->arch.vgic.dbase_size); - for ( i = 0; i < d->arch.vgic.rdist_count; i++ ) - dt_set_range(&tmp, node, d->arch.vgic.rbase[i], - d->arch.vgic.rbase_size[i]); + for ( i = 0; i < d->arch.vgic.nr_regions; i++ ) + dt_set_range(&tmp, node, d->arch.vgic.rdist_regions[i].base, + d->arch.vgic.rdist_regions[i].size); res = fdt_property(fdt, "reg", new_cells, len); xfree(new_cells); diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index c5a743a..1d0e52d 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -1108,13 +1108,14 @@ static int vgic_v3_domain_init(struct domain *d) d->arch.vgic.dbase_size); /* - * Register mmio handler per redistributor region but not for - * every sgi rdist region which is per core. - * The redistributor region encompasses per core sgi region. + * Register mmio handler per contiguous region occupied by the + * redistributors. The handler will take care to choose which + * redistributor is targeted. */ - for ( i = 0; i < d->arch.vgic.rdist_count; i++ ) + for ( i = 0; i < d->arch.vgic.nr_regions; i++ ) register_mmio_handler(d, &vgic_rdistr_mmio_handler, - d->arch.vgic.rbase[i], d->arch.vgic.rbase_size[i]); + d->arch.vgic.rdist_regions[i].base, + d->arch.vgic.rdist_regions[i].size); d->arch.vgic.ctlr = VGICD_CTLR_DEFAULT; diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 9018c6a..3eaa7f0 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -102,10 +102,13 @@ struct arch_domain #ifdef CONFIG_ARM_64 /* GIC V3 addressing */ paddr_t dbase_size; /* Distributor base size */ - paddr_t rbase[MAX_RDIST_COUNT]; /* Re-Distributor base address */ - paddr_t rbase_size[MAX_RDIST_COUNT]; /* Re-Distributor size */ - uint32_t rdist_stride; /* Re-Distributor stride */ - int rdist_count; /* No. of Re-Distributors */ + /* List of contiguous occupied by the redistributors */ + struct vgic_rdist_region { + paddr_t base; /* Base address */ + paddr_t size; /* Size */ + } rdist_regions[MAX_RDIST_COUNT]; + int nr_regions; /* Number of rdist regions */ + uint32_t rdist_stride; /* Re-Distributor stride */ #endif } vgic; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:59:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:59: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 1YSmQK-00079p-H0; Tue, 03 Mar 2015 12:59:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQJ-00079e-Q8 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:44 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 6F/17-02750-F30B5F45; Tue, 03 Mar 2015 12:59:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1425387580!8872504!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15096 invoked from network); 3 Mar 2015 12:59:41 -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; 3 Mar 2015 12:59:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQG-0002bv-74 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmQG-0003Qr-6E for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:40 +0000 Date: Tue, 03 Mar 2015 12:59:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Emulate correctly the re-distributor X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit acf65e5a25a791223a49884f803d82aeecc74606 Author: Julien Grall AuthorDate: Mon Feb 16 14:50:48 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:55:39 2015 +0000 xen/arm: vgic-v3: Emulate correctly the re-distributor There is a one-to-one mapping between each re-distributors and processors. Each re-distributors can be accessed by any processor at any time. For instance during the initialization of the GIC, the drivers will browse the re-distributor to find the one associated to the current processor (via GICR_TYPER). So each re-distributor has its own MMIO region. The current implementation of the vGICv3 emulation assumes that the re-distributor region is banked. Therefore, the processor won't be able to access other re-distributor. While this is working fine for Linux, a processor will only access GICR_TYPER to find the associated re-distributor, we have to implement correctly the re-distributor emulation in order to boot other operating systems. All emulated registers of the re-distributors take a vCPU in parameter and necessary lock. Therefore concurrent access is already properly handled. The missing bit is retrieving the right vCPU following the region accessed. Retrieving the right vCPU could be slow, so it has been divided in 2 paths: - fast path: The current vCPU is accessing its own re-distributor - slow path: The current vCPU is accessing another re-distributor As the processor needs to initialize itself, the former case is very common. To handle the access quickly, the base address of the re-distributor is computed and stored per-vCPU during the vCPU initialization. The latter is less common and more complicate to handle. The re-distributors can be spread across multiple regions in the memory. During the domain creation, Xen will browse those regions to find the first vCPU handled by this region. When an access hits the slow path, Xen will: 1) Retrieve the region using the base address of the re-distributor accessed 2) Find the vCPU ID attached to the redistributor 3) Check the validity of the vCPU. If it's not valid, a data abort will be injected to the guest Finally, this patch also correctly support the bit GICR_TYPER.LAST which indicates if the redistributor is the last one of the contiguous region. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic-v3.c | 24 ++++++++++- xen/arch/arm/vgic-v3.c | 99 +++++++++++++++++++++++++++++++++++++++++- xen/include/asm-arm/domain.h | 6 +++ 3 files changed, 126 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index fdfda0b..e7a7789 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -895,6 +896,8 @@ static int gicv_v3_init(struct domain *d) */ if ( is_hardware_domain(d) ) { + unsigned int first_cpu = 0; + d->arch.vgic.dbase = gicv3.dbase; d->arch.vgic.dbase_size = gicv3.dbase_size; @@ -909,8 +912,15 @@ static int gicv_v3_init(struct domain *d) for ( i = 0; i < gicv3.rdist_count; i++ ) { + paddr_t size = gicv3.rdist_regions[i].size; + d->arch.vgic.rdist_regions[i].base = gicv3.rdist_regions[i].base; - d->arch.vgic.rdist_regions[i].size = gicv3.rdist_regions[i].size; + d->arch.vgic.rdist_regions[i].size = size; + + /* Set the first CPU handled by this region */ + d->arch.vgic.rdist_regions[i].first_cpu = first_cpu; + + first_cpu += size / d->arch.vgic.rdist_stride; } d->arch.vgic.nr_regions = gicv3.rdist_count; } @@ -929,6 +939,7 @@ static int gicv_v3_init(struct domain *d) BUILD_BUG_ON((GUEST_GICV3_GICR0_SIZE / GUEST_GICV3_RDIST_STRIDE) < MAX_VIRT_CPUS); d->arch.vgic.rdist_regions[0].base = GUEST_GICV3_GICR0_BASE; d->arch.vgic.rdist_regions[0].size = GUEST_GICV3_GICR0_SIZE; + d->arch.vgic.rdist_regions[0].first_cpu = 0; } return 0; @@ -1173,6 +1184,14 @@ static const struct gic_hw_operations gicv3_ops = { .make_dt_node = gicv3_make_dt_node, }; +static int __init cmp_rdist(const void *a, const void *b) +{ + const struct rdist_region *l = a, *r = a; + + /* We assume that re-distributor regions can never overlap */ + return ( l->base < r->base) ? -1 : 0; +} + /* Set up the GIC */ static int __init gicv3_init(struct dt_device_node *node, const void *data) { @@ -1228,6 +1247,9 @@ static int __init gicv3_init(struct dt_device_node *node, const void *data) rdist_regs[i].size = rdist_size; } + /* The vGIC code requires the region to be sorted */ + sort(rdist_regs, gicv3.rdist_count, sizeof(*rdist_regs), cmp_rdist, NULL); + /* If stride is not set in dt. Set default to 2 * SZ_64K */ if ( !dt_property_read_u32(node, "redistributor-stride", &gicv3.rdist_stride) ) gicv3.rdist_stride = 0; diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 1d0e52d..97249db 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -114,6 +114,10 @@ static int __vgic_v3_rdistr_rd_mmio_read(struct vcpu *v, mmio_info_t *info, MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 1) << 40 | MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 0) << 32); *r = aff; + + if ( v->arch.vgic.flags & VGIC_V3_RDIST_LAST ) + *r |= GICR_TYPER_LAST; + return 1; case GICR_STATUSR: /* Not implemented */ @@ -619,13 +623,56 @@ write_ignore: return 1; } +static inline struct vcpu *get_vcpu_from_rdist(paddr_t gpa, + struct vcpu *v, + uint32_t *offset) +{ + struct domain *d = v->domain; + uint32_t stride = d->arch.vgic.rdist_stride; + paddr_t base; + int i, vcpu_id; + struct vgic_rdist_region *region; + + *offset = gpa & (stride - 1); + base = gpa & ~((paddr_t)stride - 1); + + /* Fast path: the VCPU is trying to access its re-distributor */ + if ( likely(v->arch.vgic.rdist_base == base) ) + return v; + + /* Slow path: the VCPU is trying to access another re-distributor */ + + /* + * Find the region where the re-distributor lives. For this purpose, + * we look one region ahead as only MMIO range for redistributors + * traps here. + * Note: The region has been ordered during the GIC initialization + */ + for ( i = 1; i < d->arch.vgic.nr_regions; i++ ) + { + if ( base < d->arch.vgic.rdist_regions[i].base ) + break; + } + + region = &d->arch.vgic.rdist_regions[i - 1]; + + vcpu_id = region->first_cpu + ((base - region->base) / stride); + + if ( unlikely(vcpu_id >= d->max_vcpus) ) + return NULL; + + return d->vcpu[vcpu_id]; +} + static int vgic_v3_rdistr_mmio_read(struct vcpu *v, mmio_info_t *info) { uint32_t offset; perfc_incr(vgicr_reads); - offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); + v = get_vcpu_from_rdist(info->gpa, v, &offset); + if ( unlikely(!v) ) + return 0; if ( offset < SZ_64K ) return __vgic_v3_rdistr_rd_mmio_read(v, info, offset); @@ -645,7 +692,9 @@ static int vgic_v3_rdistr_mmio_write(struct vcpu *v, mmio_info_t *info) perfc_incr(vgicr_writes); - offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); + v = get_vcpu_from_rdist(info->gpa, v, &offset); + if ( unlikely(!v) ) + return 0; if ( offset < SZ_64K ) return __vgic_v3_rdistr_rd_mmio_write(v, info, offset); @@ -1080,6 +1129,13 @@ static int vgic_v3_vcpu_init(struct vcpu *v) { int i; uint64_t affinity; + paddr_t rdist_base; + struct vgic_rdist_region *region; + unsigned int last_cpu; + + /* Convenient alias */ + struct domain *d = v->domain; + uint32_t rdist_stride = d->arch.vgic.rdist_stride; /* For SGI and PPI the target is always this CPU */ affinity = (MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 3) << 32 | @@ -1090,6 +1146,45 @@ static int vgic_v3_vcpu_init(struct vcpu *v) for ( i = 0 ; i < 32 ; i++ ) v->arch.vgic.private_irqs->v3.irouter[i] = affinity; + /* + * Find the region where the re-distributor lives. For this purpose, + * we look one region ahead as we have only the first CPU in hand. + */ + for ( i = 1; i < d->arch.vgic.nr_regions; i++ ) + { + if ( v->vcpu_id < d->arch.vgic.rdist_regions[i].first_cpu ) + break; + } + + region = &d->arch.vgic.rdist_regions[i - 1]; + + /* Get the base address of the redistributor */ + rdist_base = region->base; + rdist_base += (v->vcpu_id - region->first_cpu) * rdist_stride; + + /* Check if a valid region was found for the re-distributor */ + if ( (rdist_base < region->base) || + ((rdist_base + rdist_stride) > (region->base + region->size)) ) + { + dprintk(XENLOG_ERR, + "d%u: Unable to find a re-distributor for VCPU %u\n", + d->domain_id, v->vcpu_id); + return -EINVAL; + } + + v->arch.vgic.rdist_base = rdist_base; + + /* + * If the redistributor is the last one of the + * contiguous region of the vCPU is the last of the domain, set + * VGIC_V3_RDIST_LAST flags. + * Note that we are assuming max_vcpus will never change. + */ + last_cpu = (region->size / rdist_stride) + region->first_cpu - 1; + + if ( v->vcpu_id == last_cpu || (v->vcpu_id == (d->max_vcpus - 1)) ) + v->arch.vgic.flags |= VGIC_V3_RDIST_LAST; + return 0; } diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 3eaa7f0..81e3185 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -106,6 +106,7 @@ struct arch_domain struct vgic_rdist_region { paddr_t base; /* Base address */ paddr_t size; /* Size */ + unsigned int first_cpu; /* First CPU handled */ } rdist_regions[MAX_RDIST_COUNT]; int nr_regions; /* Number of rdist regions */ uint32_t rdist_stride; /* Re-Distributor stride */ @@ -239,6 +240,11 @@ struct arch_vcpu * lr_pending is a subset of vgic.inflight_irqs. */ struct list_head lr_pending; spinlock_t lock; + + /* GICv3: redistributor base and flags for this vCPU */ + paddr_t rdist_base; +#define VGIC_V3_RDIST_LAST (1 << 0) /* last vCPU of the rdist */ + uint8_t flags; } vgic; /* Timer registers */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:59:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:59: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 1YSmQK-00079p-H0; Tue, 03 Mar 2015 12:59:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQJ-00079e-Q8 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:44 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 6F/17-02750-F30B5F45; Tue, 03 Mar 2015 12:59:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1425387580!8872504!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15096 invoked from network); 3 Mar 2015 12:59:41 -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; 3 Mar 2015 12:59:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQG-0002bv-74 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmQG-0003Qr-6E for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:40 +0000 Date: Tue, 03 Mar 2015 12:59:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Emulate correctly the re-distributor X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit acf65e5a25a791223a49884f803d82aeecc74606 Author: Julien Grall AuthorDate: Mon Feb 16 14:50:48 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:55:39 2015 +0000 xen/arm: vgic-v3: Emulate correctly the re-distributor There is a one-to-one mapping between each re-distributors and processors. Each re-distributors can be accessed by any processor at any time. For instance during the initialization of the GIC, the drivers will browse the re-distributor to find the one associated to the current processor (via GICR_TYPER). So each re-distributor has its own MMIO region. The current implementation of the vGICv3 emulation assumes that the re-distributor region is banked. Therefore, the processor won't be able to access other re-distributor. While this is working fine for Linux, a processor will only access GICR_TYPER to find the associated re-distributor, we have to implement correctly the re-distributor emulation in order to boot other operating systems. All emulated registers of the re-distributors take a vCPU in parameter and necessary lock. Therefore concurrent access is already properly handled. The missing bit is retrieving the right vCPU following the region accessed. Retrieving the right vCPU could be slow, so it has been divided in 2 paths: - fast path: The current vCPU is accessing its own re-distributor - slow path: The current vCPU is accessing another re-distributor As the processor needs to initialize itself, the former case is very common. To handle the access quickly, the base address of the re-distributor is computed and stored per-vCPU during the vCPU initialization. The latter is less common and more complicate to handle. The re-distributors can be spread across multiple regions in the memory. During the domain creation, Xen will browse those regions to find the first vCPU handled by this region. When an access hits the slow path, Xen will: 1) Retrieve the region using the base address of the re-distributor accessed 2) Find the vCPU ID attached to the redistributor 3) Check the validity of the vCPU. If it's not valid, a data abort will be injected to the guest Finally, this patch also correctly support the bit GICR_TYPER.LAST which indicates if the redistributor is the last one of the contiguous region. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic-v3.c | 24 ++++++++++- xen/arch/arm/vgic-v3.c | 99 +++++++++++++++++++++++++++++++++++++++++- xen/include/asm-arm/domain.h | 6 +++ 3 files changed, 126 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index fdfda0b..e7a7789 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -895,6 +896,8 @@ static int gicv_v3_init(struct domain *d) */ if ( is_hardware_domain(d) ) { + unsigned int first_cpu = 0; + d->arch.vgic.dbase = gicv3.dbase; d->arch.vgic.dbase_size = gicv3.dbase_size; @@ -909,8 +912,15 @@ static int gicv_v3_init(struct domain *d) for ( i = 0; i < gicv3.rdist_count; i++ ) { + paddr_t size = gicv3.rdist_regions[i].size; + d->arch.vgic.rdist_regions[i].base = gicv3.rdist_regions[i].base; - d->arch.vgic.rdist_regions[i].size = gicv3.rdist_regions[i].size; + d->arch.vgic.rdist_regions[i].size = size; + + /* Set the first CPU handled by this region */ + d->arch.vgic.rdist_regions[i].first_cpu = first_cpu; + + first_cpu += size / d->arch.vgic.rdist_stride; } d->arch.vgic.nr_regions = gicv3.rdist_count; } @@ -929,6 +939,7 @@ static int gicv_v3_init(struct domain *d) BUILD_BUG_ON((GUEST_GICV3_GICR0_SIZE / GUEST_GICV3_RDIST_STRIDE) < MAX_VIRT_CPUS); d->arch.vgic.rdist_regions[0].base = GUEST_GICV3_GICR0_BASE; d->arch.vgic.rdist_regions[0].size = GUEST_GICV3_GICR0_SIZE; + d->arch.vgic.rdist_regions[0].first_cpu = 0; } return 0; @@ -1173,6 +1184,14 @@ static const struct gic_hw_operations gicv3_ops = { .make_dt_node = gicv3_make_dt_node, }; +static int __init cmp_rdist(const void *a, const void *b) +{ + const struct rdist_region *l = a, *r = a; + + /* We assume that re-distributor regions can never overlap */ + return ( l->base < r->base) ? -1 : 0; +} + /* Set up the GIC */ static int __init gicv3_init(struct dt_device_node *node, const void *data) { @@ -1228,6 +1247,9 @@ static int __init gicv3_init(struct dt_device_node *node, const void *data) rdist_regs[i].size = rdist_size; } + /* The vGIC code requires the region to be sorted */ + sort(rdist_regs, gicv3.rdist_count, sizeof(*rdist_regs), cmp_rdist, NULL); + /* If stride is not set in dt. Set default to 2 * SZ_64K */ if ( !dt_property_read_u32(node, "redistributor-stride", &gicv3.rdist_stride) ) gicv3.rdist_stride = 0; diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 1d0e52d..97249db 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -114,6 +114,10 @@ static int __vgic_v3_rdistr_rd_mmio_read(struct vcpu *v, mmio_info_t *info, MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 1) << 40 | MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 0) << 32); *r = aff; + + if ( v->arch.vgic.flags & VGIC_V3_RDIST_LAST ) + *r |= GICR_TYPER_LAST; + return 1; case GICR_STATUSR: /* Not implemented */ @@ -619,13 +623,56 @@ write_ignore: return 1; } +static inline struct vcpu *get_vcpu_from_rdist(paddr_t gpa, + struct vcpu *v, + uint32_t *offset) +{ + struct domain *d = v->domain; + uint32_t stride = d->arch.vgic.rdist_stride; + paddr_t base; + int i, vcpu_id; + struct vgic_rdist_region *region; + + *offset = gpa & (stride - 1); + base = gpa & ~((paddr_t)stride - 1); + + /* Fast path: the VCPU is trying to access its re-distributor */ + if ( likely(v->arch.vgic.rdist_base == base) ) + return v; + + /* Slow path: the VCPU is trying to access another re-distributor */ + + /* + * Find the region where the re-distributor lives. For this purpose, + * we look one region ahead as only MMIO range for redistributors + * traps here. + * Note: The region has been ordered during the GIC initialization + */ + for ( i = 1; i < d->arch.vgic.nr_regions; i++ ) + { + if ( base < d->arch.vgic.rdist_regions[i].base ) + break; + } + + region = &d->arch.vgic.rdist_regions[i - 1]; + + vcpu_id = region->first_cpu + ((base - region->base) / stride); + + if ( unlikely(vcpu_id >= d->max_vcpus) ) + return NULL; + + return d->vcpu[vcpu_id]; +} + static int vgic_v3_rdistr_mmio_read(struct vcpu *v, mmio_info_t *info) { uint32_t offset; perfc_incr(vgicr_reads); - offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); + v = get_vcpu_from_rdist(info->gpa, v, &offset); + if ( unlikely(!v) ) + return 0; if ( offset < SZ_64K ) return __vgic_v3_rdistr_rd_mmio_read(v, info, offset); @@ -645,7 +692,9 @@ static int vgic_v3_rdistr_mmio_write(struct vcpu *v, mmio_info_t *info) perfc_incr(vgicr_writes); - offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); + v = get_vcpu_from_rdist(info->gpa, v, &offset); + if ( unlikely(!v) ) + return 0; if ( offset < SZ_64K ) return __vgic_v3_rdistr_rd_mmio_write(v, info, offset); @@ -1080,6 +1129,13 @@ static int vgic_v3_vcpu_init(struct vcpu *v) { int i; uint64_t affinity; + paddr_t rdist_base; + struct vgic_rdist_region *region; + unsigned int last_cpu; + + /* Convenient alias */ + struct domain *d = v->domain; + uint32_t rdist_stride = d->arch.vgic.rdist_stride; /* For SGI and PPI the target is always this CPU */ affinity = (MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 3) << 32 | @@ -1090,6 +1146,45 @@ static int vgic_v3_vcpu_init(struct vcpu *v) for ( i = 0 ; i < 32 ; i++ ) v->arch.vgic.private_irqs->v3.irouter[i] = affinity; + /* + * Find the region where the re-distributor lives. For this purpose, + * we look one region ahead as we have only the first CPU in hand. + */ + for ( i = 1; i < d->arch.vgic.nr_regions; i++ ) + { + if ( v->vcpu_id < d->arch.vgic.rdist_regions[i].first_cpu ) + break; + } + + region = &d->arch.vgic.rdist_regions[i - 1]; + + /* Get the base address of the redistributor */ + rdist_base = region->base; + rdist_base += (v->vcpu_id - region->first_cpu) * rdist_stride; + + /* Check if a valid region was found for the re-distributor */ + if ( (rdist_base < region->base) || + ((rdist_base + rdist_stride) > (region->base + region->size)) ) + { + dprintk(XENLOG_ERR, + "d%u: Unable to find a re-distributor for VCPU %u\n", + d->domain_id, v->vcpu_id); + return -EINVAL; + } + + v->arch.vgic.rdist_base = rdist_base; + + /* + * If the redistributor is the last one of the + * contiguous region of the vCPU is the last of the domain, set + * VGIC_V3_RDIST_LAST flags. + * Note that we are assuming max_vcpus will never change. + */ + last_cpu = (region->size / rdist_stride) + region->first_cpu - 1; + + if ( v->vcpu_id == last_cpu || (v->vcpu_id == (d->max_vcpus - 1)) ) + v->arch.vgic.flags |= VGIC_V3_RDIST_LAST; + return 0; } diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 3eaa7f0..81e3185 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -106,6 +106,7 @@ struct arch_domain struct vgic_rdist_region { paddr_t base; /* Base address */ paddr_t size; /* Size */ + unsigned int first_cpu; /* First CPU handled */ } rdist_regions[MAX_RDIST_COUNT]; int nr_regions; /* Number of rdist regions */ uint32_t rdist_stride; /* Re-Distributor stride */ @@ -239,6 +240,11 @@ struct arch_vcpu * lr_pending is a subset of vgic.inflight_irqs. */ struct list_head lr_pending; spinlock_t lock; + + /* GICv3: redistributor base and flags for this vCPU */ + paddr_t rdist_base; +#define VGIC_V3_RDIST_LAST (1 << 0) /* last vCPU of the rdist */ + uint8_t flags; } vgic; /* Timer registers */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:59:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:59: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 1YSmQU-0007BG-K4; Tue, 03 Mar 2015 12:59:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQT-0007B6-Gu for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:53 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id E7/26-02991-840B5F45; Tue, 03 Mar 2015 12:59:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1425387590!12634338!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4518 invoked from network); 3 Mar 2015 12:59:51 -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; 3 Mar 2015 12:59:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQQ-0002c1-EN for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmQQ-0003RE-DD for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:50 +0000 Date: Tue, 03 Mar 2015 12:59:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Clarify which distributor is used in the common 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 b69707118babd90b56e07a747ea698bd90a2cf74 Author: Julien Grall AuthorDate: Mon Feb 16 14:50:49 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:55:48 2015 +0000 xen/arm: vgic-v3: Clarify which distributor is used in the common emulation The messages in the common emulation doesn't specify which distributor (redistributor or distributor) is used. This make difficult to find the correct registers. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v3.c | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 97249db..609e3c8 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -275,8 +275,8 @@ write_ignore_32: return 1; } -static int __vgic_v3_distr_common_mmio_read(struct vcpu *v, mmio_info_t *info, - uint32_t reg) +static int __vgic_v3_distr_common_mmio_read(const char *name, struct vcpu *v, + mmio_info_t *info, uint32_t reg) { struct hsr_dabt dabt = info->dabt; struct cpu_user_regs *regs = guest_cpu_user_regs(); @@ -360,15 +360,14 @@ static int __vgic_v3_distr_common_mmio_read(struct vcpu *v, mmio_info_t *info, return 1; default: printk(XENLOG_G_ERR - "%pv: vGICD/vGICR: unhandled read r%d offset %#08x\n", - v, dabt.reg, reg); + "%pv: %s: unhandled read r%d offset %#08x\n", + v, name, dabt.reg, reg); return 0; } bad_width: - printk(XENLOG_G_ERR - "%pv: vGICD/vGICR: bad read width %d r%d offset %#08x\n", - v, dabt.size, dabt.reg, reg); + printk(XENLOG_G_ERR "%pv: %s: bad read width %d r%d offset %#08x\n", + v, name, dabt.size, dabt.reg, reg); domain_crash_synchronous(); return 0; @@ -377,8 +376,8 @@ read_as_zero: return 1; } -static int __vgic_v3_distr_common_mmio_write(struct vcpu *v, mmio_info_t *info, - uint32_t reg) +static int __vgic_v3_distr_common_mmio_write(const char *name, struct vcpu *v, + mmio_info_t *info, uint32_t reg) { struct hsr_dabt dabt = info->dabt; struct cpu_user_regs *regs = guest_cpu_user_regs(); @@ -473,15 +472,15 @@ static int __vgic_v3_distr_common_mmio_write(struct vcpu *v, mmio_info_t *info, return 1; default: printk(XENLOG_G_ERR - "%pv: vGICD/vGICR: unhandled write r%d=%"PRIregister" offset %#08x\n", - v, dabt.reg, *r, reg); + "%pv: %s: unhandled write r%d=%"PRIregister" offset %#08x\n", + v, name, dabt.reg, *r, reg); return 0; } bad_width: printk(XENLOG_G_ERR - "%pv: vGICD/vGICR: bad write width %d r%d=%"PRIregister" offset %#08x\n", - v, dabt.size, dabt.reg, *r, reg); + "%pv: %s: bad write width %d r%d=%"PRIregister" offset %#08x\n", + v, name, dabt.size, dabt.reg, *r, reg); domain_crash_synchronous(); return 0; @@ -516,7 +515,8 @@ static int vgic_v3_rdistr_sgi_mmio_read(struct vcpu *v, mmio_info_t *info, * Above registers offset are common with GICD. * So handle in common with GICD handling */ - return __vgic_v3_distr_common_mmio_read(v, info, gicr_reg); + return __vgic_v3_distr_common_mmio_read("vGICR: SGI", v, info, + gicr_reg); case GICR_ISPENDR0: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ISPENDR0, DABT_WORD); @@ -581,7 +581,8 @@ static int vgic_v3_rdistr_sgi_mmio_write(struct vcpu *v, mmio_info_t *info, * Above registers offset are common with GICD. * So handle common with GICD handling */ - return __vgic_v3_distr_common_mmio_write(v, info, gicr_reg); + return __vgic_v3_distr_common_mmio_write("vGICR: SGI", v, + info, gicr_reg); case GICR_ISPENDR0: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ISACTIVER0, DABT_WORD); @@ -777,7 +778,7 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) * Above all register are common with GICR and GICD * Manage in common */ - return __vgic_v3_distr_common_mmio_read(v, info, gicd_reg); + return __vgic_v3_distr_common_mmio_read("vGICD", v, info, gicd_reg); case GICD_IROUTER ... GICD_IROUTER31: /* SGI/PPI is RES0 */ goto read_as_zero_64; @@ -942,7 +943,7 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_ICFGR ... GICD_ICFGRN: /* Above registers are common with GICR and GICD * Manage in common */ - return __vgic_v3_distr_common_mmio_write(v, info, gicd_reg); + return __vgic_v3_distr_common_mmio_write("vGICD", v, info, gicd_reg); case GICD_IROUTER ... GICD_IROUTER31: /* SGI/PPI is RES0 */ goto write_ignore_64; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 12:59:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 12:59: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 1YSmQU-0007BG-K4; Tue, 03 Mar 2015 12:59:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQT-0007B6-Gu for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:53 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id E7/26-02991-840B5F45; Tue, 03 Mar 2015 12:59:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1425387590!12634338!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4518 invoked from network); 3 Mar 2015 12:59:51 -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; 3 Mar 2015 12:59:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQQ-0002c1-EN for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmQQ-0003RE-DD for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 12:59:50 +0000 Date: Tue, 03 Mar 2015 12:59:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v3: Clarify which distributor is used in the common 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 b69707118babd90b56e07a747ea698bd90a2cf74 Author: Julien Grall AuthorDate: Mon Feb 16 14:50:49 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:55:48 2015 +0000 xen/arm: vgic-v3: Clarify which distributor is used in the common emulation The messages in the common emulation doesn't specify which distributor (redistributor or distributor) is used. This make difficult to find the correct registers. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v3.c | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 97249db..609e3c8 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -275,8 +275,8 @@ write_ignore_32: return 1; } -static int __vgic_v3_distr_common_mmio_read(struct vcpu *v, mmio_info_t *info, - uint32_t reg) +static int __vgic_v3_distr_common_mmio_read(const char *name, struct vcpu *v, + mmio_info_t *info, uint32_t reg) { struct hsr_dabt dabt = info->dabt; struct cpu_user_regs *regs = guest_cpu_user_regs(); @@ -360,15 +360,14 @@ static int __vgic_v3_distr_common_mmio_read(struct vcpu *v, mmio_info_t *info, return 1; default: printk(XENLOG_G_ERR - "%pv: vGICD/vGICR: unhandled read r%d offset %#08x\n", - v, dabt.reg, reg); + "%pv: %s: unhandled read r%d offset %#08x\n", + v, name, dabt.reg, reg); return 0; } bad_width: - printk(XENLOG_G_ERR - "%pv: vGICD/vGICR: bad read width %d r%d offset %#08x\n", - v, dabt.size, dabt.reg, reg); + printk(XENLOG_G_ERR "%pv: %s: bad read width %d r%d offset %#08x\n", + v, name, dabt.size, dabt.reg, reg); domain_crash_synchronous(); return 0; @@ -377,8 +376,8 @@ read_as_zero: return 1; } -static int __vgic_v3_distr_common_mmio_write(struct vcpu *v, mmio_info_t *info, - uint32_t reg) +static int __vgic_v3_distr_common_mmio_write(const char *name, struct vcpu *v, + mmio_info_t *info, uint32_t reg) { struct hsr_dabt dabt = info->dabt; struct cpu_user_regs *regs = guest_cpu_user_regs(); @@ -473,15 +472,15 @@ static int __vgic_v3_distr_common_mmio_write(struct vcpu *v, mmio_info_t *info, return 1; default: printk(XENLOG_G_ERR - "%pv: vGICD/vGICR: unhandled write r%d=%"PRIregister" offset %#08x\n", - v, dabt.reg, *r, reg); + "%pv: %s: unhandled write r%d=%"PRIregister" offset %#08x\n", + v, name, dabt.reg, *r, reg); return 0; } bad_width: printk(XENLOG_G_ERR - "%pv: vGICD/vGICR: bad write width %d r%d=%"PRIregister" offset %#08x\n", - v, dabt.size, dabt.reg, *r, reg); + "%pv: %s: bad write width %d r%d=%"PRIregister" offset %#08x\n", + v, name, dabt.size, dabt.reg, *r, reg); domain_crash_synchronous(); return 0; @@ -516,7 +515,8 @@ static int vgic_v3_rdistr_sgi_mmio_read(struct vcpu *v, mmio_info_t *info, * Above registers offset are common with GICD. * So handle in common with GICD handling */ - return __vgic_v3_distr_common_mmio_read(v, info, gicr_reg); + return __vgic_v3_distr_common_mmio_read("vGICR: SGI", v, info, + gicr_reg); case GICR_ISPENDR0: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ISPENDR0, DABT_WORD); @@ -581,7 +581,8 @@ static int vgic_v3_rdistr_sgi_mmio_write(struct vcpu *v, mmio_info_t *info, * Above registers offset are common with GICD. * So handle common with GICD handling */ - return __vgic_v3_distr_common_mmio_write(v, info, gicr_reg); + return __vgic_v3_distr_common_mmio_write("vGICR: SGI", v, + info, gicr_reg); case GICR_ISPENDR0: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ISACTIVER0, DABT_WORD); @@ -777,7 +778,7 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) * Above all register are common with GICR and GICD * Manage in common */ - return __vgic_v3_distr_common_mmio_read(v, info, gicd_reg); + return __vgic_v3_distr_common_mmio_read("vGICD", v, info, gicd_reg); case GICD_IROUTER ... GICD_IROUTER31: /* SGI/PPI is RES0 */ goto read_as_zero_64; @@ -942,7 +943,7 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_ICFGR ... GICD_ICFGRN: /* Above registers are common with GICR and GICD * Manage in common */ - return __vgic_v3_distr_common_mmio_write(v, info, gicd_reg); + return __vgic_v3_distr_common_mmio_write("vGICD", v, info, gicd_reg); case GICD_IROUTER ... GICD_IROUTER31: /* SGI/PPI is RES0 */ goto write_ignore_64; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:00:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:00:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQg-0007El-Oz; Tue, 03 Mar 2015 13:00:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQd-0007EN-IK for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:05 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 32/92-03164-250B5F45; Tue, 03 Mar 2015 13:00:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1425387600!9652470!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13669 invoked from network); 3 Mar 2015 13:00: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; 3 Mar 2015 13:00:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQa-0002cA-JU for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmQa-0003Rb-I4 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:00 +0000 Date: Tue, 03 Mar 2015 13:00:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v2: Correctly set GICD_TYPER.CPUNumber X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fed3569c648f6a13d4dc1ed03d885e9339b85dea Author: Julien Grall AuthorDate: Mon Feb 16 14:50:50 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:55:48 2015 +0000 xen/arm: vgic-v2: Correctly set GICD_TYPER.CPUNumber The number of implemented CPU interfaces is one more than the value of this field. Also avoid hardcoding the shift and remove useless mask. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 3b87f54..0cf82ef 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -55,7 +55,7 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_WORD ) goto bad_width; /* No secure world support for guests. */ vgic_lock(v); - *r = ( (v->domain->max_vcpus << 5) & GICD_TYPE_CPUS ) + *r = ( ((v->domain->max_vcpus - 1) << GICD_TYPE_CPUS_SHIFT) ) |( ((v->domain->arch.vgic.nr_spis / 32)) & GICD_TYPE_LINES ); vgic_unlock(v); return 1; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:00:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:00:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQg-0007El-Oz; Tue, 03 Mar 2015 13:00:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQd-0007EN-IK for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:05 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 32/92-03164-250B5F45; Tue, 03 Mar 2015 13:00:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1425387600!9652470!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13669 invoked from network); 3 Mar 2015 13:00: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; 3 Mar 2015 13:00:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQa-0002cA-JU for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmQa-0003Rb-I4 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:00 +0000 Date: Tue, 03 Mar 2015 13:00:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v2: Correctly set GICD_TYPER.CPUNumber X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fed3569c648f6a13d4dc1ed03d885e9339b85dea Author: Julien Grall AuthorDate: Mon Feb 16 14:50:50 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:55:48 2015 +0000 xen/arm: vgic-v2: Correctly set GICD_TYPER.CPUNumber The number of implemented CPU interfaces is one more than the value of this field. Also avoid hardcoding the shift and remove useless mask. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 3b87f54..0cf82ef 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -55,7 +55,7 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_WORD ) goto bad_width; /* No secure world support for guests. */ vgic_lock(v); - *r = ( (v->domain->max_vcpus << 5) & GICD_TYPE_CPUS ) + *r = ( ((v->domain->max_vcpus - 1) << GICD_TYPE_CPUS_SHIFT) ) |( ((v->domain->arch.vgic.nr_spis / 32)) & GICD_TYPE_LINES ); vgic_unlock(v); return 1; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:00:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:00: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 1YSmQp-0007GI-Ri; Tue, 03 Mar 2015 13:00:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQo-0007Fw-1e for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:14 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 8B/F0-02760-D50B5F45; Tue, 03 Mar 2015 13:00:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1425387611!14271346!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31885 invoked from network); 3 Mar 2015 13:00:12 -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; 3 Mar 2015 13:00:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQk-0002f1-Tq for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmQk-0003T6-O0 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:10 +0000 Date: Tue, 03 Mar 2015 13:00:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v2: Correctly handle RAZ/WI registers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1fefa550274758204a6bf58ea9b9509296197080 Author: Julien Grall AuthorDate: Mon Feb 16 14:50:51 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:55:48 2015 +0000 xen/arm: vgic-v2: Correctly handle RAZ/WI registers All the GICv2 registers are word-accessible. Some them are also byte-accessible (see GICD_IPRIORITYR*). Those registers are incorrectly implemented when they should be RAZ. Only word-access size are currently allowed for them. To avoid further issues, introduce different label following the access-size of the registers: - read_as_zero_32 and write_ignore_32: Used for registers accessible via a word. - read_as_zero: Used when we don't have to check the access size. The latter is used when the access size has already been checked in the register emulation and/or when the register offset is reserved/implementation defined. Note that, only used labels has been introduced. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 0cf82ef..8479027 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -74,7 +74,7 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_IGROUPR ... GICD_IGROUPRN: /* We do not implement security extensions for guests, read zero */ - goto read_as_zero; + goto read_as_zero_32; case GICD_ISENABLER ... GICD_ISENABLERN: if ( dabt.size != DABT_WORD ) goto bad_width; @@ -166,7 +166,7 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_NSACR ... GICD_NSACRN: /* We do not implement security extensions for guests, read zero */ - goto read_as_zero; + goto read_as_zero_32; case GICD_SGIR: if ( dabt.size != DABT_WORD ) goto bad_width; @@ -226,8 +226,9 @@ bad_width: domain_crash_synchronous(); return 0; -read_as_zero: +read_as_zero_32: if ( dabt.size != DABT_WORD ) goto bad_width; +read_as_zero: *r = 0; return 1; } @@ -289,7 +290,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) /* R/O -- write ignored */ case GICD_TYPER: case GICD_IIDR: - goto write_ignore; + goto write_ignore_32; /* Implementation defined -- write ignored */ case 0x020 ... 0x03c: @@ -297,7 +298,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_IGROUPR ... GICD_IGROUPRN: /* We do not implement security extensions for guests, write ignore */ - goto write_ignore; + goto write_ignore_32; case GICD_ISENABLER ... GICD_ISENABLERN: if ( dabt.size != DABT_WORD ) goto bad_width; @@ -363,7 +364,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_ITARGETSR ... GICD_ITARGETSR + 7: /* SGI/PPI target is read only */ - goto write_ignore; + goto write_ignore_32; case GICD_ITARGETSR + 8 ... GICD_ITARGETSRN: { @@ -436,10 +437,10 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ICFGR: /* SGIs */ - goto write_ignore; + goto write_ignore_32; case GICD_ICFGR + 1: /* PPIs */ /* It is implementation defined if these are writeable. We chose not */ - goto write_ignore; + goto write_ignore_32; case GICD_ICFGR + 2 ... GICD_ICFGRN: /* SPIs */ if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); @@ -451,7 +452,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_NSACR ... GICD_NSACRN: /* We do not implement security extensions for guests, write ignore */ - goto write_ignore; + goto write_ignore_32; case GICD_SGIR: if ( dabt.size != DABT_WORD ) goto bad_width; @@ -477,7 +478,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) /* R/O -- write ignore */ case GICD_ICPIDR2: - goto write_ignore; + goto write_ignore_32; /* Implementation defined -- write ignored */ case 0xfec ... 0xffc: @@ -506,8 +507,9 @@ bad_width: domain_crash_synchronous(); return 0; -write_ignore: +write_ignore_32: if ( dabt.size != DABT_WORD ) goto bad_width; +write_ignore: return 1; } -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:00:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:00: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 1YSmQp-0007GI-Ri; Tue, 03 Mar 2015 13:00:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQo-0007Fw-1e for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:14 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 8B/F0-02760-D50B5F45; Tue, 03 Mar 2015 13:00:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1425387611!14271346!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31885 invoked from network); 3 Mar 2015 13:00:12 -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; 3 Mar 2015 13:00:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQk-0002f1-Tq for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmQk-0003T6-O0 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:10 +0000 Date: Tue, 03 Mar 2015 13:00:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v2: Correctly handle RAZ/WI registers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1fefa550274758204a6bf58ea9b9509296197080 Author: Julien Grall AuthorDate: Mon Feb 16 14:50:51 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:55:48 2015 +0000 xen/arm: vgic-v2: Correctly handle RAZ/WI registers All the GICv2 registers are word-accessible. Some them are also byte-accessible (see GICD_IPRIORITYR*). Those registers are incorrectly implemented when they should be RAZ. Only word-access size are currently allowed for them. To avoid further issues, introduce different label following the access-size of the registers: - read_as_zero_32 and write_ignore_32: Used for registers accessible via a word. - read_as_zero: Used when we don't have to check the access size. The latter is used when the access size has already been checked in the register emulation and/or when the register offset is reserved/implementation defined. Note that, only used labels has been introduced. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 0cf82ef..8479027 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -74,7 +74,7 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_IGROUPR ... GICD_IGROUPRN: /* We do not implement security extensions for guests, read zero */ - goto read_as_zero; + goto read_as_zero_32; case GICD_ISENABLER ... GICD_ISENABLERN: if ( dabt.size != DABT_WORD ) goto bad_width; @@ -166,7 +166,7 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_NSACR ... GICD_NSACRN: /* We do not implement security extensions for guests, read zero */ - goto read_as_zero; + goto read_as_zero_32; case GICD_SGIR: if ( dabt.size != DABT_WORD ) goto bad_width; @@ -226,8 +226,9 @@ bad_width: domain_crash_synchronous(); return 0; -read_as_zero: +read_as_zero_32: if ( dabt.size != DABT_WORD ) goto bad_width; +read_as_zero: *r = 0; return 1; } @@ -289,7 +290,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) /* R/O -- write ignored */ case GICD_TYPER: case GICD_IIDR: - goto write_ignore; + goto write_ignore_32; /* Implementation defined -- write ignored */ case 0x020 ... 0x03c: @@ -297,7 +298,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_IGROUPR ... GICD_IGROUPRN: /* We do not implement security extensions for guests, write ignore */ - goto write_ignore; + goto write_ignore_32; case GICD_ISENABLER ... GICD_ISENABLERN: if ( dabt.size != DABT_WORD ) goto bad_width; @@ -363,7 +364,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_ITARGETSR ... GICD_ITARGETSR + 7: /* SGI/PPI target is read only */ - goto write_ignore; + goto write_ignore_32; case GICD_ITARGETSR + 8 ... GICD_ITARGETSRN: { @@ -436,10 +437,10 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ICFGR: /* SGIs */ - goto write_ignore; + goto write_ignore_32; case GICD_ICFGR + 1: /* PPIs */ /* It is implementation defined if these are writeable. We chose not */ - goto write_ignore; + goto write_ignore_32; case GICD_ICFGR + 2 ... GICD_ICFGRN: /* SPIs */ if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); @@ -451,7 +452,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_NSACR ... GICD_NSACRN: /* We do not implement security extensions for guests, write ignore */ - goto write_ignore; + goto write_ignore_32; case GICD_SGIR: if ( dabt.size != DABT_WORD ) goto bad_width; @@ -477,7 +478,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) /* R/O -- write ignore */ case GICD_ICPIDR2: - goto write_ignore; + goto write_ignore_32; /* Implementation defined -- write ignored */ case 0xfec ... 0xffc: @@ -506,8 +507,9 @@ bad_width: domain_crash_synchronous(); return 0; -write_ignore: +write_ignore_32: if ( dabt.size != DABT_WORD ) goto bad_width; +write_ignore: return 1; } -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:00:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:00: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 1YSmQz-0007Hl-V1; Tue, 03 Mar 2015 13:00:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQy-0007HV-9W for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:24 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 6D/0E-03710-760B5F45; Tue, 03 Mar 2015 13:00:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1425387621!12668020!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26696 invoked from network); 3 Mar 2015 13:00: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; 3 Mar 2015 13:00:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQv-0002f9-3q for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmQv-0003U1-1r for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:21 +0000 Date: Tue, 03 Mar 2015 13:00:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v2: Take the lock when writing into GICD_CTLR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 26ea82f165295ea2ebd92e9c4579a757647fd399 Author: Julien Grall AuthorDate: Mon Feb 16 14:50:52 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:56:01 2015 +0000 xen/arm: vgic-v2: Take the lock when writing into GICD_CTLR This register is shared between every vCPUs and the lock was already taken for read. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 8479027..42c6411 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -284,7 +284,10 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_CTLR: if ( dabt.size != DABT_WORD ) goto bad_width; /* Ignore all but the enable bit */ + vgic_lock(v); v->domain->arch.vgic.ctlr = (*r) & GICD_CTL_ENABLE; + vgic_unlock(v); + return 1; /* R/O -- write ignored */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:00:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:00: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 1YSmQz-0007Hl-V1; Tue, 03 Mar 2015 13:00:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQy-0007HV-9W for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:24 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 6D/0E-03710-760B5F45; Tue, 03 Mar 2015 13:00:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1425387621!12668020!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26696 invoked from network); 3 Mar 2015 13:00: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; 3 Mar 2015 13:00:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmQv-0002f9-3q for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmQv-0003U1-1r for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:21 +0000 Date: Tue, 03 Mar 2015 13:00:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v2: Take the lock when writing into GICD_CTLR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 26ea82f165295ea2ebd92e9c4579a757647fd399 Author: Julien Grall AuthorDate: Mon Feb 16 14:50:52 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:56:01 2015 +0000 xen/arm: vgic-v2: Take the lock when writing into GICD_CTLR This register is shared between every vCPUs and the lock was already taken for read. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 8479027..42c6411 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -284,7 +284,10 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_CTLR: if ( dabt.size != DABT_WORD ) goto bad_width; /* Ignore all but the enable bit */ + vgic_lock(v); v->domain->arch.vgic.ctlr = (*r) & GICD_CTL_ENABLE; + vgic_unlock(v); + return 1; /* R/O -- write ignored */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:00:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13: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 1YSmR9-0007J5-1e; Tue, 03 Mar 2015 13:00:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmR7-0007Iu-Ut for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:34 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 9A/26-02745-170B5F45; Tue, 03 Mar 2015 13:00:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1425387631!12631003!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11551 invoked from network); 3 Mar 2015 13:00:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 3 Mar 2015 13:00:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmR5-0002fH-9A for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmR5-0003UR-7K for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:31 +0000 Date: Tue, 03 Mar 2015 13:00:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v2: GICD_I{S, C}PENDR* are only word-accessible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 10af92d1750fc37566876bcc7c95be7159e3277a Author: Julien Grall AuthorDate: Mon Feb 16 14:50:53 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:56:01 2015 +0000 xen/arm: vgic-v2: GICD_I{S, C}PENDR* are only word-accessible Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 42c6411..1f52aeb 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -95,7 +95,7 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank, flags); @@ -104,8 +104,8 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR, DABT_WORD); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 0, gicd_reg - GICD_ICPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank, flags); *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); @@ -334,17 +334,17 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; printk(XENLOG_G_ERR - "%pv: vGICD: unhandled %s write %#"PRIregister" to ISPENDR%d\n", - v, dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ISPENDR); + "%pv: vGICD: unhandled word write %#"PRIregister" to ISPENDR%d\n", + v, *r, gicd_reg - GICD_ISPENDR); return 0; case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; printk(XENLOG_G_ERR - "%pv: vGICD: unhandled %s write %#"PRIregister" to ICPENDR%d\n", - v, dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ICPENDR); + "%pv: vGICD: unhandled word write %#"PRIregister" to ICPENDR%d\n", + v, *r, gicd_reg - GICD_ICPENDR); return 0; case GICD_ISACTIVER ... GICD_ISACTIVERN: -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:00:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13: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 1YSmR9-0007J5-1e; Tue, 03 Mar 2015 13:00:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmR7-0007Iu-Ut for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:34 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 9A/26-02745-170B5F45; Tue, 03 Mar 2015 13:00:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1425387631!12631003!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11551 invoked from network); 3 Mar 2015 13:00:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 3 Mar 2015 13:00:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmR5-0002fH-9A for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmR5-0003UR-7K for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:31 +0000 Date: Tue, 03 Mar 2015 13:00:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v2: GICD_I{S, C}PENDR* are only word-accessible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 10af92d1750fc37566876bcc7c95be7159e3277a Author: Julien Grall AuthorDate: Mon Feb 16 14:50:53 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:56:01 2015 +0000 xen/arm: vgic-v2: GICD_I{S, C}PENDR* are only word-accessible Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 42c6411..1f52aeb 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -95,7 +95,7 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank, flags); @@ -104,8 +104,8 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR, DABT_WORD); + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 0, gicd_reg - GICD_ICPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank, flags); *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); @@ -334,17 +334,17 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) return 1; case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; printk(XENLOG_G_ERR - "%pv: vGICD: unhandled %s write %#"PRIregister" to ISPENDR%d\n", - v, dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ISPENDR); + "%pv: vGICD: unhandled word write %#"PRIregister" to ISPENDR%d\n", + v, *r, gicd_reg - GICD_ISPENDR); return 0; case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + if ( dabt.size != DABT_WORD ) goto bad_width; printk(XENLOG_G_ERR - "%pv: vGICD: unhandled %s write %#"PRIregister" to ICPENDR%d\n", - v, dabt.size ? "word" : "byte", *r, gicd_reg - GICD_ICPENDR); + "%pv: vGICD: unhandled word write %#"PRIregister" to ICPENDR%d\n", + v, *r, gicd_reg - GICD_ICPENDR); return 0; case GICD_ISACTIVER ... GICD_ISACTIVERN: -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:00:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:00: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 1YSmRL-0007Kx-4Z; Tue, 03 Mar 2015 13:00:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRJ-0007Kd-AS for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:45 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 28/E3-03163-C70B5F45; Tue, 03 Mar 2015 13:00:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1425387641!8185573!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4158 invoked from network); 3 Mar 2015 13:00:42 -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; 3 Mar 2015 13:00:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRF-0002fN-G0 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmRF-0003V7-Eh for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:41 +0000 Date: Tue, 03 Mar 2015 13:00:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic: Drop iactive, ipend, pendsgi 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 a41d809b0063c564224a08af11030fee8535dd37 Author: Julien Grall AuthorDate: Mon Feb 16 14:50:54 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:56:42 2015 +0000 xen/arm: vgic: Drop iactive, ipend, pendsgi field The current VGIC code doesn't support to change the pending and active status of an IRQ via the (re-)distributor. Futhermore, all the access size wasn't support correctly and some registers was implemented as write-ignore. The latter make very difficult for a kernel developer to find that we don't support R/W to those registers. Make the support consistent: - read will return 0 (RAZ) - write will print an error and inject a data abort to the guest Also, those fields was never set and field such as ipend and pendsgi was doing the same jobs. Rather than wasting memory, we should better drop it. We could re-introduce them if we need it when the support will be made. Signed-off-by: Julien Grall Acked-by: Ian Campbell [ ijc -- s/XENLOG_ERR/XENLOG_G_ERR/g ] --- xen/arch/arm/vgic-v2.c | 71 +++++-------------------- xen/arch/arm/vgic-v3.c | 125 ++++++++++++++------------------------------ xen/include/asm-arm/vgic.h | 2 +- 3 files changed, 55 insertions(+), 143 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 1f52aeb..6d14f83 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -94,41 +94,15 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) vgic_unlock_rank(v, rank, flags); return 1; + /* Read the pending status of an IRQ via GICD is not supported */ case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank, flags); - return 1; - case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 0, gicd_reg - GICD_ICPENDR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank, flags); - return 1; + goto read_as_zero; + /* Read the active status of an IRQ via GICD is not supported */ case GICD_ISACTIVER ... GICD_ISACTIVERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = rank->iactive; - vgic_unlock_rank(v, rank, flags); - return 1; - case GICD_ICACTIVER ... GICD_ICACTIVERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = rank->iactive; - vgic_unlock_rank(v, rank, flags); - return 1; + goto read_as_zero; case GICD_ITARGETSR ... GICD_ITARGETSRN: if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; @@ -174,23 +148,10 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) *r = 0xdeadbeef; return 1; + /* Setting/Clearing the SGI pending bit via GICD is not supported */ case GICD_CPENDSGIR ... GICD_CPENDSGIRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_CPENDSGIR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank, flags); - return 1; - case GICD_SPENDSGIR ... GICD_SPENDSGIRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_SPENDSGIR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank, flags); - return 1; + goto read_as_zero; /* Implementation defined -- read as zero */ case 0xfd0 ... 0xfe4: @@ -349,21 +310,17 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_ISACTIVER ... GICD_ISACTIVERN: if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank, flags); - rank->iactive &= ~*r; - vgic_unlock_rank(v, rank, flags); - return 1; + printk(XENLOG_G_ERR + "%pv: vGICD: unhandled word write %#"PRIregister" to ISACTIVER%d\n", + v, *r, gicd_reg - GICD_ISACTIVER); + return 0; case GICD_ICACTIVER ... GICD_ICACTIVERN: if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank, flags); - rank->iactive &= ~*r; - vgic_unlock_rank(v, rank, flags); - return 1; + printk(XENLOG_G_ERR + "%pv: vGICD: unhandled word write %#"PRIregister" to ICACTIVER%d\n", + v, *r, gicd_reg - GICD_ICACTIVER); + return 0; case GICD_ITARGETSR ... GICD_ITARGETSR + 7: /* SGI/PPI target is read only */ diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 609e3c8..c72eb6c 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -306,38 +306,16 @@ static int __vgic_v3_distr_common_mmio_read(const char *name, struct vcpu *v, *r = rank->ienable; vgic_unlock_rank(v, rank, flags); return 1; + /* Read the pending status of an IRQ via GICD/GICR is not supported */ case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, reg - GICD_ISPENDR, DABT_WORD); - if ( rank == NULL ) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = vgic_byte_read(rank->ipend, dabt.sign, reg); - vgic_unlock_rank(v, rank, flags); - return 1; case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, reg - GICD_ICPENDR, DABT_WORD); - if ( rank == NULL ) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = vgic_byte_read(rank->ipend, dabt.sign, reg); - vgic_unlock_rank(v, rank, flags); - return 1; + goto read_as_zero; + + /* Read the active status of an IRQ via GICD/GICR is not supported */ case GICD_ISACTIVER ... GICD_ISACTIVERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, reg - GICD_ISACTIVER, DABT_WORD); - if ( rank == NULL ) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = rank->iactive; - vgic_unlock_rank(v, rank, flags); - return 1; case GICD_ICACTIVER ... GICD_ICACTIVERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, reg - GICD_ICACTIVER, DABT_WORD); - if ( rank == NULL ) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = rank->iactive; - vgic_unlock_rank(v, rank, flags); - return 1; + goto read_as_zero; + case GICD_IPRIORITYR ... GICD_IPRIORITYRN: if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 8, reg - GICD_IPRIORITYR, DABT_WORD); @@ -415,36 +393,32 @@ static int __vgic_v3_distr_common_mmio_write(const char *name, struct vcpu *v, return 1; case GICD_ISPENDR ... GICD_ISPENDRN: if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, reg - GICD_ISPENDR, DABT_WORD); - if ( rank == NULL ) goto write_ignore; - vgic_lock_rank(v, rank, flags); - rank->ipend = *r; - vgic_unlock_rank(v, rank, flags); - return 1; + printk(XENLOG_G_ERR + "%pv: %s: unhandled word write %#"PRIregister" to ISPENDR%d\n", + v, name, *r, reg - GICD_ISPENDR); + return 0; + case GICD_ICPENDR ... GICD_ICPENDRN: if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, reg - GICD_ICPENDR, DABT_WORD); - if ( rank == NULL ) goto write_ignore; - vgic_lock_rank(v, rank, flags); - rank->ipend &= ~*r; - vgic_unlock_rank(v, rank, flags); - return 1; + printk(XENLOG_G_ERR + "%pv: %s: unhandled word write %#"PRIregister" to ICPENDR%d\n", + v, name, *r, reg - GICD_ICPENDR); + return 0; + case GICD_ISACTIVER ... GICD_ISACTIVERN: if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, reg - GICD_ISACTIVER, DABT_WORD); - if ( rank == NULL ) goto write_ignore; - vgic_lock_rank(v, rank, flags); - rank->iactive &= ~*r; - vgic_unlock_rank(v, rank, flags); - return 1; + printk(XENLOG_G_ERR + "%pv: %s: unhandled word write %#"PRIregister" to ISACTIVER%d\n", + v, name, *r, reg - GICD_ISACTIVER); + return 0; + case GICD_ICACTIVER ... GICD_ICACTIVERN: if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, reg - GICD_ICACTIVER, DABT_WORD); - if ( rank == NULL ) goto write_ignore; - vgic_lock_rank(v, rank, flags); - rank->iactive &= ~*r; - vgic_unlock_rank(v, rank, flags); - return 1; + printk(XENLOG_G_ERR + "%pv: %s: unhandled word write %#"PRIregister" to ICACTIVER%d\n", + v, name, *r, reg - GICD_ICACTIVER); + return 0; + case GICD_IPRIORITYR ... GICD_IPRIORITYRN: if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 8, reg - GICD_IPRIORITYR, DABT_WORD); @@ -496,8 +470,6 @@ static int vgic_v3_rdistr_sgi_mmio_read(struct vcpu *v, mmio_info_t *info, struct hsr_dabt dabt = info->dabt; struct cpu_user_regs *regs = guest_cpu_user_regs(); register_t *r = select_user_reg(regs, dabt.reg); - struct vgic_irq_rank *rank; - unsigned long flags; switch ( gicr_reg ) { @@ -517,22 +489,12 @@ static int vgic_v3_rdistr_sgi_mmio_read(struct vcpu *v, mmio_info_t *info, */ return __vgic_v3_distr_common_mmio_read("vGICR: SGI", v, info, gicr_reg); + + /* Read the pending status of an SGI is via GICR is not supported */ case GICR_ISPENDR0: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ISPENDR0, DABT_WORD); - if ( rank == NULL ) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = rank->pendsgi; - vgic_unlock_rank(v, rank, flags); - return 1; case GICR_ICPENDR0: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ICPENDR0, DABT_WORD); - if ( rank == NULL ) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = rank->pendsgi; - vgic_unlock_rank(v, rank, flags); - return 1; + goto read_as_zero; + case GICR_NSACR: /* We do not implement security extensions for guests, read zero */ goto read_as_zero_32; @@ -562,8 +524,6 @@ static int vgic_v3_rdistr_sgi_mmio_write(struct vcpu *v, mmio_info_t *info, struct hsr_dabt dabt = info->dabt; struct cpu_user_regs *regs = guest_cpu_user_regs(); register_t *r = select_user_reg(regs, dabt.reg); - struct vgic_irq_rank *rank; - unsigned long flags; switch ( gicr_reg ) { @@ -585,22 +545,18 @@ static int vgic_v3_rdistr_sgi_mmio_write(struct vcpu *v, mmio_info_t *info, info, gicr_reg); case GICR_ISPENDR0: if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ISACTIVER0, DABT_WORD); - if ( rank == NULL ) goto write_ignore; - vgic_lock_rank(v, rank, flags); - /* TODO: we just store the SGI pending status. Handle it properly */ - rank->pendsgi |= *r; - vgic_unlock_rank(v, rank, flags); - return 1; + printk(XENLOG_G_ERR + "%pv: vGICR: SGI: unhandled word write %#"PRIregister" to ISPENDR0\n", + v, *r); + return 0; + case GICR_ICPENDR0: if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ISACTIVER0, DABT_WORD); - if ( rank == NULL ) goto write_ignore; - vgic_lock_rank(v, rank, flags); - /* TODO: we just store the SGI pending status. Handle it properly */ - rank->pendsgi &= ~*r; - vgic_unlock_rank(v, rank, flags); - return 1; + printk(XENLOG_G_ERR + "%pv: vGICR: SGI: unhandled word write %#"PRIregister" to ICPENDR0\n", + v, *r); + return 0; + case GICR_NSACR: /* We do not implement security extensions for guests, write ignore */ goto write_ignore_32; @@ -620,7 +576,6 @@ bad_width: write_ignore_32: if ( dabt.size != DABT_WORD ) goto bad_width; -write_ignore: return 1; } diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 74d5a4e..0c7da7f 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -85,7 +85,7 @@ struct pending_irq /* Represents state corresponding to a block of 32 interrupts */ struct vgic_irq_rank { spinlock_t lock; /* Covers access to all other members of this struct */ - uint32_t ienable, iactive, ipend, pendsgi; + uint32_t ienable; uint32_t icfg[2]; uint32_t ipriority[8]; union { -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:00:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:00: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 1YSmRL-0007Kx-4Z; Tue, 03 Mar 2015 13:00:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRJ-0007Kd-AS for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:45 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 28/E3-03163-C70B5F45; Tue, 03 Mar 2015 13:00:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1425387641!8185573!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4158 invoked from network); 3 Mar 2015 13:00:42 -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; 3 Mar 2015 13:00:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRF-0002fN-G0 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmRF-0003V7-Eh for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:41 +0000 Date: Tue, 03 Mar 2015 13:00:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic: Drop iactive, ipend, pendsgi 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 a41d809b0063c564224a08af11030fee8535dd37 Author: Julien Grall AuthorDate: Mon Feb 16 14:50:54 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:56:42 2015 +0000 xen/arm: vgic: Drop iactive, ipend, pendsgi field The current VGIC code doesn't support to change the pending and active status of an IRQ via the (re-)distributor. Futhermore, all the access size wasn't support correctly and some registers was implemented as write-ignore. The latter make very difficult for a kernel developer to find that we don't support R/W to those registers. Make the support consistent: - read will return 0 (RAZ) - write will print an error and inject a data abort to the guest Also, those fields was never set and field such as ipend and pendsgi was doing the same jobs. Rather than wasting memory, we should better drop it. We could re-introduce them if we need it when the support will be made. Signed-off-by: Julien Grall Acked-by: Ian Campbell [ ijc -- s/XENLOG_ERR/XENLOG_G_ERR/g ] --- xen/arch/arm/vgic-v2.c | 71 +++++-------------------- xen/arch/arm/vgic-v3.c | 125 ++++++++++++++------------------------------ xen/include/asm-arm/vgic.h | 2 +- 3 files changed, 55 insertions(+), 143 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 1f52aeb..6d14f83 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -94,41 +94,15 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) vgic_unlock_rank(v, rank, flags); return 1; + /* Read the pending status of an IRQ via GICD is not supported */ case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank, flags); - return 1; - case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 0, gicd_reg - GICD_ICPENDR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank, flags); - return 1; + goto read_as_zero; + /* Read the active status of an IRQ via GICD is not supported */ case GICD_ISACTIVER ... GICD_ISACTIVERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = rank->iactive; - vgic_unlock_rank(v, rank, flags); - return 1; - case GICD_ICACTIVER ... GICD_ICACTIVERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = rank->iactive; - vgic_unlock_rank(v, rank, flags); - return 1; + goto read_as_zero; case GICD_ITARGETSR ... GICD_ITARGETSRN: if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; @@ -174,23 +148,10 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) *r = 0xdeadbeef; return 1; + /* Setting/Clearing the SGI pending bit via GICD is not supported */ case GICD_CPENDSGIR ... GICD_CPENDSGIRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_CPENDSGIR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank, flags); - return 1; - case GICD_SPENDSGIR ... GICD_SPENDSGIRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_SPENDSGIR, DABT_WORD); - if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank, flags); - return 1; + goto read_as_zero; /* Implementation defined -- read as zero */ case 0xfd0 ... 0xfe4: @@ -349,21 +310,17 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_ISACTIVER ... GICD_ISACTIVERN: if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank, flags); - rank->iactive &= ~*r; - vgic_unlock_rank(v, rank, flags); - return 1; + printk(XENLOG_G_ERR + "%pv: vGICD: unhandled word write %#"PRIregister" to ISACTIVER%d\n", + v, *r, gicd_reg - GICD_ISACTIVER); + return 0; case GICD_ICACTIVER ... GICD_ICACTIVERN: if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); - if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank, flags); - rank->iactive &= ~*r; - vgic_unlock_rank(v, rank, flags); - return 1; + printk(XENLOG_G_ERR + "%pv: vGICD: unhandled word write %#"PRIregister" to ICACTIVER%d\n", + v, *r, gicd_reg - GICD_ICACTIVER); + return 0; case GICD_ITARGETSR ... GICD_ITARGETSR + 7: /* SGI/PPI target is read only */ diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 609e3c8..c72eb6c 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -306,38 +306,16 @@ static int __vgic_v3_distr_common_mmio_read(const char *name, struct vcpu *v, *r = rank->ienable; vgic_unlock_rank(v, rank, flags); return 1; + /* Read the pending status of an IRQ via GICD/GICR is not supported */ case GICD_ISPENDR ... GICD_ISPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, reg - GICD_ISPENDR, DABT_WORD); - if ( rank == NULL ) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = vgic_byte_read(rank->ipend, dabt.sign, reg); - vgic_unlock_rank(v, rank, flags); - return 1; case GICD_ICPENDR ... GICD_ICPENDRN: - if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, reg - GICD_ICPENDR, DABT_WORD); - if ( rank == NULL ) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = vgic_byte_read(rank->ipend, dabt.sign, reg); - vgic_unlock_rank(v, rank, flags); - return 1; + goto read_as_zero; + + /* Read the active status of an IRQ via GICD/GICR is not supported */ case GICD_ISACTIVER ... GICD_ISACTIVERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, reg - GICD_ISACTIVER, DABT_WORD); - if ( rank == NULL ) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = rank->iactive; - vgic_unlock_rank(v, rank, flags); - return 1; case GICD_ICACTIVER ... GICD_ICACTIVERN: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, reg - GICD_ICACTIVER, DABT_WORD); - if ( rank == NULL ) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = rank->iactive; - vgic_unlock_rank(v, rank, flags); - return 1; + goto read_as_zero; + case GICD_IPRIORITYR ... GICD_IPRIORITYRN: if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 8, reg - GICD_IPRIORITYR, DABT_WORD); @@ -415,36 +393,32 @@ static int __vgic_v3_distr_common_mmio_write(const char *name, struct vcpu *v, return 1; case GICD_ISPENDR ... GICD_ISPENDRN: if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, reg - GICD_ISPENDR, DABT_WORD); - if ( rank == NULL ) goto write_ignore; - vgic_lock_rank(v, rank, flags); - rank->ipend = *r; - vgic_unlock_rank(v, rank, flags); - return 1; + printk(XENLOG_G_ERR + "%pv: %s: unhandled word write %#"PRIregister" to ISPENDR%d\n", + v, name, *r, reg - GICD_ISPENDR); + return 0; + case GICD_ICPENDR ... GICD_ICPENDRN: if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, reg - GICD_ICPENDR, DABT_WORD); - if ( rank == NULL ) goto write_ignore; - vgic_lock_rank(v, rank, flags); - rank->ipend &= ~*r; - vgic_unlock_rank(v, rank, flags); - return 1; + printk(XENLOG_G_ERR + "%pv: %s: unhandled word write %#"PRIregister" to ICPENDR%d\n", + v, name, *r, reg - GICD_ICPENDR); + return 0; + case GICD_ISACTIVER ... GICD_ISACTIVERN: if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, reg - GICD_ISACTIVER, DABT_WORD); - if ( rank == NULL ) goto write_ignore; - vgic_lock_rank(v, rank, flags); - rank->iactive &= ~*r; - vgic_unlock_rank(v, rank, flags); - return 1; + printk(XENLOG_G_ERR + "%pv: %s: unhandled word write %#"PRIregister" to ISACTIVER%d\n", + v, name, *r, reg - GICD_ISACTIVER); + return 0; + case GICD_ICACTIVER ... GICD_ICACTIVERN: if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, reg - GICD_ICACTIVER, DABT_WORD); - if ( rank == NULL ) goto write_ignore; - vgic_lock_rank(v, rank, flags); - rank->iactive &= ~*r; - vgic_unlock_rank(v, rank, flags); - return 1; + printk(XENLOG_G_ERR + "%pv: %s: unhandled word write %#"PRIregister" to ICACTIVER%d\n", + v, name, *r, reg - GICD_ICACTIVER); + return 0; + case GICD_IPRIORITYR ... GICD_IPRIORITYRN: if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 8, reg - GICD_IPRIORITYR, DABT_WORD); @@ -496,8 +470,6 @@ static int vgic_v3_rdistr_sgi_mmio_read(struct vcpu *v, mmio_info_t *info, struct hsr_dabt dabt = info->dabt; struct cpu_user_regs *regs = guest_cpu_user_regs(); register_t *r = select_user_reg(regs, dabt.reg); - struct vgic_irq_rank *rank; - unsigned long flags; switch ( gicr_reg ) { @@ -517,22 +489,12 @@ static int vgic_v3_rdistr_sgi_mmio_read(struct vcpu *v, mmio_info_t *info, */ return __vgic_v3_distr_common_mmio_read("vGICR: SGI", v, info, gicr_reg); + + /* Read the pending status of an SGI is via GICR is not supported */ case GICR_ISPENDR0: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ISPENDR0, DABT_WORD); - if ( rank == NULL ) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = rank->pendsgi; - vgic_unlock_rank(v, rank, flags); - return 1; case GICR_ICPENDR0: - if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ICPENDR0, DABT_WORD); - if ( rank == NULL ) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = rank->pendsgi; - vgic_unlock_rank(v, rank, flags); - return 1; + goto read_as_zero; + case GICR_NSACR: /* We do not implement security extensions for guests, read zero */ goto read_as_zero_32; @@ -562,8 +524,6 @@ static int vgic_v3_rdistr_sgi_mmio_write(struct vcpu *v, mmio_info_t *info, struct hsr_dabt dabt = info->dabt; struct cpu_user_regs *regs = guest_cpu_user_regs(); register_t *r = select_user_reg(regs, dabt.reg); - struct vgic_irq_rank *rank; - unsigned long flags; switch ( gicr_reg ) { @@ -585,22 +545,18 @@ static int vgic_v3_rdistr_sgi_mmio_write(struct vcpu *v, mmio_info_t *info, info, gicr_reg); case GICR_ISPENDR0: if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ISACTIVER0, DABT_WORD); - if ( rank == NULL ) goto write_ignore; - vgic_lock_rank(v, rank, flags); - /* TODO: we just store the SGI pending status. Handle it properly */ - rank->pendsgi |= *r; - vgic_unlock_rank(v, rank, flags); - return 1; + printk(XENLOG_G_ERR + "%pv: vGICR: SGI: unhandled word write %#"PRIregister" to ISPENDR0\n", + v, *r); + return 0; + case GICR_ICPENDR0: if ( dabt.size != DABT_WORD ) goto bad_width; - rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ISACTIVER0, DABT_WORD); - if ( rank == NULL ) goto write_ignore; - vgic_lock_rank(v, rank, flags); - /* TODO: we just store the SGI pending status. Handle it properly */ - rank->pendsgi &= ~*r; - vgic_unlock_rank(v, rank, flags); - return 1; + printk(XENLOG_G_ERR + "%pv: vGICR: SGI: unhandled word write %#"PRIregister" to ICPENDR0\n", + v, *r); + return 0; + case GICR_NSACR: /* We do not implement security extensions for guests, write ignore */ goto write_ignore_32; @@ -620,7 +576,6 @@ bad_width: write_ignore_32: if ( dabt.size != DABT_WORD ) goto bad_width; -write_ignore: return 1; } diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 74d5a4e..0c7da7f 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -85,7 +85,7 @@ struct pending_irq /* Represents state corresponding to a block of 32 interrupts */ struct vgic_irq_rank { spinlock_t lock; /* Covers access to all other members of this struct */ - uint32_t ienable, iactive, ipend, pendsgi; + uint32_t ienable; uint32_t icfg[2]; uint32_t ipriority[8]; union { -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:00:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:00: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 1YSmRU-0007NG-Dt; Tue, 03 Mar 2015 13:00:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRS-0007Mt-L4 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:54 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 76/88-02756-580B5F45; Tue, 03 Mar 2015 13:00:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1425387651!9753322!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12972 invoked from network); 3 Mar 2015 13:00:52 -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; 3 Mar 2015 13:00:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRP-0002fU-Kt for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmRP-0003VT-JS for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:51 +0000 Date: Tue, 03 Mar 2015 13:00:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: gic-v3: Update some comments in the code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 98e7c60d3ff1ce1cb14da528c37b53da02f6bc24 Author: Julien Grall AuthorDate: Mon Feb 16 14:50:55 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:57:14 2015 +0000 xen/arm: gic-v3: Update some comments in the code - Drop wrong comment about the default stride. It's not always 2 * SZ_64K. When the re-distributor support VLPIs (from GICv4), the default stride is 4 * SZ_64K - Explain why SZ_64K * 2 Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic-v3.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index e7a7789..41042ab 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -639,7 +639,7 @@ static int __init gicv3_populate_rdist(void) ptr += gicv3.rdist_stride; else { - ptr += SZ_64K * 2; + ptr += SZ_64K * 2; /* Skip RD_base + SGI_base */ if ( typer & GICR_TYPER_VLPIS ) ptr += SZ_64K * 2; /* Skip VLPI_base + reserved page */ } @@ -1250,7 +1250,6 @@ static int __init gicv3_init(struct dt_device_node *node, const void *data) /* The vGIC code requires the region to be sorted */ sort(rdist_regs, gicv3.rdist_count, sizeof(*rdist_regs), cmp_rdist, NULL); - /* If stride is not set in dt. Set default to 2 * SZ_64K */ if ( !dt_property_read_u32(node, "redistributor-stride", &gicv3.rdist_stride) ) gicv3.rdist_stride = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 13:00:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:00: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 1YSmRU-0007NG-Dt; Tue, 03 Mar 2015 13:00:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRS-0007Mt-L4 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:54 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 76/88-02756-580B5F45; Tue, 03 Mar 2015 13:00:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1425387651!9753322!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12972 invoked from network); 3 Mar 2015 13:00:52 -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; 3 Mar 2015 13:00:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRP-0002fU-Kt for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmRP-0003VT-JS for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:00:51 +0000 Date: Tue, 03 Mar 2015 13:00:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: gic-v3: Update some comments in the code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 98e7c60d3ff1ce1cb14da528c37b53da02f6bc24 Author: Julien Grall AuthorDate: Mon Feb 16 14:50:55 2015 +0000 Commit: Ian Campbell CommitDate: Thu Feb 19 16:57:14 2015 +0000 xen/arm: gic-v3: Update some comments in the code - Drop wrong comment about the default stride. It's not always 2 * SZ_64K. When the re-distributor support VLPIs (from GICv4), the default stride is 4 * SZ_64K - Explain why SZ_64K * 2 Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic-v3.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index e7a7789..41042ab 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -639,7 +639,7 @@ static int __init gicv3_populate_rdist(void) ptr += gicv3.rdist_stride; else { - ptr += SZ_64K * 2; + ptr += SZ_64K * 2; /* Skip RD_base + SGI_base */ if ( typer & GICR_TYPER_VLPIS ) ptr += SZ_64K * 2; /* Skip VLPI_base + reserved page */ } @@ -1250,7 +1250,6 @@ static int __init gicv3_init(struct dt_device_node *node, const void *data) /* The vGIC code requires the region to be sorted */ sort(rdist_regs, gicv3.rdist_count, sizeof(*rdist_regs), cmp_rdist, NULL); - /* If stride is not set in dt. Set default to 2 * SZ_64K */ if ( !dt_property_read_u32(node, "redistributor-stride", &gicv3.rdist_stride) ) gicv3.rdist_stride = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 13:01:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:01:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRf-0007QV-H7; Tue, 03 Mar 2015 13:01:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRe-0007Q9-2d for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:06 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 5A/CB-02770-190B5F45; Tue, 03 Mar 2015 13:01:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1425387661!14282472!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4471 invoked from network); 3 Mar 2015 13:01:02 -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; 3 Mar 2015 13:01:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRZ-0002g5-Q1 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmRZ-0003WC-Oy for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:01 +0000 Date: Tue, 03 Mar 2015 13:01:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: gic-v2: Change the device name in DT_DEVICE_START X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 256bdee6feae6dd37812872fd6312ccf25547210 Author: Julien Grall AuthorDate: Fri Jan 30 18:49:16 2015 +0000 Commit: Ian Campbell CommitDate: Fri Feb 20 14:00:21 2015 +0000 xen/arm: gic-v2: Change the device name in DT_DEVICE_START I'm not sure why a ':' has been added in the name... But none of the other usages doesn't have it. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/gic-v2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 31fb81a..ee400b6 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -770,7 +770,7 @@ static const char * const gicv2_dt_compat[] __initconst = NULL }; -DT_DEVICE_START(gicv2, "GICv2:", DEVICE_GIC) +DT_DEVICE_START(gicv2, "GICv2", DEVICE_GIC) .compatible = gicv2_dt_compat, .init = gicv2_init, DT_DEVICE_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 Tue Mar 03 13:01:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:01:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRf-0007QV-H7; Tue, 03 Mar 2015 13:01:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRe-0007Q9-2d for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:06 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 5A/CB-02770-190B5F45; Tue, 03 Mar 2015 13:01:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1425387661!14282472!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4471 invoked from network); 3 Mar 2015 13:01:02 -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; 3 Mar 2015 13:01:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRZ-0002g5-Q1 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmRZ-0003WC-Oy for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:01 +0000 Date: Tue, 03 Mar 2015 13:01:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: gic-v2: Change the device name in DT_DEVICE_START X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 256bdee6feae6dd37812872fd6312ccf25547210 Author: Julien Grall AuthorDate: Fri Jan 30 18:49:16 2015 +0000 Commit: Ian Campbell CommitDate: Fri Feb 20 14:00:21 2015 +0000 xen/arm: gic-v2: Change the device name in DT_DEVICE_START I'm not sure why a ':' has been added in the name... But none of the other usages doesn't have it. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/gic-v2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 31fb81a..ee400b6 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -770,7 +770,7 @@ static const char * const gicv2_dt_compat[] __initconst = NULL }; -DT_DEVICE_START(gicv2, "GICv2:", DEVICE_GIC) +DT_DEVICE_START(gicv2, "GICv2", DEVICE_GIC) .compatible = gicv2_dt_compat, .init = gicv2_init, DT_DEVICE_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 Tue Mar 03 13:01:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:01: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 1YSmRn-0007U8-Jg; Tue, 03 Mar 2015 13:01:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRm-0007Tn-Gv for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:14 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 11/1A-02750-990B5F45; Tue, 03 Mar 2015 13:01:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1425387672!14247994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24938 invoked from network); 3 Mar 2015 13:01:13 -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; 3 Mar 2015 13:01:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRj-0002gB-W3 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmRj-0003Wa-Ug for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:11 +0000 Date: Tue, 03 Mar 2015 13:01:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic: Drop unecessary include asm/device.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62d4269554a15428cd73008b1e954ca9c803923f Author: Julien Grall AuthorDate: Fri Jan 30 18:49:17 2015 +0000 Commit: Ian Campbell CommitDate: Fri Feb 20 14:00:53 2015 +0000 xen/arm: vgic: Drop unecessary include asm/device.h The header asm/device.h has been included in the vgic code during splitting to support multiple version. But no code within those files requires it. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 1 - xen/arch/arm/vgic-v3.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 6d14f83..40619b2 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -26,7 +26,6 @@ #include #include -#include #include #include diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index c72eb6c..ec79c2a 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:01:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:01: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 1YSmRn-0007U8-Jg; Tue, 03 Mar 2015 13:01:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRm-0007Tn-Gv for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:14 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 11/1A-02750-990B5F45; Tue, 03 Mar 2015 13:01:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1425387672!14247994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24938 invoked from network); 3 Mar 2015 13:01:13 -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; 3 Mar 2015 13:01:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRj-0002gB-W3 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmRj-0003Wa-Ug for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:11 +0000 Date: Tue, 03 Mar 2015 13:01:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic: Drop unecessary include asm/device.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62d4269554a15428cd73008b1e954ca9c803923f Author: Julien Grall AuthorDate: Fri Jan 30 18:49:17 2015 +0000 Commit: Ian Campbell CommitDate: Fri Feb 20 14:00:53 2015 +0000 xen/arm: vgic: Drop unecessary include asm/device.h The header asm/device.h has been included in the vgic code during splitting to support multiple version. But no code within those files requires it. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 1 - xen/arch/arm/vgic-v3.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 6d14f83..40619b2 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -26,7 +26,6 @@ #include #include -#include #include #include diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index c72eb6c..ec79c2a 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:01:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:01: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 1YSmRx-0007YF-Mw; Tue, 03 Mar 2015 13:01:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRw-0007Xz-Uf for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:25 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id EA/DF-03219-4A0B5F45; Tue, 03 Mar 2015 13:01:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1425387682!12668532!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5667 invoked from network); 3 Mar 2015 13:01:23 -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; 3 Mar 2015 13:01:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRu-0002gH-95 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmRu-0003Y4-3w for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:22 +0000 Date: Tue, 03 Mar 2015 13:01:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dt: Extend dt_device_match to possibly store data X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 100f2a606ad6b0f113229cf828ad5c4479a4f44b Author: Julien Grall AuthorDate: Fri Jan 30 18:49:18 2015 +0000 Commit: Ian Campbell CommitDate: Fri Feb 20 14:01:02 2015 +0000 xen/dt: Extend dt_device_match to possibly store data Some drivers may want to configure differently the device depending on the compatible string. For this purpose, add a new field in the dt_device_match to store the data. Also modify the return type of dt_match_node to return the matching structure. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/platform.c | 2 +- xen/common/device_tree.c | 12 ++++++------ xen/include/xen/device_tree.h | 6 ++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c index cb4cda8..a79a098 100644 --- a/xen/arch/arm/platform.c +++ b/xen/arch/arm/platform.c @@ -157,7 +157,7 @@ bool_t platform_device_is_blacklisted(const struct dt_device_node *node) if ( platform && platform->blacklist_dev ) blacklist = platform->blacklist_dev; - return dt_match_node(blacklist, node); + return (dt_match_node(blacklist, node) != NULL); } unsigned int platform_dom0_evtchn_ppi(void) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index f72b2e9..34a1b9e 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -290,11 +290,12 @@ struct dt_device_node *dt_find_node_by_alias(const char *alias) return NULL; } -bool_t dt_match_node(const struct dt_device_match *matches, - const struct dt_device_node *node) +const struct dt_device_match * +dt_match_node(const struct dt_device_match *matches, + const struct dt_device_node *node) { if ( !matches ) - return 0; + return NULL; while ( matches->path || matches->type || matches->compatible || matches->not_available ) @@ -314,12 +315,11 @@ bool_t dt_match_node(const struct dt_device_match *matches, match &= !dt_device_is_available(node); if ( match ) - return match; - + return matches; matches++; } - return 0; + return NULL; } const struct dt_device_node *dt_get_parent(const struct dt_device_node *node) diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 08db8bc..6502369 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -28,6 +28,7 @@ struct dt_device_match { const char *type; const char *compatible; const bool_t not_available; + const void *data; }; #define DT_MATCH_PATH(p) { .path = p } @@ -547,8 +548,9 @@ bool_t dt_device_is_available(const struct dt_device_node *device); * * Returns true if the device node match one of dt_device_match. */ -bool_t dt_match_node(const struct dt_device_match *matches, - const struct dt_device_node *node); +const struct dt_device_match * +dt_match_node(const struct dt_device_match *matches, + const struct dt_device_node *node); /** * dt_find_matching_node - Find a node based on an dt_device_match match table -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:01:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:01: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 1YSmRx-0007YF-Mw; Tue, 03 Mar 2015 13:01:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRw-0007Xz-Uf for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:25 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id EA/DF-03219-4A0B5F45; Tue, 03 Mar 2015 13:01:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1425387682!12668532!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5667 invoked from network); 3 Mar 2015 13:01:23 -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; 3 Mar 2015 13:01:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmRu-0002gH-95 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmRu-0003Y4-3w for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:22 +0000 Date: Tue, 03 Mar 2015 13:01:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dt: Extend dt_device_match to possibly store data X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 100f2a606ad6b0f113229cf828ad5c4479a4f44b Author: Julien Grall AuthorDate: Fri Jan 30 18:49:18 2015 +0000 Commit: Ian Campbell CommitDate: Fri Feb 20 14:01:02 2015 +0000 xen/dt: Extend dt_device_match to possibly store data Some drivers may want to configure differently the device depending on the compatible string. For this purpose, add a new field in the dt_device_match to store the data. Also modify the return type of dt_match_node to return the matching structure. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/platform.c | 2 +- xen/common/device_tree.c | 12 ++++++------ xen/include/xen/device_tree.h | 6 ++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c index cb4cda8..a79a098 100644 --- a/xen/arch/arm/platform.c +++ b/xen/arch/arm/platform.c @@ -157,7 +157,7 @@ bool_t platform_device_is_blacklisted(const struct dt_device_node *node) if ( platform && platform->blacklist_dev ) blacklist = platform->blacklist_dev; - return dt_match_node(blacklist, node); + return (dt_match_node(blacklist, node) != NULL); } unsigned int platform_dom0_evtchn_ppi(void) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index f72b2e9..34a1b9e 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -290,11 +290,12 @@ struct dt_device_node *dt_find_node_by_alias(const char *alias) return NULL; } -bool_t dt_match_node(const struct dt_device_match *matches, - const struct dt_device_node *node) +const struct dt_device_match * +dt_match_node(const struct dt_device_match *matches, + const struct dt_device_node *node) { if ( !matches ) - return 0; + return NULL; while ( matches->path || matches->type || matches->compatible || matches->not_available ) @@ -314,12 +315,11 @@ bool_t dt_match_node(const struct dt_device_match *matches, match &= !dt_device_is_available(node); if ( match ) - return match; - + return matches; matches++; } - return 0; + return NULL; } const struct dt_device_node *dt_get_parent(const struct dt_device_node *node) diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 08db8bc..6502369 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -28,6 +28,7 @@ struct dt_device_match { const char *type; const char *compatible; const bool_t not_available; + const void *data; }; #define DT_MATCH_PATH(p) { .path = p } @@ -547,8 +548,9 @@ bool_t dt_device_is_available(const struct dt_device_node *device); * * Returns true if the device node match one of dt_device_match. */ -bool_t dt_match_node(const struct dt_device_match *matches, - const struct dt_device_node *node); +const struct dt_device_match * +dt_match_node(const struct dt_device_match *matches, + const struct dt_device_node *node); /** * dt_find_matching_node - Find a node based on an dt_device_match match table -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:01:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:01: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 1YSmSA-0007c0-Pe; Tue, 03 Mar 2015 13:01:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmS9-0007bV-BZ for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:37 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id E0/8B-03165-0B0B5F45; Tue, 03 Mar 2015 13:01:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1425387692!12613692!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11419 invoked from network); 3 Mar 2015 13:01:33 -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; 3 Mar 2015 13:01:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmS4-0002gP-EZ for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmS4-0003YV-DX for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:32 +0000 Date: Tue, 03 Mar 2015 13:01:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: device: Rename device_type into device_class X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fda293443a0dcb8cdc8ff05cb582ff5e0523609e Author: Julien Grall AuthorDate: Fri Jan 30 18:49:19 2015 +0000 Commit: Ian Campbell CommitDate: Fri Feb 20 14:01:16 2015 +0000 xen/arm: device: Rename device_type into device_class This enum was used for matching a specific class of device and not to get the type of device. Hence the name device_type will be used for another purpose later. Also rename device_get_type into device_get_class to reflect the change. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/device.c | 8 ++++---- xen/arch/arm/domain_build.c | 2 +- xen/include/asm-arm/device.h | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/device.c b/xen/arch/arm/device.c index 59e94c0..1f9dbf7 100644 --- a/xen/arch/arm/device.c +++ b/xen/arch/arm/device.c @@ -40,7 +40,7 @@ static bool_t __init device_is_compatible(const struct device_desc *desc, return 0; } -int __init device_init(struct dt_device_node *dev, enum device_type type, +int __init device_init(struct dt_device_node *dev, enum device_class class, const void *data) { const struct device_desc *desc; @@ -52,7 +52,7 @@ int __init device_init(struct dt_device_node *dev, enum device_type type, for ( desc = _sdevice; desc != _edevice; desc++ ) { - if ( desc->type != type ) + if ( desc->class != class ) continue; if ( device_is_compatible(desc, dev) ) @@ -67,7 +67,7 @@ int __init device_init(struct dt_device_node *dev, enum device_type type, return -EBADF; } -enum device_type device_get_type(const struct dt_device_node *dev) +enum device_class device_get_class(const struct dt_device_node *dev) { const struct device_desc *desc; @@ -76,7 +76,7 @@ enum device_type device_get_type(const struct dt_device_node *dev) for ( desc = _sdevice; desc != _edevice; desc++ ) { if ( device_is_compatible(desc, dev) ) - return desc->type; + return desc->class; } return DEVICE_UNKNOWN; diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index c2dcb49..7b923e0 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1084,7 +1084,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, /* Even if the IOMMU device is not used by Xen, it should not be * passthrough to DOM0 */ - if ( device_get_type(node) == DEVICE_IOMMU ) + if ( device_get_class(node) == DEVICE_IOMMU ) { DPRINT(" IOMMU, skip it\n"); return 0; diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index 74a80c6..b6b32bc 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -4,7 +4,7 @@ #include #include -enum device_type +enum device_class { DEVICE_SERIAL, DEVICE_IOMMU, @@ -16,8 +16,8 @@ enum device_type struct device_desc { /* Device name */ const char *name; - /* Device type */ - enum device_type type; + /* Device class */ + enum device_class class; /* Array of device tree 'compatible' strings */ const char *const *compatible; /* Device initialization */ @@ -27,12 +27,12 @@ struct device_desc { /** * device_init - Initialize a device * @dev: device to initialize - * @type: type of the device (serial, network...) + * @class: class of the device (serial, network...) * @data: specific data for initializing the device * * Return 0 on success. */ -int __init device_init(struct dt_device_node *dev, enum device_type type, +int __init device_init(struct dt_device_node *dev, enum device_class class, const void *data); /** @@ -41,13 +41,13 @@ int __init device_init(struct dt_device_node *dev, enum device_type type, * * Return the device type on success or DEVICE_ANY on failure */ -enum device_type device_get_type(const struct dt_device_node *dev); +enum device_class device_get_class(const struct dt_device_node *dev); -#define DT_DEVICE_START(_name, _namestr, _type) \ +#define DT_DEVICE_START(_name, _namestr, _class) \ static const struct device_desc __dev_desc_##_name __used \ __attribute__((__section__(".dev.info"))) = { \ .name = _namestr, \ - .type = _type, \ + .class = _class, \ #define DT_DEVICE_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 Tue Mar 03 13:01:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:01: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 1YSmSA-0007c0-Pe; Tue, 03 Mar 2015 13:01:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmS9-0007bV-BZ for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:37 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id E0/8B-03165-0B0B5F45; Tue, 03 Mar 2015 13:01:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1425387692!12613692!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11419 invoked from network); 3 Mar 2015 13:01:33 -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; 3 Mar 2015 13:01:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmS4-0002gP-EZ for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmS4-0003YV-DX for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:32 +0000 Date: Tue, 03 Mar 2015 13:01:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: device: Rename device_type into device_class X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fda293443a0dcb8cdc8ff05cb582ff5e0523609e Author: Julien Grall AuthorDate: Fri Jan 30 18:49:19 2015 +0000 Commit: Ian Campbell CommitDate: Fri Feb 20 14:01:16 2015 +0000 xen/arm: device: Rename device_type into device_class This enum was used for matching a specific class of device and not to get the type of device. Hence the name device_type will be used for another purpose later. Also rename device_get_type into device_get_class to reflect the change. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/device.c | 8 ++++---- xen/arch/arm/domain_build.c | 2 +- xen/include/asm-arm/device.h | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/device.c b/xen/arch/arm/device.c index 59e94c0..1f9dbf7 100644 --- a/xen/arch/arm/device.c +++ b/xen/arch/arm/device.c @@ -40,7 +40,7 @@ static bool_t __init device_is_compatible(const struct device_desc *desc, return 0; } -int __init device_init(struct dt_device_node *dev, enum device_type type, +int __init device_init(struct dt_device_node *dev, enum device_class class, const void *data) { const struct device_desc *desc; @@ -52,7 +52,7 @@ int __init device_init(struct dt_device_node *dev, enum device_type type, for ( desc = _sdevice; desc != _edevice; desc++ ) { - if ( desc->type != type ) + if ( desc->class != class ) continue; if ( device_is_compatible(desc, dev) ) @@ -67,7 +67,7 @@ int __init device_init(struct dt_device_node *dev, enum device_type type, return -EBADF; } -enum device_type device_get_type(const struct dt_device_node *dev) +enum device_class device_get_class(const struct dt_device_node *dev) { const struct device_desc *desc; @@ -76,7 +76,7 @@ enum device_type device_get_type(const struct dt_device_node *dev) for ( desc = _sdevice; desc != _edevice; desc++ ) { if ( device_is_compatible(desc, dev) ) - return desc->type; + return desc->class; } return DEVICE_UNKNOWN; diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index c2dcb49..7b923e0 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1084,7 +1084,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, /* Even if the IOMMU device is not used by Xen, it should not be * passthrough to DOM0 */ - if ( device_get_type(node) == DEVICE_IOMMU ) + if ( device_get_class(node) == DEVICE_IOMMU ) { DPRINT(" IOMMU, skip it\n"); return 0; diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index 74a80c6..b6b32bc 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -4,7 +4,7 @@ #include #include -enum device_type +enum device_class { DEVICE_SERIAL, DEVICE_IOMMU, @@ -16,8 +16,8 @@ enum device_type struct device_desc { /* Device name */ const char *name; - /* Device type */ - enum device_type type; + /* Device class */ + enum device_class class; /* Array of device tree 'compatible' strings */ const char *const *compatible; /* Device initialization */ @@ -27,12 +27,12 @@ struct device_desc { /** * device_init - Initialize a device * @dev: device to initialize - * @type: type of the device (serial, network...) + * @class: class of the device (serial, network...) * @data: specific data for initializing the device * * Return 0 on success. */ -int __init device_init(struct dt_device_node *dev, enum device_type type, +int __init device_init(struct dt_device_node *dev, enum device_class class, const void *data); /** @@ -41,13 +41,13 @@ int __init device_init(struct dt_device_node *dev, enum device_type type, * * Return the device type on success or DEVICE_ANY on failure */ -enum device_type device_get_type(const struct dt_device_node *dev); +enum device_class device_get_class(const struct dt_device_node *dev); -#define DT_DEVICE_START(_name, _namestr, _type) \ +#define DT_DEVICE_START(_name, _namestr, _class) \ static const struct device_desc __dev_desc_##_name __used \ __attribute__((__section__(".dev.info"))) = { \ .name = _namestr, \ - .type = _type, \ + .class = _class, \ #define DT_DEVICE_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 Tue Mar 03 13:01:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:01: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 1YSmSI-0007fH-S5; Tue, 03 Mar 2015 13:01:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSH-0007dz-AF for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:45 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 52/5C-02991-8B0B5F45; Tue, 03 Mar 2015 13:01:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1425387702!12612299!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 690 invoked from network); 3 Mar 2015 13:01:43 -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; 3 Mar 2015 13:01:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSE-0002gS-KC for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmSE-0003Z0-J7 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:42 +0000 Date: Tue, 03 Mar 2015 13:01:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Change the gating of shadow heuristics X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 99666cb632d969dd8d9b192c60f4984249a64fb8 Author: Andrew Cooper AuthorDate: Sat Feb 7 13:54:47 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:08 2015 +0000 x86/shadow: Change the gating of shadow heuristics Each of these functions will have their vcpu paramters replaced with domain parameters because they are part of domain-generic rather than vcpu specific codepaths, which means that the use of 'v' will have to change. 'current' can be used to obtain a vcpu when in an appropriate context. The 'curr->domain == d' test is less restrictive than 'v == current'. The end result is still safe as the code still only runs in the context of the correct domain, but is now valid to run in cases where previously 'v' was some other vcpu in the same domin. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 21 +++++++++++++-------- xen/arch/x86/mm/shadow/multi.c | 13 +++++++++---- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 3b5ef19..26dab30 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2170,6 +2170,9 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, ; struct domain *d = v->domain; struct page_info *pg = mfn_to_page(gmfn); +#if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC + struct vcpu *curr = current; +#endif ASSERT(paging_locked_by_me(d)); @@ -2205,7 +2208,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, } #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC - if ( v == current ) + if ( curr->domain == d ) { unsigned long gfn; /* Heuristic: there is likely to be only one writeable mapping, @@ -2213,7 +2216,8 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, * in the guest's linear map (on non-HIGHPTE linux and windows)*/ #define GUESS(_a, _h) do { \ - if ( v->arch.paging.mode->shadow.guess_wrmap(v, (_a), gmfn) ) \ + if ( curr->arch.paging.mode->shadow.guess_wrmap( \ + curr, (_a), gmfn) ) \ perfc_incr(shadow_writeable_h_ ## _h); \ if ( (pg->u.inuse.type_info & PGT_count_mask) == 0 ) \ { \ @@ -2222,7 +2226,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, } \ } while (0) - if ( v->arch.paging.mode->guest_levels == 2 ) + if ( curr->arch.paging.mode->guest_levels == 2 ) { if ( level == 1 ) /* 32bit non-PAE w2k3: linear map at 0xC0000000 */ @@ -2237,7 +2241,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, GUESS(0xBFC00000UL + ((fault_addr & VADDR_MASK) >> 10), 6); } - else if ( v->arch.paging.mode->guest_levels == 3 ) + else if ( curr->arch.paging.mode->guest_levels == 3 ) { /* 32bit PAE w2k3: linear map at 0xC0000000 */ switch ( level ) @@ -2259,7 +2263,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, + ((fault_addr & VADDR_MASK) >> 18), 6); break; } } - else if ( v->arch.paging.mode->guest_levels == 4 ) + else if ( curr->arch.paging.mode->guest_levels == 4 ) { /* 64bit w2k3: linear map at 0xfffff68000000000 */ switch ( level ) @@ -2312,14 +2316,15 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, * the writeable mapping by looking at the same MFN where the last * brute-force search succeeded. */ - if ( v->arch.paging.shadow.last_writeable_pte_smfn != 0 ) + if ( (curr->domain == d) && + (curr->arch.paging.shadow.last_writeable_pte_smfn != 0) ) { unsigned long old_count = (pg->u.inuse.type_info & PGT_count_mask); - mfn_t last_smfn = _mfn(v->arch.paging.shadow.last_writeable_pte_smfn); + mfn_t last_smfn = _mfn(curr->arch.paging.shadow.last_writeable_pte_smfn); int shtype = mfn_to_page(last_smfn)->u.sh.type; if ( callbacks[shtype] ) - callbacks[shtype](v, last_smfn, gmfn); + callbacks[shtype](curr, last_smfn, gmfn); if ( (pg->u.inuse.type_info & PGT_count_mask) != old_count ) perfc_incr(shadow_writeable_h_5); diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index b538997..f532bff 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4185,6 +4185,8 @@ sh_update_cr3(struct vcpu *v, int do_locking) int sh_rm_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, mfn_t smfn, unsigned long off) { + struct domain *d = v->domain; + struct vcpu *curr = current; int r; shadow_l1e_t *sl1p, sl1e; struct page_info *sp; @@ -4193,9 +4195,9 @@ int sh_rm_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, ASSERT(mfn_valid(smfn)); /* Remember if we've been told that this process is being torn down */ - v->arch.paging.shadow.pagetable_dying - = !!(mfn_to_page(gmfn)->shadow_flags & SHF_pagetable_dying); - + if ( curr->domain == d ) + curr->arch.paging.shadow.pagetable_dying + = !!(mfn_to_page(gmfn)->shadow_flags & SHF_pagetable_dying); sp = mfn_to_page(smfn); @@ -4290,6 +4292,8 @@ int sh_rm_write_access_from_l1(struct vcpu *v, mfn_t sl1mfn, int done = 0; int flags; #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC + struct domain *d = v->domain; + struct vcpu *curr = current; mfn_t base_sl1mfn = sl1mfn; /* Because sl1mfn changes in the foreach */ #endif @@ -4304,7 +4308,8 @@ int sh_rm_write_access_from_l1(struct vcpu *v, mfn_t sl1mfn, (void) shadow_set_l1e(v, sl1e, ro_sl1e, p2m_ram_rw, sl1mfn); #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC /* Remember the last shadow that we shot a writeable mapping in */ - v->arch.paging.shadow.last_writeable_pte_smfn = mfn_x(base_sl1mfn); + if ( curr->domain == d ) + curr->arch.paging.shadow.last_writeable_pte_smfn = mfn_x(base_sl1mfn); #endif if ( (mfn_to_page(readonly_mfn)->u.inuse.type_info & PGT_count_mask) == 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 13:01:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:01: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 1YSmSI-0007fH-S5; Tue, 03 Mar 2015 13:01:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSH-0007dz-AF for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:45 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 52/5C-02991-8B0B5F45; Tue, 03 Mar 2015 13:01:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1425387702!12612299!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 690 invoked from network); 3 Mar 2015 13:01:43 -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; 3 Mar 2015 13:01:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSE-0002gS-KC for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmSE-0003Z0-J7 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:42 +0000 Date: Tue, 03 Mar 2015 13:01:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Change the gating of shadow heuristics X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 99666cb632d969dd8d9b192c60f4984249a64fb8 Author: Andrew Cooper AuthorDate: Sat Feb 7 13:54:47 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:08 2015 +0000 x86/shadow: Change the gating of shadow heuristics Each of these functions will have their vcpu paramters replaced with domain parameters because they are part of domain-generic rather than vcpu specific codepaths, which means that the use of 'v' will have to change. 'current' can be used to obtain a vcpu when in an appropriate context. The 'curr->domain == d' test is less restrictive than 'v == current'. The end result is still safe as the code still only runs in the context of the correct domain, but is now valid to run in cases where previously 'v' was some other vcpu in the same domin. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 21 +++++++++++++-------- xen/arch/x86/mm/shadow/multi.c | 13 +++++++++---- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 3b5ef19..26dab30 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2170,6 +2170,9 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, ; struct domain *d = v->domain; struct page_info *pg = mfn_to_page(gmfn); +#if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC + struct vcpu *curr = current; +#endif ASSERT(paging_locked_by_me(d)); @@ -2205,7 +2208,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, } #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC - if ( v == current ) + if ( curr->domain == d ) { unsigned long gfn; /* Heuristic: there is likely to be only one writeable mapping, @@ -2213,7 +2216,8 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, * in the guest's linear map (on non-HIGHPTE linux and windows)*/ #define GUESS(_a, _h) do { \ - if ( v->arch.paging.mode->shadow.guess_wrmap(v, (_a), gmfn) ) \ + if ( curr->arch.paging.mode->shadow.guess_wrmap( \ + curr, (_a), gmfn) ) \ perfc_incr(shadow_writeable_h_ ## _h); \ if ( (pg->u.inuse.type_info & PGT_count_mask) == 0 ) \ { \ @@ -2222,7 +2226,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, } \ } while (0) - if ( v->arch.paging.mode->guest_levels == 2 ) + if ( curr->arch.paging.mode->guest_levels == 2 ) { if ( level == 1 ) /* 32bit non-PAE w2k3: linear map at 0xC0000000 */ @@ -2237,7 +2241,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, GUESS(0xBFC00000UL + ((fault_addr & VADDR_MASK) >> 10), 6); } - else if ( v->arch.paging.mode->guest_levels == 3 ) + else if ( curr->arch.paging.mode->guest_levels == 3 ) { /* 32bit PAE w2k3: linear map at 0xC0000000 */ switch ( level ) @@ -2259,7 +2263,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, + ((fault_addr & VADDR_MASK) >> 18), 6); break; } } - else if ( v->arch.paging.mode->guest_levels == 4 ) + else if ( curr->arch.paging.mode->guest_levels == 4 ) { /* 64bit w2k3: linear map at 0xfffff68000000000 */ switch ( level ) @@ -2312,14 +2316,15 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, * the writeable mapping by looking at the same MFN where the last * brute-force search succeeded. */ - if ( v->arch.paging.shadow.last_writeable_pte_smfn != 0 ) + if ( (curr->domain == d) && + (curr->arch.paging.shadow.last_writeable_pte_smfn != 0) ) { unsigned long old_count = (pg->u.inuse.type_info & PGT_count_mask); - mfn_t last_smfn = _mfn(v->arch.paging.shadow.last_writeable_pte_smfn); + mfn_t last_smfn = _mfn(curr->arch.paging.shadow.last_writeable_pte_smfn); int shtype = mfn_to_page(last_smfn)->u.sh.type; if ( callbacks[shtype] ) - callbacks[shtype](v, last_smfn, gmfn); + callbacks[shtype](curr, last_smfn, gmfn); if ( (pg->u.inuse.type_info & PGT_count_mask) != old_count ) perfc_incr(shadow_writeable_h_5); diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index b538997..f532bff 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4185,6 +4185,8 @@ sh_update_cr3(struct vcpu *v, int do_locking) int sh_rm_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, mfn_t smfn, unsigned long off) { + struct domain *d = v->domain; + struct vcpu *curr = current; int r; shadow_l1e_t *sl1p, sl1e; struct page_info *sp; @@ -4193,9 +4195,9 @@ int sh_rm_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, ASSERT(mfn_valid(smfn)); /* Remember if we've been told that this process is being torn down */ - v->arch.paging.shadow.pagetable_dying - = !!(mfn_to_page(gmfn)->shadow_flags & SHF_pagetable_dying); - + if ( curr->domain == d ) + curr->arch.paging.shadow.pagetable_dying + = !!(mfn_to_page(gmfn)->shadow_flags & SHF_pagetable_dying); sp = mfn_to_page(smfn); @@ -4290,6 +4292,8 @@ int sh_rm_write_access_from_l1(struct vcpu *v, mfn_t sl1mfn, int done = 0; int flags; #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC + struct domain *d = v->domain; + struct vcpu *curr = current; mfn_t base_sl1mfn = sl1mfn; /* Because sl1mfn changes in the foreach */ #endif @@ -4304,7 +4308,8 @@ int sh_rm_write_access_from_l1(struct vcpu *v, mfn_t sl1mfn, (void) shadow_set_l1e(v, sl1e, ro_sl1e, p2m_ram_rw, sl1mfn); #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC /* Remember the last shadow that we shot a writeable mapping in */ - v->arch.paging.shadow.last_writeable_pte_smfn = mfn_x(base_sl1mfn); + if ( curr->domain == d ) + curr->arch.paging.shadow.last_writeable_pte_smfn = mfn_x(base_sl1mfn); #endif if ( (mfn_to_page(readonly_mfn)->u.inuse.type_info & PGT_count_mask) == 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 13:02:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:02: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 1YSmSZ-0007mD-14; Tue, 03 Mar 2015 13:02:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSX-0007lI-F4 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:01 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 22/94-02760-7C0B5F45; Tue, 03 Mar 2015 13:01:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1425387713!14296516!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11662 invoked from network); 3 Mar 2015 13:01:53 -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; 3 Mar 2015 13:01:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSO-0002gf-Qe for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmSO-0003ZO-Oc for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:52 +0000 Date: Tue, 03 Mar 2015 13:01:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter shadow_hash_{lookup, insert, delete}() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a3b59b3ac32220950836672bf17123745843d002 Author: Andrew Cooper AuthorDate: Mon Feb 2 00:15:04 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:16 2015 +0000 x86/shadow: Alter shadow_hash_{lookup,insert,delete}() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 11 ++++------- xen/arch/x86/mm/shadow/multi.c | 22 +++++++++++++--------- xen/arch/x86/mm/shadow/private.h | 6 +++--- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 26dab30..80174df 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1878,11 +1878,10 @@ static void shadow_hash_teardown(struct domain *d) } -mfn_t shadow_hash_lookup(struct vcpu *v, unsigned long n, unsigned int t) +mfn_t shadow_hash_lookup(struct domain *d, unsigned long n, unsigned int t) /* Find an entry in the hash table. Returns the MFN of the shadow, * or INVALID_MFN if it doesn't exist */ { - struct domain *d = v->domain; struct page_info *sp, *prev; key_t key; @@ -1932,11 +1931,10 @@ mfn_t shadow_hash_lookup(struct vcpu *v, unsigned long n, unsigned int t) return _mfn(INVALID_MFN); } -void shadow_hash_insert(struct vcpu *v, unsigned long n, unsigned int t, +void shadow_hash_insert(struct domain *d, unsigned long n, unsigned int t, mfn_t smfn) /* Put a mapping (n,t)->smfn into the hash table */ { - struct domain *d = v->domain; struct page_info *sp; key_t key; @@ -1958,11 +1956,10 @@ void shadow_hash_insert(struct vcpu *v, unsigned long n, unsigned int t, sh_hash_audit_bucket(d, key); } -void shadow_hash_delete(struct vcpu *v, unsigned long n, unsigned int t, +void shadow_hash_delete(struct domain *d, unsigned long n, unsigned int t, mfn_t smfn) /* Excise the mapping (n,t)->smfn from the hash table */ { - struct domain *d = v->domain; struct page_info *sp, *x; key_t key; @@ -2611,7 +2608,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) if( !(pg->count_info & PGC_page_table) \ || !(pg->shadow_flags & (1 << t)) ) \ break; \ - smfn = shadow_hash_lookup(v, mfn_x(gmfn), t); \ + smfn = shadow_hash_lookup(d, mfn_x(gmfn), t); \ if ( unlikely(!mfn_valid(smfn)) ) \ { \ SHADOW_ERROR(": gmfn %#lx has flags %#"PRIx32 \ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index f532bff..1e6bc33 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -94,7 +94,8 @@ static inline mfn_t get_fl1_shadow_status(struct vcpu *v, gfn_t gfn) /* Look for FL1 shadows in the hash table */ { - mfn_t smfn = shadow_hash_lookup(v, gfn_x(gfn), SH_type_fl1_shadow); + struct domain *d = v->domain; + mfn_t smfn = shadow_hash_lookup(d, gfn_x(gfn), SH_type_fl1_shadow); ASSERT(!mfn_valid(smfn) || mfn_to_page(smfn)->u.sh.head); return smfn; } @@ -103,7 +104,8 @@ static inline mfn_t get_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type) /* Look for shadows in the hash table */ { - mfn_t smfn = shadow_hash_lookup(v, mfn_x(gmfn), shadow_type); + struct domain *d = v->domain; + mfn_t smfn = shadow_hash_lookup(d, mfn_x(gmfn), shadow_type); ASSERT(!mfn_valid(smfn) || mfn_to_page(smfn)->u.sh.head); perfc_incr(shadow_get_shadow_status); return smfn; @@ -113,11 +115,12 @@ static inline void set_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) /* Put an FL1 shadow into the hash table */ { + struct domain *d = v->domain; SHADOW_PRINTK("gfn=%"SH_PRI_gfn", type=%08x, smfn=%05lx\n", gfn_x(gfn), SH_type_fl1_shadow, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); - shadow_hash_insert(v, gfn_x(gfn), SH_type_fl1_shadow, smfn); + shadow_hash_insert(d, gfn_x(gfn), SH_type_fl1_shadow, smfn); } static inline void @@ -140,17 +143,18 @@ set_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) ASSERT(res == 1); } - shadow_hash_insert(v, mfn_x(gmfn), shadow_type, smfn); + shadow_hash_insert(d, mfn_x(gmfn), shadow_type, smfn); } static inline void delete_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) /* Remove a shadow from the hash table */ { + struct domain *d = v->domain; SHADOW_PRINTK("gfn=%"SH_PRI_gfn", type=%08x, smfn=%05lx\n", gfn_x(gfn), SH_type_fl1_shadow, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); - shadow_hash_delete(v, gfn_x(gfn), SH_type_fl1_shadow, smfn); + shadow_hash_delete(d, gfn_x(gfn), SH_type_fl1_shadow, smfn); } static inline void @@ -162,7 +166,7 @@ delete_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) d->domain_id, v->vcpu_id, mfn_x(gmfn), shadow_type, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); - shadow_hash_delete(v, mfn_x(gmfn), shadow_type, smfn); + shadow_hash_delete(d, mfn_x(gmfn), shadow_type, smfn); /* 32-on-64 PV guests don't own their l4 pages; see set_shadow_status */ if ( !is_pv_32on64_domain(d) || shadow_type != SH_type_l4_64_shadow ) put_page(mfn_to_page(gmfn)); @@ -4501,7 +4505,7 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) gl2a = guest_l3e_get_paddr(gl3e[i]); gfn = gl2a >> PAGE_SHIFT; gmfn = get_gfn_query_unlocked(d, gfn, &p2mt); - smfn = shadow_hash_lookup(v, mfn_x(gmfn), SH_type_l2_pae_shadow); + smfn = shadow_hash_lookup(d, mfn_x(gmfn), SH_type_l2_pae_shadow); } if ( mfn_valid(smfn) ) @@ -4539,9 +4543,9 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) paging_lock(d); #if GUEST_PAGING_LEVELS == 2 - smfn = shadow_hash_lookup(v, mfn_x(gmfn), SH_type_l2_32_shadow); + smfn = shadow_hash_lookup(d, mfn_x(gmfn), SH_type_l2_32_shadow); #else - smfn = shadow_hash_lookup(v, mfn_x(gmfn), SH_type_l4_64_shadow); + smfn = shadow_hash_lookup(d, mfn_x(gmfn), SH_type_l4_64_shadow); #endif if ( mfn_valid(smfn) ) diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index baa271c..df1dd8c 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -343,10 +343,10 @@ shadow_size(unsigned int shadow_type) */ /* Hash table functions */ -mfn_t shadow_hash_lookup(struct vcpu *v, unsigned long n, unsigned int t); -void shadow_hash_insert(struct vcpu *v, +mfn_t shadow_hash_lookup(struct domain *d, unsigned long n, unsigned int t); +void shadow_hash_insert(struct domain *d, unsigned long n, unsigned int t, mfn_t smfn); -void shadow_hash_delete(struct vcpu *v, +void shadow_hash_delete(struct domain *d, unsigned long n, unsigned int t, mfn_t smfn); /* shadow promotion */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:02:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:02: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 1YSmSZ-0007mD-14; Tue, 03 Mar 2015 13:02:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSX-0007lI-F4 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:01 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 22/94-02760-7C0B5F45; Tue, 03 Mar 2015 13:01:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1425387713!14296516!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11662 invoked from network); 3 Mar 2015 13:01:53 -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; 3 Mar 2015 13:01:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSO-0002gf-Qe for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmSO-0003ZO-Oc for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:01:52 +0000 Date: Tue, 03 Mar 2015 13:01:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter shadow_hash_{lookup, insert, delete}() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a3b59b3ac32220950836672bf17123745843d002 Author: Andrew Cooper AuthorDate: Mon Feb 2 00:15:04 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:16 2015 +0000 x86/shadow: Alter shadow_hash_{lookup,insert,delete}() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 11 ++++------- xen/arch/x86/mm/shadow/multi.c | 22 +++++++++++++--------- xen/arch/x86/mm/shadow/private.h | 6 +++--- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 26dab30..80174df 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1878,11 +1878,10 @@ static void shadow_hash_teardown(struct domain *d) } -mfn_t shadow_hash_lookup(struct vcpu *v, unsigned long n, unsigned int t) +mfn_t shadow_hash_lookup(struct domain *d, unsigned long n, unsigned int t) /* Find an entry in the hash table. Returns the MFN of the shadow, * or INVALID_MFN if it doesn't exist */ { - struct domain *d = v->domain; struct page_info *sp, *prev; key_t key; @@ -1932,11 +1931,10 @@ mfn_t shadow_hash_lookup(struct vcpu *v, unsigned long n, unsigned int t) return _mfn(INVALID_MFN); } -void shadow_hash_insert(struct vcpu *v, unsigned long n, unsigned int t, +void shadow_hash_insert(struct domain *d, unsigned long n, unsigned int t, mfn_t smfn) /* Put a mapping (n,t)->smfn into the hash table */ { - struct domain *d = v->domain; struct page_info *sp; key_t key; @@ -1958,11 +1956,10 @@ void shadow_hash_insert(struct vcpu *v, unsigned long n, unsigned int t, sh_hash_audit_bucket(d, key); } -void shadow_hash_delete(struct vcpu *v, unsigned long n, unsigned int t, +void shadow_hash_delete(struct domain *d, unsigned long n, unsigned int t, mfn_t smfn) /* Excise the mapping (n,t)->smfn from the hash table */ { - struct domain *d = v->domain; struct page_info *sp, *x; key_t key; @@ -2611,7 +2608,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) if( !(pg->count_info & PGC_page_table) \ || !(pg->shadow_flags & (1 << t)) ) \ break; \ - smfn = shadow_hash_lookup(v, mfn_x(gmfn), t); \ + smfn = shadow_hash_lookup(d, mfn_x(gmfn), t); \ if ( unlikely(!mfn_valid(smfn)) ) \ { \ SHADOW_ERROR(": gmfn %#lx has flags %#"PRIx32 \ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index f532bff..1e6bc33 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -94,7 +94,8 @@ static inline mfn_t get_fl1_shadow_status(struct vcpu *v, gfn_t gfn) /* Look for FL1 shadows in the hash table */ { - mfn_t smfn = shadow_hash_lookup(v, gfn_x(gfn), SH_type_fl1_shadow); + struct domain *d = v->domain; + mfn_t smfn = shadow_hash_lookup(d, gfn_x(gfn), SH_type_fl1_shadow); ASSERT(!mfn_valid(smfn) || mfn_to_page(smfn)->u.sh.head); return smfn; } @@ -103,7 +104,8 @@ static inline mfn_t get_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type) /* Look for shadows in the hash table */ { - mfn_t smfn = shadow_hash_lookup(v, mfn_x(gmfn), shadow_type); + struct domain *d = v->domain; + mfn_t smfn = shadow_hash_lookup(d, mfn_x(gmfn), shadow_type); ASSERT(!mfn_valid(smfn) || mfn_to_page(smfn)->u.sh.head); perfc_incr(shadow_get_shadow_status); return smfn; @@ -113,11 +115,12 @@ static inline void set_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) /* Put an FL1 shadow into the hash table */ { + struct domain *d = v->domain; SHADOW_PRINTK("gfn=%"SH_PRI_gfn", type=%08x, smfn=%05lx\n", gfn_x(gfn), SH_type_fl1_shadow, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); - shadow_hash_insert(v, gfn_x(gfn), SH_type_fl1_shadow, smfn); + shadow_hash_insert(d, gfn_x(gfn), SH_type_fl1_shadow, smfn); } static inline void @@ -140,17 +143,18 @@ set_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) ASSERT(res == 1); } - shadow_hash_insert(v, mfn_x(gmfn), shadow_type, smfn); + shadow_hash_insert(d, mfn_x(gmfn), shadow_type, smfn); } static inline void delete_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) /* Remove a shadow from the hash table */ { + struct domain *d = v->domain; SHADOW_PRINTK("gfn=%"SH_PRI_gfn", type=%08x, smfn=%05lx\n", gfn_x(gfn), SH_type_fl1_shadow, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); - shadow_hash_delete(v, gfn_x(gfn), SH_type_fl1_shadow, smfn); + shadow_hash_delete(d, gfn_x(gfn), SH_type_fl1_shadow, smfn); } static inline void @@ -162,7 +166,7 @@ delete_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) d->domain_id, v->vcpu_id, mfn_x(gmfn), shadow_type, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); - shadow_hash_delete(v, mfn_x(gmfn), shadow_type, smfn); + shadow_hash_delete(d, mfn_x(gmfn), shadow_type, smfn); /* 32-on-64 PV guests don't own their l4 pages; see set_shadow_status */ if ( !is_pv_32on64_domain(d) || shadow_type != SH_type_l4_64_shadow ) put_page(mfn_to_page(gmfn)); @@ -4501,7 +4505,7 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) gl2a = guest_l3e_get_paddr(gl3e[i]); gfn = gl2a >> PAGE_SHIFT; gmfn = get_gfn_query_unlocked(d, gfn, &p2mt); - smfn = shadow_hash_lookup(v, mfn_x(gmfn), SH_type_l2_pae_shadow); + smfn = shadow_hash_lookup(d, mfn_x(gmfn), SH_type_l2_pae_shadow); } if ( mfn_valid(smfn) ) @@ -4539,9 +4543,9 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) paging_lock(d); #if GUEST_PAGING_LEVELS == 2 - smfn = shadow_hash_lookup(v, mfn_x(gmfn), SH_type_l2_32_shadow); + smfn = shadow_hash_lookup(d, mfn_x(gmfn), SH_type_l2_32_shadow); #else - smfn = shadow_hash_lookup(v, mfn_x(gmfn), SH_type_l4_64_shadow); + smfn = shadow_hash_lookup(d, mfn_x(gmfn), SH_type_l4_64_shadow); #endif if ( mfn_valid(smfn) ) diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index baa271c..df1dd8c 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -343,10 +343,10 @@ shadow_size(unsigned int shadow_type) */ /* Hash table functions */ -mfn_t shadow_hash_lookup(struct vcpu *v, unsigned long n, unsigned int t); -void shadow_hash_insert(struct vcpu *v, +mfn_t shadow_hash_lookup(struct domain *d, unsigned long n, unsigned int t); +void shadow_hash_insert(struct domain *d, unsigned long n, unsigned int t, mfn_t smfn); -void shadow_hash_delete(struct vcpu *v, +void shadow_hash_delete(struct domain *d, unsigned long n, unsigned int t, mfn_t smfn); /* shadow promotion */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:02:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:02: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 1YSmSf-0007qB-3s; Tue, 03 Mar 2015 13:02:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSd-0007pl-Kq for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:07 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 85/D4-02760-EC0B5F45; Tue, 03 Mar 2015 13:02:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1425387723!14293621!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25956 invoked from network); 3 Mar 2015 13:02:04 -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; 3 Mar 2015 13:02:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSZ-0002hP-0T for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmSY-0003Zu-Ur for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:02 +0000 Date: Tue, 03 Mar 2015 13:02:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter *_shadow_status() and make_fl1_shadow() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 82ea66d79011d23f1f9f69b85bb626cf15192e94 Author: Andrew Cooper AuthorDate: Mon Feb 2 00:34:00 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:19 2015 +0000 x86/shadow: Alter *_shadow_status() and make_fl1_shadow() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/multi.c | 99 +++++++++++++++++++-------------------- 1 files changed, 48 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 1e6bc33..154274f 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -91,20 +91,18 @@ static char *fetch_type_names[] = { */ static inline mfn_t -get_fl1_shadow_status(struct vcpu *v, gfn_t gfn) +get_fl1_shadow_status(struct domain *d, gfn_t gfn) /* Look for FL1 shadows in the hash table */ { - struct domain *d = v->domain; mfn_t smfn = shadow_hash_lookup(d, gfn_x(gfn), SH_type_fl1_shadow); ASSERT(!mfn_valid(smfn) || mfn_to_page(smfn)->u.sh.head); return smfn; } static inline mfn_t -get_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type) +get_shadow_status(struct domain *d, mfn_t gmfn, u32 shadow_type) /* Look for shadows in the hash table */ { - struct domain *d = v->domain; mfn_t smfn = shadow_hash_lookup(d, mfn_x(gmfn), shadow_type); ASSERT(!mfn_valid(smfn) || mfn_to_page(smfn)->u.sh.head); perfc_incr(shadow_get_shadow_status); @@ -112,10 +110,9 @@ get_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type) } static inline void -set_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) +set_fl1_shadow_status(struct domain *d, gfn_t gfn, mfn_t smfn) /* Put an FL1 shadow into the hash table */ { - struct domain *d = v->domain; SHADOW_PRINTK("gfn=%"SH_PRI_gfn", type=%08x, smfn=%05lx\n", gfn_x(gfn), SH_type_fl1_shadow, mfn_x(smfn)); @@ -124,15 +121,13 @@ set_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) } static inline void -set_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) +set_shadow_status(struct domain *d, mfn_t gmfn, u32 shadow_type, mfn_t smfn) /* Put a shadow into the hash table */ { - struct domain *d = v->domain; int res; - SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx, type=%08x, smfn=%05lx\n", - d->domain_id, v->vcpu_id, mfn_x(gmfn), - shadow_type, mfn_x(smfn)); + SHADOW_PRINTK("d=%d: gmfn=%lx, type=%08x, smfn=%lx\n", + d->domain_id, mfn_x(gmfn), shadow_type, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); @@ -147,10 +142,9 @@ set_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) } static inline void -delete_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) +delete_fl1_shadow_status(struct domain *d, gfn_t gfn, mfn_t smfn) /* Remove a shadow from the hash table */ { - struct domain *d = v->domain; SHADOW_PRINTK("gfn=%"SH_PRI_gfn", type=%08x, smfn=%05lx\n", gfn_x(gfn), SH_type_fl1_shadow, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); @@ -158,13 +152,11 @@ delete_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) } static inline void -delete_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) +delete_shadow_status(struct domain *d, mfn_t gmfn, u32 shadow_type, mfn_t smfn) /* Remove a shadow from the hash table */ { - struct domain *d = v->domain; - SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx, type=%08x, smfn=%05lx\n", - d->domain_id, v->vcpu_id, - mfn_x(gmfn), shadow_type, mfn_x(smfn)); + SHADOW_PRINTK("d=%d: gmfn=%lx, type=%08x, smfn=%lx\n", + d->domain_id, mfn_x(gmfn), shadow_type, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); shadow_hash_delete(d, mfn_x(gmfn), shadow_type, smfn); /* 32-on-64 PV guests don't own their l4 pages; see set_shadow_status */ @@ -330,6 +322,7 @@ gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) * through the audit mechanisms */ static void sh_audit_gw(struct vcpu *v, walk_t *gw) { + struct domain *d = v->domain; mfn_t smfn; if ( !(SHADOW_AUDIT_ENABLE) ) @@ -337,33 +330,33 @@ static void sh_audit_gw(struct vcpu *v, walk_t *gw) #if GUEST_PAGING_LEVELS >= 4 /* 64-bit only... */ if ( mfn_valid(gw->l4mfn) - && mfn_valid((smfn = get_shadow_status(v, gw->l4mfn, + && mfn_valid((smfn = get_shadow_status(d, gw->l4mfn, SH_type_l4_shadow))) ) (void) sh_audit_l4_table(v, smfn, _mfn(INVALID_MFN)); if ( mfn_valid(gw->l3mfn) - && mfn_valid((smfn = get_shadow_status(v, gw->l3mfn, + && mfn_valid((smfn = get_shadow_status(d, gw->l3mfn, SH_type_l3_shadow))) ) (void) sh_audit_l3_table(v, smfn, _mfn(INVALID_MFN)); #endif /* PAE or 64... */ if ( mfn_valid(gw->l2mfn) ) { - if ( mfn_valid((smfn = get_shadow_status(v, gw->l2mfn, + if ( mfn_valid((smfn = get_shadow_status(d, gw->l2mfn, SH_type_l2_shadow))) ) (void) sh_audit_l2_table(v, smfn, _mfn(INVALID_MFN)); #if GUEST_PAGING_LEVELS == 3 - if ( mfn_valid((smfn = get_shadow_status(v, gw->l2mfn, + if ( mfn_valid((smfn = get_shadow_status(d, gw->l2mfn, SH_type_l2h_shadow))) ) (void) sh_audit_l2_table(v, smfn, _mfn(INVALID_MFN)); #endif } if ( mfn_valid(gw->l1mfn) - && mfn_valid((smfn = get_shadow_status(v, gw->l1mfn, + && mfn_valid((smfn = get_shadow_status(d, gw->l1mfn, SH_type_l1_shadow))) ) (void) sh_audit_l1_table(v, smfn, _mfn(INVALID_MFN)); else if ( (guest_l2e_get_flags(gw->l2e) & _PAGE_PRESENT) && (guest_l2e_get_flags(gw->l2e) & _PAGE_PSE) && mfn_valid( - (smfn = get_fl1_shadow_status(v, guest_l2e_get_gfn(gw->l2e)))) ) + (smfn = get_fl1_shadow_status(d, guest_l2e_get_gfn(gw->l2e)))) ) (void) sh_audit_fl1_table(v, smfn, _mfn(INVALID_MFN)); } @@ -1566,22 +1559,21 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) } shadow_promote(v, gmfn, shadow_type); - set_shadow_status(v, gmfn, shadow_type, smfn); + set_shadow_status(d, gmfn, shadow_type, smfn); return smfn; } /* Make a splintered superpage shadow */ static mfn_t -make_fl1_shadow(struct vcpu *v, gfn_t gfn) +make_fl1_shadow(struct domain *d, gfn_t gfn) { - struct domain *d = v->domain; mfn_t smfn = shadow_alloc(d, SH_type_fl1_shadow, gfn_x(gfn)); SHADOW_DEBUG(MAKE_SHADOW, "(%" SH_PRI_gfn ")=>%" PRI_mfn "\n", gfn_x(gfn), mfn_x(smfn)); - set_fl1_shadow_status(v, gfn, smfn); + set_fl1_shadow_status(d, gfn, smfn); return smfn; } @@ -1677,6 +1669,7 @@ static shadow_l3e_t * shadow_get_and_create_l3e(struct vcpu *v, fetch_type_t ft, int *resync) { + struct domain *d = v->domain; mfn_t sl4mfn; shadow_l4e_t *sl4e; if ( !mfn_valid(gw->l3mfn) ) return NULL; /* No guest page. */ @@ -1693,7 +1686,7 @@ static shadow_l3e_t * shadow_get_and_create_l3e(struct vcpu *v, int r; shadow_l4e_t new_sl4e; /* No l3 shadow installed: find and install it. */ - *sl3mfn = get_shadow_status(v, gw->l3mfn, SH_type_l3_shadow); + *sl3mfn = get_shadow_status(d, gw->l3mfn, SH_type_l3_shadow); if ( !mfn_valid(*sl3mfn) ) { /* No l3 shadow of this page exists at all: make one. */ @@ -1724,6 +1717,7 @@ static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, int *resync) { #if GUEST_PAGING_LEVELS >= 4 /* 64bit... */ + struct domain *d = v->domain; mfn_t sl3mfn = _mfn(INVALID_MFN); shadow_l3e_t *sl3e; if ( !mfn_valid(gw->l2mfn) ) return NULL; /* No guest page. */ @@ -1748,7 +1742,7 @@ static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, t = SH_type_l2h_shadow; /* No l2 shadow installed: find and install it. */ - *sl2mfn = get_shadow_status(v, gw->l2mfn, t); + *sl2mfn = get_shadow_status(d, gw->l2mfn, t); if ( !mfn_valid(*sl2mfn) ) { /* No l2 shadow of this page exists at all: make one. */ @@ -1796,6 +1790,7 @@ static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, mfn_t *sl1mfn, fetch_type_t ft) { + struct domain *d = v->domain; mfn_t sl2mfn; int resync = 0; shadow_l2e_t *sl2e; @@ -1825,18 +1820,18 @@ static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, { /* Splintering a superpage */ gfn_t l2gfn = guest_l2e_get_gfn(gw->l2e); - *sl1mfn = get_fl1_shadow_status(v, l2gfn); + *sl1mfn = get_fl1_shadow_status(d, l2gfn); if ( !mfn_valid(*sl1mfn) ) { /* No fl1 shadow of this superpage exists at all: make one. */ - *sl1mfn = make_fl1_shadow(v, l2gfn); + *sl1mfn = make_fl1_shadow(d, l2gfn); } } else { /* Shadowing an actual guest l1 table */ if ( !mfn_valid(gw->l1mfn) ) return NULL; /* No guest page. */ - *sl1mfn = get_shadow_status(v, gw->l1mfn, SH_type_l1_shadow); + *sl1mfn = get_shadow_status(d, gw->l1mfn, SH_type_l1_shadow); if ( !mfn_valid(*sl1mfn) ) { /* No l1 shadow of this page exists at all: make one. */ @@ -1897,7 +1892,7 @@ void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) /* Record that the guest page isn't shadowed any more (in this type) */ gmfn = backpointer(sp); - delete_shadow_status(v, gmfn, t, smfn); + delete_shadow_status(d, gmfn, t, smfn); shadow_demote(v, gmfn, t); /* Decrement refcounts of all the old entries */ sl4mfn = smfn; @@ -1929,7 +1924,7 @@ void sh_destroy_l3_shadow(struct vcpu *v, mfn_t smfn) /* Record that the guest page isn't shadowed any more (in this type) */ gmfn = backpointer(sp); - delete_shadow_status(v, gmfn, t, smfn); + delete_shadow_status(d, gmfn, t, smfn); shadow_demote(v, gmfn, t); /* Decrement refcounts of all the old entries */ @@ -1967,7 +1962,7 @@ void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) /* Record that the guest page isn't shadowed any more (in this type) */ gmfn = backpointer(sp); - delete_shadow_status(v, gmfn, t, smfn); + delete_shadow_status(d, gmfn, t, smfn); shadow_demote(v, gmfn, t); /* Decrement refcounts of all the old entries */ @@ -1999,12 +1994,12 @@ void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) if ( t == SH_type_fl1_shadow ) { gfn_t gfn = _gfn(sp->v.sh.back); - delete_fl1_shadow_status(v, gfn, smfn); + delete_fl1_shadow_status(d, gfn, smfn); } else { mfn_t gmfn = backpointer(sp); - delete_shadow_status(v, gmfn, t, smfn); + delete_shadow_status(d, gmfn, t, smfn); shadow_demote(v, gmfn, t); } @@ -2148,7 +2143,7 @@ static int validate_gl4e(struct vcpu *v, void *new_ge, mfn_t sl4mfn, void *se) gfn_t gl3gfn = guest_l4e_get_gfn(new_gl4e); mfn_t gl3mfn = get_gfn_query_unlocked(d, gfn_x(gl3gfn), &p2mt); if ( p2m_is_ram(p2mt) ) - sl3mfn = get_shadow_status(v, gl3mfn, SH_type_l3_shadow); + sl3mfn = get_shadow_status(d, gl3mfn, SH_type_l3_shadow); else if ( p2mt != p2m_populate_on_demand ) result |= SHADOW_SET_ERROR; @@ -2206,7 +2201,7 @@ static int validate_gl3e(struct vcpu *v, void *new_ge, mfn_t sl3mfn, void *se) gfn_t gl2gfn = guest_l3e_get_gfn(new_gl3e); mfn_t gl2mfn = get_gfn_query_unlocked(d, gfn_x(gl2gfn), &p2mt); if ( p2m_is_ram(p2mt) ) - sl2mfn = get_shadow_status(v, gl2mfn, SH_type_l2_shadow); + sl2mfn = get_shadow_status(d, gl2mfn, SH_type_l2_shadow); else if ( p2mt != p2m_populate_on_demand ) result |= SHADOW_SET_ERROR; @@ -2242,21 +2237,21 @@ static int validate_gl2e(struct vcpu *v, void *new_ge, mfn_t sl2mfn, void *se) { // superpage -- need to look up the shadow L1 which holds the // splitters... - sl1mfn = get_fl1_shadow_status(v, gl1gfn); + sl1mfn = get_fl1_shadow_status(d, gl1gfn); #if 0 // XXX - it's possible that we want to do some kind of prefetch // for superpage fl1's here, but this is *not* on the demand path, // so we'll hold off trying that for now... // if ( !mfn_valid(sl1mfn) ) - sl1mfn = make_fl1_shadow(v, gl1gfn); + sl1mfn = make_fl1_shadow(d, gl1gfn); #endif } else { mfn_t gl1mfn = get_gfn_query_unlocked(d, gfn_x(gl1gfn), &p2mt); if ( p2m_is_ram(p2mt) ) - sl1mfn = get_shadow_status(v, gl1mfn, SH_type_l1_shadow); + sl1mfn = get_shadow_status(d, gl1mfn, SH_type_l1_shadow); else if ( p2mt != p2m_populate_on_demand ) result |= SHADOW_SET_ERROR; } @@ -2327,7 +2322,7 @@ void sh_resync_l1(struct vcpu *v, mfn_t gl1mfn, mfn_t snpmfn) ASSERT(mfn_valid(snpmfn)); - sl1mfn = get_shadow_status(v, gl1mfn, SH_type_l1_shadow); + sl1mfn = get_shadow_status(d, gl1mfn, SH_type_l1_shadow); ASSERT(mfn_valid(sl1mfn)); /* Otherwise we would not have been called */ snp = sh_map_domain_page(snpmfn); @@ -2368,13 +2363,14 @@ void sh_resync_l1(struct vcpu *v, mfn_t gl1mfn, mfn_t snpmfn) * called in the *mode* of the vcpu that unsynced it. Clear? Good. */ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) { + struct domain *d = v->domain; struct page_info *sp; mfn_t smfn; if ( !sh_type_has_up_pointer(v, SH_type_l1_shadow) ) return 0; - smfn = get_shadow_status(v, gl1mfn, SH_type_l1_shadow); + smfn = get_shadow_status(d, gl1mfn, SH_type_l1_shadow); ASSERT(mfn_valid(smfn)); /* Otherwise we would not have been called */ /* Up to l2 */ @@ -2431,6 +2427,7 @@ sh_map_and_validate(struct vcpu *v, mfn_t gmfn, mfn_t smfn, void *se)) /* Generic function for mapping and validating. */ { + struct domain *d = v->domain; mfn_t smfn, smfn2, map_mfn; shadow_l1e_t *sl1p; u32 shadow_idx, guest_idx; @@ -2443,7 +2440,7 @@ sh_map_and_validate(struct vcpu *v, mfn_t gmfn, ASSERT(size + (((unsigned long)new_gp) & ~PAGE_MASK) <= PAGE_SIZE); /* Map the shadow page */ - smfn = get_shadow_status(v, gmfn, sh_type); + smfn = get_shadow_status(d, gmfn, sh_type); ASSERT(mfn_valid(smfn)); /* Otherwise we would not have been called */ guest_idx = guest_index(new_gp); map_mfn = smfn; @@ -3857,7 +3854,7 @@ sh_set_toplevel_shadow(struct vcpu *v, } /* Guest mfn is valid: shadow it and install the shadow */ - smfn = get_shadow_status(v, gmfn, root_type); + smfn = get_shadow_status(d, gmfn, root_type); if ( !mfn_valid(smfn) ) { /* Make sure there's enough free shadow memory. */ @@ -5048,8 +5045,8 @@ int sh_audit_l2_table(struct vcpu *v, mfn_t sl2mfn, mfn_t x) gfn = guest_l2e_get_gfn(*gl2e); mfn = shadow_l2e_get_mfn(*sl2e); gmfn = (guest_l2e_get_flags(*gl2e) & _PAGE_PSE) - ? get_fl1_shadow_status(v, gfn) - : get_shadow_status(v, + ? get_fl1_shadow_status(d, gfn) + : get_shadow_status(d, get_gfn_query_unlocked(d, gfn_x(gfn), &p2mt), SH_type_l1_shadow); if ( mfn_x(gmfn) != mfn_x(mfn) ) @@ -5099,7 +5096,7 @@ int sh_audit_l3_table(struct vcpu *v, mfn_t sl3mfn, mfn_t x) { gfn = guest_l3e_get_gfn(*gl3e); mfn = shadow_l3e_get_mfn(*sl3e); - gmfn = get_shadow_status(v, get_gfn_query_unlocked( + gmfn = get_shadow_status(d, get_gfn_query_unlocked( d, gfn_x(gfn), &p2mt), ((GUEST_PAGING_LEVELS == 3 || is_pv_32on64_vcpu(v)) @@ -5149,7 +5146,7 @@ int sh_audit_l4_table(struct vcpu *v, mfn_t sl4mfn, mfn_t x) { gfn = guest_l4e_get_gfn(*gl4e); mfn = shadow_l4e_get_mfn(*sl4e); - gmfn = get_shadow_status(v, get_gfn_query_unlocked( + gmfn = get_shadow_status(d, get_gfn_query_unlocked( d, gfn_x(gfn), &p2mt), SH_type_l3_shadow); if ( mfn_x(gmfn) != mfn_x(mfn) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 13:02:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:02: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 1YSmSf-0007qB-3s; Tue, 03 Mar 2015 13:02:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSd-0007pl-Kq for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:07 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 85/D4-02760-EC0B5F45; Tue, 03 Mar 2015 13:02:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1425387723!14293621!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25956 invoked from network); 3 Mar 2015 13:02:04 -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; 3 Mar 2015 13:02:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSZ-0002hP-0T for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmSY-0003Zu-Ur for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:02 +0000 Date: Tue, 03 Mar 2015 13:02:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter *_shadow_status() and make_fl1_shadow() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 82ea66d79011d23f1f9f69b85bb626cf15192e94 Author: Andrew Cooper AuthorDate: Mon Feb 2 00:34:00 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:19 2015 +0000 x86/shadow: Alter *_shadow_status() and make_fl1_shadow() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/multi.c | 99 +++++++++++++++++++-------------------- 1 files changed, 48 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 1e6bc33..154274f 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -91,20 +91,18 @@ static char *fetch_type_names[] = { */ static inline mfn_t -get_fl1_shadow_status(struct vcpu *v, gfn_t gfn) +get_fl1_shadow_status(struct domain *d, gfn_t gfn) /* Look for FL1 shadows in the hash table */ { - struct domain *d = v->domain; mfn_t smfn = shadow_hash_lookup(d, gfn_x(gfn), SH_type_fl1_shadow); ASSERT(!mfn_valid(smfn) || mfn_to_page(smfn)->u.sh.head); return smfn; } static inline mfn_t -get_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type) +get_shadow_status(struct domain *d, mfn_t gmfn, u32 shadow_type) /* Look for shadows in the hash table */ { - struct domain *d = v->domain; mfn_t smfn = shadow_hash_lookup(d, mfn_x(gmfn), shadow_type); ASSERT(!mfn_valid(smfn) || mfn_to_page(smfn)->u.sh.head); perfc_incr(shadow_get_shadow_status); @@ -112,10 +110,9 @@ get_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type) } static inline void -set_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) +set_fl1_shadow_status(struct domain *d, gfn_t gfn, mfn_t smfn) /* Put an FL1 shadow into the hash table */ { - struct domain *d = v->domain; SHADOW_PRINTK("gfn=%"SH_PRI_gfn", type=%08x, smfn=%05lx\n", gfn_x(gfn), SH_type_fl1_shadow, mfn_x(smfn)); @@ -124,15 +121,13 @@ set_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) } static inline void -set_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) +set_shadow_status(struct domain *d, mfn_t gmfn, u32 shadow_type, mfn_t smfn) /* Put a shadow into the hash table */ { - struct domain *d = v->domain; int res; - SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx, type=%08x, smfn=%05lx\n", - d->domain_id, v->vcpu_id, mfn_x(gmfn), - shadow_type, mfn_x(smfn)); + SHADOW_PRINTK("d=%d: gmfn=%lx, type=%08x, smfn=%lx\n", + d->domain_id, mfn_x(gmfn), shadow_type, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); @@ -147,10 +142,9 @@ set_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) } static inline void -delete_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) +delete_fl1_shadow_status(struct domain *d, gfn_t gfn, mfn_t smfn) /* Remove a shadow from the hash table */ { - struct domain *d = v->domain; SHADOW_PRINTK("gfn=%"SH_PRI_gfn", type=%08x, smfn=%05lx\n", gfn_x(gfn), SH_type_fl1_shadow, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); @@ -158,13 +152,11 @@ delete_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) } static inline void -delete_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) +delete_shadow_status(struct domain *d, mfn_t gmfn, u32 shadow_type, mfn_t smfn) /* Remove a shadow from the hash table */ { - struct domain *d = v->domain; - SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx, type=%08x, smfn=%05lx\n", - d->domain_id, v->vcpu_id, - mfn_x(gmfn), shadow_type, mfn_x(smfn)); + SHADOW_PRINTK("d=%d: gmfn=%lx, type=%08x, smfn=%lx\n", + d->domain_id, mfn_x(gmfn), shadow_type, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); shadow_hash_delete(d, mfn_x(gmfn), shadow_type, smfn); /* 32-on-64 PV guests don't own their l4 pages; see set_shadow_status */ @@ -330,6 +322,7 @@ gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) * through the audit mechanisms */ static void sh_audit_gw(struct vcpu *v, walk_t *gw) { + struct domain *d = v->domain; mfn_t smfn; if ( !(SHADOW_AUDIT_ENABLE) ) @@ -337,33 +330,33 @@ static void sh_audit_gw(struct vcpu *v, walk_t *gw) #if GUEST_PAGING_LEVELS >= 4 /* 64-bit only... */ if ( mfn_valid(gw->l4mfn) - && mfn_valid((smfn = get_shadow_status(v, gw->l4mfn, + && mfn_valid((smfn = get_shadow_status(d, gw->l4mfn, SH_type_l4_shadow))) ) (void) sh_audit_l4_table(v, smfn, _mfn(INVALID_MFN)); if ( mfn_valid(gw->l3mfn) - && mfn_valid((smfn = get_shadow_status(v, gw->l3mfn, + && mfn_valid((smfn = get_shadow_status(d, gw->l3mfn, SH_type_l3_shadow))) ) (void) sh_audit_l3_table(v, smfn, _mfn(INVALID_MFN)); #endif /* PAE or 64... */ if ( mfn_valid(gw->l2mfn) ) { - if ( mfn_valid((smfn = get_shadow_status(v, gw->l2mfn, + if ( mfn_valid((smfn = get_shadow_status(d, gw->l2mfn, SH_type_l2_shadow))) ) (void) sh_audit_l2_table(v, smfn, _mfn(INVALID_MFN)); #if GUEST_PAGING_LEVELS == 3 - if ( mfn_valid((smfn = get_shadow_status(v, gw->l2mfn, + if ( mfn_valid((smfn = get_shadow_status(d, gw->l2mfn, SH_type_l2h_shadow))) ) (void) sh_audit_l2_table(v, smfn, _mfn(INVALID_MFN)); #endif } if ( mfn_valid(gw->l1mfn) - && mfn_valid((smfn = get_shadow_status(v, gw->l1mfn, + && mfn_valid((smfn = get_shadow_status(d, gw->l1mfn, SH_type_l1_shadow))) ) (void) sh_audit_l1_table(v, smfn, _mfn(INVALID_MFN)); else if ( (guest_l2e_get_flags(gw->l2e) & _PAGE_PRESENT) && (guest_l2e_get_flags(gw->l2e) & _PAGE_PSE) && mfn_valid( - (smfn = get_fl1_shadow_status(v, guest_l2e_get_gfn(gw->l2e)))) ) + (smfn = get_fl1_shadow_status(d, guest_l2e_get_gfn(gw->l2e)))) ) (void) sh_audit_fl1_table(v, smfn, _mfn(INVALID_MFN)); } @@ -1566,22 +1559,21 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) } shadow_promote(v, gmfn, shadow_type); - set_shadow_status(v, gmfn, shadow_type, smfn); + set_shadow_status(d, gmfn, shadow_type, smfn); return smfn; } /* Make a splintered superpage shadow */ static mfn_t -make_fl1_shadow(struct vcpu *v, gfn_t gfn) +make_fl1_shadow(struct domain *d, gfn_t gfn) { - struct domain *d = v->domain; mfn_t smfn = shadow_alloc(d, SH_type_fl1_shadow, gfn_x(gfn)); SHADOW_DEBUG(MAKE_SHADOW, "(%" SH_PRI_gfn ")=>%" PRI_mfn "\n", gfn_x(gfn), mfn_x(smfn)); - set_fl1_shadow_status(v, gfn, smfn); + set_fl1_shadow_status(d, gfn, smfn); return smfn; } @@ -1677,6 +1669,7 @@ static shadow_l3e_t * shadow_get_and_create_l3e(struct vcpu *v, fetch_type_t ft, int *resync) { + struct domain *d = v->domain; mfn_t sl4mfn; shadow_l4e_t *sl4e; if ( !mfn_valid(gw->l3mfn) ) return NULL; /* No guest page. */ @@ -1693,7 +1686,7 @@ static shadow_l3e_t * shadow_get_and_create_l3e(struct vcpu *v, int r; shadow_l4e_t new_sl4e; /* No l3 shadow installed: find and install it. */ - *sl3mfn = get_shadow_status(v, gw->l3mfn, SH_type_l3_shadow); + *sl3mfn = get_shadow_status(d, gw->l3mfn, SH_type_l3_shadow); if ( !mfn_valid(*sl3mfn) ) { /* No l3 shadow of this page exists at all: make one. */ @@ -1724,6 +1717,7 @@ static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, int *resync) { #if GUEST_PAGING_LEVELS >= 4 /* 64bit... */ + struct domain *d = v->domain; mfn_t sl3mfn = _mfn(INVALID_MFN); shadow_l3e_t *sl3e; if ( !mfn_valid(gw->l2mfn) ) return NULL; /* No guest page. */ @@ -1748,7 +1742,7 @@ static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, t = SH_type_l2h_shadow; /* No l2 shadow installed: find and install it. */ - *sl2mfn = get_shadow_status(v, gw->l2mfn, t); + *sl2mfn = get_shadow_status(d, gw->l2mfn, t); if ( !mfn_valid(*sl2mfn) ) { /* No l2 shadow of this page exists at all: make one. */ @@ -1796,6 +1790,7 @@ static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, mfn_t *sl1mfn, fetch_type_t ft) { + struct domain *d = v->domain; mfn_t sl2mfn; int resync = 0; shadow_l2e_t *sl2e; @@ -1825,18 +1820,18 @@ static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, { /* Splintering a superpage */ gfn_t l2gfn = guest_l2e_get_gfn(gw->l2e); - *sl1mfn = get_fl1_shadow_status(v, l2gfn); + *sl1mfn = get_fl1_shadow_status(d, l2gfn); if ( !mfn_valid(*sl1mfn) ) { /* No fl1 shadow of this superpage exists at all: make one. */ - *sl1mfn = make_fl1_shadow(v, l2gfn); + *sl1mfn = make_fl1_shadow(d, l2gfn); } } else { /* Shadowing an actual guest l1 table */ if ( !mfn_valid(gw->l1mfn) ) return NULL; /* No guest page. */ - *sl1mfn = get_shadow_status(v, gw->l1mfn, SH_type_l1_shadow); + *sl1mfn = get_shadow_status(d, gw->l1mfn, SH_type_l1_shadow); if ( !mfn_valid(*sl1mfn) ) { /* No l1 shadow of this page exists at all: make one. */ @@ -1897,7 +1892,7 @@ void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) /* Record that the guest page isn't shadowed any more (in this type) */ gmfn = backpointer(sp); - delete_shadow_status(v, gmfn, t, smfn); + delete_shadow_status(d, gmfn, t, smfn); shadow_demote(v, gmfn, t); /* Decrement refcounts of all the old entries */ sl4mfn = smfn; @@ -1929,7 +1924,7 @@ void sh_destroy_l3_shadow(struct vcpu *v, mfn_t smfn) /* Record that the guest page isn't shadowed any more (in this type) */ gmfn = backpointer(sp); - delete_shadow_status(v, gmfn, t, smfn); + delete_shadow_status(d, gmfn, t, smfn); shadow_demote(v, gmfn, t); /* Decrement refcounts of all the old entries */ @@ -1967,7 +1962,7 @@ void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) /* Record that the guest page isn't shadowed any more (in this type) */ gmfn = backpointer(sp); - delete_shadow_status(v, gmfn, t, smfn); + delete_shadow_status(d, gmfn, t, smfn); shadow_demote(v, gmfn, t); /* Decrement refcounts of all the old entries */ @@ -1999,12 +1994,12 @@ void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) if ( t == SH_type_fl1_shadow ) { gfn_t gfn = _gfn(sp->v.sh.back); - delete_fl1_shadow_status(v, gfn, smfn); + delete_fl1_shadow_status(d, gfn, smfn); } else { mfn_t gmfn = backpointer(sp); - delete_shadow_status(v, gmfn, t, smfn); + delete_shadow_status(d, gmfn, t, smfn); shadow_demote(v, gmfn, t); } @@ -2148,7 +2143,7 @@ static int validate_gl4e(struct vcpu *v, void *new_ge, mfn_t sl4mfn, void *se) gfn_t gl3gfn = guest_l4e_get_gfn(new_gl4e); mfn_t gl3mfn = get_gfn_query_unlocked(d, gfn_x(gl3gfn), &p2mt); if ( p2m_is_ram(p2mt) ) - sl3mfn = get_shadow_status(v, gl3mfn, SH_type_l3_shadow); + sl3mfn = get_shadow_status(d, gl3mfn, SH_type_l3_shadow); else if ( p2mt != p2m_populate_on_demand ) result |= SHADOW_SET_ERROR; @@ -2206,7 +2201,7 @@ static int validate_gl3e(struct vcpu *v, void *new_ge, mfn_t sl3mfn, void *se) gfn_t gl2gfn = guest_l3e_get_gfn(new_gl3e); mfn_t gl2mfn = get_gfn_query_unlocked(d, gfn_x(gl2gfn), &p2mt); if ( p2m_is_ram(p2mt) ) - sl2mfn = get_shadow_status(v, gl2mfn, SH_type_l2_shadow); + sl2mfn = get_shadow_status(d, gl2mfn, SH_type_l2_shadow); else if ( p2mt != p2m_populate_on_demand ) result |= SHADOW_SET_ERROR; @@ -2242,21 +2237,21 @@ static int validate_gl2e(struct vcpu *v, void *new_ge, mfn_t sl2mfn, void *se) { // superpage -- need to look up the shadow L1 which holds the // splitters... - sl1mfn = get_fl1_shadow_status(v, gl1gfn); + sl1mfn = get_fl1_shadow_status(d, gl1gfn); #if 0 // XXX - it's possible that we want to do some kind of prefetch // for superpage fl1's here, but this is *not* on the demand path, // so we'll hold off trying that for now... // if ( !mfn_valid(sl1mfn) ) - sl1mfn = make_fl1_shadow(v, gl1gfn); + sl1mfn = make_fl1_shadow(d, gl1gfn); #endif } else { mfn_t gl1mfn = get_gfn_query_unlocked(d, gfn_x(gl1gfn), &p2mt); if ( p2m_is_ram(p2mt) ) - sl1mfn = get_shadow_status(v, gl1mfn, SH_type_l1_shadow); + sl1mfn = get_shadow_status(d, gl1mfn, SH_type_l1_shadow); else if ( p2mt != p2m_populate_on_demand ) result |= SHADOW_SET_ERROR; } @@ -2327,7 +2322,7 @@ void sh_resync_l1(struct vcpu *v, mfn_t gl1mfn, mfn_t snpmfn) ASSERT(mfn_valid(snpmfn)); - sl1mfn = get_shadow_status(v, gl1mfn, SH_type_l1_shadow); + sl1mfn = get_shadow_status(d, gl1mfn, SH_type_l1_shadow); ASSERT(mfn_valid(sl1mfn)); /* Otherwise we would not have been called */ snp = sh_map_domain_page(snpmfn); @@ -2368,13 +2363,14 @@ void sh_resync_l1(struct vcpu *v, mfn_t gl1mfn, mfn_t snpmfn) * called in the *mode* of the vcpu that unsynced it. Clear? Good. */ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) { + struct domain *d = v->domain; struct page_info *sp; mfn_t smfn; if ( !sh_type_has_up_pointer(v, SH_type_l1_shadow) ) return 0; - smfn = get_shadow_status(v, gl1mfn, SH_type_l1_shadow); + smfn = get_shadow_status(d, gl1mfn, SH_type_l1_shadow); ASSERT(mfn_valid(smfn)); /* Otherwise we would not have been called */ /* Up to l2 */ @@ -2431,6 +2427,7 @@ sh_map_and_validate(struct vcpu *v, mfn_t gmfn, mfn_t smfn, void *se)) /* Generic function for mapping and validating. */ { + struct domain *d = v->domain; mfn_t smfn, smfn2, map_mfn; shadow_l1e_t *sl1p; u32 shadow_idx, guest_idx; @@ -2443,7 +2440,7 @@ sh_map_and_validate(struct vcpu *v, mfn_t gmfn, ASSERT(size + (((unsigned long)new_gp) & ~PAGE_MASK) <= PAGE_SIZE); /* Map the shadow page */ - smfn = get_shadow_status(v, gmfn, sh_type); + smfn = get_shadow_status(d, gmfn, sh_type); ASSERT(mfn_valid(smfn)); /* Otherwise we would not have been called */ guest_idx = guest_index(new_gp); map_mfn = smfn; @@ -3857,7 +3854,7 @@ sh_set_toplevel_shadow(struct vcpu *v, } /* Guest mfn is valid: shadow it and install the shadow */ - smfn = get_shadow_status(v, gmfn, root_type); + smfn = get_shadow_status(d, gmfn, root_type); if ( !mfn_valid(smfn) ) { /* Make sure there's enough free shadow memory. */ @@ -5048,8 +5045,8 @@ int sh_audit_l2_table(struct vcpu *v, mfn_t sl2mfn, mfn_t x) gfn = guest_l2e_get_gfn(*gl2e); mfn = shadow_l2e_get_mfn(*sl2e); gmfn = (guest_l2e_get_flags(*gl2e) & _PAGE_PSE) - ? get_fl1_shadow_status(v, gfn) - : get_shadow_status(v, + ? get_fl1_shadow_status(d, gfn) + : get_shadow_status(d, get_gfn_query_unlocked(d, gfn_x(gfn), &p2mt), SH_type_l1_shadow); if ( mfn_x(gmfn) != mfn_x(mfn) ) @@ -5099,7 +5096,7 @@ int sh_audit_l3_table(struct vcpu *v, mfn_t sl3mfn, mfn_t x) { gfn = guest_l3e_get_gfn(*gl3e); mfn = shadow_l3e_get_mfn(*sl3e); - gmfn = get_shadow_status(v, get_gfn_query_unlocked( + gmfn = get_shadow_status(d, get_gfn_query_unlocked( d, gfn_x(gfn), &p2mt), ((GUEST_PAGING_LEVELS == 3 || is_pv_32on64_vcpu(v)) @@ -5149,7 +5146,7 @@ int sh_audit_l4_table(struct vcpu *v, mfn_t sl4mfn, mfn_t x) { gfn = guest_l4e_get_gfn(*gl4e); mfn = shadow_l4e_get_mfn(*sl4e); - gmfn = get_shadow_status(v, get_gfn_query_unlocked( + gmfn = get_shadow_status(d, get_gfn_query_unlocked( d, gfn_x(gfn), &p2mt), SH_type_l3_shadow); if ( mfn_x(gmfn) != mfn_x(mfn) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 13:02:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:02: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 1YSmSn-0007st-6z; Tue, 03 Mar 2015 13:02:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSl-0007sW-O6 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:15 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 0E/05-02801-7D0B5F45; Tue, 03 Mar 2015 13:02:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1425387733!12614037!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21520 invoked from network); 3 Mar 2015 13:02:14 -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; 3 Mar 2015 13:02:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSj-0002hV-6O for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmSj-0003aI-4q for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:13 +0000 Date: Tue, 03 Mar 2015 13:02:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_type_{is_pinnable, has_up_pointer}() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9350220ce9af68598a502d984b853097947e5179 Author: Andrew Cooper AuthorDate: Mon Feb 2 01:18:32 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:23 2015 +0000 x86/shadow: Alter sh_type_{is_pinnable,has_up_pointer}() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 7 ++++--- xen/arch/x86/mm/shadow/multi.c | 10 +++++----- xen/arch/x86/mm/shadow/private.h | 18 ++++++++++-------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 80174df..bdb19fb 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2472,6 +2472,7 @@ static int sh_remove_shadow_via_pointer(struct vcpu *v, mfn_t smfn) /* Follow this shadow's up-pointer, if it has one, and remove the reference * found there. Returns 1 if that was the only reference to this shadow */ { + struct domain *d = v->domain; struct page_info *sp = mfn_to_page(smfn); mfn_t pmfn; void *vaddr; @@ -2479,7 +2480,7 @@ static int sh_remove_shadow_via_pointer(struct vcpu *v, mfn_t smfn) ASSERT(sp->u.sh.type > 0); ASSERT(sp->u.sh.type < SH_type_max_shadow); - ASSERT(sh_type_has_up_pointer(v, sp->u.sh.type)); + ASSERT(sh_type_has_up_pointer(d, sp->u.sh.type)); if (sp->up == 0) return 0; pmfn = _mfn(sp->up >> PAGE_SHIFT); @@ -2616,9 +2617,9 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) mfn_x(gmfn), (uint32_t)pg->shadow_flags, t); \ break; \ } \ - if ( sh_type_is_pinnable(v, t) ) \ + if ( sh_type_is_pinnable(d, t) ) \ sh_unpin(v, smfn); \ - else if ( sh_type_has_up_pointer(v, t) ) \ + else if ( sh_type_has_up_pointer(d, t) ) \ sh_remove_shadow_via_pointer(v, smfn); \ if( !fast \ && (pg->count_info & PGC_page_table) \ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 154274f..ea3b520 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -903,7 +903,7 @@ static int shadow_set_l4e(struct vcpu *v, mfn_t sl3mfn = shadow_l4e_get_mfn(new_sl4e); ok = sh_get_ref(v, sl3mfn, paddr); /* Are we pinning l3 shadows to handle wierd linux behaviour? */ - if ( sh_type_is_pinnable(v, SH_type_l3_64_shadow) ) + if ( sh_type_is_pinnable(d, SH_type_l3_64_shadow) ) ok |= sh_pin(v, sl3mfn); if ( !ok ) { @@ -1501,7 +1501,7 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) SHADOW_DEBUG(MAKE_SHADOW, "(%05lx, %u)=>%05lx\n", mfn_x(gmfn), shadow_type, mfn_x(smfn)); - if ( sh_type_has_up_pointer(v, shadow_type) ) + if ( sh_type_has_up_pointer(d, shadow_type) ) /* Lower-level shadow, not yet linked form a higher level */ mfn_to_page(smfn)->up = 0; @@ -2367,7 +2367,7 @@ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) struct page_info *sp; mfn_t smfn; - if ( !sh_type_has_up_pointer(v, SH_type_l1_shadow) ) + if ( !sh_type_has_up_pointer(d, SH_type_l1_shadow) ) return 0; smfn = get_shadow_status(d, gl1mfn, SH_type_l1_shadow); @@ -2383,7 +2383,7 @@ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) #if (SHADOW_PAGING_LEVELS == 4) /* up to l3 */ sp = mfn_to_page(smfn); - ASSERT(sh_type_has_up_pointer(v, SH_type_l2_shadow)); + ASSERT(sh_type_has_up_pointer(d, SH_type_l2_shadow)); if ( sp->u.sh.count != 1 || !sp->up ) return 0; smfn = _mfn(sp->up >> PAGE_SHIFT); @@ -2392,7 +2392,7 @@ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) /* up to l4 */ sp = mfn_to_page(smfn); if ( sp->u.sh.count != 1 - || !sh_type_has_up_pointer(v, SH_type_l3_64_shadow) || !sp->up ) + || !sh_type_has_up_pointer(d, SH_type_l3_64_shadow) || !sp->up ) return 0; smfn = _mfn(sp->up >> PAGE_SHIFT); ASSERT(mfn_valid(smfn)); diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index df1dd8c..8c06775 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -195,7 +195,7 @@ extern void shadow_audit_tables(struct vcpu *v); * What counts as a pinnable shadow? */ -static inline int sh_type_is_pinnable(struct vcpu *v, unsigned int t) +static inline int sh_type_is_pinnable(struct domain *d, unsigned int t) { /* Top-level shadow types in each mode can be pinned, so that they * persist even when not currently in use in a guest CR3 */ @@ -211,7 +211,7 @@ static inline int sh_type_is_pinnable(struct vcpu *v, unsigned int t) * page. When we're shadowing those kernels, we have to pin l3 * shadows so they don't just evaporate on every context switch. * For all other guests, we'd rather use the up-pointer field in l3s. */ - if ( unlikely((v->domain->arch.paging.shadow.opt_flags & SHOPT_LINUX_L3_TOPLEVEL) + if ( unlikely((d->arch.paging.shadow.opt_flags & SHOPT_LINUX_L3_TOPLEVEL) && t == SH_type_l3_64_shadow) ) return 1; #endif @@ -220,7 +220,7 @@ static inline int sh_type_is_pinnable(struct vcpu *v, unsigned int t) return 0; } -static inline int sh_type_has_up_pointer(struct vcpu *v, unsigned int t) +static inline int sh_type_has_up_pointer(struct domain *d, unsigned int t) { /* Multi-page shadows don't have up-pointers */ if ( t == SH_type_l1_32_shadow @@ -228,7 +228,7 @@ static inline int sh_type_has_up_pointer(struct vcpu *v, unsigned int t) || t == SH_type_l2_32_shadow ) return 0; /* Pinnable shadows don't have up-pointers either */ - return !sh_type_is_pinnable(v, t); + return !sh_type_is_pinnable(d, t); } static inline void sh_terminate_list(struct page_list_head *tmp_list) @@ -540,6 +540,7 @@ void sh_destroy_shadow(struct vcpu *v, mfn_t smfn); * Returns 0 for failure, 1 for success. */ static inline int sh_get_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) { + struct domain *d = v->domain; u32 x, nx; struct page_info *sp = mfn_to_page(smfn); @@ -561,7 +562,7 @@ static inline int sh_get_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) /* We remember the first shadow entry that points to each shadow. */ if ( entry_pa != 0 - && sh_type_has_up_pointer(v, sp->u.sh.type) + && sh_type_has_up_pointer(d, sp->u.sh.type) && sp->up == 0 ) sp->up = entry_pa; @@ -573,6 +574,7 @@ static inline int sh_get_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) * physical address of the shadow entry that held this reference. */ static inline void sh_put_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) { + struct domain *d = v->domain; u32 x, nx; struct page_info *sp = mfn_to_page(smfn); @@ -582,7 +584,7 @@ static inline void sh_put_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) /* If this is the entry in the up-pointer, remove it */ if ( entry_pa != 0 - && sh_type_has_up_pointer(v, sp->u.sh.type) + && sh_type_has_up_pointer(d, sp->u.sh.type) && sp->up == entry_pa ) sp->up = 0; @@ -656,7 +658,7 @@ static inline int sh_pin(struct vcpu *v, mfn_t smfn) sp[0] = mfn_to_page(smfn); pages = shadow_size(sp[0]->u.sh.type); already_pinned = sp[0]->u.sh.pinned; - ASSERT(sh_type_is_pinnable(v, sp[0]->u.sh.type)); + ASSERT(sh_type_is_pinnable(d, sp[0]->u.sh.type)); ASSERT(sp[0]->u.sh.head); pin_list = &d->arch.paging.shadow.pinned_shadows; @@ -704,7 +706,7 @@ static inline void sh_unpin(struct vcpu *v, mfn_t smfn) ASSERT(mfn_valid(smfn)); sp = mfn_to_page(smfn); head_type = sp->u.sh.type; - ASSERT(sh_type_is_pinnable(v, sp->u.sh.type)); + ASSERT(sh_type_is_pinnable(d, sp->u.sh.type)); ASSERT(sp->u.sh.head); if ( !sp->u.sh.pinned ) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:02:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:02: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 1YSmSn-0007st-6z; Tue, 03 Mar 2015 13:02:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSl-0007sW-O6 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:15 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 0E/05-02801-7D0B5F45; Tue, 03 Mar 2015 13:02:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1425387733!12614037!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21520 invoked from network); 3 Mar 2015 13:02:14 -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; 3 Mar 2015 13:02:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSj-0002hV-6O for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmSj-0003aI-4q for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:13 +0000 Date: Tue, 03 Mar 2015 13:02:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_type_{is_pinnable, has_up_pointer}() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9350220ce9af68598a502d984b853097947e5179 Author: Andrew Cooper AuthorDate: Mon Feb 2 01:18:32 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:23 2015 +0000 x86/shadow: Alter sh_type_{is_pinnable,has_up_pointer}() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 7 ++++--- xen/arch/x86/mm/shadow/multi.c | 10 +++++----- xen/arch/x86/mm/shadow/private.h | 18 ++++++++++-------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 80174df..bdb19fb 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2472,6 +2472,7 @@ static int sh_remove_shadow_via_pointer(struct vcpu *v, mfn_t smfn) /* Follow this shadow's up-pointer, if it has one, and remove the reference * found there. Returns 1 if that was the only reference to this shadow */ { + struct domain *d = v->domain; struct page_info *sp = mfn_to_page(smfn); mfn_t pmfn; void *vaddr; @@ -2479,7 +2480,7 @@ static int sh_remove_shadow_via_pointer(struct vcpu *v, mfn_t smfn) ASSERT(sp->u.sh.type > 0); ASSERT(sp->u.sh.type < SH_type_max_shadow); - ASSERT(sh_type_has_up_pointer(v, sp->u.sh.type)); + ASSERT(sh_type_has_up_pointer(d, sp->u.sh.type)); if (sp->up == 0) return 0; pmfn = _mfn(sp->up >> PAGE_SHIFT); @@ -2616,9 +2617,9 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) mfn_x(gmfn), (uint32_t)pg->shadow_flags, t); \ break; \ } \ - if ( sh_type_is_pinnable(v, t) ) \ + if ( sh_type_is_pinnable(d, t) ) \ sh_unpin(v, smfn); \ - else if ( sh_type_has_up_pointer(v, t) ) \ + else if ( sh_type_has_up_pointer(d, t) ) \ sh_remove_shadow_via_pointer(v, smfn); \ if( !fast \ && (pg->count_info & PGC_page_table) \ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 154274f..ea3b520 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -903,7 +903,7 @@ static int shadow_set_l4e(struct vcpu *v, mfn_t sl3mfn = shadow_l4e_get_mfn(new_sl4e); ok = sh_get_ref(v, sl3mfn, paddr); /* Are we pinning l3 shadows to handle wierd linux behaviour? */ - if ( sh_type_is_pinnable(v, SH_type_l3_64_shadow) ) + if ( sh_type_is_pinnable(d, SH_type_l3_64_shadow) ) ok |= sh_pin(v, sl3mfn); if ( !ok ) { @@ -1501,7 +1501,7 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) SHADOW_DEBUG(MAKE_SHADOW, "(%05lx, %u)=>%05lx\n", mfn_x(gmfn), shadow_type, mfn_x(smfn)); - if ( sh_type_has_up_pointer(v, shadow_type) ) + if ( sh_type_has_up_pointer(d, shadow_type) ) /* Lower-level shadow, not yet linked form a higher level */ mfn_to_page(smfn)->up = 0; @@ -2367,7 +2367,7 @@ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) struct page_info *sp; mfn_t smfn; - if ( !sh_type_has_up_pointer(v, SH_type_l1_shadow) ) + if ( !sh_type_has_up_pointer(d, SH_type_l1_shadow) ) return 0; smfn = get_shadow_status(d, gl1mfn, SH_type_l1_shadow); @@ -2383,7 +2383,7 @@ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) #if (SHADOW_PAGING_LEVELS == 4) /* up to l3 */ sp = mfn_to_page(smfn); - ASSERT(sh_type_has_up_pointer(v, SH_type_l2_shadow)); + ASSERT(sh_type_has_up_pointer(d, SH_type_l2_shadow)); if ( sp->u.sh.count != 1 || !sp->up ) return 0; smfn = _mfn(sp->up >> PAGE_SHIFT); @@ -2392,7 +2392,7 @@ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) /* up to l4 */ sp = mfn_to_page(smfn); if ( sp->u.sh.count != 1 - || !sh_type_has_up_pointer(v, SH_type_l3_64_shadow) || !sp->up ) + || !sh_type_has_up_pointer(d, SH_type_l3_64_shadow) || !sp->up ) return 0; smfn = _mfn(sp->up >> PAGE_SHIFT); ASSERT(mfn_valid(smfn)); diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index df1dd8c..8c06775 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -195,7 +195,7 @@ extern void shadow_audit_tables(struct vcpu *v); * What counts as a pinnable shadow? */ -static inline int sh_type_is_pinnable(struct vcpu *v, unsigned int t) +static inline int sh_type_is_pinnable(struct domain *d, unsigned int t) { /* Top-level shadow types in each mode can be pinned, so that they * persist even when not currently in use in a guest CR3 */ @@ -211,7 +211,7 @@ static inline int sh_type_is_pinnable(struct vcpu *v, unsigned int t) * page. When we're shadowing those kernels, we have to pin l3 * shadows so they don't just evaporate on every context switch. * For all other guests, we'd rather use the up-pointer field in l3s. */ - if ( unlikely((v->domain->arch.paging.shadow.opt_flags & SHOPT_LINUX_L3_TOPLEVEL) + if ( unlikely((d->arch.paging.shadow.opt_flags & SHOPT_LINUX_L3_TOPLEVEL) && t == SH_type_l3_64_shadow) ) return 1; #endif @@ -220,7 +220,7 @@ static inline int sh_type_is_pinnable(struct vcpu *v, unsigned int t) return 0; } -static inline int sh_type_has_up_pointer(struct vcpu *v, unsigned int t) +static inline int sh_type_has_up_pointer(struct domain *d, unsigned int t) { /* Multi-page shadows don't have up-pointers */ if ( t == SH_type_l1_32_shadow @@ -228,7 +228,7 @@ static inline int sh_type_has_up_pointer(struct vcpu *v, unsigned int t) || t == SH_type_l2_32_shadow ) return 0; /* Pinnable shadows don't have up-pointers either */ - return !sh_type_is_pinnable(v, t); + return !sh_type_is_pinnable(d, t); } static inline void sh_terminate_list(struct page_list_head *tmp_list) @@ -540,6 +540,7 @@ void sh_destroy_shadow(struct vcpu *v, mfn_t smfn); * Returns 0 for failure, 1 for success. */ static inline int sh_get_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) { + struct domain *d = v->domain; u32 x, nx; struct page_info *sp = mfn_to_page(smfn); @@ -561,7 +562,7 @@ static inline int sh_get_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) /* We remember the first shadow entry that points to each shadow. */ if ( entry_pa != 0 - && sh_type_has_up_pointer(v, sp->u.sh.type) + && sh_type_has_up_pointer(d, sp->u.sh.type) && sp->up == 0 ) sp->up = entry_pa; @@ -573,6 +574,7 @@ static inline int sh_get_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) * physical address of the shadow entry that held this reference. */ static inline void sh_put_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) { + struct domain *d = v->domain; u32 x, nx; struct page_info *sp = mfn_to_page(smfn); @@ -582,7 +584,7 @@ static inline void sh_put_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) /* If this is the entry in the up-pointer, remove it */ if ( entry_pa != 0 - && sh_type_has_up_pointer(v, sp->u.sh.type) + && sh_type_has_up_pointer(d, sp->u.sh.type) && sp->up == entry_pa ) sp->up = 0; @@ -656,7 +658,7 @@ static inline int sh_pin(struct vcpu *v, mfn_t smfn) sp[0] = mfn_to_page(smfn); pages = shadow_size(sp[0]->u.sh.type); already_pinned = sp[0]->u.sh.pinned; - ASSERT(sh_type_is_pinnable(v, sp[0]->u.sh.type)); + ASSERT(sh_type_is_pinnable(d, sp[0]->u.sh.type)); ASSERT(sp[0]->u.sh.head); pin_list = &d->arch.paging.shadow.pinned_shadows; @@ -704,7 +706,7 @@ static inline void sh_unpin(struct vcpu *v, mfn_t smfn) ASSERT(mfn_valid(smfn)); sp = mfn_to_page(smfn); head_type = sp->u.sh.type; - ASSERT(sh_type_is_pinnable(v, sp->u.sh.type)); + ASSERT(sh_type_is_pinnable(d, sp->u.sh.type)); ASSERT(sp->u.sh.head); if ( !sp->u.sh.pinned ) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:02:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:02: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 1YSmSy-0007x5-C6; Tue, 03 Mar 2015 13:02:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSw-0007wl-H3 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:26 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 72/4B-02898-1E0B5F45; Tue, 03 Mar 2015 13:02:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1425387743!12669138!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19617 invoked from network); 3 Mar 2015 13:02:24 -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; 3 Mar 2015 13:02:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSt-0002he-FT for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmSt-0003bB-BB for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:23 +0000 Date: Tue, 03 Mar 2015 13:02:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter OOS functions to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 53f860064d6fba5dad69baac274d05db2f7f67df Author: Andrew Cooper AuthorDate: Mon Feb 2 01:25:34 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:27 2015 +0000 x86/shadow: Alter OOS functions to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 23 ++++++++++++----------- xen/arch/x86/mm/shadow/multi.c | 19 ++++++++++++------- xen/arch/x86/mm/shadow/private.h | 6 +++--- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index bdb19fb..6945dfe 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -603,13 +603,13 @@ static inline int oos_fixup_flush_gmfn(struct vcpu *v, mfn_t gmfn, return 1; } -void oos_fixup_add(struct vcpu *v, mfn_t gmfn, +void oos_fixup_add(struct domain *d, mfn_t gmfn, mfn_t smfn, unsigned long off) { int idx, next; mfn_t *oos; struct oos_fixup *oos_fixup; - struct domain *d = v->domain; + struct vcpu *v; perfc_incr(shadow_oos_fixup_add); @@ -788,13 +788,13 @@ static void oos_hash_add(struct vcpu *v, mfn_t gmfn) } /* Remove an MFN from the list of out-of-sync guest pagetables */ -static void oos_hash_remove(struct vcpu *v, mfn_t gmfn) +static void oos_hash_remove(struct domain *d, mfn_t gmfn) { int idx; mfn_t *oos; - struct domain *d = v->domain; + struct vcpu *v; - SHADOW_PRINTK("%pv gmfn %lx\n", v, mfn_x(gmfn)); + SHADOW_PRINTK("d%d gmfn %lx\n", d->domain_id, mfn_x(gmfn)); for_each_vcpu(d, v) { @@ -813,12 +813,12 @@ static void oos_hash_remove(struct vcpu *v, mfn_t gmfn) BUG(); } -mfn_t oos_snapshot_lookup(struct vcpu *v, mfn_t gmfn) +mfn_t oos_snapshot_lookup(struct domain *d, mfn_t gmfn) { int idx; mfn_t *oos; mfn_t *oos_snapshot; - struct domain *d = v->domain; + struct vcpu *v; for_each_vcpu(d, v) { @@ -839,13 +839,13 @@ mfn_t oos_snapshot_lookup(struct vcpu *v, mfn_t gmfn) } /* Pull a single guest page back into sync */ -void sh_resync(struct vcpu *v, mfn_t gmfn) +void sh_resync(struct domain *d, mfn_t gmfn) { int idx; mfn_t *oos; mfn_t *oos_snapshot; struct oos_fixup *oos_fixup; - struct domain *d = v->domain; + struct vcpu *v; for_each_vcpu(d, v) { @@ -1000,7 +1000,7 @@ void shadow_promote(struct vcpu *v, mfn_t gmfn, unsigned int type) #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* Is the page already shadowed and out of sync? */ if ( page_is_out_of_sync(page) ) - sh_resync(v, gmfn); + sh_resync(d, gmfn); #endif /* We should never try to promote a gmfn that has writeable mappings */ @@ -1019,6 +1019,7 @@ void shadow_promote(struct vcpu *v, mfn_t gmfn, unsigned int type) void shadow_demote(struct vcpu *v, mfn_t gmfn, u32 type) { + struct domain *d = v->domain; struct page_info *page = mfn_to_page(gmfn); ASSERT(test_bit(_PGC_page_table, &page->count_info)); @@ -1032,7 +1033,7 @@ void shadow_demote(struct vcpu *v, mfn_t gmfn, u32 type) /* Was the page out of sync? */ if ( page_is_out_of_sync(page) ) { - oos_hash_remove(v, gmfn); + oos_hash_remove(d, gmfn); } #endif clear_bit(_PGC_page_table, &page->count_info); diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index ea3b520..82759a6 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -278,6 +278,11 @@ shadow_check_gl1e(struct vcpu *v, walk_t *gw) static inline uint32_t gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) { +#if GUEST_PAGING_LEVELS >= 3 /* PAE or 64... */ +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) + struct domain *d = v->domain; +#endif +#endif uint32_t rc = 0; #if GUEST_PAGING_LEVELS >= 3 /* PAE or 64... */ @@ -285,7 +290,7 @@ gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) if ( mfn_is_out_of_sync(gw->l3mfn) ) { - sh_resync(v, gw->l3mfn); + sh_resync(d, gw->l3mfn); rc = GW_RMWR_REWALK; } else @@ -297,7 +302,7 @@ gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) if ( mfn_is_out_of_sync(gw->l2mfn) ) { - sh_resync(v, gw->l2mfn); + sh_resync(d, gw->l2mfn); rc |= GW_RMWR_REWALK; } else @@ -1030,7 +1035,7 @@ static int shadow_set_l2e(struct vcpu *v, OOS. */ if ( (sp->u.sh.type != SH_type_fl1_shadow) && mfn_valid(gl1mfn) && mfn_is_out_of_sync(gl1mfn) ) - sh_resync(v, gl1mfn); + sh_resync(d, gl1mfn); } #endif #if GUEST_PAGING_LEVELS == 2 @@ -1178,7 +1183,7 @@ static int shadow_set_l1e(struct vcpu *v, if ( mfn_valid(new_gmfn) && mfn_oos_may_write(new_gmfn) && ((shadow_l1e_get_flags(new_sl1e) & (_PAGE_RW|_PAGE_PRESENT)) == (_PAGE_RW|_PAGE_PRESENT)) ) - oos_fixup_add(v, new_gmfn, sl1mfn, pgentry_ptr_to_slot(sl1e)); + oos_fixup_add(d, new_gmfn, sl1mfn, pgentry_ptr_to_slot(sl1e)); #endif old_sl1e = *sl1e; @@ -2291,7 +2296,7 @@ static int validate_gl1e(struct vcpu *v, void *new_ge, mfn_t sl1mfn, void *se) && mfn_is_out_of_sync(gl1mfn) ) { /* Update the OOS snapshot. */ - mfn_t snpmfn = oos_snapshot_lookup(v, gl1mfn); + mfn_t snpmfn = oos_snapshot_lookup(d, gl1mfn); guest_l1e_t *snp; ASSERT(mfn_valid(snpmfn)); @@ -2629,7 +2634,7 @@ static void sh_prefetch(struct vcpu *v, walk_t *gw, #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) if ( mfn_is_out_of_sync(gw->l1mfn) ) { - mfn_t snpmfn = oos_snapshot_lookup(v, gw->l1mfn); + mfn_t snpmfn = oos_snapshot_lookup(d, gw->l1mfn); ASSERT(mfn_valid(snpmfn)); snpl1p = sh_map_domain_page(snpmfn); @@ -3167,7 +3172,7 @@ static int sh_page_fault(struct vcpu *v, && mfn_is_out_of_sync(gw.l1mfn) ) { /* Update the OOS snapshot. */ - mfn_t snpmfn = oos_snapshot_lookup(v, gw.l1mfn); + mfn_t snpmfn = oos_snapshot_lookup(d, gw.l1mfn); guest_l1e_t *snp; ASSERT(mfn_valid(snpmfn)); diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index 8c06775..7abb0e0 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -401,9 +401,9 @@ void shadow_unhook_mappings(struct vcpu *v, mfn_t smfn, int user_only); int sh_unsync(struct vcpu *v, mfn_t gmfn); /* Pull an out-of-sync page back into sync. */ -void sh_resync(struct vcpu *v, mfn_t gmfn); +void sh_resync(struct domain *d, mfn_t gmfn); -void oos_fixup_add(struct vcpu *v, mfn_t gmfn, mfn_t smfn, unsigned long off); +void oos_fixup_add(struct domain *d, mfn_t gmfn, mfn_t smfn, unsigned long off); int sh_remove_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, mfn_t smfn, unsigned long offset); @@ -432,7 +432,7 @@ shadow_sync_other_vcpus(struct vcpu *v) } void oos_audit_hash_is_present(struct domain *d, mfn_t gmfn); -mfn_t oos_snapshot_lookup(struct vcpu *v, mfn_t gmfn); +mfn_t oos_snapshot_lookup(struct domain *d, mfn_t gmfn); #endif /* (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:02:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:02: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 1YSmSy-0007x5-C6; Tue, 03 Mar 2015 13:02:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSw-0007wl-H3 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:26 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 72/4B-02898-1E0B5F45; Tue, 03 Mar 2015 13:02:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1425387743!12669138!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19617 invoked from network); 3 Mar 2015 13:02:24 -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; 3 Mar 2015 13:02:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmSt-0002he-FT for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmSt-0003bB-BB for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:23 +0000 Date: Tue, 03 Mar 2015 13:02:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter OOS functions to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 53f860064d6fba5dad69baac274d05db2f7f67df Author: Andrew Cooper AuthorDate: Mon Feb 2 01:25:34 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:27 2015 +0000 x86/shadow: Alter OOS functions to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 23 ++++++++++++----------- xen/arch/x86/mm/shadow/multi.c | 19 ++++++++++++------- xen/arch/x86/mm/shadow/private.h | 6 +++--- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index bdb19fb..6945dfe 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -603,13 +603,13 @@ static inline int oos_fixup_flush_gmfn(struct vcpu *v, mfn_t gmfn, return 1; } -void oos_fixup_add(struct vcpu *v, mfn_t gmfn, +void oos_fixup_add(struct domain *d, mfn_t gmfn, mfn_t smfn, unsigned long off) { int idx, next; mfn_t *oos; struct oos_fixup *oos_fixup; - struct domain *d = v->domain; + struct vcpu *v; perfc_incr(shadow_oos_fixup_add); @@ -788,13 +788,13 @@ static void oos_hash_add(struct vcpu *v, mfn_t gmfn) } /* Remove an MFN from the list of out-of-sync guest pagetables */ -static void oos_hash_remove(struct vcpu *v, mfn_t gmfn) +static void oos_hash_remove(struct domain *d, mfn_t gmfn) { int idx; mfn_t *oos; - struct domain *d = v->domain; + struct vcpu *v; - SHADOW_PRINTK("%pv gmfn %lx\n", v, mfn_x(gmfn)); + SHADOW_PRINTK("d%d gmfn %lx\n", d->domain_id, mfn_x(gmfn)); for_each_vcpu(d, v) { @@ -813,12 +813,12 @@ static void oos_hash_remove(struct vcpu *v, mfn_t gmfn) BUG(); } -mfn_t oos_snapshot_lookup(struct vcpu *v, mfn_t gmfn) +mfn_t oos_snapshot_lookup(struct domain *d, mfn_t gmfn) { int idx; mfn_t *oos; mfn_t *oos_snapshot; - struct domain *d = v->domain; + struct vcpu *v; for_each_vcpu(d, v) { @@ -839,13 +839,13 @@ mfn_t oos_snapshot_lookup(struct vcpu *v, mfn_t gmfn) } /* Pull a single guest page back into sync */ -void sh_resync(struct vcpu *v, mfn_t gmfn) +void sh_resync(struct domain *d, mfn_t gmfn) { int idx; mfn_t *oos; mfn_t *oos_snapshot; struct oos_fixup *oos_fixup; - struct domain *d = v->domain; + struct vcpu *v; for_each_vcpu(d, v) { @@ -1000,7 +1000,7 @@ void shadow_promote(struct vcpu *v, mfn_t gmfn, unsigned int type) #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* Is the page already shadowed and out of sync? */ if ( page_is_out_of_sync(page) ) - sh_resync(v, gmfn); + sh_resync(d, gmfn); #endif /* We should never try to promote a gmfn that has writeable mappings */ @@ -1019,6 +1019,7 @@ void shadow_promote(struct vcpu *v, mfn_t gmfn, unsigned int type) void shadow_demote(struct vcpu *v, mfn_t gmfn, u32 type) { + struct domain *d = v->domain; struct page_info *page = mfn_to_page(gmfn); ASSERT(test_bit(_PGC_page_table, &page->count_info)); @@ -1032,7 +1033,7 @@ void shadow_demote(struct vcpu *v, mfn_t gmfn, u32 type) /* Was the page out of sync? */ if ( page_is_out_of_sync(page) ) { - oos_hash_remove(v, gmfn); + oos_hash_remove(d, gmfn); } #endif clear_bit(_PGC_page_table, &page->count_info); diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index ea3b520..82759a6 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -278,6 +278,11 @@ shadow_check_gl1e(struct vcpu *v, walk_t *gw) static inline uint32_t gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) { +#if GUEST_PAGING_LEVELS >= 3 /* PAE or 64... */ +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) + struct domain *d = v->domain; +#endif +#endif uint32_t rc = 0; #if GUEST_PAGING_LEVELS >= 3 /* PAE or 64... */ @@ -285,7 +290,7 @@ gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) if ( mfn_is_out_of_sync(gw->l3mfn) ) { - sh_resync(v, gw->l3mfn); + sh_resync(d, gw->l3mfn); rc = GW_RMWR_REWALK; } else @@ -297,7 +302,7 @@ gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) if ( mfn_is_out_of_sync(gw->l2mfn) ) { - sh_resync(v, gw->l2mfn); + sh_resync(d, gw->l2mfn); rc |= GW_RMWR_REWALK; } else @@ -1030,7 +1035,7 @@ static int shadow_set_l2e(struct vcpu *v, OOS. */ if ( (sp->u.sh.type != SH_type_fl1_shadow) && mfn_valid(gl1mfn) && mfn_is_out_of_sync(gl1mfn) ) - sh_resync(v, gl1mfn); + sh_resync(d, gl1mfn); } #endif #if GUEST_PAGING_LEVELS == 2 @@ -1178,7 +1183,7 @@ static int shadow_set_l1e(struct vcpu *v, if ( mfn_valid(new_gmfn) && mfn_oos_may_write(new_gmfn) && ((shadow_l1e_get_flags(new_sl1e) & (_PAGE_RW|_PAGE_PRESENT)) == (_PAGE_RW|_PAGE_PRESENT)) ) - oos_fixup_add(v, new_gmfn, sl1mfn, pgentry_ptr_to_slot(sl1e)); + oos_fixup_add(d, new_gmfn, sl1mfn, pgentry_ptr_to_slot(sl1e)); #endif old_sl1e = *sl1e; @@ -2291,7 +2296,7 @@ static int validate_gl1e(struct vcpu *v, void *new_ge, mfn_t sl1mfn, void *se) && mfn_is_out_of_sync(gl1mfn) ) { /* Update the OOS snapshot. */ - mfn_t snpmfn = oos_snapshot_lookup(v, gl1mfn); + mfn_t snpmfn = oos_snapshot_lookup(d, gl1mfn); guest_l1e_t *snp; ASSERT(mfn_valid(snpmfn)); @@ -2629,7 +2634,7 @@ static void sh_prefetch(struct vcpu *v, walk_t *gw, #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) if ( mfn_is_out_of_sync(gw->l1mfn) ) { - mfn_t snpmfn = oos_snapshot_lookup(v, gw->l1mfn); + mfn_t snpmfn = oos_snapshot_lookup(d, gw->l1mfn); ASSERT(mfn_valid(snpmfn)); snpl1p = sh_map_domain_page(snpmfn); @@ -3167,7 +3172,7 @@ static int sh_page_fault(struct vcpu *v, && mfn_is_out_of_sync(gw.l1mfn) ) { /* Update the OOS snapshot. */ - mfn_t snpmfn = oos_snapshot_lookup(v, gw.l1mfn); + mfn_t snpmfn = oos_snapshot_lookup(d, gw.l1mfn); guest_l1e_t *snp; ASSERT(mfn_valid(snpmfn)); diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index 8c06775..7abb0e0 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -401,9 +401,9 @@ void shadow_unhook_mappings(struct vcpu *v, mfn_t smfn, int user_only); int sh_unsync(struct vcpu *v, mfn_t gmfn); /* Pull an out-of-sync page back into sync. */ -void sh_resync(struct vcpu *v, mfn_t gmfn); +void sh_resync(struct domain *d, mfn_t gmfn); -void oos_fixup_add(struct vcpu *v, mfn_t gmfn, mfn_t smfn, unsigned long off); +void oos_fixup_add(struct domain *d, mfn_t gmfn, mfn_t smfn, unsigned long off); int sh_remove_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, mfn_t smfn, unsigned long offset); @@ -432,7 +432,7 @@ shadow_sync_other_vcpus(struct vcpu *v) } void oos_audit_hash_is_present(struct domain *d, mfn_t gmfn); -mfn_t oos_snapshot_lookup(struct vcpu *v, mfn_t gmfn); +mfn_t oos_snapshot_lookup(struct domain *d, mfn_t gmfn); #endif /* (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:02:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:02: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 1YSmT8-000803-F7; Tue, 03 Mar 2015 13:02:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmT6-0007zm-MZ for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:36 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 87/3C-02991-BE0B5F45; Tue, 03 Mar 2015 13:02:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1425387754!9754118!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1860 invoked from network); 3 Mar 2015 13:02:35 -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; 3 Mar 2015 13:02:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmT3-0002hm-LA for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmT3-0003bb-Jf for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:33 +0000 Date: Tue, 03 Mar 2015 13:02:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter shadow_{pro, de}mote() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ca6d3727d70991985f4554303d8fc7626ba060b Author: Andrew Cooper AuthorDate: Thu Aug 21 19:55:48 2014 +0100 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:30 2015 +0000 x86/shadow: Alter shadow_{pro,de}mote() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 6 ++---- xen/arch/x86/mm/shadow/multi.c | 10 +++++----- xen/arch/x86/mm/shadow/private.h | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 6945dfe..c6b8e6f 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -990,9 +990,8 @@ int sh_unsync(struct vcpu *v, mfn_t gmfn) * involves making sure there are no writable mappings available to the guest * for this page. */ -void shadow_promote(struct vcpu *v, mfn_t gmfn, unsigned int type) +void shadow_promote(struct domain *d, mfn_t gmfn, unsigned int type) { - struct domain *d = v->domain; struct page_info *page = mfn_to_page(gmfn); ASSERT(mfn_valid(gmfn)); @@ -1017,9 +1016,8 @@ void shadow_promote(struct vcpu *v, mfn_t gmfn, unsigned int type) TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_PROMOTE); } -void shadow_demote(struct vcpu *v, mfn_t gmfn, u32 type) +void shadow_demote(struct domain *d, mfn_t gmfn, u32 type) { - struct domain *d = v->domain; struct page_info *page = mfn_to_page(gmfn); ASSERT(test_bit(_PGC_page_table, &page->count_info)); diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 82759a6..f2dea16 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -1563,7 +1563,7 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) } } - shadow_promote(v, gmfn, shadow_type); + shadow_promote(d, gmfn, shadow_type); set_shadow_status(d, gmfn, shadow_type, smfn); return smfn; @@ -1898,7 +1898,7 @@ void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) /* Record that the guest page isn't shadowed any more (in this type) */ gmfn = backpointer(sp); delete_shadow_status(d, gmfn, t, smfn); - shadow_demote(v, gmfn, t); + shadow_demote(d, gmfn, t); /* Decrement refcounts of all the old entries */ sl4mfn = smfn; SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, d, { @@ -1930,7 +1930,7 @@ void sh_destroy_l3_shadow(struct vcpu *v, mfn_t smfn) /* Record that the guest page isn't shadowed any more (in this type) */ gmfn = backpointer(sp); delete_shadow_status(d, gmfn, t, smfn); - shadow_demote(v, gmfn, t); + shadow_demote(d, gmfn, t); /* Decrement refcounts of all the old entries */ sl3mfn = smfn; @@ -1968,7 +1968,7 @@ void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) /* Record that the guest page isn't shadowed any more (in this type) */ gmfn = backpointer(sp); delete_shadow_status(d, gmfn, t, smfn); - shadow_demote(v, gmfn, t); + shadow_demote(d, gmfn, t); /* Decrement refcounts of all the old entries */ sl2mfn = smfn; @@ -2005,7 +2005,7 @@ void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) { mfn_t gmfn = backpointer(sp); delete_shadow_status(d, gmfn, t, smfn); - shadow_demote(v, gmfn, t); + shadow_demote(d, gmfn, t); } if ( shadow_mode_refcounts(d) ) diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index 7abb0e0..3820d9e 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -350,8 +350,8 @@ void shadow_hash_delete(struct domain *d, unsigned long n, unsigned int t, mfn_t smfn); /* shadow promotion */ -void shadow_promote(struct vcpu *v, mfn_t gmfn, u32 type); -void shadow_demote(struct vcpu *v, mfn_t gmfn, u32 type); +void shadow_promote(struct domain *d, mfn_t gmfn, u32 type); +void shadow_demote(struct domain *d, mfn_t gmfn, u32 type); /* Shadow page allocation functions */ void shadow_prealloc(struct domain *d, u32 shadow_type, unsigned int count); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:02:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:02: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 1YSmT8-000803-F7; Tue, 03 Mar 2015 13:02:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmT6-0007zm-MZ for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:36 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 87/3C-02991-BE0B5F45; Tue, 03 Mar 2015 13:02:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1425387754!9754118!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1860 invoked from network); 3 Mar 2015 13:02:35 -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; 3 Mar 2015 13:02:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmT3-0002hm-LA for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmT3-0003bb-Jf for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:33 +0000 Date: Tue, 03 Mar 2015 13:02:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter shadow_{pro, de}mote() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ca6d3727d70991985f4554303d8fc7626ba060b Author: Andrew Cooper AuthorDate: Thu Aug 21 19:55:48 2014 +0100 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:30 2015 +0000 x86/shadow: Alter shadow_{pro,de}mote() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 6 ++---- xen/arch/x86/mm/shadow/multi.c | 10 +++++----- xen/arch/x86/mm/shadow/private.h | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 6945dfe..c6b8e6f 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -990,9 +990,8 @@ int sh_unsync(struct vcpu *v, mfn_t gmfn) * involves making sure there are no writable mappings available to the guest * for this page. */ -void shadow_promote(struct vcpu *v, mfn_t gmfn, unsigned int type) +void shadow_promote(struct domain *d, mfn_t gmfn, unsigned int type) { - struct domain *d = v->domain; struct page_info *page = mfn_to_page(gmfn); ASSERT(mfn_valid(gmfn)); @@ -1017,9 +1016,8 @@ void shadow_promote(struct vcpu *v, mfn_t gmfn, unsigned int type) TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_PROMOTE); } -void shadow_demote(struct vcpu *v, mfn_t gmfn, u32 type) +void shadow_demote(struct domain *d, mfn_t gmfn, u32 type) { - struct domain *d = v->domain; struct page_info *page = mfn_to_page(gmfn); ASSERT(test_bit(_PGC_page_table, &page->count_info)); diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 82759a6..f2dea16 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -1563,7 +1563,7 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) } } - shadow_promote(v, gmfn, shadow_type); + shadow_promote(d, gmfn, shadow_type); set_shadow_status(d, gmfn, shadow_type, smfn); return smfn; @@ -1898,7 +1898,7 @@ void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) /* Record that the guest page isn't shadowed any more (in this type) */ gmfn = backpointer(sp); delete_shadow_status(d, gmfn, t, smfn); - shadow_demote(v, gmfn, t); + shadow_demote(d, gmfn, t); /* Decrement refcounts of all the old entries */ sl4mfn = smfn; SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, d, { @@ -1930,7 +1930,7 @@ void sh_destroy_l3_shadow(struct vcpu *v, mfn_t smfn) /* Record that the guest page isn't shadowed any more (in this type) */ gmfn = backpointer(sp); delete_shadow_status(d, gmfn, t, smfn); - shadow_demote(v, gmfn, t); + shadow_demote(d, gmfn, t); /* Decrement refcounts of all the old entries */ sl3mfn = smfn; @@ -1968,7 +1968,7 @@ void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) /* Record that the guest page isn't shadowed any more (in this type) */ gmfn = backpointer(sp); delete_shadow_status(d, gmfn, t, smfn); - shadow_demote(v, gmfn, t); + shadow_demote(d, gmfn, t); /* Decrement refcounts of all the old entries */ sl2mfn = smfn; @@ -2005,7 +2005,7 @@ void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) { mfn_t gmfn = backpointer(sp); delete_shadow_status(d, gmfn, t, smfn); - shadow_demote(v, gmfn, t); + shadow_demote(d, gmfn, t); } if ( shadow_mode_refcounts(d) ) diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index 7abb0e0..3820d9e 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -350,8 +350,8 @@ void shadow_hash_delete(struct domain *d, unsigned long n, unsigned int t, mfn_t smfn); /* shadow promotion */ -void shadow_promote(struct vcpu *v, mfn_t gmfn, u32 type); -void shadow_demote(struct vcpu *v, mfn_t gmfn, u32 type); +void shadow_promote(struct domain *d, mfn_t gmfn, u32 type); +void shadow_demote(struct domain *d, mfn_t gmfn, u32 type); /* Shadow page allocation functions */ void shadow_prealloc(struct domain *d, u32 shadow_type, unsigned int count); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:02:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:02: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 1YSmTJ-00083L-IL; Tue, 03 Mar 2015 13:02:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTH-00082U-KN for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:47 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 9F/03-02884-6F0B5F45; Tue, 03 Mar 2015 13:02:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1425387764!12552759!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20879 invoked from network); 3 Mar 2015 13:02:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 3 Mar 2015 13:02:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTE-0002hs-8A for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmTE-0003bx-7L for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:44 +0000 Date: Tue, 03 Mar 2015 13:02:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_put_ref() and shadow destroy functions to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 157a9690b7ec60a729950d24ec18480559b06f63 Author: Andrew Cooper AuthorDate: Mon Feb 2 01:46:12 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:33 2015 +0000 x86/shadow: Alter sh_put_ref() and shadow destroy functions to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 19 +++++++++---------- xen/arch/x86/mm/shadow/multi.c | 30 +++++++++++++----------------- xen/arch/x86/mm/shadow/multi.h | 8 ++++---- xen/arch/x86/mm/shadow/private.h | 9 ++++----- 4 files changed, 30 insertions(+), 36 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index c6b8e6f..e2ea6cb 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2052,9 +2052,8 @@ static void hash_vcpu_foreach(struct vcpu *v, unsigned int callback_mask, * which will decrement refcounts appropriately and return memory to the * free pool. */ -void sh_destroy_shadow(struct vcpu *v, mfn_t smfn) +void sh_destroy_shadow(struct domain *d, mfn_t smfn) { - struct domain *d = v->domain; struct page_info *sp = mfn_to_page(smfn); unsigned int t = sp->u.sh.type; @@ -2076,36 +2075,36 @@ void sh_destroy_shadow(struct vcpu *v, mfn_t smfn) { case SH_type_l1_32_shadow: case SH_type_fl1_32_shadow: - SHADOW_INTERNAL_NAME(sh_destroy_l1_shadow, 2)(v, smfn); + SHADOW_INTERNAL_NAME(sh_destroy_l1_shadow, 2)(d, smfn); break; case SH_type_l2_32_shadow: - SHADOW_INTERNAL_NAME(sh_destroy_l2_shadow, 2)(v, smfn); + SHADOW_INTERNAL_NAME(sh_destroy_l2_shadow, 2)(d, smfn); break; case SH_type_l1_pae_shadow: case SH_type_fl1_pae_shadow: - SHADOW_INTERNAL_NAME(sh_destroy_l1_shadow, 3)(v, smfn); + SHADOW_INTERNAL_NAME(sh_destroy_l1_shadow, 3)(d, smfn); break; case SH_type_l2_pae_shadow: case SH_type_l2h_pae_shadow: - SHADOW_INTERNAL_NAME(sh_destroy_l2_shadow, 3)(v, smfn); + SHADOW_INTERNAL_NAME(sh_destroy_l2_shadow, 3)(d, smfn); break; case SH_type_l1_64_shadow: case SH_type_fl1_64_shadow: - SHADOW_INTERNAL_NAME(sh_destroy_l1_shadow, 4)(v, smfn); + SHADOW_INTERNAL_NAME(sh_destroy_l1_shadow, 4)(d, smfn); break; case SH_type_l2h_64_shadow: ASSERT(is_pv_32on64_domain(d)); /* Fall through... */ case SH_type_l2_64_shadow: - SHADOW_INTERNAL_NAME(sh_destroy_l2_shadow, 4)(v, smfn); + SHADOW_INTERNAL_NAME(sh_destroy_l2_shadow, 4)(d, smfn); break; case SH_type_l3_64_shadow: - SHADOW_INTERNAL_NAME(sh_destroy_l3_shadow, 4)(v, smfn); + SHADOW_INTERNAL_NAME(sh_destroy_l3_shadow, 4)(d, smfn); break; case SH_type_l4_64_shadow: - SHADOW_INTERNAL_NAME(sh_destroy_l4_shadow, 4)(v, smfn); + SHADOW_INTERNAL_NAME(sh_destroy_l4_shadow, 4)(d, smfn); break; default: diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index f2dea16..7d82d90 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -931,7 +931,7 @@ static int shadow_set_l4e(struct vcpu *v, { flags |= SHADOW_SET_FLUSH; } - sh_put_ref(v, osl3mfn, paddr); + sh_put_ref(d, osl3mfn, paddr); } return flags; } @@ -977,7 +977,7 @@ static int shadow_set_l3e(struct vcpu *v, { flags |= SHADOW_SET_FLUSH; } - sh_put_ref(v, osl2mfn, paddr); + sh_put_ref(d, osl2mfn, paddr); } return flags; } @@ -1063,7 +1063,7 @@ static int shadow_set_l2e(struct vcpu *v, { flags |= SHADOW_SET_FLUSH; } - sh_put_ref(v, osl1mfn, paddr); + sh_put_ref(d, osl1mfn, paddr); } return flags; } @@ -1882,9 +1882,8 @@ static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, */ #if GUEST_PAGING_LEVELS >= 4 -void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) +void sh_destroy_l4_shadow(struct domain *d, mfn_t smfn) { - struct domain *d = v->domain; shadow_l4e_t *sl4e; struct page_info *sp = mfn_to_page(smfn); u32 t = sp->u.sh.type; @@ -1904,7 +1903,7 @@ void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, d, { if ( shadow_l4e_get_flags(*sl4e) & _PAGE_PRESENT ) { - sh_put_ref(v, shadow_l4e_get_mfn(*sl4e), + sh_put_ref(d, shadow_l4e_get_mfn(*sl4e), (((paddr_t)mfn_x(sl4mfn)) << PAGE_SHIFT) | ((unsigned long)sl4e & ~PAGE_MASK)); } @@ -1914,9 +1913,8 @@ void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) shadow_free(d, smfn); } -void sh_destroy_l3_shadow(struct vcpu *v, mfn_t smfn) +void sh_destroy_l3_shadow(struct domain *d, mfn_t smfn) { - struct domain *d = v->domain; shadow_l3e_t *sl3e; struct page_info *sp = mfn_to_page(smfn); u32 t = sp->u.sh.type; @@ -1936,7 +1934,7 @@ void sh_destroy_l3_shadow(struct vcpu *v, mfn_t smfn) sl3mfn = smfn; SHADOW_FOREACH_L3E(sl3mfn, sl3e, 0, 0, { if ( shadow_l3e_get_flags(*sl3e) & _PAGE_PRESENT ) - sh_put_ref(v, shadow_l3e_get_mfn(*sl3e), + sh_put_ref(d, shadow_l3e_get_mfn(*sl3e), (((paddr_t)mfn_x(sl3mfn)) << PAGE_SHIFT) | ((unsigned long)sl3e & ~PAGE_MASK)); }); @@ -1947,9 +1945,8 @@ void sh_destroy_l3_shadow(struct vcpu *v, mfn_t smfn) #endif /* GUEST_PAGING_LEVELS >= 4 */ -void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) +void sh_destroy_l2_shadow(struct domain *d, mfn_t smfn) { - struct domain *d = v->domain; shadow_l2e_t *sl2e; struct page_info *sp = mfn_to_page(smfn); u32 t = sp->u.sh.type; @@ -1974,7 +1971,7 @@ void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) sl2mfn = smfn; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( shadow_l2e_get_flags(*sl2e) & _PAGE_PRESENT ) - sh_put_ref(v, shadow_l2e_get_mfn(*sl2e), + sh_put_ref(d, shadow_l2e_get_mfn(*sl2e), (((paddr_t)mfn_x(sl2mfn)) << PAGE_SHIFT) | ((unsigned long)sl2e & ~PAGE_MASK)); }); @@ -1983,9 +1980,8 @@ void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) shadow_free(d, smfn); } -void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) +void sh_destroy_l1_shadow(struct domain *d, mfn_t smfn) { - struct domain *d = v->domain; shadow_l1e_t *sl1e; struct page_info *sp = mfn_to_page(smfn); u32 t = sp->u.sh.type; @@ -3799,6 +3795,7 @@ sh_update_linear_entries(struct vcpu *v) static void sh_detach_old_tables(struct vcpu *v) { + struct domain *d = v->domain; mfn_t smfn; int i = 0; @@ -3812,7 +3809,6 @@ sh_detach_old_tables(struct vcpu *v) #else if ( v->arch.paging.shadow.guest_vtable ) { - struct domain *d = v->domain; if ( shadow_mode_external(d) || shadow_mode_translate(d) ) sh_unmap_domain_page_global(v->arch.paging.shadow.guest_vtable); v->arch.paging.shadow.guest_vtable = NULL; @@ -3831,7 +3827,7 @@ sh_detach_old_tables(struct vcpu *v) { smfn = pagetable_get_mfn(v->arch.shadow_table[i]); if ( mfn_x(smfn) ) - sh_put_ref(v, smfn, 0); + sh_put_ref(d, smfn, 0); v->arch.shadow_table[i] = pagetable_null(); } } @@ -3904,7 +3900,7 @@ sh_set_toplevel_shadow(struct vcpu *v, SHADOW_ERROR("can't re-pin %#lx\n", mfn_x(old_smfn)); domain_crash(d); } - sh_put_ref(v, old_smfn, 0); + sh_put_ref(d, old_smfn, 0); } } diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index 7f829fd..614103d 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -39,16 +39,16 @@ SHADOW_INTERNAL_NAME(sh_map_and_validate_gl4e, GUEST_LEVELS)( extern void SHADOW_INTERNAL_NAME(sh_destroy_l1_shadow, GUEST_LEVELS)( - struct vcpu *v, mfn_t smfn); + struct domain *d, mfn_t smfn); extern void SHADOW_INTERNAL_NAME(sh_destroy_l2_shadow, GUEST_LEVELS)( - struct vcpu *v, mfn_t smfn); + struct domain *d, mfn_t smfn); extern void SHADOW_INTERNAL_NAME(sh_destroy_l3_shadow, GUEST_LEVELS)( - struct vcpu *v, mfn_t smfn); + struct domain *d, mfn_t smfn); extern void SHADOW_INTERNAL_NAME(sh_destroy_l4_shadow, GUEST_LEVELS)( - struct vcpu *v, mfn_t smfn); + struct domain *d, mfn_t smfn); extern void SHADOW_INTERNAL_NAME(sh_unhook_32b_mappings, GUEST_LEVELS) diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index 3820d9e..a848c94 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -532,7 +532,7 @@ sh_unmap_domain_page_global(void *p) /**************************************************************************/ /* Shadow-page refcounting. */ -void sh_destroy_shadow(struct vcpu *v, mfn_t smfn); +void sh_destroy_shadow(struct domain *d, mfn_t smfn); /* Increase the refcount of a shadow page. Arguments are the mfn to refcount, * and the physical address of the shadow entry that holds the ref (or zero @@ -572,9 +572,8 @@ static inline int sh_get_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) /* Decrease the refcount of a shadow page. As for get_ref, takes the * physical address of the shadow entry that held this reference. */ -static inline void sh_put_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) +static inline void sh_put_ref(struct domain *d, mfn_t smfn, paddr_t entry_pa) { - struct domain *d = v->domain; u32 x, nx; struct page_info *sp = mfn_to_page(smfn); @@ -602,7 +601,7 @@ static inline void sh_put_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) sp->u.sh.count = nx; if ( unlikely(nx == 0) ) - sh_destroy_shadow(v, smfn); + sh_destroy_shadow(d, smfn); } @@ -728,7 +727,7 @@ static inline void sh_unpin(struct vcpu *v, mfn_t smfn) } sh_terminate_list(&tmp_list); - sh_put_ref(v, smfn, 0); + sh_put_ref(d, smfn, 0); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 13:02:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:02: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 1YSmTJ-00083L-IL; Tue, 03 Mar 2015 13:02:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTH-00082U-KN for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:47 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 9F/03-02884-6F0B5F45; Tue, 03 Mar 2015 13:02:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1425387764!12552759!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20879 invoked from network); 3 Mar 2015 13:02:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 3 Mar 2015 13:02:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTE-0002hs-8A for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmTE-0003bx-7L for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:44 +0000 Date: Tue, 03 Mar 2015 13:02:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_put_ref() and shadow destroy functions to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 157a9690b7ec60a729950d24ec18480559b06f63 Author: Andrew Cooper AuthorDate: Mon Feb 2 01:46:12 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:33 2015 +0000 x86/shadow: Alter sh_put_ref() and shadow destroy functions to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 19 +++++++++---------- xen/arch/x86/mm/shadow/multi.c | 30 +++++++++++++----------------- xen/arch/x86/mm/shadow/multi.h | 8 ++++---- xen/arch/x86/mm/shadow/private.h | 9 ++++----- 4 files changed, 30 insertions(+), 36 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index c6b8e6f..e2ea6cb 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2052,9 +2052,8 @@ static void hash_vcpu_foreach(struct vcpu *v, unsigned int callback_mask, * which will decrement refcounts appropriately and return memory to the * free pool. */ -void sh_destroy_shadow(struct vcpu *v, mfn_t smfn) +void sh_destroy_shadow(struct domain *d, mfn_t smfn) { - struct domain *d = v->domain; struct page_info *sp = mfn_to_page(smfn); unsigned int t = sp->u.sh.type; @@ -2076,36 +2075,36 @@ void sh_destroy_shadow(struct vcpu *v, mfn_t smfn) { case SH_type_l1_32_shadow: case SH_type_fl1_32_shadow: - SHADOW_INTERNAL_NAME(sh_destroy_l1_shadow, 2)(v, smfn); + SHADOW_INTERNAL_NAME(sh_destroy_l1_shadow, 2)(d, smfn); break; case SH_type_l2_32_shadow: - SHADOW_INTERNAL_NAME(sh_destroy_l2_shadow, 2)(v, smfn); + SHADOW_INTERNAL_NAME(sh_destroy_l2_shadow, 2)(d, smfn); break; case SH_type_l1_pae_shadow: case SH_type_fl1_pae_shadow: - SHADOW_INTERNAL_NAME(sh_destroy_l1_shadow, 3)(v, smfn); + SHADOW_INTERNAL_NAME(sh_destroy_l1_shadow, 3)(d, smfn); break; case SH_type_l2_pae_shadow: case SH_type_l2h_pae_shadow: - SHADOW_INTERNAL_NAME(sh_destroy_l2_shadow, 3)(v, smfn); + SHADOW_INTERNAL_NAME(sh_destroy_l2_shadow, 3)(d, smfn); break; case SH_type_l1_64_shadow: case SH_type_fl1_64_shadow: - SHADOW_INTERNAL_NAME(sh_destroy_l1_shadow, 4)(v, smfn); + SHADOW_INTERNAL_NAME(sh_destroy_l1_shadow, 4)(d, smfn); break; case SH_type_l2h_64_shadow: ASSERT(is_pv_32on64_domain(d)); /* Fall through... */ case SH_type_l2_64_shadow: - SHADOW_INTERNAL_NAME(sh_destroy_l2_shadow, 4)(v, smfn); + SHADOW_INTERNAL_NAME(sh_destroy_l2_shadow, 4)(d, smfn); break; case SH_type_l3_64_shadow: - SHADOW_INTERNAL_NAME(sh_destroy_l3_shadow, 4)(v, smfn); + SHADOW_INTERNAL_NAME(sh_destroy_l3_shadow, 4)(d, smfn); break; case SH_type_l4_64_shadow: - SHADOW_INTERNAL_NAME(sh_destroy_l4_shadow, 4)(v, smfn); + SHADOW_INTERNAL_NAME(sh_destroy_l4_shadow, 4)(d, smfn); break; default: diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index f2dea16..7d82d90 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -931,7 +931,7 @@ static int shadow_set_l4e(struct vcpu *v, { flags |= SHADOW_SET_FLUSH; } - sh_put_ref(v, osl3mfn, paddr); + sh_put_ref(d, osl3mfn, paddr); } return flags; } @@ -977,7 +977,7 @@ static int shadow_set_l3e(struct vcpu *v, { flags |= SHADOW_SET_FLUSH; } - sh_put_ref(v, osl2mfn, paddr); + sh_put_ref(d, osl2mfn, paddr); } return flags; } @@ -1063,7 +1063,7 @@ static int shadow_set_l2e(struct vcpu *v, { flags |= SHADOW_SET_FLUSH; } - sh_put_ref(v, osl1mfn, paddr); + sh_put_ref(d, osl1mfn, paddr); } return flags; } @@ -1882,9 +1882,8 @@ static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, */ #if GUEST_PAGING_LEVELS >= 4 -void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) +void sh_destroy_l4_shadow(struct domain *d, mfn_t smfn) { - struct domain *d = v->domain; shadow_l4e_t *sl4e; struct page_info *sp = mfn_to_page(smfn); u32 t = sp->u.sh.type; @@ -1904,7 +1903,7 @@ void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, d, { if ( shadow_l4e_get_flags(*sl4e) & _PAGE_PRESENT ) { - sh_put_ref(v, shadow_l4e_get_mfn(*sl4e), + sh_put_ref(d, shadow_l4e_get_mfn(*sl4e), (((paddr_t)mfn_x(sl4mfn)) << PAGE_SHIFT) | ((unsigned long)sl4e & ~PAGE_MASK)); } @@ -1914,9 +1913,8 @@ void sh_destroy_l4_shadow(struct vcpu *v, mfn_t smfn) shadow_free(d, smfn); } -void sh_destroy_l3_shadow(struct vcpu *v, mfn_t smfn) +void sh_destroy_l3_shadow(struct domain *d, mfn_t smfn) { - struct domain *d = v->domain; shadow_l3e_t *sl3e; struct page_info *sp = mfn_to_page(smfn); u32 t = sp->u.sh.type; @@ -1936,7 +1934,7 @@ void sh_destroy_l3_shadow(struct vcpu *v, mfn_t smfn) sl3mfn = smfn; SHADOW_FOREACH_L3E(sl3mfn, sl3e, 0, 0, { if ( shadow_l3e_get_flags(*sl3e) & _PAGE_PRESENT ) - sh_put_ref(v, shadow_l3e_get_mfn(*sl3e), + sh_put_ref(d, shadow_l3e_get_mfn(*sl3e), (((paddr_t)mfn_x(sl3mfn)) << PAGE_SHIFT) | ((unsigned long)sl3e & ~PAGE_MASK)); }); @@ -1947,9 +1945,8 @@ void sh_destroy_l3_shadow(struct vcpu *v, mfn_t smfn) #endif /* GUEST_PAGING_LEVELS >= 4 */ -void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) +void sh_destroy_l2_shadow(struct domain *d, mfn_t smfn) { - struct domain *d = v->domain; shadow_l2e_t *sl2e; struct page_info *sp = mfn_to_page(smfn); u32 t = sp->u.sh.type; @@ -1974,7 +1971,7 @@ void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) sl2mfn = smfn; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( shadow_l2e_get_flags(*sl2e) & _PAGE_PRESENT ) - sh_put_ref(v, shadow_l2e_get_mfn(*sl2e), + sh_put_ref(d, shadow_l2e_get_mfn(*sl2e), (((paddr_t)mfn_x(sl2mfn)) << PAGE_SHIFT) | ((unsigned long)sl2e & ~PAGE_MASK)); }); @@ -1983,9 +1980,8 @@ void sh_destroy_l2_shadow(struct vcpu *v, mfn_t smfn) shadow_free(d, smfn); } -void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) +void sh_destroy_l1_shadow(struct domain *d, mfn_t smfn) { - struct domain *d = v->domain; shadow_l1e_t *sl1e; struct page_info *sp = mfn_to_page(smfn); u32 t = sp->u.sh.type; @@ -3799,6 +3795,7 @@ sh_update_linear_entries(struct vcpu *v) static void sh_detach_old_tables(struct vcpu *v) { + struct domain *d = v->domain; mfn_t smfn; int i = 0; @@ -3812,7 +3809,6 @@ sh_detach_old_tables(struct vcpu *v) #else if ( v->arch.paging.shadow.guest_vtable ) { - struct domain *d = v->domain; if ( shadow_mode_external(d) || shadow_mode_translate(d) ) sh_unmap_domain_page_global(v->arch.paging.shadow.guest_vtable); v->arch.paging.shadow.guest_vtable = NULL; @@ -3831,7 +3827,7 @@ sh_detach_old_tables(struct vcpu *v) { smfn = pagetable_get_mfn(v->arch.shadow_table[i]); if ( mfn_x(smfn) ) - sh_put_ref(v, smfn, 0); + sh_put_ref(d, smfn, 0); v->arch.shadow_table[i] = pagetable_null(); } } @@ -3904,7 +3900,7 @@ sh_set_toplevel_shadow(struct vcpu *v, SHADOW_ERROR("can't re-pin %#lx\n", mfn_x(old_smfn)); domain_crash(d); } - sh_put_ref(v, old_smfn, 0); + sh_put_ref(d, old_smfn, 0); } } diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index 7f829fd..614103d 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -39,16 +39,16 @@ SHADOW_INTERNAL_NAME(sh_map_and_validate_gl4e, GUEST_LEVELS)( extern void SHADOW_INTERNAL_NAME(sh_destroy_l1_shadow, GUEST_LEVELS)( - struct vcpu *v, mfn_t smfn); + struct domain *d, mfn_t smfn); extern void SHADOW_INTERNAL_NAME(sh_destroy_l2_shadow, GUEST_LEVELS)( - struct vcpu *v, mfn_t smfn); + struct domain *d, mfn_t smfn); extern void SHADOW_INTERNAL_NAME(sh_destroy_l3_shadow, GUEST_LEVELS)( - struct vcpu *v, mfn_t smfn); + struct domain *d, mfn_t smfn); extern void SHADOW_INTERNAL_NAME(sh_destroy_l4_shadow, GUEST_LEVELS)( - struct vcpu *v, mfn_t smfn); + struct domain *d, mfn_t smfn); extern void SHADOW_INTERNAL_NAME(sh_unhook_32b_mappings, GUEST_LEVELS) diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index 3820d9e..a848c94 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -532,7 +532,7 @@ sh_unmap_domain_page_global(void *p) /**************************************************************************/ /* Shadow-page refcounting. */ -void sh_destroy_shadow(struct vcpu *v, mfn_t smfn); +void sh_destroy_shadow(struct domain *d, mfn_t smfn); /* Increase the refcount of a shadow page. Arguments are the mfn to refcount, * and the physical address of the shadow entry that holds the ref (or zero @@ -572,9 +572,8 @@ static inline int sh_get_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) /* Decrease the refcount of a shadow page. As for get_ref, takes the * physical address of the shadow entry that held this reference. */ -static inline void sh_put_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) +static inline void sh_put_ref(struct domain *d, mfn_t smfn, paddr_t entry_pa) { - struct domain *d = v->domain; u32 x, nx; struct page_info *sp = mfn_to_page(smfn); @@ -602,7 +601,7 @@ static inline void sh_put_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) sp->u.sh.count = nx; if ( unlikely(nx == 0) ) - sh_destroy_shadow(v, smfn); + sh_destroy_shadow(d, smfn); } @@ -728,7 +727,7 @@ static inline void sh_unpin(struct vcpu *v, mfn_t smfn) } sh_terminate_list(&tmp_list); - sh_put_ref(v, smfn, 0); + sh_put_ref(d, smfn, 0); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 13:03:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:03: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 1YSmTX-00086z-Lt; Tue, 03 Mar 2015 13:03:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTW-00086t-1n for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:02 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 41/84-02639-501B5F45; Tue, 03 Mar 2015 13:03:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1425387774!14245960!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6838 invoked from network); 3 Mar 2015 13:02:56 -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; 3 Mar 2015 13:02:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTO-0002i1-Dw for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmTO-0003cK-Bs for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:54 +0000 Date: Tue, 03 Mar 2015 13:02:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_get_ref() and sh_{, un}pin() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 63a8f0c18a1456f170a90ed33e7bf30f48b6f624 Author: Andrew Cooper AuthorDate: Mon Aug 11 01:56:52 2014 +0100 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:39 2015 +0000 x86/shadow: Alter sh_get_ref() and sh_{,un}pin() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 6 +++--- xen/arch/x86/mm/shadow/multi.c | 16 ++++++++-------- xen/arch/x86/mm/shadow/private.h | 11 ++++------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index e2ea6cb..046201a 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1305,7 +1305,7 @@ static void _shadow_prealloc( /* Unpin this top-level shadow */ trace_shadow_prealloc_unpin(d, smfn); - sh_unpin(v, smfn); + sh_unpin(d, smfn); /* See if that freed up enough space */ if ( d->arch.paging.shadow.free_pages >= pages ) return; @@ -1370,7 +1370,7 @@ static void shadow_blow_tables(struct domain *d) foreach_pinned_shadow(d, sp, t) { smfn = page_to_mfn(sp); - sh_unpin(v, smfn); + sh_unpin(d, smfn); } /* Second pass: unhook entries of in-use shadows */ @@ -2616,7 +2616,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) break; \ } \ if ( sh_type_is_pinnable(d, t) ) \ - sh_unpin(v, smfn); \ + sh_unpin(d, smfn); \ else if ( sh_type_has_up_pointer(d, t) ) \ sh_remove_shadow_via_pointer(v, smfn); \ if( !fast \ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 7d82d90..ccb08d3 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -906,10 +906,10 @@ static int shadow_set_l4e(struct vcpu *v, { /* About to install a new reference */ mfn_t sl3mfn = shadow_l4e_get_mfn(new_sl4e); - ok = sh_get_ref(v, sl3mfn, paddr); + ok = sh_get_ref(d, sl3mfn, paddr); /* Are we pinning l3 shadows to handle wierd linux behaviour? */ if ( sh_type_is_pinnable(d, SH_type_l3_64_shadow) ) - ok |= sh_pin(v, sl3mfn); + ok |= sh_pin(d, sl3mfn); if ( !ok ) { domain_crash(d); @@ -956,7 +956,7 @@ static int shadow_set_l3e(struct vcpu *v, if ( shadow_l3e_get_flags(new_sl3e) & _PAGE_PRESENT ) { /* About to install a new reference */ - if ( !sh_get_ref(v, shadow_l3e_get_mfn(new_sl3e), paddr) ) + if ( !sh_get_ref(d, shadow_l3e_get_mfn(new_sl3e), paddr) ) { domain_crash(d); return SHADOW_SET_ERROR; @@ -1018,7 +1018,7 @@ static int shadow_set_l2e(struct vcpu *v, ASSERT(mfn_to_page(sl1mfn)->u.sh.head); /* About to install a new reference */ - if ( !sh_get_ref(v, sl1mfn, paddr) ) + if ( !sh_get_ref(d, sl1mfn, paddr) ) { domain_crash(d); return SHADOW_SET_ERROR; @@ -1537,7 +1537,7 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) page_list_for_each_safe(sp, t, &d->arch.paging.shadow.pinned_shadows) { if ( sp->u.sh.type == SH_type_l3_64_shadow ) - sh_unpin(v, page_to_mfn(sp)); + sh_unpin(d, page_to_mfn(sp)); } d->arch.paging.shadow.opt_flags &= ~SHOPT_LINUX_L3_TOPLEVEL; sh_reset_l3_up_pointers(v); @@ -3866,7 +3866,7 @@ sh_set_toplevel_shadow(struct vcpu *v, ASSERT(mfn_valid(smfn)); /* Pin the shadow and put it (back) on the list of pinned shadows */ - if ( sh_pin(v, smfn) == 0 ) + if ( sh_pin(d, smfn) == 0 ) { SHADOW_ERROR("can't pin %#lx as toplevel shadow\n", mfn_x(smfn)); domain_crash(d); @@ -3874,7 +3874,7 @@ sh_set_toplevel_shadow(struct vcpu *v, /* Take a ref to this page: it will be released in sh_detach_old_tables() * or the next call to set_toplevel_shadow() */ - if ( !sh_get_ref(v, smfn, 0) ) + if ( !sh_get_ref(d, smfn, 0) ) { SHADOW_ERROR("can't install %#lx as toplevel shadow\n", mfn_x(smfn)); domain_crash(d); @@ -3895,7 +3895,7 @@ sh_set_toplevel_shadow(struct vcpu *v, /* Need to repin the old toplevel shadow if it's been unpinned * by shadow_prealloc(): in PV mode we're still running on this * shadow and it's not safe to free it yet. */ - if ( !mfn_to_page(old_smfn)->u.sh.pinned && !sh_pin(v, old_smfn) ) + if ( !mfn_to_page(old_smfn)->u.sh.pinned && !sh_pin(d, old_smfn) ) { SHADOW_ERROR("can't re-pin %#lx\n", mfn_x(old_smfn)); domain_crash(d); diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index a848c94..cddfde6 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -538,9 +538,8 @@ void sh_destroy_shadow(struct domain *d, mfn_t smfn); * and the physical address of the shadow entry that holds the ref (or zero * if the ref is held by something else). * Returns 0 for failure, 1 for success. */ -static inline int sh_get_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) +static inline int sh_get_ref(struct domain *d, mfn_t smfn, paddr_t entry_pa) { - struct domain *d = v->domain; u32 x, nx; struct page_info *sp = mfn_to_page(smfn); @@ -645,9 +644,8 @@ prev_pinned_shadow(const struct page_info *page, /* Pin a shadow page: take an extra refcount, set the pin bit, * and put the shadow at the head of the list of pinned shadows. * Returns 0 for failure, 1 for success. */ -static inline int sh_pin(struct vcpu *v, mfn_t smfn) +static inline int sh_pin(struct domain *d, mfn_t smfn) { - struct domain *d = v->domain; struct page_info *sp[4]; struct page_list_head *pin_list; unsigned int i, pages; @@ -681,7 +679,7 @@ static inline int sh_pin(struct vcpu *v, mfn_t smfn) else { /* Not pinned: pin it! */ - if ( !sh_get_ref(v, smfn, 0) ) + if ( !sh_get_ref(d, smfn, 0) ) return 0; sp[0]->u.sh.pinned = 1; } @@ -695,9 +693,8 @@ static inline int sh_pin(struct vcpu *v, mfn_t smfn) /* Unpin a shadow page: unset the pin bit, take the shadow off the list * of pinned shadows, and release the extra ref. */ -static inline void sh_unpin(struct vcpu *v, mfn_t smfn) +static inline void sh_unpin(struct domain *d, mfn_t smfn) { - struct domain *d = v->domain; struct page_list_head tmp_list, *pin_list; struct page_info *sp, *next; unsigned int i, head_type; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:03:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:03: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 1YSmTX-00086z-Lt; Tue, 03 Mar 2015 13:03:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTW-00086t-1n for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:02 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 41/84-02639-501B5F45; Tue, 03 Mar 2015 13:03:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1425387774!14245960!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6838 invoked from network); 3 Mar 2015 13:02:56 -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; 3 Mar 2015 13:02:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTO-0002i1-Dw for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmTO-0003cK-Bs for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:02:54 +0000 Date: Tue, 03 Mar 2015 13:02:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_get_ref() and sh_{, un}pin() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 63a8f0c18a1456f170a90ed33e7bf30f48b6f624 Author: Andrew Cooper AuthorDate: Mon Aug 11 01:56:52 2014 +0100 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:39 2015 +0000 x86/shadow: Alter sh_get_ref() and sh_{,un}pin() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 6 +++--- xen/arch/x86/mm/shadow/multi.c | 16 ++++++++-------- xen/arch/x86/mm/shadow/private.h | 11 ++++------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index e2ea6cb..046201a 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1305,7 +1305,7 @@ static void _shadow_prealloc( /* Unpin this top-level shadow */ trace_shadow_prealloc_unpin(d, smfn); - sh_unpin(v, smfn); + sh_unpin(d, smfn); /* See if that freed up enough space */ if ( d->arch.paging.shadow.free_pages >= pages ) return; @@ -1370,7 +1370,7 @@ static void shadow_blow_tables(struct domain *d) foreach_pinned_shadow(d, sp, t) { smfn = page_to_mfn(sp); - sh_unpin(v, smfn); + sh_unpin(d, smfn); } /* Second pass: unhook entries of in-use shadows */ @@ -2616,7 +2616,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) break; \ } \ if ( sh_type_is_pinnable(d, t) ) \ - sh_unpin(v, smfn); \ + sh_unpin(d, smfn); \ else if ( sh_type_has_up_pointer(d, t) ) \ sh_remove_shadow_via_pointer(v, smfn); \ if( !fast \ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 7d82d90..ccb08d3 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -906,10 +906,10 @@ static int shadow_set_l4e(struct vcpu *v, { /* About to install a new reference */ mfn_t sl3mfn = shadow_l4e_get_mfn(new_sl4e); - ok = sh_get_ref(v, sl3mfn, paddr); + ok = sh_get_ref(d, sl3mfn, paddr); /* Are we pinning l3 shadows to handle wierd linux behaviour? */ if ( sh_type_is_pinnable(d, SH_type_l3_64_shadow) ) - ok |= sh_pin(v, sl3mfn); + ok |= sh_pin(d, sl3mfn); if ( !ok ) { domain_crash(d); @@ -956,7 +956,7 @@ static int shadow_set_l3e(struct vcpu *v, if ( shadow_l3e_get_flags(new_sl3e) & _PAGE_PRESENT ) { /* About to install a new reference */ - if ( !sh_get_ref(v, shadow_l3e_get_mfn(new_sl3e), paddr) ) + if ( !sh_get_ref(d, shadow_l3e_get_mfn(new_sl3e), paddr) ) { domain_crash(d); return SHADOW_SET_ERROR; @@ -1018,7 +1018,7 @@ static int shadow_set_l2e(struct vcpu *v, ASSERT(mfn_to_page(sl1mfn)->u.sh.head); /* About to install a new reference */ - if ( !sh_get_ref(v, sl1mfn, paddr) ) + if ( !sh_get_ref(d, sl1mfn, paddr) ) { domain_crash(d); return SHADOW_SET_ERROR; @@ -1537,7 +1537,7 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) page_list_for_each_safe(sp, t, &d->arch.paging.shadow.pinned_shadows) { if ( sp->u.sh.type == SH_type_l3_64_shadow ) - sh_unpin(v, page_to_mfn(sp)); + sh_unpin(d, page_to_mfn(sp)); } d->arch.paging.shadow.opt_flags &= ~SHOPT_LINUX_L3_TOPLEVEL; sh_reset_l3_up_pointers(v); @@ -3866,7 +3866,7 @@ sh_set_toplevel_shadow(struct vcpu *v, ASSERT(mfn_valid(smfn)); /* Pin the shadow and put it (back) on the list of pinned shadows */ - if ( sh_pin(v, smfn) == 0 ) + if ( sh_pin(d, smfn) == 0 ) { SHADOW_ERROR("can't pin %#lx as toplevel shadow\n", mfn_x(smfn)); domain_crash(d); @@ -3874,7 +3874,7 @@ sh_set_toplevel_shadow(struct vcpu *v, /* Take a ref to this page: it will be released in sh_detach_old_tables() * or the next call to set_toplevel_shadow() */ - if ( !sh_get_ref(v, smfn, 0) ) + if ( !sh_get_ref(d, smfn, 0) ) { SHADOW_ERROR("can't install %#lx as toplevel shadow\n", mfn_x(smfn)); domain_crash(d); @@ -3895,7 +3895,7 @@ sh_set_toplevel_shadow(struct vcpu *v, /* Need to repin the old toplevel shadow if it's been unpinned * by shadow_prealloc(): in PV mode we're still running on this * shadow and it's not safe to free it yet. */ - if ( !mfn_to_page(old_smfn)->u.sh.pinned && !sh_pin(v, old_smfn) ) + if ( !mfn_to_page(old_smfn)->u.sh.pinned && !sh_pin(d, old_smfn) ) { SHADOW_ERROR("can't re-pin %#lx\n", mfn_x(old_smfn)); domain_crash(d); diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index a848c94..cddfde6 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -538,9 +538,8 @@ void sh_destroy_shadow(struct domain *d, mfn_t smfn); * and the physical address of the shadow entry that holds the ref (or zero * if the ref is held by something else). * Returns 0 for failure, 1 for success. */ -static inline int sh_get_ref(struct vcpu *v, mfn_t smfn, paddr_t entry_pa) +static inline int sh_get_ref(struct domain *d, mfn_t smfn, paddr_t entry_pa) { - struct domain *d = v->domain; u32 x, nx; struct page_info *sp = mfn_to_page(smfn); @@ -645,9 +644,8 @@ prev_pinned_shadow(const struct page_info *page, /* Pin a shadow page: take an extra refcount, set the pin bit, * and put the shadow at the head of the list of pinned shadows. * Returns 0 for failure, 1 for success. */ -static inline int sh_pin(struct vcpu *v, mfn_t smfn) +static inline int sh_pin(struct domain *d, mfn_t smfn) { - struct domain *d = v->domain; struct page_info *sp[4]; struct page_list_head *pin_list; unsigned int i, pages; @@ -681,7 +679,7 @@ static inline int sh_pin(struct vcpu *v, mfn_t smfn) else { /* Not pinned: pin it! */ - if ( !sh_get_ref(v, smfn, 0) ) + if ( !sh_get_ref(d, smfn, 0) ) return 0; sp[0]->u.sh.pinned = 1; } @@ -695,9 +693,8 @@ static inline int sh_pin(struct vcpu *v, mfn_t smfn) /* Unpin a shadow page: unset the pin bit, take the shadow off the list * of pinned shadows, and release the extra ref. */ -static inline void sh_unpin(struct vcpu *v, mfn_t smfn) +static inline void sh_unpin(struct domain *d, mfn_t smfn) { - struct domain *d = v->domain; struct page_list_head tmp_list, *pin_list; struct page_info *sp, *next; unsigned int i, head_type; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:03:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:03: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 1YSmTg-00089u-Sz; Tue, 03 Mar 2015 13:03:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTe-00089H-Kb for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:11 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 2D/89-02777-D01B5F45; Tue, 03 Mar 2015 13:03:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1425387787!14296968!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31806 invoked from network); 3 Mar 2015 13:03:08 -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; 3 Mar 2015 13:03:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTY-0002iX-KA for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmTY-0003cq-J6 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:04 +0000 Date: Tue, 03 Mar 2015 13:03:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter shadow_set_l?e() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 97f59389beb509e8d901eb39769ee10018aa8a90 Author: Andrew Cooper AuthorDate: Mon Feb 2 02:10:55 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:42 2015 +0000 x86/shadow: Alter shadow_set_l?e() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/multi.c | 69 ++++++++++++++++++++------------------- 1 files changed, 35 insertions(+), 34 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index ccb08d3..1db8161 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -885,12 +885,11 @@ shadow_put_page_from_l1e(shadow_l1e_t sl1e, struct domain *d) } #if GUEST_PAGING_LEVELS >= 4 -static int shadow_set_l4e(struct vcpu *v, +static int shadow_set_l4e(struct domain *d, shadow_l4e_t *sl4e, shadow_l4e_t new_sl4e, mfn_t sl4mfn) { - struct domain *d = v->domain; int flags = 0, ok; shadow_l4e_t old_sl4e; paddr_t paddr; @@ -936,12 +935,11 @@ static int shadow_set_l4e(struct vcpu *v, return flags; } -static int shadow_set_l3e(struct vcpu *v, +static int shadow_set_l3e(struct domain *d, shadow_l3e_t *sl3e, shadow_l3e_t new_sl3e, mfn_t sl3mfn) { - struct domain *d = v->domain; int flags = 0; shadow_l3e_t old_sl3e; paddr_t paddr; @@ -983,12 +981,11 @@ static int shadow_set_l3e(struct vcpu *v, } #endif /* GUEST_PAGING_LEVELS >= 4 */ -static int shadow_set_l2e(struct vcpu *v, +static int shadow_set_l2e(struct domain *d, shadow_l2e_t *sl2e, shadow_l2e_t new_sl2e, mfn_t sl2mfn) { - struct domain *d = v->domain; int flags = 0; shadow_l2e_t old_sl2e; paddr_t paddr; @@ -1165,14 +1162,13 @@ static inline void shadow_vram_put_l1e(shadow_l1e_t old_sl1e, } } -static int shadow_set_l1e(struct vcpu *v, +static int shadow_set_l1e(struct domain *d, shadow_l1e_t *sl1e, shadow_l1e_t new_sl1e, p2m_type_t new_type, mfn_t sl1mfn) { int flags = 0; - struct domain *d = v->domain; shadow_l1e_t old_sl1e; #if SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC mfn_t new_gmfn = shadow_l1e_get_mfn(new_sl1e); @@ -1699,7 +1695,7 @@ static shadow_l3e_t * shadow_get_and_create_l3e(struct vcpu *v, } /* Install the new sl3 table in the sl4e */ l4e_propagate_from_guest(v, gw->l4e, *sl3mfn, &new_sl4e, ft); - r = shadow_set_l4e(v, sl4e, new_sl4e, sl4mfn); + r = shadow_set_l4e(d, sl4e, new_sl4e, sl4mfn); ASSERT((r & SHADOW_SET_FLUSH) == 0); if ( r & SHADOW_SET_ERROR ) return NULL; @@ -1755,7 +1751,7 @@ static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, } /* Install the new sl2 table in the sl3e */ l3e_propagate_from_guest(v, gw->l3e, *sl2mfn, &new_sl3e, ft); - r = shadow_set_l3e(v, sl3e, new_sl3e, sl3mfn); + r = shadow_set_l3e(d, sl3e, new_sl3e, sl3mfn); ASSERT((r & SHADOW_SET_FLUSH) == 0); if ( r & SHADOW_SET_ERROR ) return NULL; @@ -1845,7 +1841,7 @@ static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, } /* Install the new sl1 table in the sl2e */ l2e_propagate_from_guest(v, gw->l2e, *sl1mfn, &new_sl2e, ft); - r = shadow_set_l2e(v, sl2e, new_sl2e, sl2mfn); + r = shadow_set_l2e(d, sl2e, new_sl2e, sl2mfn); ASSERT((r & SHADOW_SET_FLUSH) == 0); if ( r & SHADOW_SET_ERROR ) return NULL; @@ -2084,7 +2080,7 @@ void sh_unhook_32b_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) shadow_l2e_t *sl2e; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) - (void) shadow_set_l2e(v, sl2e, shadow_l2e_empty(), sl2mfn); + (void) shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); }); } @@ -2097,7 +2093,7 @@ void sh_unhook_pae_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) shadow_l2e_t *sl2e; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) - (void) shadow_set_l2e(v, sl2e, shadow_l2e_empty(), sl2mfn); + (void) shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); }); } @@ -2109,7 +2105,7 @@ void sh_unhook_64b_mappings(struct vcpu *v, mfn_t sl4mfn, int user_only) shadow_l4e_t *sl4e; SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, d, { if ( !user_only || (sl4e->l4 & _PAGE_USER) ) - (void) shadow_set_l4e(v, sl4e, shadow_l4e_empty(), sl4mfn); + (void) shadow_set_l4e(d, sl4e, shadow_l4e_empty(), sl4mfn); }); } @@ -2180,7 +2176,7 @@ static int validate_gl4e(struct vcpu *v, void *new_ge, mfn_t sl4mfn, void *se) } } - result |= shadow_set_l4e(v, sl4p, new_sl4e, sl4mfn); + result |= shadow_set_l4e(d, sl4p, new_sl4e, sl4mfn); return result; } @@ -2212,7 +2208,7 @@ static int validate_gl3e(struct vcpu *v, void *new_ge, mfn_t sl3mfn, void *se) #endif } l3e_propagate_from_guest(v, new_gl3e, sl2mfn, &new_sl3e, ft_prefetch); - result |= shadow_set_l3e(v, sl3p, new_sl3e, sl3mfn); + result |= shadow_set_l3e(d, sl3p, new_sl3e, sl3mfn); return result; } @@ -2259,7 +2255,7 @@ static int validate_gl2e(struct vcpu *v, void *new_ge, mfn_t sl2mfn, void *se) } l2e_propagate_from_guest(v, new_gl2e, sl1mfn, &new_sl2e, ft_prefetch); - result |= shadow_set_l2e(v, sl2p, new_sl2e, sl2mfn); + result |= shadow_set_l2e(d, sl2p, new_sl2e, sl2mfn); return result; } @@ -2284,7 +2280,7 @@ static int validate_gl1e(struct vcpu *v, void *new_ge, mfn_t sl1mfn, void *se) gmfn = get_gfn_query_unlocked(d, gfn_x(gfn), &p2mt); l1e_propagate_from_guest(v, new_gl1e, gmfn, &new_sl1e, ft_prefetch, p2mt); - result |= shadow_set_l1e(v, sl1p, new_sl1e, p2mt, sl1mfn); + result |= shadow_set_l1e(d, sl1p, new_sl1e, p2mt, sl1mfn); #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) gl1mfn = backpointer(mfn_to_page(sl1mfn)); @@ -2344,7 +2340,7 @@ void sh_resync_l1(struct vcpu *v, mfn_t gl1mfn, mfn_t snpmfn) gfn = guest_l1e_get_gfn(gl1e); gmfn = get_gfn_query_unlocked(d, gfn_x(gfn), &p2mt); l1e_propagate_from_guest(v, gl1e, gmfn, &nsl1e, ft_prefetch, p2mt); - rc |= shadow_set_l1e(v, sl1p, nsl1e, p2mt, sl1mfn); + rc |= shadow_set_l1e(d, sl1p, nsl1e, p2mt, sl1mfn); *snpl1p = gl1e; } }); @@ -2673,7 +2669,7 @@ static void sh_prefetch(struct vcpu *v, walk_t *gw, /* Propagate the entry. */ l1e_propagate_from_guest(v, gl1e, gmfn, &sl1e, ft_prefetch, p2mt); - (void) shadow_set_l1e(v, ptr_sl1e + i, sl1e, p2mt, sl1mfn); + (void) shadow_set_l1e(d, ptr_sl1e + i, sl1e, p2mt, sl1mfn); #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) if ( snpl1p != NULL ) @@ -3161,7 +3157,7 @@ static int sh_page_fault(struct vcpu *v, /* Calculate the shadow entry and write it */ l1e_propagate_from_guest(v, gw.l1e, gmfn, &sl1e, ft, p2mt); - r = shadow_set_l1e(v, ptr_sl1e, sl1e, p2mt, sl1mfn); + r = shadow_set_l1e(d, ptr_sl1e, sl1e, p2mt, sl1mfn); #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) if ( mfn_valid(gw.l1mfn) @@ -3590,7 +3586,7 @@ sh_invlpg(struct vcpu *v, unsigned long va) shadow_l1e_t *sl1; sl1 = sh_linear_l1_table(v) + shadow_l1_linear_offset(va); /* Remove the shadow entry that maps this VA */ - (void) shadow_set_l1e(v, sl1, shadow_l1e_empty(), + (void) shadow_set_l1e(d, sl1, shadow_l1e_empty(), p2m_invalid, sl1mfn); } paging_unlock(d); @@ -4221,7 +4217,7 @@ int sh_rm_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, /* Found it! Need to remove its write permissions. */ sl1e = shadow_l1e_remove_flags(sl1e, _PAGE_RW); - r = shadow_set_l1e(v, sl1p, sl1e, p2m_ram_rw, smfn); + r = shadow_set_l1e(d, sl1p, sl1e, p2m_ram_rw, smfn); ASSERT( !(r & SHADOW_SET_ERROR) ); sh_unmap_domain_page(sl1p); @@ -4239,6 +4235,7 @@ static int sh_guess_wrmap(struct vcpu *v, unsigned long vaddr, mfn_t gmfn) /* Look up this vaddr in the current shadow and see if it's a writeable * mapping of this gmfn. If so, remove it. Returns 1 if it worked. */ { + struct domain *d = v->domain; shadow_l1e_t sl1e, *sl1p; shadow_l2e_t *sl2p; shadow_l3e_t *sl3p; @@ -4275,7 +4272,7 @@ static int sh_guess_wrmap(struct vcpu *v, unsigned long vaddr, mfn_t gmfn) /* Found it! Need to remove its write permissions. */ sl1mfn = shadow_l2e_get_mfn(*sl2p); sl1e = shadow_l1e_remove_flags(sl1e, _PAGE_RW); - r = shadow_set_l1e(v, sl1p, sl1e, p2m_ram_rw, sl1mfn); + r = shadow_set_l1e(d, sl1p, sl1e, p2m_ram_rw, sl1mfn); if ( r & SHADOW_SET_ERROR ) { /* Can only currently happen if we found a grant-mapped * page. Just make the guess fail. */ @@ -4290,11 +4287,11 @@ int sh_rm_write_access_from_l1(struct vcpu *v, mfn_t sl1mfn, mfn_t readonly_mfn) /* Excises all writeable mappings to readonly_mfn from this l1 shadow table */ { + struct domain *d = v->domain; shadow_l1e_t *sl1e; int done = 0; int flags; #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC - struct domain *d = v->domain; struct vcpu *curr = current; mfn_t base_sl1mfn = sl1mfn; /* Because sl1mfn changes in the foreach */ #endif @@ -4307,7 +4304,7 @@ int sh_rm_write_access_from_l1(struct vcpu *v, mfn_t sl1mfn, && (mfn_x(shadow_l1e_get_mfn(*sl1e)) == mfn_x(readonly_mfn)) ) { shadow_l1e_t ro_sl1e = shadow_l1e_remove_flags(*sl1e, _PAGE_RW); - (void) shadow_set_l1e(v, sl1e, ro_sl1e, p2m_ram_rw, sl1mfn); + (void) shadow_set_l1e(d, sl1e, ro_sl1e, p2m_ram_rw, sl1mfn); #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC /* Remember the last shadow that we shot a writeable mapping in */ if ( curr->domain == d ) @@ -4326,6 +4323,7 @@ int sh_rm_write_access_from_l1(struct vcpu *v, mfn_t sl1mfn, int sh_rm_mappings_from_l1(struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn) /* Excises all mappings to guest frame from this shadow l1 table */ { + struct domain *d = v->domain; shadow_l1e_t *sl1e; int done = 0; int flags; @@ -4336,7 +4334,7 @@ int sh_rm_mappings_from_l1(struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn) if ( (flags & _PAGE_PRESENT) && (mfn_x(shadow_l1e_get_mfn(*sl1e)) == mfn_x(target_mfn)) ) { - (void) shadow_set_l1e(v, sl1e, shadow_l1e_empty(), + (void) shadow_set_l1e(d, sl1e, shadow_l1e_empty(), p2m_invalid, sl1mfn); if ( sh_check_page_has_no_refs(mfn_to_page(target_mfn)) ) /* This breaks us cleanly out of the FOREACH macro */ @@ -4352,23 +4350,25 @@ int sh_rm_mappings_from_l1(struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn) void sh_clear_shadow_entry(struct vcpu *v, void *ep, mfn_t smfn) /* Blank out a single shadow entry */ { + struct domain *d = v->domain; + switch ( mfn_to_page(smfn)->u.sh.type ) { case SH_type_l1_shadow: - (void) shadow_set_l1e(v, ep, shadow_l1e_empty(), p2m_invalid, smfn); + (void) shadow_set_l1e(d, ep, shadow_l1e_empty(), p2m_invalid, smfn); break; case SH_type_l2_shadow: #if GUEST_PAGING_LEVELS >= 3 case SH_type_l2h_shadow: #endif - (void) shadow_set_l2e(v, ep, shadow_l2e_empty(), smfn); + (void) shadow_set_l2e(d, ep, shadow_l2e_empty(), smfn); break; #if GUEST_PAGING_LEVELS >= 4 case SH_type_l3_shadow: - (void) shadow_set_l3e(v, ep, shadow_l3e_empty(), smfn); + (void) shadow_set_l3e(d, ep, shadow_l3e_empty(), smfn); break; case SH_type_l4_shadow: - (void) shadow_set_l4e(v, ep, shadow_l4e_empty(), smfn); + (void) shadow_set_l4e(d, ep, shadow_l4e_empty(), smfn); break; #endif default: BUG(); /* Called with the wrong kind of shadow. */ @@ -4389,7 +4389,7 @@ int sh_remove_l1_shadow(struct vcpu *v, mfn_t sl2mfn, mfn_t sl1mfn) if ( (flags & _PAGE_PRESENT) && (mfn_x(shadow_l2e_get_mfn(*sl2e)) == mfn_x(sl1mfn)) ) { - (void) shadow_set_l2e(v, sl2e, shadow_l2e_empty(), sl2mfn); + (void) shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); if ( mfn_to_page(sl1mfn)->u.sh.type == 0 ) /* This breaks us cleanly out of the FOREACH macro */ done = 1; @@ -4402,6 +4402,7 @@ int sh_remove_l1_shadow(struct vcpu *v, mfn_t sl2mfn, mfn_t sl1mfn) int sh_remove_l2_shadow(struct vcpu *v, mfn_t sl3mfn, mfn_t sl2mfn) /* Remove all mappings of this l2 shadow from this l3 shadow */ { + struct domain *d = v->domain; shadow_l3e_t *sl3e; int done = 0; int flags; @@ -4412,7 +4413,7 @@ int sh_remove_l2_shadow(struct vcpu *v, mfn_t sl3mfn, mfn_t sl2mfn) if ( (flags & _PAGE_PRESENT) && (mfn_x(shadow_l3e_get_mfn(*sl3e)) == mfn_x(sl2mfn)) ) { - (void) shadow_set_l3e(v, sl3e, shadow_l3e_empty(), sl3mfn); + (void) shadow_set_l3e(d, sl3e, shadow_l3e_empty(), sl3mfn); if ( mfn_to_page(sl2mfn)->u.sh.type == 0 ) /* This breaks us cleanly out of the FOREACH macro */ done = 1; @@ -4435,7 +4436,7 @@ int sh_remove_l3_shadow(struct vcpu *v, mfn_t sl4mfn, mfn_t sl3mfn) if ( (flags & _PAGE_PRESENT) && (mfn_x(shadow_l4e_get_mfn(*sl4e)) == mfn_x(sl3mfn)) ) { - (void) shadow_set_l4e(v, sl4e, shadow_l4e_empty(), sl4mfn); + (void) shadow_set_l4e(d, sl4e, shadow_l4e_empty(), sl4mfn); if ( mfn_to_page(sl3mfn)->u.sh.type == 0 ) /* This breaks us cleanly out of the FOREACH macro */ done = 1; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:03:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:03: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 1YSmTg-00089u-Sz; Tue, 03 Mar 2015 13:03:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTe-00089H-Kb for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:11 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 2D/89-02777-D01B5F45; Tue, 03 Mar 2015 13:03:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1425387787!14296968!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31806 invoked from network); 3 Mar 2015 13:03:08 -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; 3 Mar 2015 13:03:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTY-0002iX-KA for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmTY-0003cq-J6 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:04 +0000 Date: Tue, 03 Mar 2015 13:03:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter shadow_set_l?e() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 97f59389beb509e8d901eb39769ee10018aa8a90 Author: Andrew Cooper AuthorDate: Mon Feb 2 02:10:55 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:42 2015 +0000 x86/shadow: Alter shadow_set_l?e() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/multi.c | 69 ++++++++++++++++++++------------------- 1 files changed, 35 insertions(+), 34 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index ccb08d3..1db8161 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -885,12 +885,11 @@ shadow_put_page_from_l1e(shadow_l1e_t sl1e, struct domain *d) } #if GUEST_PAGING_LEVELS >= 4 -static int shadow_set_l4e(struct vcpu *v, +static int shadow_set_l4e(struct domain *d, shadow_l4e_t *sl4e, shadow_l4e_t new_sl4e, mfn_t sl4mfn) { - struct domain *d = v->domain; int flags = 0, ok; shadow_l4e_t old_sl4e; paddr_t paddr; @@ -936,12 +935,11 @@ static int shadow_set_l4e(struct vcpu *v, return flags; } -static int shadow_set_l3e(struct vcpu *v, +static int shadow_set_l3e(struct domain *d, shadow_l3e_t *sl3e, shadow_l3e_t new_sl3e, mfn_t sl3mfn) { - struct domain *d = v->domain; int flags = 0; shadow_l3e_t old_sl3e; paddr_t paddr; @@ -983,12 +981,11 @@ static int shadow_set_l3e(struct vcpu *v, } #endif /* GUEST_PAGING_LEVELS >= 4 */ -static int shadow_set_l2e(struct vcpu *v, +static int shadow_set_l2e(struct domain *d, shadow_l2e_t *sl2e, shadow_l2e_t new_sl2e, mfn_t sl2mfn) { - struct domain *d = v->domain; int flags = 0; shadow_l2e_t old_sl2e; paddr_t paddr; @@ -1165,14 +1162,13 @@ static inline void shadow_vram_put_l1e(shadow_l1e_t old_sl1e, } } -static int shadow_set_l1e(struct vcpu *v, +static int shadow_set_l1e(struct domain *d, shadow_l1e_t *sl1e, shadow_l1e_t new_sl1e, p2m_type_t new_type, mfn_t sl1mfn) { int flags = 0; - struct domain *d = v->domain; shadow_l1e_t old_sl1e; #if SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC mfn_t new_gmfn = shadow_l1e_get_mfn(new_sl1e); @@ -1699,7 +1695,7 @@ static shadow_l3e_t * shadow_get_and_create_l3e(struct vcpu *v, } /* Install the new sl3 table in the sl4e */ l4e_propagate_from_guest(v, gw->l4e, *sl3mfn, &new_sl4e, ft); - r = shadow_set_l4e(v, sl4e, new_sl4e, sl4mfn); + r = shadow_set_l4e(d, sl4e, new_sl4e, sl4mfn); ASSERT((r & SHADOW_SET_FLUSH) == 0); if ( r & SHADOW_SET_ERROR ) return NULL; @@ -1755,7 +1751,7 @@ static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, } /* Install the new sl2 table in the sl3e */ l3e_propagate_from_guest(v, gw->l3e, *sl2mfn, &new_sl3e, ft); - r = shadow_set_l3e(v, sl3e, new_sl3e, sl3mfn); + r = shadow_set_l3e(d, sl3e, new_sl3e, sl3mfn); ASSERT((r & SHADOW_SET_FLUSH) == 0); if ( r & SHADOW_SET_ERROR ) return NULL; @@ -1845,7 +1841,7 @@ static shadow_l1e_t * shadow_get_and_create_l1e(struct vcpu *v, } /* Install the new sl1 table in the sl2e */ l2e_propagate_from_guest(v, gw->l2e, *sl1mfn, &new_sl2e, ft); - r = shadow_set_l2e(v, sl2e, new_sl2e, sl2mfn); + r = shadow_set_l2e(d, sl2e, new_sl2e, sl2mfn); ASSERT((r & SHADOW_SET_FLUSH) == 0); if ( r & SHADOW_SET_ERROR ) return NULL; @@ -2084,7 +2080,7 @@ void sh_unhook_32b_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) shadow_l2e_t *sl2e; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) - (void) shadow_set_l2e(v, sl2e, shadow_l2e_empty(), sl2mfn); + (void) shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); }); } @@ -2097,7 +2093,7 @@ void sh_unhook_pae_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) shadow_l2e_t *sl2e; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) - (void) shadow_set_l2e(v, sl2e, shadow_l2e_empty(), sl2mfn); + (void) shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); }); } @@ -2109,7 +2105,7 @@ void sh_unhook_64b_mappings(struct vcpu *v, mfn_t sl4mfn, int user_only) shadow_l4e_t *sl4e; SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, d, { if ( !user_only || (sl4e->l4 & _PAGE_USER) ) - (void) shadow_set_l4e(v, sl4e, shadow_l4e_empty(), sl4mfn); + (void) shadow_set_l4e(d, sl4e, shadow_l4e_empty(), sl4mfn); }); } @@ -2180,7 +2176,7 @@ static int validate_gl4e(struct vcpu *v, void *new_ge, mfn_t sl4mfn, void *se) } } - result |= shadow_set_l4e(v, sl4p, new_sl4e, sl4mfn); + result |= shadow_set_l4e(d, sl4p, new_sl4e, sl4mfn); return result; } @@ -2212,7 +2208,7 @@ static int validate_gl3e(struct vcpu *v, void *new_ge, mfn_t sl3mfn, void *se) #endif } l3e_propagate_from_guest(v, new_gl3e, sl2mfn, &new_sl3e, ft_prefetch); - result |= shadow_set_l3e(v, sl3p, new_sl3e, sl3mfn); + result |= shadow_set_l3e(d, sl3p, new_sl3e, sl3mfn); return result; } @@ -2259,7 +2255,7 @@ static int validate_gl2e(struct vcpu *v, void *new_ge, mfn_t sl2mfn, void *se) } l2e_propagate_from_guest(v, new_gl2e, sl1mfn, &new_sl2e, ft_prefetch); - result |= shadow_set_l2e(v, sl2p, new_sl2e, sl2mfn); + result |= shadow_set_l2e(d, sl2p, new_sl2e, sl2mfn); return result; } @@ -2284,7 +2280,7 @@ static int validate_gl1e(struct vcpu *v, void *new_ge, mfn_t sl1mfn, void *se) gmfn = get_gfn_query_unlocked(d, gfn_x(gfn), &p2mt); l1e_propagate_from_guest(v, new_gl1e, gmfn, &new_sl1e, ft_prefetch, p2mt); - result |= shadow_set_l1e(v, sl1p, new_sl1e, p2mt, sl1mfn); + result |= shadow_set_l1e(d, sl1p, new_sl1e, p2mt, sl1mfn); #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) gl1mfn = backpointer(mfn_to_page(sl1mfn)); @@ -2344,7 +2340,7 @@ void sh_resync_l1(struct vcpu *v, mfn_t gl1mfn, mfn_t snpmfn) gfn = guest_l1e_get_gfn(gl1e); gmfn = get_gfn_query_unlocked(d, gfn_x(gfn), &p2mt); l1e_propagate_from_guest(v, gl1e, gmfn, &nsl1e, ft_prefetch, p2mt); - rc |= shadow_set_l1e(v, sl1p, nsl1e, p2mt, sl1mfn); + rc |= shadow_set_l1e(d, sl1p, nsl1e, p2mt, sl1mfn); *snpl1p = gl1e; } }); @@ -2673,7 +2669,7 @@ static void sh_prefetch(struct vcpu *v, walk_t *gw, /* Propagate the entry. */ l1e_propagate_from_guest(v, gl1e, gmfn, &sl1e, ft_prefetch, p2mt); - (void) shadow_set_l1e(v, ptr_sl1e + i, sl1e, p2mt, sl1mfn); + (void) shadow_set_l1e(d, ptr_sl1e + i, sl1e, p2mt, sl1mfn); #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) if ( snpl1p != NULL ) @@ -3161,7 +3157,7 @@ static int sh_page_fault(struct vcpu *v, /* Calculate the shadow entry and write it */ l1e_propagate_from_guest(v, gw.l1e, gmfn, &sl1e, ft, p2mt); - r = shadow_set_l1e(v, ptr_sl1e, sl1e, p2mt, sl1mfn); + r = shadow_set_l1e(d, ptr_sl1e, sl1e, p2mt, sl1mfn); #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) if ( mfn_valid(gw.l1mfn) @@ -3590,7 +3586,7 @@ sh_invlpg(struct vcpu *v, unsigned long va) shadow_l1e_t *sl1; sl1 = sh_linear_l1_table(v) + shadow_l1_linear_offset(va); /* Remove the shadow entry that maps this VA */ - (void) shadow_set_l1e(v, sl1, shadow_l1e_empty(), + (void) shadow_set_l1e(d, sl1, shadow_l1e_empty(), p2m_invalid, sl1mfn); } paging_unlock(d); @@ -4221,7 +4217,7 @@ int sh_rm_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, /* Found it! Need to remove its write permissions. */ sl1e = shadow_l1e_remove_flags(sl1e, _PAGE_RW); - r = shadow_set_l1e(v, sl1p, sl1e, p2m_ram_rw, smfn); + r = shadow_set_l1e(d, sl1p, sl1e, p2m_ram_rw, smfn); ASSERT( !(r & SHADOW_SET_ERROR) ); sh_unmap_domain_page(sl1p); @@ -4239,6 +4235,7 @@ static int sh_guess_wrmap(struct vcpu *v, unsigned long vaddr, mfn_t gmfn) /* Look up this vaddr in the current shadow and see if it's a writeable * mapping of this gmfn. If so, remove it. Returns 1 if it worked. */ { + struct domain *d = v->domain; shadow_l1e_t sl1e, *sl1p; shadow_l2e_t *sl2p; shadow_l3e_t *sl3p; @@ -4275,7 +4272,7 @@ static int sh_guess_wrmap(struct vcpu *v, unsigned long vaddr, mfn_t gmfn) /* Found it! Need to remove its write permissions. */ sl1mfn = shadow_l2e_get_mfn(*sl2p); sl1e = shadow_l1e_remove_flags(sl1e, _PAGE_RW); - r = shadow_set_l1e(v, sl1p, sl1e, p2m_ram_rw, sl1mfn); + r = shadow_set_l1e(d, sl1p, sl1e, p2m_ram_rw, sl1mfn); if ( r & SHADOW_SET_ERROR ) { /* Can only currently happen if we found a grant-mapped * page. Just make the guess fail. */ @@ -4290,11 +4287,11 @@ int sh_rm_write_access_from_l1(struct vcpu *v, mfn_t sl1mfn, mfn_t readonly_mfn) /* Excises all writeable mappings to readonly_mfn from this l1 shadow table */ { + struct domain *d = v->domain; shadow_l1e_t *sl1e; int done = 0; int flags; #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC - struct domain *d = v->domain; struct vcpu *curr = current; mfn_t base_sl1mfn = sl1mfn; /* Because sl1mfn changes in the foreach */ #endif @@ -4307,7 +4304,7 @@ int sh_rm_write_access_from_l1(struct vcpu *v, mfn_t sl1mfn, && (mfn_x(shadow_l1e_get_mfn(*sl1e)) == mfn_x(readonly_mfn)) ) { shadow_l1e_t ro_sl1e = shadow_l1e_remove_flags(*sl1e, _PAGE_RW); - (void) shadow_set_l1e(v, sl1e, ro_sl1e, p2m_ram_rw, sl1mfn); + (void) shadow_set_l1e(d, sl1e, ro_sl1e, p2m_ram_rw, sl1mfn); #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC /* Remember the last shadow that we shot a writeable mapping in */ if ( curr->domain == d ) @@ -4326,6 +4323,7 @@ int sh_rm_write_access_from_l1(struct vcpu *v, mfn_t sl1mfn, int sh_rm_mappings_from_l1(struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn) /* Excises all mappings to guest frame from this shadow l1 table */ { + struct domain *d = v->domain; shadow_l1e_t *sl1e; int done = 0; int flags; @@ -4336,7 +4334,7 @@ int sh_rm_mappings_from_l1(struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn) if ( (flags & _PAGE_PRESENT) && (mfn_x(shadow_l1e_get_mfn(*sl1e)) == mfn_x(target_mfn)) ) { - (void) shadow_set_l1e(v, sl1e, shadow_l1e_empty(), + (void) shadow_set_l1e(d, sl1e, shadow_l1e_empty(), p2m_invalid, sl1mfn); if ( sh_check_page_has_no_refs(mfn_to_page(target_mfn)) ) /* This breaks us cleanly out of the FOREACH macro */ @@ -4352,23 +4350,25 @@ int sh_rm_mappings_from_l1(struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn) void sh_clear_shadow_entry(struct vcpu *v, void *ep, mfn_t smfn) /* Blank out a single shadow entry */ { + struct domain *d = v->domain; + switch ( mfn_to_page(smfn)->u.sh.type ) { case SH_type_l1_shadow: - (void) shadow_set_l1e(v, ep, shadow_l1e_empty(), p2m_invalid, smfn); + (void) shadow_set_l1e(d, ep, shadow_l1e_empty(), p2m_invalid, smfn); break; case SH_type_l2_shadow: #if GUEST_PAGING_LEVELS >= 3 case SH_type_l2h_shadow: #endif - (void) shadow_set_l2e(v, ep, shadow_l2e_empty(), smfn); + (void) shadow_set_l2e(d, ep, shadow_l2e_empty(), smfn); break; #if GUEST_PAGING_LEVELS >= 4 case SH_type_l3_shadow: - (void) shadow_set_l3e(v, ep, shadow_l3e_empty(), smfn); + (void) shadow_set_l3e(d, ep, shadow_l3e_empty(), smfn); break; case SH_type_l4_shadow: - (void) shadow_set_l4e(v, ep, shadow_l4e_empty(), smfn); + (void) shadow_set_l4e(d, ep, shadow_l4e_empty(), smfn); break; #endif default: BUG(); /* Called with the wrong kind of shadow. */ @@ -4389,7 +4389,7 @@ int sh_remove_l1_shadow(struct vcpu *v, mfn_t sl2mfn, mfn_t sl1mfn) if ( (flags & _PAGE_PRESENT) && (mfn_x(shadow_l2e_get_mfn(*sl2e)) == mfn_x(sl1mfn)) ) { - (void) shadow_set_l2e(v, sl2e, shadow_l2e_empty(), sl2mfn); + (void) shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); if ( mfn_to_page(sl1mfn)->u.sh.type == 0 ) /* This breaks us cleanly out of the FOREACH macro */ done = 1; @@ -4402,6 +4402,7 @@ int sh_remove_l1_shadow(struct vcpu *v, mfn_t sl2mfn, mfn_t sl1mfn) int sh_remove_l2_shadow(struct vcpu *v, mfn_t sl3mfn, mfn_t sl2mfn) /* Remove all mappings of this l2 shadow from this l3 shadow */ { + struct domain *d = v->domain; shadow_l3e_t *sl3e; int done = 0; int flags; @@ -4412,7 +4413,7 @@ int sh_remove_l2_shadow(struct vcpu *v, mfn_t sl3mfn, mfn_t sl2mfn) if ( (flags & _PAGE_PRESENT) && (mfn_x(shadow_l3e_get_mfn(*sl3e)) == mfn_x(sl2mfn)) ) { - (void) shadow_set_l3e(v, sl3e, shadow_l3e_empty(), sl3mfn); + (void) shadow_set_l3e(d, sl3e, shadow_l3e_empty(), sl3mfn); if ( mfn_to_page(sl2mfn)->u.sh.type == 0 ) /* This breaks us cleanly out of the FOREACH macro */ done = 1; @@ -4435,7 +4436,7 @@ int sh_remove_l3_shadow(struct vcpu *v, mfn_t sl4mfn, mfn_t sl3mfn) if ( (flags & _PAGE_PRESENT) && (mfn_x(shadow_l4e_get_mfn(*sl4e)) == mfn_x(sl3mfn)) ) { - (void) shadow_set_l4e(v, sl4e, shadow_l4e_empty(), sl4mfn); + (void) shadow_set_l4e(d, sl4e, shadow_l4e_empty(), sl4mfn); if ( mfn_to_page(sl3mfn)->u.sh.type == 0 ) /* This breaks us cleanly out of the FOREACH macro */ done = 1; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:03:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:03: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 1YSmTp-0008CK-Vr; Tue, 03 Mar 2015 13:03:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTn-0008Bn-QR for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:20 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 43/AD-03736-711B5F45; Tue, 03 Mar 2015 13:03:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1425387797!12657966!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32389 invoked from network); 3 Mar 2015 13:03: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; 3 Mar 2015 13:03:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTl-0002ig-6S for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmTl-0003dx-5Q for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:17 +0000 Date: Tue, 03 Mar 2015 13:03:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_{clear_shadow_entry, remove_shadow_via_pointer}() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c2fda096126ab618ad5234865fe465d86670869c Author: Andrew Cooper AuthorDate: Mon Aug 11 02:16:23 2014 +0100 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:45 2015 +0000 x86/shadow: Alter sh_{clear_shadow_entry,remove_shadow_via_pointer}() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 11 +++++------ xen/arch/x86/mm/shadow/multi.c | 4 +--- xen/arch/x86/mm/shadow/multi.h | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 046201a..e522b60 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2466,11 +2466,10 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) /**************************************************************************/ /* Remove all shadows of a guest frame from the shadow tables */ -static int sh_remove_shadow_via_pointer(struct vcpu *v, mfn_t smfn) +static int sh_remove_shadow_via_pointer(struct domain *d, mfn_t smfn) /* Follow this shadow's up-pointer, if it has one, and remove the reference * found there. Returns 1 if that was the only reference to this shadow */ { - struct domain *d = v->domain; struct page_info *sp = mfn_to_page(smfn); mfn_t pmfn; void *vaddr; @@ -2496,19 +2495,19 @@ static int sh_remove_shadow_via_pointer(struct vcpu *v, mfn_t smfn) { case SH_type_l1_32_shadow: case SH_type_l2_32_shadow: - SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, 2)(v, vaddr, pmfn); + SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, 2)(d, vaddr, pmfn); break; case SH_type_l1_pae_shadow: case SH_type_l2_pae_shadow: case SH_type_l2h_pae_shadow: - SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, 3)(v, vaddr, pmfn); + SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, 3)(d, vaddr, pmfn); break; case SH_type_l1_64_shadow: case SH_type_l2_64_shadow: case SH_type_l2h_64_shadow: case SH_type_l3_64_shadow: case SH_type_l4_64_shadow: - SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, 4)(v, vaddr, pmfn); + SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, 4)(d, vaddr, pmfn); break; default: BUG(); /* Some wierd unknown shadow type */ } @@ -2618,7 +2617,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) if ( sh_type_is_pinnable(d, t) ) \ sh_unpin(d, smfn); \ else if ( sh_type_has_up_pointer(d, t) ) \ - sh_remove_shadow_via_pointer(v, smfn); \ + sh_remove_shadow_via_pointer(d, smfn); \ if( !fast \ && (pg->count_info & PGC_page_table) \ && (pg->shadow_flags & (1 << t)) ) \ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 1db8161..469ad25 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4347,11 +4347,9 @@ int sh_rm_mappings_from_l1(struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn) /**************************************************************************/ /* Functions to excise all pointers to shadows from higher-level shadows. */ -void sh_clear_shadow_entry(struct vcpu *v, void *ep, mfn_t smfn) +void sh_clear_shadow_entry(struct domain *d, void *ep, mfn_t smfn) /* Blank out a single shadow entry */ { - struct domain *d = v->domain; - switch ( mfn_to_page(smfn)->u.sh.type ) { case SH_type_l1_shadow: diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index 614103d..e33948c 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -69,7 +69,7 @@ SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, GUEST_LEVELS) extern void SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, GUEST_LEVELS) - (struct vcpu *v, void *ep, mfn_t smfn); + (struct domain *d, void *ep, mfn_t smfn); extern int SHADOW_INTERNAL_NAME(sh_remove_l1_shadow, GUEST_LEVELS) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:03:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:03: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 1YSmTp-0008CK-Vr; Tue, 03 Mar 2015 13:03:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTn-0008Bn-QR for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:20 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 43/AD-03736-711B5F45; Tue, 03 Mar 2015 13:03:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1425387797!12657966!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32389 invoked from network); 3 Mar 2015 13:03: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; 3 Mar 2015 13:03:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTl-0002ig-6S for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmTl-0003dx-5Q for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:17 +0000 Date: Tue, 03 Mar 2015 13:03:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_{clear_shadow_entry, remove_shadow_via_pointer}() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c2fda096126ab618ad5234865fe465d86670869c Author: Andrew Cooper AuthorDate: Mon Aug 11 02:16:23 2014 +0100 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:45 2015 +0000 x86/shadow: Alter sh_{clear_shadow_entry,remove_shadow_via_pointer}() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 11 +++++------ xen/arch/x86/mm/shadow/multi.c | 4 +--- xen/arch/x86/mm/shadow/multi.h | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 046201a..e522b60 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2466,11 +2466,10 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) /**************************************************************************/ /* Remove all shadows of a guest frame from the shadow tables */ -static int sh_remove_shadow_via_pointer(struct vcpu *v, mfn_t smfn) +static int sh_remove_shadow_via_pointer(struct domain *d, mfn_t smfn) /* Follow this shadow's up-pointer, if it has one, and remove the reference * found there. Returns 1 if that was the only reference to this shadow */ { - struct domain *d = v->domain; struct page_info *sp = mfn_to_page(smfn); mfn_t pmfn; void *vaddr; @@ -2496,19 +2495,19 @@ static int sh_remove_shadow_via_pointer(struct vcpu *v, mfn_t smfn) { case SH_type_l1_32_shadow: case SH_type_l2_32_shadow: - SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, 2)(v, vaddr, pmfn); + SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, 2)(d, vaddr, pmfn); break; case SH_type_l1_pae_shadow: case SH_type_l2_pae_shadow: case SH_type_l2h_pae_shadow: - SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, 3)(v, vaddr, pmfn); + SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, 3)(d, vaddr, pmfn); break; case SH_type_l1_64_shadow: case SH_type_l2_64_shadow: case SH_type_l2h_64_shadow: case SH_type_l3_64_shadow: case SH_type_l4_64_shadow: - SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, 4)(v, vaddr, pmfn); + SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, 4)(d, vaddr, pmfn); break; default: BUG(); /* Some wierd unknown shadow type */ } @@ -2618,7 +2617,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) if ( sh_type_is_pinnable(d, t) ) \ sh_unpin(d, smfn); \ else if ( sh_type_has_up_pointer(d, t) ) \ - sh_remove_shadow_via_pointer(v, smfn); \ + sh_remove_shadow_via_pointer(d, smfn); \ if( !fast \ && (pg->count_info & PGC_page_table) \ && (pg->shadow_flags & (1 << t)) ) \ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 1db8161..469ad25 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4347,11 +4347,9 @@ int sh_rm_mappings_from_l1(struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn) /**************************************************************************/ /* Functions to excise all pointers to shadows from higher-level shadows. */ -void sh_clear_shadow_entry(struct vcpu *v, void *ep, mfn_t smfn) +void sh_clear_shadow_entry(struct domain *d, void *ep, mfn_t smfn) /* Blank out a single shadow entry */ { - struct domain *d = v->domain; - switch ( mfn_to_page(smfn)->u.sh.type ) { case SH_type_l1_shadow: diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index 614103d..e33948c 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -69,7 +69,7 @@ SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, GUEST_LEVELS) extern void SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, GUEST_LEVELS) - (struct vcpu *v, void *ep, mfn_t smfn); + (struct domain *d, void *ep, mfn_t smfn); extern int SHADOW_INTERNAL_NAME(sh_remove_l1_shadow, GUEST_LEVELS) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:03:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:03: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 1YSmU0-0008FU-2X; Tue, 03 Mar 2015 13:03:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTy-0008El-3a for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:30 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 6A/08-02801-121B5F45; Tue, 03 Mar 2015 13:03:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1425387807!9282754!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18486 invoked from network); 3 Mar 2015 13:03:28 -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; 3 Mar 2015 13:03:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTv-0002im-CR for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmTv-0003eJ-AL for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:27 +0000 Date: Tue, 03 Mar 2015 13:03:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_remove_l?_shadow() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 54e00ca6f7ccea3b6262465832f5ee0a666b47b2 Author: Andrew Cooper AuthorDate: Mon Aug 11 02:32:44 2014 +0100 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:49 2015 +0000 x86/shadow: Alter sh_remove_l?_shadow() to take a domain This involves introducing the domain variant of hash_foreach() Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 52 +++++++++++++++++++++++++++++++++++++- xen/arch/x86/mm/shadow/multi.c | 9 ++---- xen/arch/x86/mm/shadow/multi.h | 6 ++-- 3 files changed, 56 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index e522b60..3810b75 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1998,6 +1998,7 @@ void shadow_hash_delete(struct domain *d, unsigned long n, unsigned int t, } typedef int (*hash_vcpu_callback_t)(struct vcpu *v, mfn_t smfn, mfn_t other_mfn); +typedef int (*hash_domain_callback_t)(struct domain *d, mfn_t smfn, mfn_t other_mfn); static void hash_vcpu_foreach(struct vcpu *v, unsigned int callback_mask, const hash_vcpu_callback_t callbacks[], @@ -2046,6 +2047,53 @@ static void hash_vcpu_foreach(struct vcpu *v, unsigned int callback_mask, d->arch.paging.shadow.hash_walking = 0; } +static void hash_domain_foreach(struct domain *d, + unsigned int callback_mask, + const hash_domain_callback_t callbacks[], + mfn_t callback_mfn) +/* Walk the hash table looking at the types of the entries and + * calling the appropriate callback function for each entry. + * The mask determines which shadow types we call back for, and the array + * of callbacks tells us which function to call. + * Any callback may return non-zero to let us skip the rest of the scan. + * + * WARNING: Callbacks MUST NOT add or remove hash entries unless they + * then return non-zero to terminate the scan. */ +{ + int i, done = 0; + struct page_info *x; + + ASSERT(paging_locked_by_me(d)); + + /* Can be called via p2m code &c after shadow teardown. */ + if ( unlikely(!d->arch.paging.shadow.hash_table) ) + return; + + /* Say we're here, to stop hash-lookups reordering the chains */ + ASSERT(d->arch.paging.shadow.hash_walking == 0); + d->arch.paging.shadow.hash_walking = 1; + + for ( i = 0; i < SHADOW_HASH_BUCKETS; i++ ) + { + /* WARNING: This is not safe against changes to the hash table. + * The callback *must* return non-zero if it has inserted or + * deleted anything from the hash (lookups are OK, though). */ + for ( x = d->arch.paging.shadow.hash_table[i]; x; x = next_shadow(x) ) + { + if ( callback_mask & (1 << x->u.sh.type) ) + { + ASSERT(x->u.sh.type <= 15); + ASSERT(callbacks[x->u.sh.type] != NULL); + done = callbacks[x->u.sh.type](d, page_to_mfn(x), + callback_mfn); + if ( done ) break; + } + } + if ( done ) break; + } + d->arch.paging.shadow.hash_walking = 0; +} + /**************************************************************************/ /* Destroy a shadow page: simple dispatcher to call the per-type destructor @@ -2537,7 +2585,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) /* Dispatch table for getting per-type functions: each level must * be called with the function to remove a lower-level shadow. */ - static const hash_vcpu_callback_t callbacks[SH_type_unused] = { + static const hash_domain_callback_t callbacks[SH_type_unused] = { NULL, /* none */ NULL, /* l1_32 */ NULL, /* fl1_32 */ @@ -2621,7 +2669,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) if( !fast \ && (pg->count_info & PGC_page_table) \ && (pg->shadow_flags & (1 << t)) ) \ - hash_vcpu_foreach(v, masks[t], callbacks, smfn); \ + hash_domain_foreach(d, masks[t], callbacks, smfn); \ } while (0) DO_UNSHADOW(SH_type_l2_32_shadow); diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 469ad25..ab6ebe2 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4373,10 +4373,9 @@ void sh_clear_shadow_entry(struct domain *d, void *ep, mfn_t smfn) } } -int sh_remove_l1_shadow(struct vcpu *v, mfn_t sl2mfn, mfn_t sl1mfn) +int sh_remove_l1_shadow(struct domain *d, mfn_t sl2mfn, mfn_t sl1mfn) /* Remove all mappings of this l1 shadow from this l2 shadow */ { - struct domain *d = v->domain; shadow_l2e_t *sl2e; int done = 0; int flags; @@ -4397,10 +4396,9 @@ int sh_remove_l1_shadow(struct vcpu *v, mfn_t sl2mfn, mfn_t sl1mfn) } #if GUEST_PAGING_LEVELS >= 4 -int sh_remove_l2_shadow(struct vcpu *v, mfn_t sl3mfn, mfn_t sl2mfn) +int sh_remove_l2_shadow(struct domain *d, mfn_t sl3mfn, mfn_t sl2mfn) /* Remove all mappings of this l2 shadow from this l3 shadow */ { - struct domain *d = v->domain; shadow_l3e_t *sl3e; int done = 0; int flags; @@ -4420,10 +4418,9 @@ int sh_remove_l2_shadow(struct vcpu *v, mfn_t sl3mfn, mfn_t sl2mfn) return done; } -int sh_remove_l3_shadow(struct vcpu *v, mfn_t sl4mfn, mfn_t sl3mfn) +int sh_remove_l3_shadow(struct domain *d, mfn_t sl4mfn, mfn_t sl3mfn) /* Remove all mappings of this l3 shadow from this l4 shadow */ { - struct domain *d = v->domain; shadow_l4e_t *sl4e; int done = 0; int flags; diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index e33948c..8bb8ece 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -73,13 +73,13 @@ SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, GUEST_LEVELS) extern int SHADOW_INTERNAL_NAME(sh_remove_l1_shadow, GUEST_LEVELS) - (struct vcpu *v, mfn_t sl2mfn, mfn_t sl1mfn); + (struct domain *d, mfn_t sl2mfn, mfn_t sl1mfn); extern int SHADOW_INTERNAL_NAME(sh_remove_l2_shadow, GUEST_LEVELS) - (struct vcpu *v, mfn_t sl3mfn, mfn_t sl2mfn); + (struct domain *d, mfn_t sl3mfn, mfn_t sl2mfn); extern int SHADOW_INTERNAL_NAME(sh_remove_l3_shadow, GUEST_LEVELS) - (struct vcpu *v, mfn_t sl4mfn, mfn_t sl3mfn); + (struct domain *d, mfn_t sl4mfn, mfn_t sl3mfn); #if SHADOW_AUDIT & SHADOW_AUDIT_ENTRIES int -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:03:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:03: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 1YSmU0-0008FU-2X; Tue, 03 Mar 2015 13:03:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTy-0008El-3a for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:30 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 6A/08-02801-121B5F45; Tue, 03 Mar 2015 13:03:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1425387807!9282754!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18486 invoked from network); 3 Mar 2015 13:03:28 -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; 3 Mar 2015 13:03:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmTv-0002im-CR for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmTv-0003eJ-AL for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:27 +0000 Date: Tue, 03 Mar 2015 13:03:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_remove_l?_shadow() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 54e00ca6f7ccea3b6262465832f5ee0a666b47b2 Author: Andrew Cooper AuthorDate: Mon Aug 11 02:32:44 2014 +0100 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:49 2015 +0000 x86/shadow: Alter sh_remove_l?_shadow() to take a domain This involves introducing the domain variant of hash_foreach() Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 52 +++++++++++++++++++++++++++++++++++++- xen/arch/x86/mm/shadow/multi.c | 9 ++---- xen/arch/x86/mm/shadow/multi.h | 6 ++-- 3 files changed, 56 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index e522b60..3810b75 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1998,6 +1998,7 @@ void shadow_hash_delete(struct domain *d, unsigned long n, unsigned int t, } typedef int (*hash_vcpu_callback_t)(struct vcpu *v, mfn_t smfn, mfn_t other_mfn); +typedef int (*hash_domain_callback_t)(struct domain *d, mfn_t smfn, mfn_t other_mfn); static void hash_vcpu_foreach(struct vcpu *v, unsigned int callback_mask, const hash_vcpu_callback_t callbacks[], @@ -2046,6 +2047,53 @@ static void hash_vcpu_foreach(struct vcpu *v, unsigned int callback_mask, d->arch.paging.shadow.hash_walking = 0; } +static void hash_domain_foreach(struct domain *d, + unsigned int callback_mask, + const hash_domain_callback_t callbacks[], + mfn_t callback_mfn) +/* Walk the hash table looking at the types of the entries and + * calling the appropriate callback function for each entry. + * The mask determines which shadow types we call back for, and the array + * of callbacks tells us which function to call. + * Any callback may return non-zero to let us skip the rest of the scan. + * + * WARNING: Callbacks MUST NOT add or remove hash entries unless they + * then return non-zero to terminate the scan. */ +{ + int i, done = 0; + struct page_info *x; + + ASSERT(paging_locked_by_me(d)); + + /* Can be called via p2m code &c after shadow teardown. */ + if ( unlikely(!d->arch.paging.shadow.hash_table) ) + return; + + /* Say we're here, to stop hash-lookups reordering the chains */ + ASSERT(d->arch.paging.shadow.hash_walking == 0); + d->arch.paging.shadow.hash_walking = 1; + + for ( i = 0; i < SHADOW_HASH_BUCKETS; i++ ) + { + /* WARNING: This is not safe against changes to the hash table. + * The callback *must* return non-zero if it has inserted or + * deleted anything from the hash (lookups are OK, though). */ + for ( x = d->arch.paging.shadow.hash_table[i]; x; x = next_shadow(x) ) + { + if ( callback_mask & (1 << x->u.sh.type) ) + { + ASSERT(x->u.sh.type <= 15); + ASSERT(callbacks[x->u.sh.type] != NULL); + done = callbacks[x->u.sh.type](d, page_to_mfn(x), + callback_mfn); + if ( done ) break; + } + } + if ( done ) break; + } + d->arch.paging.shadow.hash_walking = 0; +} + /**************************************************************************/ /* Destroy a shadow page: simple dispatcher to call the per-type destructor @@ -2537,7 +2585,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) /* Dispatch table for getting per-type functions: each level must * be called with the function to remove a lower-level shadow. */ - static const hash_vcpu_callback_t callbacks[SH_type_unused] = { + static const hash_domain_callback_t callbacks[SH_type_unused] = { NULL, /* none */ NULL, /* l1_32 */ NULL, /* fl1_32 */ @@ -2621,7 +2669,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) if( !fast \ && (pg->count_info & PGC_page_table) \ && (pg->shadow_flags & (1 << t)) ) \ - hash_vcpu_foreach(v, masks[t], callbacks, smfn); \ + hash_domain_foreach(d, masks[t], callbacks, smfn); \ } while (0) DO_UNSHADOW(SH_type_l2_32_shadow); diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 469ad25..ab6ebe2 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4373,10 +4373,9 @@ void sh_clear_shadow_entry(struct domain *d, void *ep, mfn_t smfn) } } -int sh_remove_l1_shadow(struct vcpu *v, mfn_t sl2mfn, mfn_t sl1mfn) +int sh_remove_l1_shadow(struct domain *d, mfn_t sl2mfn, mfn_t sl1mfn) /* Remove all mappings of this l1 shadow from this l2 shadow */ { - struct domain *d = v->domain; shadow_l2e_t *sl2e; int done = 0; int flags; @@ -4397,10 +4396,9 @@ int sh_remove_l1_shadow(struct vcpu *v, mfn_t sl2mfn, mfn_t sl1mfn) } #if GUEST_PAGING_LEVELS >= 4 -int sh_remove_l2_shadow(struct vcpu *v, mfn_t sl3mfn, mfn_t sl2mfn) +int sh_remove_l2_shadow(struct domain *d, mfn_t sl3mfn, mfn_t sl2mfn) /* Remove all mappings of this l2 shadow from this l3 shadow */ { - struct domain *d = v->domain; shadow_l3e_t *sl3e; int done = 0; int flags; @@ -4420,10 +4418,9 @@ int sh_remove_l2_shadow(struct vcpu *v, mfn_t sl3mfn, mfn_t sl2mfn) return done; } -int sh_remove_l3_shadow(struct vcpu *v, mfn_t sl4mfn, mfn_t sl3mfn) +int sh_remove_l3_shadow(struct domain *d, mfn_t sl4mfn, mfn_t sl3mfn) /* Remove all mappings of this l3 shadow from this l4 shadow */ { - struct domain *d = v->domain; shadow_l4e_t *sl4e; int done = 0; int flags; diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index e33948c..8bb8ece 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -73,13 +73,13 @@ SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, GUEST_LEVELS) extern int SHADOW_INTERNAL_NAME(sh_remove_l1_shadow, GUEST_LEVELS) - (struct vcpu *v, mfn_t sl2mfn, mfn_t sl1mfn); + (struct domain *d, mfn_t sl2mfn, mfn_t sl1mfn); extern int SHADOW_INTERNAL_NAME(sh_remove_l2_shadow, GUEST_LEVELS) - (struct vcpu *v, mfn_t sl3mfn, mfn_t sl2mfn); + (struct domain *d, mfn_t sl3mfn, mfn_t sl2mfn); extern int SHADOW_INTERNAL_NAME(sh_remove_l3_shadow, GUEST_LEVELS) - (struct vcpu *v, mfn_t sl4mfn, mfn_t sl3mfn); + (struct domain *d, mfn_t sl4mfn, mfn_t sl3mfn); #if SHADOW_AUDIT & SHADOW_AUDIT_ENTRIES int -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:03:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:03: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 1YSmUB-0008Ir-9C; Tue, 03 Mar 2015 13:03:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUA-0008IM-5U for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:42 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 3E/76-03164-D21B5F45; Tue, 03 Mar 2015 13:03:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1425387817!12624453!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24378 invoked from network); 3 Mar 2015 13:03:38 -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; 3 Mar 2015 13:03:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmU5-0002iu-IM for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmU5-0003en-H0 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:37 +0000 Date: Tue, 03 Mar 2015 13:03:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter shadow_unhook{_???}_mappings() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 653e1c0717c83866a64c07806f9499aa252db568 Author: Andrew Cooper AuthorDate: Sat Feb 7 15:58:40 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:53 2015 +0000 x86/shadow: Alter shadow_unhook{_???}_mappings() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 12 ++++++------ xen/arch/x86/mm/shadow/multi.c | 13 +++++-------- xen/arch/x86/mm/shadow/multi.h | 6 +++--- xen/arch/x86/mm/shadow/private.h | 2 +- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 3810b75..4a9b94b 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1244,20 +1244,20 @@ static unsigned int shadow_min_acceptable_pages(struct domain *d) /* Dispatcher function: call the per-mode function that will unhook the * non-Xen mappings in this top-level shadow mfn. With user_only == 1, * unhooks only the user-mode mappings. */ -void shadow_unhook_mappings(struct vcpu *v, mfn_t smfn, int user_only) +void shadow_unhook_mappings(struct domain *d, mfn_t smfn, int user_only) { struct page_info *sp = mfn_to_page(smfn); switch ( sp->u.sh.type ) { case SH_type_l2_32_shadow: - SHADOW_INTERNAL_NAME(sh_unhook_32b_mappings, 2)(v, smfn, user_only); + SHADOW_INTERNAL_NAME(sh_unhook_32b_mappings, 2)(d, smfn, user_only); break; case SH_type_l2_pae_shadow: case SH_type_l2h_pae_shadow: - SHADOW_INTERNAL_NAME(sh_unhook_pae_mappings, 3)(v, smfn, user_only); + SHADOW_INTERNAL_NAME(sh_unhook_pae_mappings, 3)(d, smfn, user_only); break; case SH_type_l4_64_shadow: - SHADOW_INTERNAL_NAME(sh_unhook_64b_mappings, 4)(v, smfn, user_only); + SHADOW_INTERNAL_NAME(sh_unhook_64b_mappings, 4)(d, smfn, user_only); break; default: SHADOW_ERROR("top-level shadow has bad type %08x\n", sp->u.sh.type); @@ -1322,7 +1322,7 @@ static void _shadow_prealloc( if ( !pagetable_is_null(v2->arch.shadow_table[i]) ) { TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_PREALLOC_UNHOOK); - shadow_unhook_mappings(v, + shadow_unhook_mappings(d, pagetable_get_mfn(v2->arch.shadow_table[i]), 0); /* See if that freed up enough space */ @@ -1377,7 +1377,7 @@ static void shadow_blow_tables(struct domain *d) for_each_vcpu(d, v) for ( i = 0 ; i < 4 ; i++ ) if ( !pagetable_is_null(v->arch.shadow_table[i]) ) - shadow_unhook_mappings(v, + shadow_unhook_mappings(d, pagetable_get_mfn(v->arch.shadow_table[i]), 0); /* Make sure everyone sees the unshadowings */ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index ab6ebe2..79d8888 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2074,9 +2074,8 @@ void sh_destroy_monitor_table(struct vcpu *v, mfn_t mmfn) #if GUEST_PAGING_LEVELS == 2 -void sh_unhook_32b_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) +void sh_unhook_32b_mappings(struct domain *d, mfn_t sl2mfn, int user_only) { - struct domain *d = v->domain; shadow_l2e_t *sl2e; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) @@ -2086,10 +2085,9 @@ void sh_unhook_32b_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) #elif GUEST_PAGING_LEVELS == 3 -void sh_unhook_pae_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) +void sh_unhook_pae_mappings(struct domain *d, mfn_t sl2mfn, int user_only) /* Walk a PAE l2 shadow, unhooking entries from all the subshadows */ { - struct domain *d = v->domain; shadow_l2e_t *sl2e; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) @@ -2099,9 +2097,8 @@ void sh_unhook_pae_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) #elif GUEST_PAGING_LEVELS == 4 -void sh_unhook_64b_mappings(struct vcpu *v, mfn_t sl4mfn, int user_only) +void sh_unhook_64b_mappings(struct domain *d, mfn_t sl4mfn, int user_only) { - struct domain *d = v->domain; shadow_l4e_t *sl4e; SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, d, { if ( !user_only || (sl4e->l4 & _PAGE_USER) ) @@ -4506,7 +4503,7 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) { gmfn = _mfn(mfn_to_page(smfn)->v.sh.back); mfn_to_page(gmfn)->shadow_flags |= SHF_pagetable_dying; - shadow_unhook_mappings(v, smfn, 1/* user pages only */); + shadow_unhook_mappings(d, smfn, 1/* user pages only */); flush = 1; } } @@ -4545,7 +4542,7 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) if ( mfn_valid(smfn) ) { mfn_to_page(gmfn)->shadow_flags |= SHF_pagetable_dying; - shadow_unhook_mappings(v, smfn, 1/* user pages only */); + shadow_unhook_mappings(d, smfn, 1/* user pages only */); /* Now flush the TLB: we removed toplevel mappings. */ flush_tlb_mask(d->domain_dirty_cpumask); } diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index 8bb8ece..07dffac 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -52,13 +52,13 @@ SHADOW_INTERNAL_NAME(sh_destroy_l4_shadow, GUEST_LEVELS)( extern void SHADOW_INTERNAL_NAME(sh_unhook_32b_mappings, GUEST_LEVELS) - (struct vcpu *v, mfn_t sl2mfn, int user_only); + (struct domain *d, mfn_t sl2mfn, int user_only); extern void SHADOW_INTERNAL_NAME(sh_unhook_pae_mappings, GUEST_LEVELS) - (struct vcpu *v, mfn_t sl3mfn, int user_only); + (struct domain *d, mfn_t sl3mfn, int user_only); extern void SHADOW_INTERNAL_NAME(sh_unhook_64b_mappings, GUEST_LEVELS) - (struct vcpu *v, mfn_t sl4mfn, int user_only); + (struct domain *d, mfn_t sl4mfn, int user_only); extern int SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, GUEST_LEVELS) diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index cddfde6..14f5d45 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -394,7 +394,7 @@ void shadow_update_paging_modes(struct vcpu *v); /* Unhook the non-Xen mappings in this top-level shadow mfn. * With user_only == 1, unhooks only the user-mode mappings. */ -void shadow_unhook_mappings(struct vcpu *v, mfn_t smfn, int user_only); +void shadow_unhook_mappings(struct domain *d, mfn_t smfn, int user_only); #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* Allow a shadowed page to go out of sync */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:03:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:03: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 1YSmUB-0008Ir-9C; Tue, 03 Mar 2015 13:03:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUA-0008IM-5U for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:42 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 3E/76-03164-D21B5F45; Tue, 03 Mar 2015 13:03:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1425387817!12624453!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24378 invoked from network); 3 Mar 2015 13:03:38 -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; 3 Mar 2015 13:03:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmU5-0002iu-IM for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmU5-0003en-H0 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:37 +0000 Date: Tue, 03 Mar 2015 13:03:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter shadow_unhook{_???}_mappings() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 653e1c0717c83866a64c07806f9499aa252db568 Author: Andrew Cooper AuthorDate: Sat Feb 7 15:58:40 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:53 2015 +0000 x86/shadow: Alter shadow_unhook{_???}_mappings() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 12 ++++++------ xen/arch/x86/mm/shadow/multi.c | 13 +++++-------- xen/arch/x86/mm/shadow/multi.h | 6 +++--- xen/arch/x86/mm/shadow/private.h | 2 +- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 3810b75..4a9b94b 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1244,20 +1244,20 @@ static unsigned int shadow_min_acceptable_pages(struct domain *d) /* Dispatcher function: call the per-mode function that will unhook the * non-Xen mappings in this top-level shadow mfn. With user_only == 1, * unhooks only the user-mode mappings. */ -void shadow_unhook_mappings(struct vcpu *v, mfn_t smfn, int user_only) +void shadow_unhook_mappings(struct domain *d, mfn_t smfn, int user_only) { struct page_info *sp = mfn_to_page(smfn); switch ( sp->u.sh.type ) { case SH_type_l2_32_shadow: - SHADOW_INTERNAL_NAME(sh_unhook_32b_mappings, 2)(v, smfn, user_only); + SHADOW_INTERNAL_NAME(sh_unhook_32b_mappings, 2)(d, smfn, user_only); break; case SH_type_l2_pae_shadow: case SH_type_l2h_pae_shadow: - SHADOW_INTERNAL_NAME(sh_unhook_pae_mappings, 3)(v, smfn, user_only); + SHADOW_INTERNAL_NAME(sh_unhook_pae_mappings, 3)(d, smfn, user_only); break; case SH_type_l4_64_shadow: - SHADOW_INTERNAL_NAME(sh_unhook_64b_mappings, 4)(v, smfn, user_only); + SHADOW_INTERNAL_NAME(sh_unhook_64b_mappings, 4)(d, smfn, user_only); break; default: SHADOW_ERROR("top-level shadow has bad type %08x\n", sp->u.sh.type); @@ -1322,7 +1322,7 @@ static void _shadow_prealloc( if ( !pagetable_is_null(v2->arch.shadow_table[i]) ) { TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_PREALLOC_UNHOOK); - shadow_unhook_mappings(v, + shadow_unhook_mappings(d, pagetable_get_mfn(v2->arch.shadow_table[i]), 0); /* See if that freed up enough space */ @@ -1377,7 +1377,7 @@ static void shadow_blow_tables(struct domain *d) for_each_vcpu(d, v) for ( i = 0 ; i < 4 ; i++ ) if ( !pagetable_is_null(v->arch.shadow_table[i]) ) - shadow_unhook_mappings(v, + shadow_unhook_mappings(d, pagetable_get_mfn(v->arch.shadow_table[i]), 0); /* Make sure everyone sees the unshadowings */ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index ab6ebe2..79d8888 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2074,9 +2074,8 @@ void sh_destroy_monitor_table(struct vcpu *v, mfn_t mmfn) #if GUEST_PAGING_LEVELS == 2 -void sh_unhook_32b_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) +void sh_unhook_32b_mappings(struct domain *d, mfn_t sl2mfn, int user_only) { - struct domain *d = v->domain; shadow_l2e_t *sl2e; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) @@ -2086,10 +2085,9 @@ void sh_unhook_32b_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) #elif GUEST_PAGING_LEVELS == 3 -void sh_unhook_pae_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) +void sh_unhook_pae_mappings(struct domain *d, mfn_t sl2mfn, int user_only) /* Walk a PAE l2 shadow, unhooking entries from all the subshadows */ { - struct domain *d = v->domain; shadow_l2e_t *sl2e; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) @@ -2099,9 +2097,8 @@ void sh_unhook_pae_mappings(struct vcpu *v, mfn_t sl2mfn, int user_only) #elif GUEST_PAGING_LEVELS == 4 -void sh_unhook_64b_mappings(struct vcpu *v, mfn_t sl4mfn, int user_only) +void sh_unhook_64b_mappings(struct domain *d, mfn_t sl4mfn, int user_only) { - struct domain *d = v->domain; shadow_l4e_t *sl4e; SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, d, { if ( !user_only || (sl4e->l4 & _PAGE_USER) ) @@ -4506,7 +4503,7 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) { gmfn = _mfn(mfn_to_page(smfn)->v.sh.back); mfn_to_page(gmfn)->shadow_flags |= SHF_pagetable_dying; - shadow_unhook_mappings(v, smfn, 1/* user pages only */); + shadow_unhook_mappings(d, smfn, 1/* user pages only */); flush = 1; } } @@ -4545,7 +4542,7 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) if ( mfn_valid(smfn) ) { mfn_to_page(gmfn)->shadow_flags |= SHF_pagetable_dying; - shadow_unhook_mappings(v, smfn, 1/* user pages only */); + shadow_unhook_mappings(d, smfn, 1/* user pages only */); /* Now flush the TLB: we removed toplevel mappings. */ flush_tlb_mask(d->domain_dirty_cpumask); } diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index 8bb8ece..07dffac 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -52,13 +52,13 @@ SHADOW_INTERNAL_NAME(sh_destroy_l4_shadow, GUEST_LEVELS)( extern void SHADOW_INTERNAL_NAME(sh_unhook_32b_mappings, GUEST_LEVELS) - (struct vcpu *v, mfn_t sl2mfn, int user_only); + (struct domain *d, mfn_t sl2mfn, int user_only); extern void SHADOW_INTERNAL_NAME(sh_unhook_pae_mappings, GUEST_LEVELS) - (struct vcpu *v, mfn_t sl3mfn, int user_only); + (struct domain *d, mfn_t sl3mfn, int user_only); extern void SHADOW_INTERNAL_NAME(sh_unhook_64b_mappings, GUEST_LEVELS) - (struct vcpu *v, mfn_t sl4mfn, int user_only); + (struct domain *d, mfn_t sl4mfn, int user_only); extern int SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, GUEST_LEVELS) diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index cddfde6..14f5d45 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -394,7 +394,7 @@ void shadow_update_paging_modes(struct vcpu *v); /* Unhook the non-Xen mappings in this top-level shadow mfn. * With user_only == 1, unhooks only the user-mode mappings. */ -void shadow_unhook_mappings(struct vcpu *v, mfn_t smfn, int user_only); +void shadow_unhook_mappings(struct domain *d, mfn_t smfn, int user_only); #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) /* Allow a shadowed page to go out of sync */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:03:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:03: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 1YSmUJ-0008LC-CB; Tue, 03 Mar 2015 13:03:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUI-0008KY-IZ for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:50 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 19/DE-02898-531B5F45; Tue, 03 Mar 2015 13:03:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1425387827!8881535!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2584 invoked from network); 3 Mar 2015 13:03:48 -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; 3 Mar 2015 13:03:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUF-0002j0-O5 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmUF-0003f9-Mx for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:47 +0000 Date: Tue, 03 Mar 2015 13:03:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_rm_write_access_from_???() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0814b2246f71add668d1218f9dfff0c070065336 Author: Andrew Cooper AuthorDate: Fri Aug 22 00:09:11 2014 +0100 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:56 2015 +0000 x86/shadow: Alter sh_rm_write_access_from_???() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 19 ++++++++++--------- xen/arch/x86/mm/shadow/multi.c | 6 ++---- xen/arch/x86/mm/shadow/multi.h | 4 ++-- xen/arch/x86/mm/shadow/private.h | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 4a9b94b..e10b578 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -587,12 +587,13 @@ static inline void _sh_resync_l1(struct vcpu *v, mfn_t gmfn, mfn_t snpmfn) static inline int oos_fixup_flush_gmfn(struct vcpu *v, mfn_t gmfn, struct oos_fixup *fixup) { + struct domain *d = v->domain; int i; for ( i = 0; i < SHADOW_OOS_FIXUPS; i++ ) { if ( mfn_x(fixup->smfn[i]) != INVALID_MFN ) { - sh_remove_write_access_from_sl1p(v, gmfn, + sh_remove_write_access_from_sl1p(d, gmfn, fixup->smfn[i], fixup->off[i]); fixup->smfn[i] = _mfn(INVALID_MFN); @@ -638,7 +639,7 @@ void oos_fixup_add(struct domain *d, mfn_t gmfn, TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_OOS_FIXUP_EVICT); /* Reuse this slot and remove current writable mapping. */ - sh_remove_write_access_from_sl1p(v, gmfn, + sh_remove_write_access_from_sl1p(d, gmfn, oos_fixup[idx].smfn[next], oos_fixup[idx].off[next]); perfc_incr(shadow_oos_fixup_evict); @@ -2184,7 +2185,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, unsigned long fault_addr) { /* Dispatch table for getting per-type functions */ - static const hash_vcpu_callback_t callbacks[SH_type_unused] = { + static const hash_domain_callback_t callbacks[SH_type_unused] = { NULL, /* none */ SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, 2), /* l1_32 */ SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, 2), /* fl1_32 */ @@ -2367,7 +2368,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, int shtype = mfn_to_page(last_smfn)->u.sh.type; if ( callbacks[shtype] ) - callbacks[shtype](curr, last_smfn, gmfn); + callbacks[shtype](d, last_smfn, gmfn); if ( (pg->u.inuse.type_info & PGT_count_mask) != old_count ) perfc_incr(shadow_writeable_h_5); @@ -2384,7 +2385,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, perfc_incr(shadow_writeable_bf_1); else perfc_incr(shadow_writeable_bf); - hash_vcpu_foreach(v, callback_mask, callbacks, gmfn); + hash_domain_foreach(d, callback_mask, callbacks, gmfn); /* If that didn't catch the mapping, then there's some non-pagetable * mapping -- ioreq page, grant mapping, &c. */ @@ -2404,7 +2405,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, } #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) -int sh_remove_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, +int sh_remove_write_access_from_sl1p(struct domain *d, mfn_t gmfn, mfn_t smfn, unsigned long off) { struct page_info *sp = mfn_to_page(smfn); @@ -2416,16 +2417,16 @@ int sh_remove_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, || sp->u.sh.type == SH_type_fl1_32_shadow ) { return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p,2) - (v, gmfn, smfn, off); + (d, gmfn, smfn, off); } else if ( sp->u.sh.type == SH_type_l1_pae_shadow || sp->u.sh.type == SH_type_fl1_pae_shadow ) return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p,3) - (v, gmfn, smfn, off); + (d, gmfn, smfn, off); else if ( sp->u.sh.type == SH_type_l1_64_shadow || sp->u.sh.type == SH_type_fl1_64_shadow ) return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p,4) - (v, gmfn, smfn, off); + (d, gmfn, smfn, off); return 0; } diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 79d8888..0d1021b 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4177,10 +4177,9 @@ sh_update_cr3(struct vcpu *v, int do_locking) /* Functions to revoke guest rights */ #if SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC -int sh_rm_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, +int sh_rm_write_access_from_sl1p(struct domain *d, mfn_t gmfn, mfn_t smfn, unsigned long off) { - struct domain *d = v->domain; struct vcpu *curr = current; int r; shadow_l1e_t *sl1p, sl1e; @@ -4280,11 +4279,10 @@ static int sh_guess_wrmap(struct vcpu *v, unsigned long vaddr, mfn_t gmfn) } #endif -int sh_rm_write_access_from_l1(struct vcpu *v, mfn_t sl1mfn, +int sh_rm_write_access_from_l1(struct domain *d, mfn_t sl1mfn, mfn_t readonly_mfn) /* Excises all writeable mappings to readonly_mfn from this l1 shadow table */ { - struct domain *d = v->domain; shadow_l1e_t *sl1e; int done = 0; int flags; diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index 07dffac..1af9225 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -62,7 +62,7 @@ SHADOW_INTERNAL_NAME(sh_unhook_64b_mappings, GUEST_LEVELS) extern int SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, GUEST_LEVELS) - (struct vcpu *v, mfn_t sl1mfn, mfn_t readonly_mfn); + (struct domain *d, mfn_t sl1mfn, mfn_t readonly_mfn); extern int SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, GUEST_LEVELS) (struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn); @@ -127,5 +127,5 @@ SHADOW_INTERNAL_NAME(sh_safe_not_to_sync, GUEST_LEVELS) extern int SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p, GUEST_LEVELS) - (struct vcpu *v, mfn_t gmfn, mfn_t smfn, unsigned long off); + (struct domain *d, mfn_t gmfn, mfn_t smfn, unsigned long off); #endif diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index 14f5d45..96b53b9 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -405,7 +405,7 @@ void sh_resync(struct domain *d, mfn_t gmfn); void oos_fixup_add(struct domain *d, mfn_t gmfn, mfn_t smfn, unsigned long off); -int sh_remove_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, +int sh_remove_write_access_from_sl1p(struct domain *d, mfn_t gmfn, mfn_t smfn, unsigned long offset); /* Pull all out-of-sync shadows back into sync. If skip != 0, we try -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:03:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:03: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 1YSmUJ-0008LC-CB; Tue, 03 Mar 2015 13:03:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUI-0008KY-IZ for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:50 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 19/DE-02898-531B5F45; Tue, 03 Mar 2015 13:03:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1425387827!8881535!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2584 invoked from network); 3 Mar 2015 13:03:48 -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; 3 Mar 2015 13:03:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUF-0002j0-O5 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmUF-0003f9-Mx for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:47 +0000 Date: Tue, 03 Mar 2015 13:03:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_rm_write_access_from_???() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0814b2246f71add668d1218f9dfff0c070065336 Author: Andrew Cooper AuthorDate: Fri Aug 22 00:09:11 2014 +0100 Commit: Tim Deegan CommitDate: Fri Feb 20 14:47:56 2015 +0000 x86/shadow: Alter sh_rm_write_access_from_???() to take a domain Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 19 ++++++++++--------- xen/arch/x86/mm/shadow/multi.c | 6 ++---- xen/arch/x86/mm/shadow/multi.h | 4 ++-- xen/arch/x86/mm/shadow/private.h | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 4a9b94b..e10b578 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -587,12 +587,13 @@ static inline void _sh_resync_l1(struct vcpu *v, mfn_t gmfn, mfn_t snpmfn) static inline int oos_fixup_flush_gmfn(struct vcpu *v, mfn_t gmfn, struct oos_fixup *fixup) { + struct domain *d = v->domain; int i; for ( i = 0; i < SHADOW_OOS_FIXUPS; i++ ) { if ( mfn_x(fixup->smfn[i]) != INVALID_MFN ) { - sh_remove_write_access_from_sl1p(v, gmfn, + sh_remove_write_access_from_sl1p(d, gmfn, fixup->smfn[i], fixup->off[i]); fixup->smfn[i] = _mfn(INVALID_MFN); @@ -638,7 +639,7 @@ void oos_fixup_add(struct domain *d, mfn_t gmfn, TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_OOS_FIXUP_EVICT); /* Reuse this slot and remove current writable mapping. */ - sh_remove_write_access_from_sl1p(v, gmfn, + sh_remove_write_access_from_sl1p(d, gmfn, oos_fixup[idx].smfn[next], oos_fixup[idx].off[next]); perfc_incr(shadow_oos_fixup_evict); @@ -2184,7 +2185,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, unsigned long fault_addr) { /* Dispatch table for getting per-type functions */ - static const hash_vcpu_callback_t callbacks[SH_type_unused] = { + static const hash_domain_callback_t callbacks[SH_type_unused] = { NULL, /* none */ SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, 2), /* l1_32 */ SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, 2), /* fl1_32 */ @@ -2367,7 +2368,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, int shtype = mfn_to_page(last_smfn)->u.sh.type; if ( callbacks[shtype] ) - callbacks[shtype](curr, last_smfn, gmfn); + callbacks[shtype](d, last_smfn, gmfn); if ( (pg->u.inuse.type_info & PGT_count_mask) != old_count ) perfc_incr(shadow_writeable_h_5); @@ -2384,7 +2385,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, perfc_incr(shadow_writeable_bf_1); else perfc_incr(shadow_writeable_bf); - hash_vcpu_foreach(v, callback_mask, callbacks, gmfn); + hash_domain_foreach(d, callback_mask, callbacks, gmfn); /* If that didn't catch the mapping, then there's some non-pagetable * mapping -- ioreq page, grant mapping, &c. */ @@ -2404,7 +2405,7 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, } #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) -int sh_remove_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, +int sh_remove_write_access_from_sl1p(struct domain *d, mfn_t gmfn, mfn_t smfn, unsigned long off) { struct page_info *sp = mfn_to_page(smfn); @@ -2416,16 +2417,16 @@ int sh_remove_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, || sp->u.sh.type == SH_type_fl1_32_shadow ) { return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p,2) - (v, gmfn, smfn, off); + (d, gmfn, smfn, off); } else if ( sp->u.sh.type == SH_type_l1_pae_shadow || sp->u.sh.type == SH_type_fl1_pae_shadow ) return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p,3) - (v, gmfn, smfn, off); + (d, gmfn, smfn, off); else if ( sp->u.sh.type == SH_type_l1_64_shadow || sp->u.sh.type == SH_type_fl1_64_shadow ) return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p,4) - (v, gmfn, smfn, off); + (d, gmfn, smfn, off); return 0; } diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 79d8888..0d1021b 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4177,10 +4177,9 @@ sh_update_cr3(struct vcpu *v, int do_locking) /* Functions to revoke guest rights */ #if SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC -int sh_rm_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, +int sh_rm_write_access_from_sl1p(struct domain *d, mfn_t gmfn, mfn_t smfn, unsigned long off) { - struct domain *d = v->domain; struct vcpu *curr = current; int r; shadow_l1e_t *sl1p, sl1e; @@ -4280,11 +4279,10 @@ static int sh_guess_wrmap(struct vcpu *v, unsigned long vaddr, mfn_t gmfn) } #endif -int sh_rm_write_access_from_l1(struct vcpu *v, mfn_t sl1mfn, +int sh_rm_write_access_from_l1(struct domain *d, mfn_t sl1mfn, mfn_t readonly_mfn) /* Excises all writeable mappings to readonly_mfn from this l1 shadow table */ { - struct domain *d = v->domain; shadow_l1e_t *sl1e; int done = 0; int flags; diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index 07dffac..1af9225 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -62,7 +62,7 @@ SHADOW_INTERNAL_NAME(sh_unhook_64b_mappings, GUEST_LEVELS) extern int SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, GUEST_LEVELS) - (struct vcpu *v, mfn_t sl1mfn, mfn_t readonly_mfn); + (struct domain *d, mfn_t sl1mfn, mfn_t readonly_mfn); extern int SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, GUEST_LEVELS) (struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn); @@ -127,5 +127,5 @@ SHADOW_INTERNAL_NAME(sh_safe_not_to_sync, GUEST_LEVELS) extern int SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p, GUEST_LEVELS) - (struct vcpu *v, mfn_t gmfn, mfn_t smfn, unsigned long off); + (struct domain *d, mfn_t gmfn, mfn_t smfn, unsigned long off); #endif diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index 14f5d45..96b53b9 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -405,7 +405,7 @@ void sh_resync(struct domain *d, mfn_t gmfn); void oos_fixup_add(struct domain *d, mfn_t gmfn, mfn_t smfn, unsigned long off); -int sh_remove_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, +int sh_remove_write_access_from_sl1p(struct domain *d, mfn_t gmfn, mfn_t smfn, unsigned long offset); /* Pull all out-of-sync shadows back into sync. If skip != 0, we try -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:04:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:04: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 1YSmUU-0008Ny-Ft; Tue, 03 Mar 2015 13:04:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUS-0008NO-TC for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:01 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 33/71-10942-041B5F45; Tue, 03 Mar 2015 13:04:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1425387838!8881628!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4855 invoked from network); 3 Mar 2015 13:03:59 -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; 3 Mar 2015 13:03:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUP-0002jA-UV for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmUP-0003fX-T9 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:57 +0000 Date: Tue, 03 Mar 2015 13:03:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_remove_{all_}shadows{, _and_parents}() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e5a0366ff7c930bceaeecc77d21fdd3894b9c050 Author: Andrew Cooper AuthorDate: Mon Aug 11 02:38:53 2014 +0100 Commit: Tim Deegan CommitDate: Fri Feb 20 14:48:01 2015 +0000 x86/shadow: Alter sh_remove_{all_}shadows{,_and_parents}() to take a domain This allows the removal of 3 improper uses of d->vcpu[0] from toolstack context Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/mm.c | 4 ++-- xen/arch/x86/mm/shadow/common.c | 18 ++++++++---------- xen/arch/x86/mm/shadow/multi.c | 15 ++++++++------- xen/include/asm-x86/shadow.h | 8 ++++---- 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 72e383f..4734d71 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -6074,7 +6074,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) paging_mark_dirty(d, page_to_mfn(page)); /* These are most probably not page tables any more */ /* don't take a long time and don't die either */ - sh_remove_shadows(d->vcpu[0], _mfn(page_to_mfn(page)), 1, 0); + sh_remove_shadows(d, _mfn(page_to_mfn(page)), 1, 0); put_page(page); } diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 9ab7a26..ca5369a 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2118,7 +2118,7 @@ int free_page_type(struct page_info *page, unsigned long type, ASSERT(VALID_M2P(gmfn)); /* Page sharing not supported for shadowed domains */ if(!SHARED_M2P(gmfn)) - shadow_remove_all_shadows(owner->vcpu[0], _mfn(gmfn)); + shadow_remove_all_shadows(owner, _mfn(gmfn)); } if ( !(type & PGT_partial) ) @@ -2283,7 +2283,7 @@ static int __get_page_type(struct page_info *page, unsigned long type, && (page->count_info & PGC_page_table) && !((page->shadow_flags & (1u<<29)) && type == PGT_writable_page) ) - shadow_remove_all_shadows(d->vcpu[0], _mfn(page_to_mfn(page))); + shadow_remove_all_shadows(d, _mfn(page_to_mfn(page))); ASSERT(!(x & PGT_pae_xen_l2)); if ( (x & PGT_type_mask) != type ) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index e10b578..30580ee 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -687,7 +687,7 @@ static int oos_remove_write_access(struct vcpu *v, mfn_t gmfn, * the page. If that doesn't work either, the guest is granting * his pagetables and must be killed after all. * This will flush the tlb, so we can return with no worries. */ - sh_remove_shadows(v, gmfn, 0 /* Be thorough */, 1 /* Must succeed */); + sh_remove_shadows(d, gmfn, 0 /* Be thorough */, 1 /* Must succeed */); return 1; } @@ -1130,7 +1130,7 @@ sh_validate_guest_pt_write(struct vcpu *v, mfn_t gmfn, * Since the validate call above will have made a "safe" (i.e. zero) * shadow entry, we can let the domain live even if we can't fully * unshadow the page. */ - sh_remove_shadows(v, gmfn, 0, 0); + sh_remove_shadows(d, gmfn, 0, 0); } } @@ -2570,7 +2570,7 @@ static int sh_remove_shadow_via_pointer(struct domain *d, mfn_t smfn) return rc; } -void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) +void sh_remove_shadows(struct domain *d, mfn_t gmfn, int fast, int all) /* Remove the shadows of this guest page. * If fast != 0, just try the quick heuristic, which will remove * at most one reference to each shadow of the page. Otherwise, walk @@ -2579,7 +2579,6 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) * (all != 0 implies fast == 0) */ { - struct domain *d = v->domain; struct page_info *pg = mfn_to_page(gmfn); mfn_t smfn; unsigned char t; @@ -2633,8 +2632,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) * can be called via put_page_type when we clear a shadow l1e).*/ paging_lock_recursive(d); - SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx\n", - d->domain_id, v->vcpu_id, mfn_x(gmfn)); + SHADOW_PRINTK("d=%d: gmfn=%lx\n", d->domain_id, mfn_x(gmfn)); /* Bail out now if the page is not shadowed */ if ( (pg->count_info & PGC_page_table) == 0 ) @@ -2703,11 +2701,11 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) } static void -sh_remove_all_shadows_and_parents(struct vcpu *v, mfn_t gmfn) +sh_remove_all_shadows_and_parents(struct domain *d, mfn_t gmfn) /* Even harsher: this is a HVM page that we thing is no longer a pagetable. * Unshadow it, and recursively unshadow pages that reference it. */ { - sh_remove_shadows(v, gmfn, 0, 1); + sh_remove_shadows(d, gmfn, 0, 1); /* XXX TODO: * Rework this hashtable walker to return a linked-list of all * the shadows it modified, then do breadth-first recursion @@ -3384,7 +3382,7 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, p2m_type_t p2mt = p2m_flags_to_type(l1e_get_flags(*p)); if ( (p2m_is_valid(p2mt) || p2m_is_grant(p2mt)) && mfn_valid(mfn) ) { - sh_remove_all_shadows_and_parents(v, mfn); + sh_remove_all_shadows_and_parents(d, mfn); if ( sh_remove_all_mappings(v, mfn) ) flush_tlb_mask(d->domain_dirty_cpumask); } @@ -3419,7 +3417,7 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, || l1e_get_pfn(npte[i]) != mfn_x(omfn) ) { /* This GFN->MFN mapping has gone away */ - sh_remove_all_shadows_and_parents(v, omfn); + sh_remove_all_shadows_and_parents(d, omfn); if ( sh_remove_all_mappings(v, omfn) ) cpumask_or(&flushmask, &flushmask, d->domain_dirty_cpumask); diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 0d1021b..7705674 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2564,7 +2564,7 @@ static inline void check_for_early_unshadow(struct vcpu *v, mfn_t gmfn) & (SHF_L2_32|SHF_L2_PAE|SHF_L2H_PAE|SHF_L4_64))) ) { perfc_incr(shadow_early_unshadow); - sh_remove_shadows(v, gmfn, 1, 0 /* Fast, can fail to unshadow */ ); + sh_remove_shadows(d, gmfn, 1, 0 /* Fast, can fail to unshadow */ ); TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_EARLY_UNSHADOW); } v->arch.paging.shadow.last_emulated_mfn_for_unshadow = mfn_x(gmfn); @@ -3251,7 +3251,7 @@ static int sh_page_fault(struct vcpu *v, SHADOW_PRINTK("user-mode fault to PT, unshadowing mfn %#lx\n", mfn_x(gmfn)); perfc_incr(shadow_fault_emulate_failed); - sh_remove_shadows(v, gmfn, 0 /* thorough */, 1 /* must succeed */); + sh_remove_shadows(d, gmfn, 0 /* thorough */, 1 /* must succeed */); trace_shadow_emulate_other(TRC_SHADOW_EMULATE_UNSHADOW_USER, va, gfn); goto done; @@ -3293,7 +3293,7 @@ static int sh_page_fault(struct vcpu *v, } if ( !used ) - sh_remove_shadows(v, gmfn, 1 /* fast */, 0 /* can fail */); + sh_remove_shadows(d, gmfn, 1 /* fast */, 0 /* can fail */); } /* @@ -3331,7 +3331,7 @@ static int sh_page_fault(struct vcpu *v, gdprintk(XENLOG_DEBUG, "write to pagetable during event " "injection: cr2=%#lx, mfn=%#lx\n", va, mfn_x(gmfn)); - sh_remove_shadows(v, gmfn, 0 /* thorough */, 1 /* must succeed */); + sh_remove_shadows(d, gmfn, 0 /* thorough */, 1 /* must succeed */); trace_shadow_emulate_other(TRC_SHADOW_EMULATE_UNSHADOW_EVTINJ, va, gfn); return EXCRET_fault_fixed; @@ -3365,7 +3365,7 @@ static int sh_page_fault(struct vcpu *v, /* If this is actually a page table, then we have a bug, and need * to support more operations in the emulator. More likely, * though, this is a hint that this page should not be shadowed. */ - shadow_remove_all_shadows(v, gmfn); + shadow_remove_all_shadows(d, gmfn); trace_shadow_emulate_other(TRC_SHADOW_EMULATE_UNSHADOW_UNHANDLED, va, gfn); @@ -4626,6 +4626,7 @@ static void *emulate_map_dest(struct vcpu *v, u32 bytes, struct sh_emulate_ctxt *sh_ctxt) { + struct domain *d = v->domain; void *map = NULL; sh_ctxt->mfn1 = emulate_gva_to_mfn(v, vaddr, sh_ctxt); @@ -4647,7 +4648,7 @@ static void *emulate_map_dest(struct vcpu *v, /* Unaligned writes mean probably this isn't a pagetable */ if ( vaddr & (bytes - 1) ) - sh_remove_shadows(v, sh_ctxt->mfn1, 0, 0 /* Slow, can fail */ ); + sh_remove_shadows(d, sh_ctxt->mfn1, 0, 0 /* Slow, can fail */ ); if ( likely(((vaddr + bytes - 1) & PAGE_MASK) == (vaddr & PAGE_MASK)) ) { @@ -4674,7 +4675,7 @@ static void *emulate_map_dest(struct vcpu *v, MAPPING_SILENT_FAIL : MAPPING_UNHANDLEABLE); /* Cross-page writes mean probably not a pagetable */ - sh_remove_shadows(v, sh_ctxt->mfn2, 0, 0 /* Slow, can fail */ ); + sh_remove_shadows(d, sh_ctxt->mfn2, 0, 0 /* Slow, can fail */ ); mfns[0] = mfn_x(sh_ctxt->mfn1); mfns[1] = mfn_x(sh_ctxt->mfn2); diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index a4c8776..5b9772d 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -79,7 +79,7 @@ void shadow_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void shadow_final_teardown(struct domain *d); -void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all); +void sh_remove_shadows(struct domain *d, mfn_t gmfn, int fast, int all); /* Discard _all_ mappings from the domain's shadows. */ void shadow_blow_tables_per_domain(struct domain *d); @@ -93,7 +93,7 @@ void shadow_blow_tables_per_domain(struct domain *d); #define shadow_track_dirty_vram(d, begin_pfn, nr, bitmap) \ ({ ASSERT_UNREACHABLE(); -EOPNOTSUPP; }) -static inline void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, +static inline void sh_remove_shadows(struct domain *d, mfn_t gmfn, bool_t fast, bool_t all) {} static inline void shadow_blow_tables_per_domain(struct domain *d) {} @@ -107,10 +107,10 @@ static inline int shadow_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, #endif /* CONFIG_SHADOW_PAGING */ /* Remove all shadows of the guest mfn. */ -static inline void shadow_remove_all_shadows(struct vcpu *v, mfn_t gmfn) +static inline void shadow_remove_all_shadows(struct domain *d, mfn_t gmfn) { /* See the comment about locking in sh_remove_shadows */ - sh_remove_shadows(v, gmfn, 0 /* Be thorough */, 1 /* Must succeed */); + sh_remove_shadows(d, gmfn, 0 /* Be thorough */, 1 /* Must succeed */); } #endif /* _XEN_SHADOW_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 13:04:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:04: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 1YSmUU-0008Ny-Ft; Tue, 03 Mar 2015 13:04:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUS-0008NO-TC for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:01 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 33/71-10942-041B5F45; Tue, 03 Mar 2015 13:04:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1425387838!8881628!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4855 invoked from network); 3 Mar 2015 13:03:59 -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; 3 Mar 2015 13:03:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUP-0002jA-UV for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmUP-0003fX-T9 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:03:57 +0000 Date: Tue, 03 Mar 2015 13:03:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_remove_{all_}shadows{, _and_parents}() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e5a0366ff7c930bceaeecc77d21fdd3894b9c050 Author: Andrew Cooper AuthorDate: Mon Aug 11 02:38:53 2014 +0100 Commit: Tim Deegan CommitDate: Fri Feb 20 14:48:01 2015 +0000 x86/shadow: Alter sh_remove_{all_}shadows{,_and_parents}() to take a domain This allows the removal of 3 improper uses of d->vcpu[0] from toolstack context Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/mm.c | 4 ++-- xen/arch/x86/mm/shadow/common.c | 18 ++++++++---------- xen/arch/x86/mm/shadow/multi.c | 15 ++++++++------- xen/include/asm-x86/shadow.h | 8 ++++---- 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 72e383f..4734d71 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -6074,7 +6074,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) paging_mark_dirty(d, page_to_mfn(page)); /* These are most probably not page tables any more */ /* don't take a long time and don't die either */ - sh_remove_shadows(d->vcpu[0], _mfn(page_to_mfn(page)), 1, 0); + sh_remove_shadows(d, _mfn(page_to_mfn(page)), 1, 0); put_page(page); } diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 9ab7a26..ca5369a 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2118,7 +2118,7 @@ int free_page_type(struct page_info *page, unsigned long type, ASSERT(VALID_M2P(gmfn)); /* Page sharing not supported for shadowed domains */ if(!SHARED_M2P(gmfn)) - shadow_remove_all_shadows(owner->vcpu[0], _mfn(gmfn)); + shadow_remove_all_shadows(owner, _mfn(gmfn)); } if ( !(type & PGT_partial) ) @@ -2283,7 +2283,7 @@ static int __get_page_type(struct page_info *page, unsigned long type, && (page->count_info & PGC_page_table) && !((page->shadow_flags & (1u<<29)) && type == PGT_writable_page) ) - shadow_remove_all_shadows(d->vcpu[0], _mfn(page_to_mfn(page))); + shadow_remove_all_shadows(d, _mfn(page_to_mfn(page))); ASSERT(!(x & PGT_pae_xen_l2)); if ( (x & PGT_type_mask) != type ) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index e10b578..30580ee 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -687,7 +687,7 @@ static int oos_remove_write_access(struct vcpu *v, mfn_t gmfn, * the page. If that doesn't work either, the guest is granting * his pagetables and must be killed after all. * This will flush the tlb, so we can return with no worries. */ - sh_remove_shadows(v, gmfn, 0 /* Be thorough */, 1 /* Must succeed */); + sh_remove_shadows(d, gmfn, 0 /* Be thorough */, 1 /* Must succeed */); return 1; } @@ -1130,7 +1130,7 @@ sh_validate_guest_pt_write(struct vcpu *v, mfn_t gmfn, * Since the validate call above will have made a "safe" (i.e. zero) * shadow entry, we can let the domain live even if we can't fully * unshadow the page. */ - sh_remove_shadows(v, gmfn, 0, 0); + sh_remove_shadows(d, gmfn, 0, 0); } } @@ -2570,7 +2570,7 @@ static int sh_remove_shadow_via_pointer(struct domain *d, mfn_t smfn) return rc; } -void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) +void sh_remove_shadows(struct domain *d, mfn_t gmfn, int fast, int all) /* Remove the shadows of this guest page. * If fast != 0, just try the quick heuristic, which will remove * at most one reference to each shadow of the page. Otherwise, walk @@ -2579,7 +2579,6 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) * (all != 0 implies fast == 0) */ { - struct domain *d = v->domain; struct page_info *pg = mfn_to_page(gmfn); mfn_t smfn; unsigned char t; @@ -2633,8 +2632,7 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) * can be called via put_page_type when we clear a shadow l1e).*/ paging_lock_recursive(d); - SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx\n", - d->domain_id, v->vcpu_id, mfn_x(gmfn)); + SHADOW_PRINTK("d=%d: gmfn=%lx\n", d->domain_id, mfn_x(gmfn)); /* Bail out now if the page is not shadowed */ if ( (pg->count_info & PGC_page_table) == 0 ) @@ -2703,11 +2701,11 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all) } static void -sh_remove_all_shadows_and_parents(struct vcpu *v, mfn_t gmfn) +sh_remove_all_shadows_and_parents(struct domain *d, mfn_t gmfn) /* Even harsher: this is a HVM page that we thing is no longer a pagetable. * Unshadow it, and recursively unshadow pages that reference it. */ { - sh_remove_shadows(v, gmfn, 0, 1); + sh_remove_shadows(d, gmfn, 0, 1); /* XXX TODO: * Rework this hashtable walker to return a linked-list of all * the shadows it modified, then do breadth-first recursion @@ -3384,7 +3382,7 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, p2m_type_t p2mt = p2m_flags_to_type(l1e_get_flags(*p)); if ( (p2m_is_valid(p2mt) || p2m_is_grant(p2mt)) && mfn_valid(mfn) ) { - sh_remove_all_shadows_and_parents(v, mfn); + sh_remove_all_shadows_and_parents(d, mfn); if ( sh_remove_all_mappings(v, mfn) ) flush_tlb_mask(d->domain_dirty_cpumask); } @@ -3419,7 +3417,7 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, || l1e_get_pfn(npte[i]) != mfn_x(omfn) ) { /* This GFN->MFN mapping has gone away */ - sh_remove_all_shadows_and_parents(v, omfn); + sh_remove_all_shadows_and_parents(d, omfn); if ( sh_remove_all_mappings(v, omfn) ) cpumask_or(&flushmask, &flushmask, d->domain_dirty_cpumask); diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 0d1021b..7705674 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2564,7 +2564,7 @@ static inline void check_for_early_unshadow(struct vcpu *v, mfn_t gmfn) & (SHF_L2_32|SHF_L2_PAE|SHF_L2H_PAE|SHF_L4_64))) ) { perfc_incr(shadow_early_unshadow); - sh_remove_shadows(v, gmfn, 1, 0 /* Fast, can fail to unshadow */ ); + sh_remove_shadows(d, gmfn, 1, 0 /* Fast, can fail to unshadow */ ); TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_EARLY_UNSHADOW); } v->arch.paging.shadow.last_emulated_mfn_for_unshadow = mfn_x(gmfn); @@ -3251,7 +3251,7 @@ static int sh_page_fault(struct vcpu *v, SHADOW_PRINTK("user-mode fault to PT, unshadowing mfn %#lx\n", mfn_x(gmfn)); perfc_incr(shadow_fault_emulate_failed); - sh_remove_shadows(v, gmfn, 0 /* thorough */, 1 /* must succeed */); + sh_remove_shadows(d, gmfn, 0 /* thorough */, 1 /* must succeed */); trace_shadow_emulate_other(TRC_SHADOW_EMULATE_UNSHADOW_USER, va, gfn); goto done; @@ -3293,7 +3293,7 @@ static int sh_page_fault(struct vcpu *v, } if ( !used ) - sh_remove_shadows(v, gmfn, 1 /* fast */, 0 /* can fail */); + sh_remove_shadows(d, gmfn, 1 /* fast */, 0 /* can fail */); } /* @@ -3331,7 +3331,7 @@ static int sh_page_fault(struct vcpu *v, gdprintk(XENLOG_DEBUG, "write to pagetable during event " "injection: cr2=%#lx, mfn=%#lx\n", va, mfn_x(gmfn)); - sh_remove_shadows(v, gmfn, 0 /* thorough */, 1 /* must succeed */); + sh_remove_shadows(d, gmfn, 0 /* thorough */, 1 /* must succeed */); trace_shadow_emulate_other(TRC_SHADOW_EMULATE_UNSHADOW_EVTINJ, va, gfn); return EXCRET_fault_fixed; @@ -3365,7 +3365,7 @@ static int sh_page_fault(struct vcpu *v, /* If this is actually a page table, then we have a bug, and need * to support more operations in the emulator. More likely, * though, this is a hint that this page should not be shadowed. */ - shadow_remove_all_shadows(v, gmfn); + shadow_remove_all_shadows(d, gmfn); trace_shadow_emulate_other(TRC_SHADOW_EMULATE_UNSHADOW_UNHANDLED, va, gfn); @@ -4626,6 +4626,7 @@ static void *emulate_map_dest(struct vcpu *v, u32 bytes, struct sh_emulate_ctxt *sh_ctxt) { + struct domain *d = v->domain; void *map = NULL; sh_ctxt->mfn1 = emulate_gva_to_mfn(v, vaddr, sh_ctxt); @@ -4647,7 +4648,7 @@ static void *emulate_map_dest(struct vcpu *v, /* Unaligned writes mean probably this isn't a pagetable */ if ( vaddr & (bytes - 1) ) - sh_remove_shadows(v, sh_ctxt->mfn1, 0, 0 /* Slow, can fail */ ); + sh_remove_shadows(d, sh_ctxt->mfn1, 0, 0 /* Slow, can fail */ ); if ( likely(((vaddr + bytes - 1) & PAGE_MASK) == (vaddr & PAGE_MASK)) ) { @@ -4674,7 +4675,7 @@ static void *emulate_map_dest(struct vcpu *v, MAPPING_SILENT_FAIL : MAPPING_UNHANDLEABLE); /* Cross-page writes mean probably not a pagetable */ - sh_remove_shadows(v, sh_ctxt->mfn2, 0, 0 /* Slow, can fail */ ); + sh_remove_shadows(d, sh_ctxt->mfn2, 0, 0 /* Slow, can fail */ ); mfns[0] = mfn_x(sh_ctxt->mfn1); mfns[1] = mfn_x(sh_ctxt->mfn2); diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index a4c8776..5b9772d 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -79,7 +79,7 @@ void shadow_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void shadow_final_teardown(struct domain *d); -void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all); +void sh_remove_shadows(struct domain *d, mfn_t gmfn, int fast, int all); /* Discard _all_ mappings from the domain's shadows. */ void shadow_blow_tables_per_domain(struct domain *d); @@ -93,7 +93,7 @@ void shadow_blow_tables_per_domain(struct domain *d); #define shadow_track_dirty_vram(d, begin_pfn, nr, bitmap) \ ({ ASSERT_UNREACHABLE(); -EOPNOTSUPP; }) -static inline void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, +static inline void sh_remove_shadows(struct domain *d, mfn_t gmfn, bool_t fast, bool_t all) {} static inline void shadow_blow_tables_per_domain(struct domain *d) {} @@ -107,10 +107,10 @@ static inline int shadow_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, #endif /* CONFIG_SHADOW_PAGING */ /* Remove all shadows of the guest mfn. */ -static inline void shadow_remove_all_shadows(struct vcpu *v, mfn_t gmfn) +static inline void shadow_remove_all_shadows(struct domain *d, mfn_t gmfn) { /* See the comment about locking in sh_remove_shadows */ - sh_remove_shadows(v, gmfn, 0 /* Be thorough */, 1 /* Must succeed */); + sh_remove_shadows(d, gmfn, 0 /* Be thorough */, 1 /* Must succeed */); } #endif /* _XEN_SHADOW_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 03 13:04:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:04: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 1YSmUd-0008RC-LL; Tue, 03 Mar 2015 13:04:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUc-0008Qr-Pf for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:10 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 95/84-03168-A41B5F45; Tue, 03 Mar 2015 13:04:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1425387848!9654787!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16263 invoked from network); 3 Mar 2015 13:04:09 -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; 3 Mar 2015 13:04:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUa-0002ji-3m for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmUa-0003g3-2x for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:08 +0000 Date: Tue, 03 Mar 2015 13:04:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_{remove_all_mappings, rm_mappings_from_l1}() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d76738a620e8716fbfb67502da6311adf27a5ce7 Author: Andrew Cooper AuthorDate: Mon Aug 11 02:42:57 2014 +0100 Commit: Tim Deegan CommitDate: Fri Feb 20 14:48:04 2015 +0000 x86/shadow: Alter sh_{remove_all_mappings,rm_mappings_from_l1}() to take a domain This allows the removal an improper use of d->vcpu[0] from toolstack context Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 13 ++++++------- xen/arch/x86/mm/shadow/multi.c | 3 +-- xen/arch/x86/mm/shadow/multi.h | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 30580ee..d24859e 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2436,13 +2436,12 @@ int sh_remove_write_access_from_sl1p(struct domain *d, mfn_t gmfn, /* Remove all mappings of a guest frame from the shadow tables. * Returns non-zero if we need to flush TLBs. */ -static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) +static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn) { - struct domain *d = v->domain; struct page_info *page = mfn_to_page(gmfn); /* Dispatch table for getting per-type functions */ - static const hash_vcpu_callback_t callbacks[SH_type_unused] = { + static const hash_domain_callback_t callbacks[SH_type_unused] = { NULL, /* none */ SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, 2), /* l1_32 */ SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, 2), /* fl1_32 */ @@ -2484,7 +2483,7 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) /* Brute-force search of all the shadows, by walking the hash */ perfc_incr(shadow_mappings_bf); - hash_vcpu_foreach(v, callback_mask, callbacks, gmfn); + hash_domain_foreach(d, callback_mask, callbacks, gmfn); /* If that didn't catch the mapping, something is very wrong */ if ( !sh_check_page_has_no_refs(page) ) @@ -3383,7 +3382,7 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, if ( (p2m_is_valid(p2mt) || p2m_is_grant(p2mt)) && mfn_valid(mfn) ) { sh_remove_all_shadows_and_parents(d, mfn); - if ( sh_remove_all_mappings(v, mfn) ) + if ( sh_remove_all_mappings(d, mfn) ) flush_tlb_mask(d->domain_dirty_cpumask); } } @@ -3418,7 +3417,7 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, { /* This GFN->MFN mapping has gone away */ sh_remove_all_shadows_and_parents(d, omfn); - if ( sh_remove_all_mappings(v, omfn) ) + if ( sh_remove_all_mappings(d, omfn) ) cpumask_or(&flushmask, &flushmask, d->domain_dirty_cpumask); } @@ -3634,7 +3633,7 @@ int shadow_track_dirty_vram(struct domain *d, dirty = 1; /* TODO: Heuristics for finding the single mapping of * this gmfn */ - flush_tlb |= sh_remove_all_mappings(d->vcpu[0], mfn); + flush_tlb |= sh_remove_all_mappings(d, mfn); } else { diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 7705674..288c7d5 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4315,10 +4315,9 @@ int sh_rm_write_access_from_l1(struct domain *d, mfn_t sl1mfn, } -int sh_rm_mappings_from_l1(struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn) +int sh_rm_mappings_from_l1(struct domain *d, mfn_t sl1mfn, mfn_t target_mfn) /* Excises all mappings to guest frame from this shadow l1 table */ { - struct domain *d = v->domain; shadow_l1e_t *sl1e; int done = 0; int flags; diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index 1af9225..935e12d 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -65,7 +65,7 @@ SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, GUEST_LEVELS) (struct domain *d, mfn_t sl1mfn, mfn_t readonly_mfn); extern int SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, GUEST_LEVELS) - (struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn); + (struct domain *d, mfn_t sl1mfn, mfn_t target_mfn); extern void SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, GUEST_LEVELS) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:04:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:04: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 1YSmUd-0008RC-LL; Tue, 03 Mar 2015 13:04:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUc-0008Qr-Pf for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:10 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 95/84-03168-A41B5F45; Tue, 03 Mar 2015 13:04:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1425387848!9654787!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16263 invoked from network); 3 Mar 2015 13:04:09 -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; 3 Mar 2015 13:04:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUa-0002ji-3m for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmUa-0003g3-2x for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:08 +0000 Date: Tue, 03 Mar 2015 13:04:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_{remove_all_mappings, rm_mappings_from_l1}() to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d76738a620e8716fbfb67502da6311adf27a5ce7 Author: Andrew Cooper AuthorDate: Mon Aug 11 02:42:57 2014 +0100 Commit: Tim Deegan CommitDate: Fri Feb 20 14:48:04 2015 +0000 x86/shadow: Alter sh_{remove_all_mappings,rm_mappings_from_l1}() to take a domain This allows the removal an improper use of d->vcpu[0] from toolstack context Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 13 ++++++------- xen/arch/x86/mm/shadow/multi.c | 3 +-- xen/arch/x86/mm/shadow/multi.h | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 30580ee..d24859e 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2436,13 +2436,12 @@ int sh_remove_write_access_from_sl1p(struct domain *d, mfn_t gmfn, /* Remove all mappings of a guest frame from the shadow tables. * Returns non-zero if we need to flush TLBs. */ -static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) +static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn) { - struct domain *d = v->domain; struct page_info *page = mfn_to_page(gmfn); /* Dispatch table for getting per-type functions */ - static const hash_vcpu_callback_t callbacks[SH_type_unused] = { + static const hash_domain_callback_t callbacks[SH_type_unused] = { NULL, /* none */ SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, 2), /* l1_32 */ SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, 2), /* fl1_32 */ @@ -2484,7 +2483,7 @@ static int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) /* Brute-force search of all the shadows, by walking the hash */ perfc_incr(shadow_mappings_bf); - hash_vcpu_foreach(v, callback_mask, callbacks, gmfn); + hash_domain_foreach(d, callback_mask, callbacks, gmfn); /* If that didn't catch the mapping, something is very wrong */ if ( !sh_check_page_has_no_refs(page) ) @@ -3383,7 +3382,7 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, if ( (p2m_is_valid(p2mt) || p2m_is_grant(p2mt)) && mfn_valid(mfn) ) { sh_remove_all_shadows_and_parents(d, mfn); - if ( sh_remove_all_mappings(v, mfn) ) + if ( sh_remove_all_mappings(d, mfn) ) flush_tlb_mask(d->domain_dirty_cpumask); } } @@ -3418,7 +3417,7 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, { /* This GFN->MFN mapping has gone away */ sh_remove_all_shadows_and_parents(d, omfn); - if ( sh_remove_all_mappings(v, omfn) ) + if ( sh_remove_all_mappings(d, omfn) ) cpumask_or(&flushmask, &flushmask, d->domain_dirty_cpumask); } @@ -3634,7 +3633,7 @@ int shadow_track_dirty_vram(struct domain *d, dirty = 1; /* TODO: Heuristics for finding the single mapping of * this gmfn */ - flush_tlb |= sh_remove_all_mappings(d->vcpu[0], mfn); + flush_tlb |= sh_remove_all_mappings(d, mfn); } else { diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 7705674..288c7d5 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4315,10 +4315,9 @@ int sh_rm_write_access_from_l1(struct domain *d, mfn_t sl1mfn, } -int sh_rm_mappings_from_l1(struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn) +int sh_rm_mappings_from_l1(struct domain *d, mfn_t sl1mfn, mfn_t target_mfn) /* Excises all mappings to guest frame from this shadow l1 table */ { - struct domain *d = v->domain; shadow_l1e_t *sl1e; int done = 0; int flags; diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index 1af9225..935e12d 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -65,7 +65,7 @@ SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, GUEST_LEVELS) (struct domain *d, mfn_t sl1mfn, mfn_t readonly_mfn); extern int SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, GUEST_LEVELS) - (struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn); + (struct domain *d, mfn_t sl1mfn, mfn_t target_mfn); extern void SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, GUEST_LEVELS) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:04:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:04: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 1YSmUn-0008Tm-O9; Tue, 03 Mar 2015 13:04:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUm-0008TM-RG for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:21 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id BA/96-02994-451B5F45; Tue, 03 Mar 2015 13:04:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1425387858!14273128!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27385 invoked from network); 3 Mar 2015 13:04:19 -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; 3 Mar 2015 13:04:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUk-0002jo-8T for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmUk-0003h1-7I for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:18 +0000 Date: Tue, 03 Mar 2015 13:04:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_remove_write_access to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 190a54e1776a33d0c12678a2c279640e38df0237 Author: Andrew Cooper AuthorDate: Sat Feb 7 16:50:10 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:48:09 2015 +0000 x86/shadow: Alter sh_remove_write_access to take a domain This allows the removal an improper use of d->vcpu[0] from toolstack context Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 7 +++---- xen/arch/x86/mm/shadow/multi.c | 16 ++++++---------- xen/arch/x86/mm/shadow/private.h | 2 +- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index d24859e..4e6397a 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -671,7 +671,7 @@ static int oos_remove_write_access(struct vcpu *v, mfn_t gmfn, ftlb |= oos_fixup_flush_gmfn(v, gmfn, fixup); - switch ( sh_remove_write_access(v, gmfn, 0, 0) ) + switch ( sh_remove_write_access(d, gmfn, 0, 0) ) { default: case 0: @@ -2180,7 +2180,7 @@ static inline void trace_shadow_wrmap_bf(mfn_t gmfn) * level==0 means we have some other reason for revoking write access. * If level==0 we are allowed to fail, returning -1. */ -int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, +int sh_remove_write_access(struct domain *d, mfn_t gmfn, unsigned int level, unsigned long fault_addr) { @@ -2212,7 +2212,6 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, | SHF_L1_64 | SHF_FL1_64 ; - struct domain *d = v->domain; struct page_info *pg = mfn_to_page(gmfn); #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC struct vcpu *curr = current; @@ -3689,7 +3688,7 @@ int shadow_track_dirty_vram(struct domain *d, for ( i = begin_pfn; i < end_pfn; i++ ) { mfn_t mfn = get_gfn_query_unlocked(d, i, &t); if (mfn_x(mfn) != INVALID_MFN) - flush_tlb |= sh_remove_write_access(d->vcpu[0], mfn, 1, 0); + flush_tlb |= sh_remove_write_access(d, mfn, 1, 0); } dirty_vram->last_dirty = -1; } diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 288c7d5..16cd60d 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -278,11 +278,7 @@ shadow_check_gl1e(struct vcpu *v, walk_t *gw) static inline uint32_t gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) { -#if GUEST_PAGING_LEVELS >= 3 /* PAE or 64... */ -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) struct domain *d = v->domain; -#endif -#endif uint32_t rc = 0; #if GUEST_PAGING_LEVELS >= 3 /* PAE or 64... */ @@ -295,7 +291,7 @@ gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) } else #endif /* OOS */ - if ( sh_remove_write_access(v, gw->l3mfn, 3, va) ) + if ( sh_remove_write_access(d, gw->l3mfn, 3, va) ) rc = GW_RMWR_FLUSHTLB; #endif /* GUEST_PAGING_LEVELS >= 4 */ @@ -307,7 +303,7 @@ gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) } else #endif /* OOS */ - if ( sh_remove_write_access(v, gw->l2mfn, 2, va) ) + if ( sh_remove_write_access(d, gw->l2mfn, 2, va) ) rc |= GW_RMWR_FLUSHTLB; #endif /* GUEST_PAGING_LEVELS >= 3 */ @@ -316,7 +312,7 @@ gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) && !mfn_is_out_of_sync(gw->l1mfn) #endif /* OOS */ - && sh_remove_write_access(v, gw->l1mfn, 1, va) ) + && sh_remove_write_access(d, gw->l1mfn, 1, va) ) rc |= GW_RMWR_FLUSHTLB; return rc; @@ -4028,7 +4024,7 @@ sh_update_cr3(struct vcpu *v, int do_locking) * replace the old shadow pagetable(s), so that we can safely use the * (old) shadow linear maps in the writeable mapping heuristics. */ #if GUEST_PAGING_LEVELS == 2 - if ( sh_remove_write_access(v, gmfn, 2, 0) != 0 ) + if ( sh_remove_write_access(d, gmfn, 2, 0) != 0 ) flush_tlb_mask(d->domain_dirty_cpumask); sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l2_shadow); #elif GUEST_PAGING_LEVELS == 3 @@ -4048,7 +4044,7 @@ sh_update_cr3(struct vcpu *v, int do_locking) gl2gfn = guest_l3e_get_gfn(gl3e[i]); gl2mfn = get_gfn_query_unlocked(d, gfn_x(gl2gfn), &p2mt); if ( p2m_is_ram(p2mt) ) - flush |= sh_remove_write_access(v, gl2mfn, 2, 0); + flush |= sh_remove_write_access(d, gl2mfn, 2, 0); } } if ( flush ) @@ -4072,7 +4068,7 @@ sh_update_cr3(struct vcpu *v, int do_locking) } } #elif GUEST_PAGING_LEVELS == 4 - if ( sh_remove_write_access(v, gmfn, 4, 0) != 0 ) + if ( sh_remove_write_access(d, gmfn, 4, 0) != 0 ) flush_tlb_mask(d->domain_dirty_cpumask); sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l4_shadow); #else diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index 96b53b9..1bf1deb 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -374,7 +374,7 @@ void sh_validate_guest_pt_write(struct vcpu *v, mfn_t gmfn, * Returns non-zero if we need to flush TLBs. * level and fault_addr desribe how we found this to be a pagetable; * level==0 means we have some other reason for revoking write access. */ -extern int sh_remove_write_access(struct vcpu *v, mfn_t readonly_mfn, +extern int sh_remove_write_access(struct domain *d, mfn_t readonly_mfn, unsigned int level, unsigned long fault_addr); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:04:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:04: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 1YSmUn-0008Tm-O9; Tue, 03 Mar 2015 13:04:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUm-0008TM-RG for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:21 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id BA/96-02994-451B5F45; Tue, 03 Mar 2015 13:04:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1425387858!14273128!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27385 invoked from network); 3 Mar 2015 13:04:19 -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; 3 Mar 2015 13:04:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUk-0002jo-8T for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmUk-0003h1-7I for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:18 +0000 Date: Tue, 03 Mar 2015 13:04:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Alter sh_remove_write_access to take a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 190a54e1776a33d0c12678a2c279640e38df0237 Author: Andrew Cooper AuthorDate: Sat Feb 7 16:50:10 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:48:09 2015 +0000 x86/shadow: Alter sh_remove_write_access to take a domain This allows the removal an improper use of d->vcpu[0] from toolstack context Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 7 +++---- xen/arch/x86/mm/shadow/multi.c | 16 ++++++---------- xen/arch/x86/mm/shadow/private.h | 2 +- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index d24859e..4e6397a 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -671,7 +671,7 @@ static int oos_remove_write_access(struct vcpu *v, mfn_t gmfn, ftlb |= oos_fixup_flush_gmfn(v, gmfn, fixup); - switch ( sh_remove_write_access(v, gmfn, 0, 0) ) + switch ( sh_remove_write_access(d, gmfn, 0, 0) ) { default: case 0: @@ -2180,7 +2180,7 @@ static inline void trace_shadow_wrmap_bf(mfn_t gmfn) * level==0 means we have some other reason for revoking write access. * If level==0 we are allowed to fail, returning -1. */ -int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, +int sh_remove_write_access(struct domain *d, mfn_t gmfn, unsigned int level, unsigned long fault_addr) { @@ -2212,7 +2212,6 @@ int sh_remove_write_access(struct vcpu *v, mfn_t gmfn, | SHF_L1_64 | SHF_FL1_64 ; - struct domain *d = v->domain; struct page_info *pg = mfn_to_page(gmfn); #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC struct vcpu *curr = current; @@ -3689,7 +3688,7 @@ int shadow_track_dirty_vram(struct domain *d, for ( i = begin_pfn; i < end_pfn; i++ ) { mfn_t mfn = get_gfn_query_unlocked(d, i, &t); if (mfn_x(mfn) != INVALID_MFN) - flush_tlb |= sh_remove_write_access(d->vcpu[0], mfn, 1, 0); + flush_tlb |= sh_remove_write_access(d, mfn, 1, 0); } dirty_vram->last_dirty = -1; } diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 288c7d5..16cd60d 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -278,11 +278,7 @@ shadow_check_gl1e(struct vcpu *v, walk_t *gw) static inline uint32_t gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) { -#if GUEST_PAGING_LEVELS >= 3 /* PAE or 64... */ -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) struct domain *d = v->domain; -#endif -#endif uint32_t rc = 0; #if GUEST_PAGING_LEVELS >= 3 /* PAE or 64... */ @@ -295,7 +291,7 @@ gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) } else #endif /* OOS */ - if ( sh_remove_write_access(v, gw->l3mfn, 3, va) ) + if ( sh_remove_write_access(d, gw->l3mfn, 3, va) ) rc = GW_RMWR_FLUSHTLB; #endif /* GUEST_PAGING_LEVELS >= 4 */ @@ -307,7 +303,7 @@ gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) } else #endif /* OOS */ - if ( sh_remove_write_access(v, gw->l2mfn, 2, va) ) + if ( sh_remove_write_access(d, gw->l2mfn, 2, va) ) rc |= GW_RMWR_FLUSHTLB; #endif /* GUEST_PAGING_LEVELS >= 3 */ @@ -316,7 +312,7 @@ gw_remove_write_accesses(struct vcpu *v, unsigned long va, walk_t *gw) #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) && !mfn_is_out_of_sync(gw->l1mfn) #endif /* OOS */ - && sh_remove_write_access(v, gw->l1mfn, 1, va) ) + && sh_remove_write_access(d, gw->l1mfn, 1, va) ) rc |= GW_RMWR_FLUSHTLB; return rc; @@ -4028,7 +4024,7 @@ sh_update_cr3(struct vcpu *v, int do_locking) * replace the old shadow pagetable(s), so that we can safely use the * (old) shadow linear maps in the writeable mapping heuristics. */ #if GUEST_PAGING_LEVELS == 2 - if ( sh_remove_write_access(v, gmfn, 2, 0) != 0 ) + if ( sh_remove_write_access(d, gmfn, 2, 0) != 0 ) flush_tlb_mask(d->domain_dirty_cpumask); sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l2_shadow); #elif GUEST_PAGING_LEVELS == 3 @@ -4048,7 +4044,7 @@ sh_update_cr3(struct vcpu *v, int do_locking) gl2gfn = guest_l3e_get_gfn(gl3e[i]); gl2mfn = get_gfn_query_unlocked(d, gfn_x(gl2gfn), &p2mt); if ( p2m_is_ram(p2mt) ) - flush |= sh_remove_write_access(v, gl2mfn, 2, 0); + flush |= sh_remove_write_access(d, gl2mfn, 2, 0); } } if ( flush ) @@ -4072,7 +4068,7 @@ sh_update_cr3(struct vcpu *v, int do_locking) } } #elif GUEST_PAGING_LEVELS == 4 - if ( sh_remove_write_access(v, gmfn, 4, 0) != 0 ) + if ( sh_remove_write_access(d, gmfn, 4, 0) != 0 ) flush_tlb_mask(d->domain_dirty_cpumask); sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l4_shadow); #else diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index 96b53b9..1bf1deb 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -374,7 +374,7 @@ void sh_validate_guest_pt_write(struct vcpu *v, mfn_t gmfn, * Returns non-zero if we need to flush TLBs. * level and fault_addr desribe how we found this to be a pagetable; * level==0 means we have some other reason for revoking write access. */ -extern int sh_remove_write_access(struct vcpu *v, mfn_t readonly_mfn, +extern int sh_remove_write_access(struct domain *d, mfn_t readonly_mfn, unsigned int level, unsigned long fault_addr); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:04:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:04: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 1YSmUx-00005c-R0; Tue, 03 Mar 2015 13:04:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUw-00005G-La for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:30 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 21/FF-25903-D51B5F45; Tue, 03 Mar 2015 13:04:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1425387868!7343374!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7165 invoked from network); 3 Mar 2015 13:04:29 -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; 3 Mar 2015 13:04:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUu-0002jw-Cr for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmUu-0003hQ-C1 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:28 +0000 Date: Tue, 03 Mar 2015 13:04:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Cleanup of vcpu 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 6ac984f8a9f3ce20af42490bafa9db31c19564ae Author: Andrew Cooper AuthorDate: Sat Feb 7 16:01:13 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:48:13 2015 +0000 x86/shadow: Cleanup of vcpu handling There existed some codepaths which had a domain in their hand, but needed a vcpu to drive the shadow interface. Now that these interfaces have changed to be domain based, the hoop-jumping can be removed. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 30 ++++++++++-------------------- 1 files changed, 10 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 4e6397a..01bc750 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1280,23 +1280,17 @@ static inline void trace_shadow_prealloc_unpin(struct domain *d, mfn_t smfn) /* Make sure there are at least count order-sized pages * available in the shadow page pool. */ -static void _shadow_prealloc( - struct domain *d, - unsigned int pages) +static void _shadow_prealloc(struct domain *d, unsigned int pages) { - /* Need a vpcu for calling unpins; for now, since we don't have - * per-vcpu shadows, any will do */ - struct vcpu *v, *v2; + struct vcpu *v; struct page_info *sp, *t; mfn_t smfn; int i; if ( d->arch.paging.shadow.free_pages >= pages ) return; - v = current; - if ( v->domain != d ) - v = d->vcpu[0]; - ASSERT(v != NULL); /* Shouldn't have enabled shadows if we've no vcpus */ + /* Shouldn't have enabled shadows if we've no vcpus. */ + ASSERT(d->vcpu && d->vcpu[0]); /* Stage one: walk the list of pinned pages, unpinning them */ perfc_incr(shadow_prealloc_1); @@ -1317,14 +1311,14 @@ static void _shadow_prealloc( * mappings. */ perfc_incr(shadow_prealloc_2); - for_each_vcpu(d, v2) + for_each_vcpu(d, v) for ( i = 0 ; i < 4 ; i++ ) { - if ( !pagetable_is_null(v2->arch.shadow_table[i]) ) + if ( !pagetable_is_null(v->arch.shadow_table[i]) ) { TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_PREALLOC_UNHOOK); shadow_unhook_mappings(d, - pagetable_get_mfn(v2->arch.shadow_table[i]), 0); + pagetable_get_mfn(v->arch.shadow_table[i]), 0); /* See if that freed up enough space */ if ( d->arch.paging.shadow.free_pages >= pages ) @@ -1361,11 +1355,12 @@ void shadow_prealloc(struct domain *d, u32 type, unsigned int count) static void shadow_blow_tables(struct domain *d) { struct page_info *sp, *t; - struct vcpu *v = d->vcpu[0]; + struct vcpu *v; mfn_t smfn; int i; - ASSERT(v != NULL); + /* Shouldn't have enabled shadows if we've no vcpus. */ + ASSERT(d->vcpu && d->vcpu[0]); /* Pass one: unpin all pinned pages */ foreach_pinned_shadow(d, sp, t) @@ -3363,11 +3358,6 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, l1_pgentry_t *p, l1_pgentry_t new, unsigned int level) { - struct vcpu *v = current; - - if ( v->domain != d ) - v = d->vcpu ? d->vcpu[0] : NULL; - /* The following assertion is to make sure we don't step on 1GB host * page support of HVM guest. */ ASSERT(!(level > 2 && (l1e_get_flags(*p) & _PAGE_PRESENT) && -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:04:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:04: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 1YSmUx-00005c-R0; Tue, 03 Mar 2015 13:04:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUw-00005G-La for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:30 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 21/FF-25903-D51B5F45; Tue, 03 Mar 2015 13:04:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1425387868!7343374!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7165 invoked from network); 3 Mar 2015 13:04:29 -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; 3 Mar 2015 13:04:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmUu-0002jw-Cr for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmUu-0003hQ-C1 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:28 +0000 Date: Tue, 03 Mar 2015 13:04:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: Cleanup of vcpu 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 6ac984f8a9f3ce20af42490bafa9db31c19564ae Author: Andrew Cooper AuthorDate: Sat Feb 7 16:01:13 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 20 14:48:13 2015 +0000 x86/shadow: Cleanup of vcpu handling There existed some codepaths which had a domain in their hand, but needed a vcpu to drive the shadow interface. Now that these interfaces have changed to be domain based, the hoop-jumping can be removed. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 30 ++++++++++-------------------- 1 files changed, 10 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 4e6397a..01bc750 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1280,23 +1280,17 @@ static inline void trace_shadow_prealloc_unpin(struct domain *d, mfn_t smfn) /* Make sure there are at least count order-sized pages * available in the shadow page pool. */ -static void _shadow_prealloc( - struct domain *d, - unsigned int pages) +static void _shadow_prealloc(struct domain *d, unsigned int pages) { - /* Need a vpcu for calling unpins; for now, since we don't have - * per-vcpu shadows, any will do */ - struct vcpu *v, *v2; + struct vcpu *v; struct page_info *sp, *t; mfn_t smfn; int i; if ( d->arch.paging.shadow.free_pages >= pages ) return; - v = current; - if ( v->domain != d ) - v = d->vcpu[0]; - ASSERT(v != NULL); /* Shouldn't have enabled shadows if we've no vcpus */ + /* Shouldn't have enabled shadows if we've no vcpus. */ + ASSERT(d->vcpu && d->vcpu[0]); /* Stage one: walk the list of pinned pages, unpinning them */ perfc_incr(shadow_prealloc_1); @@ -1317,14 +1311,14 @@ static void _shadow_prealloc( * mappings. */ perfc_incr(shadow_prealloc_2); - for_each_vcpu(d, v2) + for_each_vcpu(d, v) for ( i = 0 ; i < 4 ; i++ ) { - if ( !pagetable_is_null(v2->arch.shadow_table[i]) ) + if ( !pagetable_is_null(v->arch.shadow_table[i]) ) { TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_PREALLOC_UNHOOK); shadow_unhook_mappings(d, - pagetable_get_mfn(v2->arch.shadow_table[i]), 0); + pagetable_get_mfn(v->arch.shadow_table[i]), 0); /* See if that freed up enough space */ if ( d->arch.paging.shadow.free_pages >= pages ) @@ -1361,11 +1355,12 @@ void shadow_prealloc(struct domain *d, u32 type, unsigned int count) static void shadow_blow_tables(struct domain *d) { struct page_info *sp, *t; - struct vcpu *v = d->vcpu[0]; + struct vcpu *v; mfn_t smfn; int i; - ASSERT(v != NULL); + /* Shouldn't have enabled shadows if we've no vcpus. */ + ASSERT(d->vcpu && d->vcpu[0]); /* Pass one: unpin all pinned pages */ foreach_pinned_shadow(d, sp, t) @@ -3363,11 +3358,6 @@ static void sh_unshadow_for_p2m_change(struct domain *d, unsigned long gfn, l1_pgentry_t *p, l1_pgentry_t new, unsigned int level) { - struct vcpu *v = current; - - if ( v->domain != d ) - v = d->vcpu ? d->vcpu[0] : NULL; - /* The following assertion is to make sure we don't step on 1GB host * page support of HVM guest. */ ASSERT(!(level > 2 && (l1e_get_flags(*p) & _PAGE_PRESENT) && -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:04:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:04: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 1YSmV7-00007p-Tc; Tue, 03 Mar 2015 13:04:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmV7-00007h-3n for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:41 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 83/70-02750-861B5F45; Tue, 03 Mar 2015 13:04:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1425387878!14284175!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23955 invoked from network); 3 Mar 2015 13:04:39 -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; 3 Mar 2015 13:04:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmV4-0002k2-Hl for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmV4-0003hx-Gt for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:38 +0000 Date: Tue, 03 Mar 2015 13:04:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: add x86 emulator test directory to "X86 ARCHITECTURE" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b63c7db5fc6bc8f53354520c537e9f84f80e3512 Author: Jan Beulich AuthorDate: Fri Feb 20 16:20:52 2015 +0100 Commit: Jan Beulich CommitDate: Fri Feb 20 16:20:52 2015 +0100 MAINTAINERS: add x86 emulator test directory to "X86 ARCHITECTURE" Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Wei Liu Acked-by: Ian Campbell --- MAINTAINERS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 3bbac9e..3ca757d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -347,6 +347,7 @@ L: xen-devel@lists.xen.org F: xen/arch/x86/ F: xen/include/asm-x86/ F: tools/firmware/hvmloader/ +F: tools/tests/x86_emulator/ X86 MEMORY MANAGEMENT M: Tim Deegan -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:04:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:04: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 1YSmV7-00007p-Tc; Tue, 03 Mar 2015 13:04:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmV7-00007h-3n for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:41 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 83/70-02750-861B5F45; Tue, 03 Mar 2015 13:04:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1425387878!14284175!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23955 invoked from network); 3 Mar 2015 13:04:39 -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; 3 Mar 2015 13:04:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmV4-0002k2-Hl for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmV4-0003hx-Gt for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:38 +0000 Date: Tue, 03 Mar 2015 13:04:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: add x86 emulator test directory to "X86 ARCHITECTURE" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b63c7db5fc6bc8f53354520c537e9f84f80e3512 Author: Jan Beulich AuthorDate: Fri Feb 20 16:20:52 2015 +0100 Commit: Jan Beulich CommitDate: Fri Feb 20 16:20:52 2015 +0100 MAINTAINERS: add x86 emulator test directory to "X86 ARCHITECTURE" Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Wei Liu Acked-by: Ian Campbell --- MAINTAINERS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 3bbac9e..3ca757d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -347,6 +347,7 @@ L: xen-devel@lists.xen.org F: xen/arch/x86/ F: xen/include/asm-x86/ F: tools/firmware/hvmloader/ +F: tools/tests/x86_emulator/ X86 MEMORY MANAGEMENT M: Tim Deegan -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:04:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:04: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 1YSmVI-00009L-03; Tue, 03 Mar 2015 13:04:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmVH-000096-59 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:51 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 5E/A8-02884-271B5F45; Tue, 03 Mar 2015 13:04:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1425387888!12633354!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4844 invoked from network); 3 Mar 2015 13:04:49 -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; 3 Mar 2015 13:04:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmVE-0002k8-Lk for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmVE-0003iJ-Kx for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:48 +0000 Date: Tue, 03 Mar 2015 13:04:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix build failure if using perfc=y X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 24b2b8dea180098a3acc809a91cde6c0cc4c8607 Author: Dario Faggioli AuthorDate: Fri Feb 20 16:21:10 2015 +0100 Commit: Jan Beulich CommitDate: Fri Feb 20 16:21:10 2015 +0100 fix build failure if using perfc=y by providing the definition of the {w,r}rmsr_tsc_msr counters, used within Viridian implementation. Signed-off-by: Dario Faggioli --- xen/include/asm-x86/perfc_defn.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/include/asm-x86/perfc_defn.h b/xen/include/asm-x86/perfc_defn.h index 170da00..9ef092e 100644 --- a/xen/include/asm-x86/perfc_defn.h +++ b/xen/include/asm-x86/perfc_defn.h @@ -125,6 +125,7 @@ PERFCOUNTER(mshv_rdmsr_icr, "MS Hv rdmsr icr") PERFCOUNTER(mshv_rdmsr_tpr, "MS Hv rdmsr tpr") PERFCOUNTER(mshv_rdmsr_apic_assist, "MS Hv rdmsr APIC assist") PERFCOUNTER(mshv_rdmsr_apic_msr, "MS Hv rdmsr APIC msr") +PERFCOUNTER(mshv_rdmsr_tsc_msr, "MS Hv rdmsr TSC msr") PERFCOUNTER(mshv_wrmsr_osid, "MS Hv wrmsr Guest OS ID") PERFCOUNTER(mshv_wrmsr_hc_page, "MS Hv wrmsr hypercall page") PERFCOUNTER(mshv_wrmsr_vp_index, "MS Hv wrmsr vp index") @@ -133,6 +134,7 @@ PERFCOUNTER(mshv_wrmsr_tpr, "MS Hv wrmsr tpr") PERFCOUNTER(mshv_wrmsr_eoi, "MS Hv wrmsr eoi") PERFCOUNTER(mshv_wrmsr_apic_assist, "MS Hv wrmsr APIC assist") PERFCOUNTER(mshv_wrmsr_apic_msr, "MS Hv wrmsr APIC msr") +PERFCOUNTER(mshv_wrmsr_tsc_msr, "MS Hv wrmsr TSC msr") PERFCOUNTER(realmode_emulations, "realmode instructions emulated") PERFCOUNTER(realmode_exits, "vmexits from realmode") -- generated by git-patchbot for /home/xen/git/xen.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 Mar 03 13:04:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2015 13:04: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 1YSmVI-00009L-03; Tue, 03 Mar 2015 13:04:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmVH-000096-59 for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:51 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 5E/A8-02884-271B5F45; Tue, 03 Mar 2015 13:04:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1425387888!12633354!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4844 invoked from network); 3 Mar 2015 13:04:49 -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; 3 Mar 2015 13:04:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YSmVE-0002k8-Lk for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YSmVE-0003iJ-Kx for xen-changelog@lists.xensource.com; Tue, 03 Mar 2015 13:04:48 +0000 Date: Tue, 03 Mar 2015 13:04:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix build failure if using perfc=y X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 24b2b8dea180098a3acc809a91cde6c0cc4c8607 Author: Dario Faggioli AuthorDate: Fri Feb 20 16:21:10 2015 +0100 Commit: Jan Beulich CommitDate: Fri Feb 20 16:21:10 2015 +0100 fix build failure if using perfc=y by providing the definition of the {w,r}rmsr_tsc_msr counters, used within Viridian implementation. Signed-off-by: Dario Faggioli --- xen/include/asm-x86/perfc_defn.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/include/asm-x86/perfc_defn.h b/xen/include/asm-x86/perfc_defn.h index 170da00..9ef092e 100644 --- a/xen/include/asm-x86/perfc_defn.h +++ b/xen/include/asm-x86/perfc_defn.h @@ -125,6 +125,7 @@ PERFCOUNTER(mshv_rdmsr_icr, "MS Hv rdmsr icr") PERFCOUNTER(mshv_rdmsr_tpr, "MS Hv rdmsr tpr") PERFCOUNTER(mshv_rdmsr_apic_assist, "MS Hv rdmsr APIC assist") PERFCOUNTER(mshv_rdmsr_apic_msr, "MS Hv rdmsr APIC msr") +PERFCOUNTER(mshv_rdmsr_tsc_msr, "MS Hv rdmsr TSC msr") PERFCOUNTER(mshv_wrmsr_osid, "MS Hv wrmsr Guest OS ID") PERFCOUNTER(mshv_wrmsr_hc_page, "MS Hv wrmsr hypercall page") PERFCOUNTER(mshv_wrmsr_vp_index, "MS Hv wrmsr vp index") @@ -133,6 +134,7 @@ PERFCOUNTER(mshv_wrmsr_tpr, "MS Hv wrmsr tpr") PERFCOUNTER(mshv_wrmsr_eoi, "MS Hv wrmsr eoi") PERFCOUNTER(mshv_wrmsr_apic_assist, "MS Hv wrmsr APIC assist") PERFCOUNTER(mshv_wrmsr_apic_msr, "MS Hv wrmsr APIC msr") +PERFCOUNTER(mshv_wrmsr_tsc_msr, "MS Hv wrmsr TSC msr") PERFCOUNTER(realmode_emulations, "realmode instructions emulated") PERFCOUNTER(realmode_exits, "vmexits from realmode") -- generated by git-patchbot for /home/xen/git/xen.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 Mar 05 18:11:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Mar 2015 18:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTaEm-0006BE-0Z; Thu, 05 Mar 2015 18:11:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTaEj-00067y-TM for xen-changelog@lists.xensource.com; Thu, 05 Mar 2015 18:11:06 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 57/75-02745-93C98F45; Thu, 05 Mar 2015 18:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425579063!13549482!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13593 invoked from network); 5 Mar 2015 18:11:04 -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; 5 Mar 2015 18:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTaEg-0003z9-Ud for xen-changelog@lists.xensource.com; Thu, 05 Mar 2015 18:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTaEg-0007De-H0 for xen-changelog@lists.xensource.com; Thu, 05 Mar 2015 18:11:02 +0000 Date: Thu, 05 Mar 2015 18:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/libxc: Don't leave scratch_pfn uninitialised if the domain has no memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3665563ac10c5476484dc1c13776fd997c1592e5 Author: Andrew Cooper AuthorDate: Wed Jan 28 15:52:35 2015 +0000 Commit: Ian Jackson CommitDate: Tue Mar 3 17:40:56 2015 +0000 tools/libxc: Don't leave scratch_pfn uninitialised if the domain has no memory c/s 5b5c40c0d1 "libxc: introduce a per architecture scratch pfn for temporary grant mapping" accidentally an issue whereby there were two paths out of xc_core_arch_get_scratch_gpfn() which returned 0, but only one of which assigned a value to the gpfn parameter. xc_domain_maximum_gpfn() can validly return 0, at which point gpfn 1 is a valid scratch page to use. In addition, widen rc before adding 1 and possibly overflowing. Signed-off-by: Andrew Cooper CC: Julien Grall CC: Jan Beulich CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 5b0447f647b1031595d24a8a50b362726c887d12) --- tools/libxc/xc_core_x86.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_core_x86.c b/tools/libxc/xc_core_x86.c index fac99ec..d8846f1 100644 --- a/tools/libxc/xc_core_x86.c +++ b/tools/libxc/xc_core_x86.c @@ -214,10 +214,10 @@ xc_core_arch_get_scratch_gpfn(xc_interface *xch, domid_t domid, rc = xc_domain_maximum_gpfn(xch, domid); - if ( rc <= 0 ) + if ( rc < 0 ) return rc; - *gpfn = rc + 1; + *gpfn = (xen_pfn_t)rc + 1; return 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 Mar 05 18:11:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Mar 2015 18:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTaEm-0006BE-0Z; Thu, 05 Mar 2015 18:11:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTaEj-00067y-TM for xen-changelog@lists.xensource.com; Thu, 05 Mar 2015 18:11:06 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 57/75-02745-93C98F45; Thu, 05 Mar 2015 18:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425579063!13549482!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13593 invoked from network); 5 Mar 2015 18:11:04 -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; 5 Mar 2015 18:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTaEg-0003z9-Ud for xen-changelog@lists.xensource.com; Thu, 05 Mar 2015 18:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTaEg-0007De-H0 for xen-changelog@lists.xensource.com; Thu, 05 Mar 2015 18:11:02 +0000 Date: Thu, 05 Mar 2015 18:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/libxc: Don't leave scratch_pfn uninitialised if the domain has no memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3665563ac10c5476484dc1c13776fd997c1592e5 Author: Andrew Cooper AuthorDate: Wed Jan 28 15:52:35 2015 +0000 Commit: Ian Jackson CommitDate: Tue Mar 3 17:40:56 2015 +0000 tools/libxc: Don't leave scratch_pfn uninitialised if the domain has no memory c/s 5b5c40c0d1 "libxc: introduce a per architecture scratch pfn for temporary grant mapping" accidentally an issue whereby there were two paths out of xc_core_arch_get_scratch_gpfn() which returned 0, but only one of which assigned a value to the gpfn parameter. xc_domain_maximum_gpfn() can validly return 0, at which point gpfn 1 is a valid scratch page to use. In addition, widen rc before adding 1 and possibly overflowing. Signed-off-by: Andrew Cooper CC: Julien Grall CC: Jan Beulich CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 5b0447f647b1031595d24a8a50b362726c887d12) --- tools/libxc/xc_core_x86.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_core_x86.c b/tools/libxc/xc_core_x86.c index fac99ec..d8846f1 100644 --- a/tools/libxc/xc_core_x86.c +++ b/tools/libxc/xc_core_x86.c @@ -214,10 +214,10 @@ xc_core_arch_get_scratch_gpfn(xc_interface *xch, domid_t domid, rc = xc_domain_maximum_gpfn(xch, domid); - if ( rc <= 0 ) + if ( rc < 0 ) return rc; - *gpfn = rc + 1; + *gpfn = (xen_pfn_t)rc + 1; return 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 Fri Mar 06 10:00:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 10:00:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTp3J-0000wg-0f; Fri, 06 Mar 2015 10:00:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTp3I-0000wL-4t for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 10:00:16 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 39/34-03168-FAA79F45; Fri, 06 Mar 2015 10:00:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1425636008!15227155!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16571 invoked from network); 6 Mar 2015 10:00:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 10:00:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTp34-0005KI-Va for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 10:00:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTp34-0007K2-Tj for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 10:00:02 +0000 Message-Id: Date: Fri, 06 Mar 2015 10:00:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] sfc_netfront: deal with gcc5 warning X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1425635649 -3600 # Node ID 29dd60ae4773da716d26260e19743081c1dd162a # Parent a3e3a5aea1a2aa30d7f45d9f69569bb3c7ca20e7 sfc_netfront: deal with gcc5 warning gcc5 warns about (!x == y) assuming !(x == y) may be meant, and the driver's Makefile enforcing -Werror results in this failing the build. As the construct looks bogus anyway (making it harder to grok than necessary) fix it here (there's a second one which isn't being fixed, as gcc is being or already was changed to not warn on (!!a == b) and alike). Reported-by: Jiri Slaby Signed-off-by: Jan Beulich --- diff -r a3e3a5aea1a2 -r 29dd60ae4773 drivers/xen/sfc_netfront/falcon_event.c --- a/drivers/xen/sfc_netfront/falcon_event.c Mon Feb 02 09:09:54 2015 +0100 +++ b/drivers/xen/sfc_netfront/falcon_event.c Fri Mar 06 10:54:09 2015 +0100 @@ -110,7 +110,7 @@ ef_vi_inline int falcon_rx_check_dup(ef_ #endif BUG_ON(!QWORD_TEST_BIT(RX_EV_FRM_TRUNC, *ev)); BUG_ON( QWORD_TEST_BIT(RX_EV_PKT_OK, *ev)); - BUG_ON(!QWORD_GET_U(RX_EV_BYTE_CNT, *ev) == 0); + BUG_ON(QWORD_GET_U(RX_EV_BYTE_CNT, *ev)); ev_out->rx_no_desc_trunc.type = EF_EVENT_TYPE_RX_NO_DESC_TRUNC; ev_out->rx_no_desc_trunc.q_id = q_id; return 1; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 06 10:00:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 10:00:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTp3J-0000wg-0f; Fri, 06 Mar 2015 10:00:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTp3I-0000wL-4t for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 10:00:16 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 39/34-03168-FAA79F45; Fri, 06 Mar 2015 10:00:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1425636008!15227155!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16571 invoked from network); 6 Mar 2015 10:00:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 10:00:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTp34-0005KI-Va for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 10:00:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTp34-0007K2-Tj for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 10:00:02 +0000 Message-Id: Date: Fri, 06 Mar 2015 10:00:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] sfc_netfront: deal with gcc5 warning X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1425635649 -3600 # Node ID 29dd60ae4773da716d26260e19743081c1dd162a # Parent a3e3a5aea1a2aa30d7f45d9f69569bb3c7ca20e7 sfc_netfront: deal with gcc5 warning gcc5 warns about (!x == y) assuming !(x == y) may be meant, and the driver's Makefile enforcing -Werror results in this failing the build. As the construct looks bogus anyway (making it harder to grok than necessary) fix it here (there's a second one which isn't being fixed, as gcc is being or already was changed to not warn on (!!a == b) and alike). Reported-by: Jiri Slaby Signed-off-by: Jan Beulich --- diff -r a3e3a5aea1a2 -r 29dd60ae4773 drivers/xen/sfc_netfront/falcon_event.c --- a/drivers/xen/sfc_netfront/falcon_event.c Mon Feb 02 09:09:54 2015 +0100 +++ b/drivers/xen/sfc_netfront/falcon_event.c Fri Mar 06 10:54:09 2015 +0100 @@ -110,7 +110,7 @@ ef_vi_inline int falcon_rx_check_dup(ef_ #endif BUG_ON(!QWORD_TEST_BIT(RX_EV_FRM_TRUNC, *ev)); BUG_ON( QWORD_TEST_BIT(RX_EV_PKT_OK, *ev)); - BUG_ON(!QWORD_GET_U(RX_EV_BYTE_CNT, *ev) == 0); + BUG_ON(QWORD_GET_U(RX_EV_BYTE_CNT, *ev)); ev_out->rx_no_desc_trunc.type = EF_EVENT_TYPE_RX_NO_DESC_TRUNC; ev_out->rx_no_desc_trunc.q_id = q_id; return 1; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:11:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTq9t-00082C-Cl; Fri, 06 Mar 2015 11:11:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTq9r-00081A-Rr for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:07 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id C1/B4-02745-B4B89F45; Fri, 06 Mar 2015 11:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1425640265!13652287!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18921 invoked from network); 6 Mar 2015 11:11:06 -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; 6 Mar 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 1YTq9p-000659-6a for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTq9o-0001Ng-Oj for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:04 +0000 Date: Fri, 06 Mar 2015 11:11:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/Coverity: Audit of MISSING_BREAK defects X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f01eb36114c62ea79adba75f1fad906a2de90607 Author: Andrew Cooper AuthorDate: Thu Feb 12 20:08:33 2015 +0000 Commit: Ian Campbell CommitDate: Tue Feb 24 15:51:04 2015 +0000 tools/Coverity: Audit of MISSING_BREAK defects Coverity uses several heuristics to identify when one case statement legitimately falls through into the next, and a comment as the final item in a case statement is one heuristic (the assumption being that it is a justification for the fallthrough). Use this to perform an audit of defects and hide the legitimate fallthroughs. There are two bugfixes identified in the audit, both minor: * 'n' command line handling for gtracestat * BKSPC handling in xentop All other identified defaults are legitimate fallthoughs Signed-off-by: Andrew Cooper Coverity-IDs: 1055464, 1055465, 1055467, 1055468, 1055481, 1055482 CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Xen Coverity Team Acked-by: Wei Liu Reviewed-by: Don Koch --- tools/libxl/xl_cmdimpl.c | 3 +++ tools/misc/gtracestat.c | 1 + tools/misc/gtraceview.c | 1 + tools/xenstat/xentop/xentop.c | 1 + tools/xenstore/xenstore_client.c | 1 + 5 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 440db78..53c16eb 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2752,11 +2752,14 @@ static int64_t parse_mem_size_kb(const char *mem) switch (tolower((uint8_t)*endptr)) { case 't': kbytes <<= 10; + /* fallthrough */ case 'g': kbytes <<= 10; + /* fallthrough */ case '\0': case 'm': kbytes <<= 10; + /* fallthrough */ case 'k': break; case 'b': diff --git a/tools/misc/gtracestat.c b/tools/misc/gtracestat.c index 874a043..a59e536 100644 --- a/tools/misc/gtracestat.c +++ b/tools/misc/gtracestat.c @@ -167,6 +167,7 @@ int main(int argc, char *argv[]) tsc2phase = atoll(optarg); if (tsc2phase <= 0) tsc2phase = 55800000UL; + break; case 'd': is_digest = 1; break; diff --git a/tools/misc/gtraceview.c b/tools/misc/gtraceview.c index cf9287c..501f86a 100644 --- a/tools/misc/gtraceview.c +++ b/tools/misc/gtraceview.c @@ -1097,6 +1097,7 @@ void choose_cpus(void) this->init(); return; } + /* fallthrough */ case KEY_F(4): exit(EXIT_SUCCESS); } diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c index 3062cb5..23b57f1 100644 --- a/tools/xenstat/xentop/xentop.c +++ b/tools/xenstat/xentop/xentop.c @@ -407,6 +407,7 @@ static int handle_key(int ch) case KEY_BACKSPACE: if(prompt_val_len > 0) prompt_val[--prompt_val_len] = '\0'; + break; default: if((prompt_val_len+1) < PROMPT_VAL_LEN && isprint(ch)) { diff --git a/tools/xenstore/xenstore_client.c b/tools/xenstore/xenstore_client.c index 1054f18..3d14d37 100644 --- a/tools/xenstore/xenstore_client.c +++ b/tools/xenstore/xenstore_client.c @@ -87,6 +87,7 @@ usage(enum mode mode, int incl_mode, const char *progname) errx(1, "Usage: %s %s[-h] [-s] [-t] key [...]", progname, mstr); case MODE_exists: mstr = incl_mode ? "exists " : ""; + /* fallthrough */ case MODE_list: mstr = mstr ? : incl_mode ? "list " : ""; errx(1, "Usage: %s %s[-h] [-p] [-s] key [...]", progname, mstr); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:11:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTq9t-00082C-Cl; Fri, 06 Mar 2015 11:11:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTq9r-00081A-Rr for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:07 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id C1/B4-02745-B4B89F45; Fri, 06 Mar 2015 11:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1425640265!13652287!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18921 invoked from network); 6 Mar 2015 11:11:06 -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; 6 Mar 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 1YTq9p-000659-6a for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTq9o-0001Ng-Oj for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:04 +0000 Date: Fri, 06 Mar 2015 11:11:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/Coverity: Audit of MISSING_BREAK defects X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f01eb36114c62ea79adba75f1fad906a2de90607 Author: Andrew Cooper AuthorDate: Thu Feb 12 20:08:33 2015 +0000 Commit: Ian Campbell CommitDate: Tue Feb 24 15:51:04 2015 +0000 tools/Coverity: Audit of MISSING_BREAK defects Coverity uses several heuristics to identify when one case statement legitimately falls through into the next, and a comment as the final item in a case statement is one heuristic (the assumption being that it is a justification for the fallthrough). Use this to perform an audit of defects and hide the legitimate fallthroughs. There are two bugfixes identified in the audit, both minor: * 'n' command line handling for gtracestat * BKSPC handling in xentop All other identified defaults are legitimate fallthoughs Signed-off-by: Andrew Cooper Coverity-IDs: 1055464, 1055465, 1055467, 1055468, 1055481, 1055482 CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Xen Coverity Team Acked-by: Wei Liu Reviewed-by: Don Koch --- tools/libxl/xl_cmdimpl.c | 3 +++ tools/misc/gtracestat.c | 1 + tools/misc/gtraceview.c | 1 + tools/xenstat/xentop/xentop.c | 1 + tools/xenstore/xenstore_client.c | 1 + 5 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 440db78..53c16eb 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2752,11 +2752,14 @@ static int64_t parse_mem_size_kb(const char *mem) switch (tolower((uint8_t)*endptr)) { case 't': kbytes <<= 10; + /* fallthrough */ case 'g': kbytes <<= 10; + /* fallthrough */ case '\0': case 'm': kbytes <<= 10; + /* fallthrough */ case 'k': break; case 'b': diff --git a/tools/misc/gtracestat.c b/tools/misc/gtracestat.c index 874a043..a59e536 100644 --- a/tools/misc/gtracestat.c +++ b/tools/misc/gtracestat.c @@ -167,6 +167,7 @@ int main(int argc, char *argv[]) tsc2phase = atoll(optarg); if (tsc2phase <= 0) tsc2phase = 55800000UL; + break; case 'd': is_digest = 1; break; diff --git a/tools/misc/gtraceview.c b/tools/misc/gtraceview.c index cf9287c..501f86a 100644 --- a/tools/misc/gtraceview.c +++ b/tools/misc/gtraceview.c @@ -1097,6 +1097,7 @@ void choose_cpus(void) this->init(); return; } + /* fallthrough */ case KEY_F(4): exit(EXIT_SUCCESS); } diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c index 3062cb5..23b57f1 100644 --- a/tools/xenstat/xentop/xentop.c +++ b/tools/xenstat/xentop/xentop.c @@ -407,6 +407,7 @@ static int handle_key(int ch) case KEY_BACKSPACE: if(prompt_val_len > 0) prompt_val[--prompt_val_len] = '\0'; + break; default: if((prompt_val_len+1) < PROMPT_VAL_LEN && isprint(ch)) { diff --git a/tools/xenstore/xenstore_client.c b/tools/xenstore/xenstore_client.c index 1054f18..3d14d37 100644 --- a/tools/xenstore/xenstore_client.c +++ b/tools/xenstore/xenstore_client.c @@ -87,6 +87,7 @@ usage(enum mode mode, int incl_mode, const char *progname) errx(1, "Usage: %s %s[-h] [-s] [-t] key [...]", progname, mstr); case MODE_exists: mstr = incl_mode ? "exists " : ""; + /* fallthrough */ case MODE_list: mstr = mstr ? : incl_mode ? "list " : ""; errx(1, "Usage: %s %s[-h] [-p] [-s] key [...]", progname, mstr); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:11:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqA4-000858-FI; Fri, 06 Mar 2015 11:11:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqA2-00084v-VJ for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:19 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 5E/9B-03185-65B89F45; Fri, 06 Mar 2015 11:11:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1425640275!13704397!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5343 invoked from network); 6 Mar 2015 11:11:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:11:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTq9z-00065F-H1 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTq9z-0001Oa-Be for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:15 +0000 Date: Fri, 06 Mar 2015 11:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: Generate the permission in a spec-compliant way X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b81a749a6cbbbbed7462e7b662485e799ac8fee Author: Julien Grall AuthorDate: Fri Feb 20 15:58:28 2015 +0000 Commit: Ian Campbell CommitDate: Tue Feb 24 15:54:08 2015 +0000 xen/xsm: Generate the permission in a spec-compliant way Each class can contains 32 permisions which are encoded on a word (one bit per permission). Currently the awk script will generate an hexadecimal value for each permission. This may result to generate an invalid value on some version of awk. For instance debian jessie is using a version of mawk where (1 << 31) will result to 0x7fffffff. This is because the awk specification requires to do the arithmetic with float. So the resulting integer may vary following the implementation. As the generated headers are only used by C code, generate the permission define via "1UL << n". Signed-off-by: Julien Grall Acked-by: Daniel De Graaf --- xen/xsm/flask/policy/mkaccess_vector.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/xsm/flask/policy/mkaccess_vector.sh b/xen/xsm/flask/policy/mkaccess_vector.sh index 8ec87f7..7fa4aaf 100644 --- a/xen/xsm/flask/policy/mkaccess_vector.sh +++ b/xen/xsm/flask/policy/mkaccess_vector.sh @@ -42,7 +42,7 @@ $1 == "class" { } av_defined[tclass] = 1; - permission = 1; + permission = 0; nextstate = "INHERITS_OR_CLASS-OPENBRACKET"; next; @@ -108,8 +108,8 @@ $1 == "{" { for (i = 0; i < spaces; i++) printf(" ") > outfile; - printf("0x%08xUL\n", permission) > outfile; - permission = permission * 2; + printf("(1UL << %u)\n", permission) > outfile; + permission = permission + 1; } $1 == "}" { if (nextstate != "CLASS-CLOSEBRACKET" && -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:11:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqA4-000858-FI; Fri, 06 Mar 2015 11:11:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqA2-00084v-VJ for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:19 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 5E/9B-03185-65B89F45; Fri, 06 Mar 2015 11:11:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1425640275!13704397!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5343 invoked from network); 6 Mar 2015 11:11:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:11:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTq9z-00065F-H1 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTq9z-0001Oa-Be for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:15 +0000 Date: Fri, 06 Mar 2015 11:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: Generate the permission in a spec-compliant way X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b81a749a6cbbbbed7462e7b662485e799ac8fee Author: Julien Grall AuthorDate: Fri Feb 20 15:58:28 2015 +0000 Commit: Ian Campbell CommitDate: Tue Feb 24 15:54:08 2015 +0000 xen/xsm: Generate the permission in a spec-compliant way Each class can contains 32 permisions which are encoded on a word (one bit per permission). Currently the awk script will generate an hexadecimal value for each permission. This may result to generate an invalid value on some version of awk. For instance debian jessie is using a version of mawk where (1 << 31) will result to 0x7fffffff. This is because the awk specification requires to do the arithmetic with float. So the resulting integer may vary following the implementation. As the generated headers are only used by C code, generate the permission define via "1UL << n". Signed-off-by: Julien Grall Acked-by: Daniel De Graaf --- xen/xsm/flask/policy/mkaccess_vector.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/xsm/flask/policy/mkaccess_vector.sh b/xen/xsm/flask/policy/mkaccess_vector.sh index 8ec87f7..7fa4aaf 100644 --- a/xen/xsm/flask/policy/mkaccess_vector.sh +++ b/xen/xsm/flask/policy/mkaccess_vector.sh @@ -42,7 +42,7 @@ $1 == "class" { } av_defined[tclass] = 1; - permission = 1; + permission = 0; nextstate = "INHERITS_OR_CLASS-OPENBRACKET"; next; @@ -108,8 +108,8 @@ $1 == "{" { for (i = 0; i < spaces; i++) printf(" ") > outfile; - printf("0x%08xUL\n", permission) > outfile; - permission = permission * 2; + printf("(1UL << %u)\n", permission) > outfile; + permission = permission + 1; } $1 == "}" { if (nextstate != "CLASS-CLOSEBRACKET" && -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:11:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11: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 1YTqAD-00088r-Hx; Fri, 06 Mar 2015 11:11:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAC-00087o-Jw for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:28 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 8F/45-02896-F5B89F45; Fri, 06 Mar 2015 11:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1425640286!9285719!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25284 invoked from network); 6 Mar 2015 11:11:27 -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; 6 Mar 2015 11:11:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqA9-00065L-QH for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqA9-0001Ow-LH for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:25 +0000 Date: Fri, 06 Mar 2015 11:11:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: systemd: Don't ever kill xenstored X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 96e0ee8386cf690c28c46a2c9f75cd2b03f646e1 Author: Ross Lagerwall AuthorDate: Tue Feb 24 08:05:50 2015 +0000 Commit: Ian Campbell CommitDate: Tue Feb 24 16:06:22 2015 +0000 tools/hotplug: systemd: Don't ever kill xenstored Don't kill xenstored as part of the usual service shutdown process to prevent hangs on shutdown where the kernel tries to unplug a VIF after xenstored has exited. In an ideal case with all guests cooperating, xendomains will have shut down all guests before xenstored is killed. However in the uncooperative case, malicious or crashed guests may still be running after xendomains has exited and this should not block the shutdown/reboot of dom0. Xenstored has no state to sync to disk, and never used to be killed in the sysvinit case; observe the warning in xencommons. Our testing has shown regressions caused by the change in behaviour between sysvinit and systemd when it comes to killing xenstored. Signed-off-by: Ross Lagerwall Acked-by: Wei Liu [ ijc -- added systemd to title ] --- tools/hotplug/Linux/systemd/xenstored.service.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in index 0f0ac58..a5f836b 100644 --- a/tools/hotplug/Linux/systemd/xenstored.service.in +++ b/tools/hotplug/Linux/systemd/xenstored.service.in @@ -8,6 +8,7 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=notify +KillMode=none Environment=XENSTORED_ARGS= Environment=XENSTORED=@XENSTORED@ EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:11:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11: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 1YTqAD-00088r-Hx; Fri, 06 Mar 2015 11:11:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAC-00087o-Jw for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:28 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 8F/45-02896-F5B89F45; Fri, 06 Mar 2015 11:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1425640286!9285719!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25284 invoked from network); 6 Mar 2015 11:11:27 -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; 6 Mar 2015 11:11:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqA9-00065L-QH for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqA9-0001Ow-LH for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:25 +0000 Date: Fri, 06 Mar 2015 11:11:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: systemd: Don't ever kill xenstored X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 96e0ee8386cf690c28c46a2c9f75cd2b03f646e1 Author: Ross Lagerwall AuthorDate: Tue Feb 24 08:05:50 2015 +0000 Commit: Ian Campbell CommitDate: Tue Feb 24 16:06:22 2015 +0000 tools/hotplug: systemd: Don't ever kill xenstored Don't kill xenstored as part of the usual service shutdown process to prevent hangs on shutdown where the kernel tries to unplug a VIF after xenstored has exited. In an ideal case with all guests cooperating, xendomains will have shut down all guests before xenstored is killed. However in the uncooperative case, malicious or crashed guests may still be running after xendomains has exited and this should not block the shutdown/reboot of dom0. Xenstored has no state to sync to disk, and never used to be killed in the sysvinit case; observe the warning in xencommons. Our testing has shown regressions caused by the change in behaviour between sysvinit and systemd when it comes to killing xenstored. Signed-off-by: Ross Lagerwall Acked-by: Wei Liu [ ijc -- added systemd to title ] --- tools/hotplug/Linux/systemd/xenstored.service.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in index 0f0ac58..a5f836b 100644 --- a/tools/hotplug/Linux/systemd/xenstored.service.in +++ b/tools/hotplug/Linux/systemd/xenstored.service.in @@ -8,6 +8,7 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=notify +KillMode=none Environment=XENSTORED_ARGS= Environment=XENSTORED=@XENSTORED@ EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:11:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:11: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 1YTqAO-0008JE-Kd; Fri, 06 Mar 2015 11:11:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAN-0008Hg-1B for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:39 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 6D/8F-03219-A6B89F45; Fri, 06 Mar 2015 11:11:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1425640296!11276917!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18713 invoked from network); 6 Mar 2015 11:11: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; 6 Mar 2015 11:11:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAK-00065T-5F for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqAJ-0001PV-UX for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:36 +0000 Date: Fri, 06 Mar 2015 11:11:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: create reproducible html X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d76a66849100c4d0b1c4efe95845483681889e36 Author: Olaf Hering AuthorDate: Tue Feb 3 12:45:35 2015 +0100 Commit: Ian Campbell CommitDate: Tue Feb 24 16:19:02 2015 +0000 docs: create reproducible html The Makefile uses wildcard to collect a list of files. The resulting list of files is in directory order, which is random. As a result the generated html files will differ when build on different hosts. Use the built-in sort function to get a stable list of files. Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- docs/Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 2c0903b..854fb50 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -7,14 +7,14 @@ VERSION := $(shell $(MAKE) -C $(XEN_ROOT)/xen --no-print-directory xenversion) DOC_ARCHES := arm x86_32 x86_64 # Documentation sources to build -MAN1SRC-y := $(wildcard man/xl*.pod.1) -MAN1SRC-y += $(wildcard man/xenstore*.pod.1) +MAN1SRC-y := $(sort $(wildcard man/xl*.pod.1)) +MAN1SRC-y += $(sort $(wildcard man/xenstore*.pod.1)) -MAN5SRC-y := $(wildcard man/xl*.pod.5) +MAN5SRC-y := $(sort $(wildcard man/xl*.pod.5)) -MARKDOWNSRC-y := $(wildcard misc/*.markdown) +MARKDOWNSRC-y := $(sort $(wildcard misc/*.markdown)) -TXTSRC-y := $(wildcard misc/*.txt) +TXTSRC-y := $(sort $(wildcard misc/*.txt)) DOC_MAN1 := $(patsubst man/%.pod.1,man1/%.1,$(MAN1SRC-y)) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:11:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:11: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 1YTqAO-0008JE-Kd; Fri, 06 Mar 2015 11:11:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAN-0008Hg-1B for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:39 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 6D/8F-03219-A6B89F45; Fri, 06 Mar 2015 11:11:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1425640296!11276917!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18713 invoked from network); 6 Mar 2015 11:11: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; 6 Mar 2015 11:11:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAK-00065T-5F for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqAJ-0001PV-UX for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:36 +0000 Date: Fri, 06 Mar 2015 11:11:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: create reproducible html X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d76a66849100c4d0b1c4efe95845483681889e36 Author: Olaf Hering AuthorDate: Tue Feb 3 12:45:35 2015 +0100 Commit: Ian Campbell CommitDate: Tue Feb 24 16:19:02 2015 +0000 docs: create reproducible html The Makefile uses wildcard to collect a list of files. The resulting list of files is in directory order, which is random. As a result the generated html files will differ when build on different hosts. Use the built-in sort function to get a stable list of files. Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- docs/Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 2c0903b..854fb50 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -7,14 +7,14 @@ VERSION := $(shell $(MAKE) -C $(XEN_ROOT)/xen --no-print-directory xenversion) DOC_ARCHES := arm x86_32 x86_64 # Documentation sources to build -MAN1SRC-y := $(wildcard man/xl*.pod.1) -MAN1SRC-y += $(wildcard man/xenstore*.pod.1) +MAN1SRC-y := $(sort $(wildcard man/xl*.pod.1)) +MAN1SRC-y += $(sort $(wildcard man/xenstore*.pod.1)) -MAN5SRC-y := $(wildcard man/xl*.pod.5) +MAN5SRC-y := $(sort $(wildcard man/xl*.pod.5)) -MARKDOWNSRC-y := $(wildcard misc/*.markdown) +MARKDOWNSRC-y := $(sort $(wildcard misc/*.markdown)) -TXTSRC-y := $(wildcard misc/*.txt) +TXTSRC-y := $(sort $(wildcard misc/*.txt)) DOC_MAN1 := $(patsubst man/%.pod.1,man1/%.1,$(MAN1SRC-y)) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:11:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:11: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 1YTqAY-0008Oa-NL; Fri, 06 Mar 2015 11:11:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAX-0008ON-B2 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:49 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id D4/CA-03163-47B89F45; Fri, 06 Mar 2015 11:11:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1425640306!13689857!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22605 invoked from network); 6 Mar 2015 11:11:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:11:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAU-00065a-BN for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqAU-0001Pv-9s for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:46 +0000 Date: Fri, 06 Mar 2015 11:11:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] etherboot: [build] sort objects in blib.a X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb8366d34ef5021af761ca1977d9cb305ba8fabd Author: Olaf Hering AuthorDate: Tue Feb 3 12:45:36 2015 +0100 Commit: Ian Campbell CommitDate: Tue Feb 24 16:19:19 2015 +0000 etherboot: [build] sort objects in blib.a When building hvmloader for Xen tools the ipxe objects are also linked into the binary. Unfortunately the linker will place them in the order found in the archive. Since this order is random the resulting hvmloader binary differs when it was built from identical sources but on different build hosts. To help with creating a reproducible binary the elements in blib.a must simply be sorted before passing them to $(AR). Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- .../firmware/etherboot/patches/build-compare.patch | 19 +++++++++++++++++++ tools/firmware/etherboot/patches/series | 1 + 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/tools/firmware/etherboot/patches/build-compare.patch b/tools/firmware/etherboot/patches/build-compare.patch new file mode 100644 index 0000000..d41f68b --- /dev/null +++ b/tools/firmware/etherboot/patches/build-compare.patch @@ -0,0 +1,19 @@ +The result of $(wildcard *) is random. +Sort input files to reduce build-compare noise. +--- + ipxe/src/Makefile.housekeeping | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: ipxe/src/Makefile.housekeeping +=================================================================== +--- ipxe/src/Makefile.housekeeping ++++ ipxe/src/Makefile.housekeeping +@@ -773,7 +773,7 @@ BLIB = $(BIN)/blib.a + $(BLIB) : $(BLIB_OBJS) $(BLIB_LIST) $(MAKEDEPS) + $(Q)$(RM) $(BLIB) + $(QM)$(ECHO) " [AR] $@" +- $(Q)$(AR) r $@ $(BLIB_OBJS) ++ $(Q)$(AR) r $@ $(sort $(BLIB_OBJS)) + $(Q)$(RANLIB) $@ + blib : $(BLIB) + diff --git a/tools/firmware/etherboot/patches/series b/tools/firmware/etherboot/patches/series index 5bd7df8..7512c14 100644 --- a/tools/firmware/etherboot/patches/series +++ b/tools/firmware/etherboot/patches/series @@ -2,3 +2,4 @@ boot_prompt_option.patch build_fix_1.patch build_fix_2.patch build_fix_3.patch +build-compare.patch -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:11:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:11: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 1YTqAY-0008Oa-NL; Fri, 06 Mar 2015 11:11:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAX-0008ON-B2 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:49 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id D4/CA-03163-47B89F45; Fri, 06 Mar 2015 11:11:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1425640306!13689857!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22605 invoked from network); 6 Mar 2015 11:11:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:11:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAU-00065a-BN for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqAU-0001Pv-9s for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:46 +0000 Date: Fri, 06 Mar 2015 11:11:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] etherboot: [build] sort objects in blib.a X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb8366d34ef5021af761ca1977d9cb305ba8fabd Author: Olaf Hering AuthorDate: Tue Feb 3 12:45:36 2015 +0100 Commit: Ian Campbell CommitDate: Tue Feb 24 16:19:19 2015 +0000 etherboot: [build] sort objects in blib.a When building hvmloader for Xen tools the ipxe objects are also linked into the binary. Unfortunately the linker will place them in the order found in the archive. Since this order is random the resulting hvmloader binary differs when it was built from identical sources but on different build hosts. To help with creating a reproducible binary the elements in blib.a must simply be sorted before passing them to $(AR). Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- .../firmware/etherboot/patches/build-compare.patch | 19 +++++++++++++++++++ tools/firmware/etherboot/patches/series | 1 + 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/tools/firmware/etherboot/patches/build-compare.patch b/tools/firmware/etherboot/patches/build-compare.patch new file mode 100644 index 0000000..d41f68b --- /dev/null +++ b/tools/firmware/etherboot/patches/build-compare.patch @@ -0,0 +1,19 @@ +The result of $(wildcard *) is random. +Sort input files to reduce build-compare noise. +--- + ipxe/src/Makefile.housekeeping | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: ipxe/src/Makefile.housekeeping +=================================================================== +--- ipxe/src/Makefile.housekeeping ++++ ipxe/src/Makefile.housekeeping +@@ -773,7 +773,7 @@ BLIB = $(BIN)/blib.a + $(BLIB) : $(BLIB_OBJS) $(BLIB_LIST) $(MAKEDEPS) + $(Q)$(RM) $(BLIB) + $(QM)$(ECHO) " [AR] $@" +- $(Q)$(AR) r $@ $(BLIB_OBJS) ++ $(Q)$(AR) r $@ $(sort $(BLIB_OBJS)) + $(Q)$(RANLIB) $@ + blib : $(BLIB) + diff --git a/tools/firmware/etherboot/patches/series b/tools/firmware/etherboot/patches/series index 5bd7df8..7512c14 100644 --- a/tools/firmware/etherboot/patches/series +++ b/tools/firmware/etherboot/patches/series @@ -2,3 +2,4 @@ boot_prompt_option.patch build_fix_1.patch build_fix_2.patch build_fix_3.patch +build-compare.patch -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:12:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:12: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 1YTqAi-0008SG-Rm; Fri, 06 Mar 2015 11:12:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAh-0008QN-Ai for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:59 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id BA/04-02885-E7B89F45; Fri, 06 Mar 2015 11:11:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425640317!13762134!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28720 invoked from network); 6 Mar 2015 11:11: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; 6 Mar 2015 11:11:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAe-00065j-QZ for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqAe-0001Qe-NU for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:56 +0000 Date: Fri, 06 Mar 2015 11:11:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: remove commented out stale references to efi_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 a7ba3bf38a5f6079ebd0c24487ef50edbc874f5f Author: Daniel Kiper AuthorDate: Mon Feb 23 17:53:46 2015 +0100 Commit: Jan Beulich CommitDate: Mon Feb 23 17:53:46 2015 +0100 x86: remove commented out stale references to efi_enabled Signed-off-by: Daniel Kiper --- xen/arch/x86/e820.c | 29 ++++++++++------------------- 1 files changed, 10 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/e820.c b/xen/arch/x86/e820.c index 743a375..3c64f19 100644 --- a/xen/arch/x86/e820.c +++ b/xen/arch/x86/e820.c @@ -74,20 +74,18 @@ static void __init add_memory_region(unsigned long long start, { int x; - /*if (!efi_enabled)*/ { - x = e820.nr_map; + x = e820.nr_map; - if (x == E820MAX) { - printk(KERN_ERR "Ooops! Too many entries in the memory map!\n"); - return; - } - - e820.map[x].addr = start; - e820.map[x].size = size; - e820.map[x].type = type; - e820.nr_map++; + if (x == E820MAX) { + printk(KERN_ERR "Ooops! Too many entries in the memory map!\n"); + return; } -} /* add_memory_region */ + + e820.map[x].addr = start; + e820.map[x].size = size; + e820.map[x].type = type; + e820.nr_map++; +} static void __init print_e820_memory_map(struct e820entry *map, unsigned int entries) { @@ -349,13 +347,6 @@ static unsigned long __init find_max_pfn(void) int i; unsigned long max_pfn = 0; -#if 0 - if (efi_enabled) { - efi_memmap_walk(efi_find_max_pfn, &max_pfn); - return; - } -#endif - for (i = 0; i < e820.nr_map; i++) { unsigned long start, end; /* RAM? */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:12:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:12: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 1YTqAi-0008SG-Rm; Fri, 06 Mar 2015 11:12:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAh-0008QN-Ai for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:59 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id BA/04-02885-E7B89F45; Fri, 06 Mar 2015 11:11:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425640317!13762134!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28720 invoked from network); 6 Mar 2015 11:11: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; 6 Mar 2015 11:11:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAe-00065j-QZ for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqAe-0001Qe-NU for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:11:56 +0000 Date: Fri, 06 Mar 2015 11:11:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: remove commented out stale references to efi_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 a7ba3bf38a5f6079ebd0c24487ef50edbc874f5f Author: Daniel Kiper AuthorDate: Mon Feb 23 17:53:46 2015 +0100 Commit: Jan Beulich CommitDate: Mon Feb 23 17:53:46 2015 +0100 x86: remove commented out stale references to efi_enabled Signed-off-by: Daniel Kiper --- xen/arch/x86/e820.c | 29 ++++++++++------------------- 1 files changed, 10 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/e820.c b/xen/arch/x86/e820.c index 743a375..3c64f19 100644 --- a/xen/arch/x86/e820.c +++ b/xen/arch/x86/e820.c @@ -74,20 +74,18 @@ static void __init add_memory_region(unsigned long long start, { int x; - /*if (!efi_enabled)*/ { - x = e820.nr_map; + x = e820.nr_map; - if (x == E820MAX) { - printk(KERN_ERR "Ooops! Too many entries in the memory map!\n"); - return; - } - - e820.map[x].addr = start; - e820.map[x].size = size; - e820.map[x].type = type; - e820.nr_map++; + if (x == E820MAX) { + printk(KERN_ERR "Ooops! Too many entries in the memory map!\n"); + return; } -} /* add_memory_region */ + + e820.map[x].addr = start; + e820.map[x].size = size; + e820.map[x].type = type; + e820.nr_map++; +} static void __init print_e820_memory_map(struct e820entry *map, unsigned int entries) { @@ -349,13 +347,6 @@ static unsigned long __init find_max_pfn(void) int i; unsigned long max_pfn = 0; -#if 0 - if (efi_enabled) { - efi_memmap_walk(efi_find_max_pfn, &max_pfn); - return; - } -#endif - for (i = 0; i < e820.nr_map; i++) { unsigned long start, end; /* RAM? */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:12:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:12: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 1YTqAv-00007c-0l; Fri, 06 Mar 2015 11:12:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAt-0008Vp-NW for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:11 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 74/C7-02760-88B89F45; Fri, 06 Mar 2015 11:12:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1425640327!15238136!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17181 invoked from network); 6 Mar 2015 11:12:08 -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; 6 Mar 2015 11:12:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAp-00066H-1Y for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqAo-0001RD-VE for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:07 +0000 Date: Fri, 06 Mar 2015 11:12:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] test_x86_emulator.c: add emacs block X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4f3283fea384229366b6df101c6c0e008b35105b Author: Don Slutz AuthorDate: Mon Feb 23 17:54:59 2015 +0100 Commit: Jan Beulich CommitDate: Mon Feb 23 17:54:59 2015 +0100 test_x86_emulator.c: add emacs block Signed-off-by: Don Slutz Acked-by: Andrew Cooper --- tools/tests/x86_emulator/test_x86_emulator.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 6f67fc7..66d5eff 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -934,3 +934,12 @@ int main(int argc, char **argv) printf("failed!\n"); return 1; } + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * 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 Fri Mar 06 11:12:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:12: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 1YTqAv-00007c-0l; Fri, 06 Mar 2015 11:12:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAt-0008Vp-NW for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:11 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 74/C7-02760-88B89F45; Fri, 06 Mar 2015 11:12:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1425640327!15238136!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17181 invoked from network); 6 Mar 2015 11:12:08 -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; 6 Mar 2015 11:12:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAp-00066H-1Y for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqAo-0001RD-VE for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:07 +0000 Date: Fri, 06 Mar 2015 11:12:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] test_x86_emulator.c: add emacs block X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4f3283fea384229366b6df101c6c0e008b35105b Author: Don Slutz AuthorDate: Mon Feb 23 17:54:59 2015 +0100 Commit: Jan Beulich CommitDate: Mon Feb 23 17:54:59 2015 +0100 test_x86_emulator.c: add emacs block Signed-off-by: Don Slutz Acked-by: Andrew Cooper --- tools/tests/x86_emulator/test_x86_emulator.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 6f67fc7..66d5eff 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -934,3 +934,12 @@ int main(int argc, char **argv) printf("failed!\n"); return 1; } + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * 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 Fri Mar 06 11:12:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:12: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 1YTqB3-000097-3H; Fri, 06 Mar 2015 11:12:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqB1-00008s-OR for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:19 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 13/BE-02639-39B89F45; Fri, 06 Mar 2015 11:12:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1425640337!9841858!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24481 invoked from network); 6 Mar 2015 11:12:18 -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; 6 Mar 2015 11:12:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAz-00066O-8y for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqAz-0001SK-6n for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:17 +0000 Date: Fri, 06 Mar 2015 11:12:17 +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 f74a9a5fe44d4060ae02d9bf7cefc597a3a6b785 Merge: cb8366d34ef5021af761ca1977d9cb305ba8fabd 4f3283fea384229366b6df101c6c0e008b35105b Author: Ian Campbell AuthorDate: Tue Feb 24 16:42:24 2015 +0000 Commit: Ian Campbell CommitDate: Tue Feb 24 16:42:24 2015 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging MAINTAINERS | 1 + tools/tests/x86_emulator/test_x86_emulator.c | 9 + xen/arch/x86/e820.c | 29 +-- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/mm.c | 4 +- xen/arch/x86/mm/shadow/common.c | 249 +++++++++++--------- xen/arch/x86/mm/shadow/multi.c | 324 +++++++++++++------------- xen/arch/x86/mm/shadow/multi.h | 28 ++-- xen/arch/x86/mm/shadow/private.h | 56 +++--- xen/include/asm-x86/perfc_defn.h | 2 + xen/include/asm-x86/shadow.h | 8 +- 11 files changed, 371 insertions(+), 341 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 Mar 06 11:12:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:12: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 1YTqB3-000097-3H; Fri, 06 Mar 2015 11:12:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqB1-00008s-OR for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:19 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 13/BE-02639-39B89F45; Fri, 06 Mar 2015 11:12:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1425640337!9841858!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24481 invoked from network); 6 Mar 2015 11:12:18 -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; 6 Mar 2015 11:12:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqAz-00066O-8y for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqAz-0001SK-6n for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:17 +0000 Date: Fri, 06 Mar 2015 11:12:17 +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 f74a9a5fe44d4060ae02d9bf7cefc597a3a6b785 Merge: cb8366d34ef5021af761ca1977d9cb305ba8fabd 4f3283fea384229366b6df101c6c0e008b35105b Author: Ian Campbell AuthorDate: Tue Feb 24 16:42:24 2015 +0000 Commit: Ian Campbell CommitDate: Tue Feb 24 16:42:24 2015 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging MAINTAINERS | 1 + tools/tests/x86_emulator/test_x86_emulator.c | 9 + xen/arch/x86/e820.c | 29 +-- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/mm.c | 4 +- xen/arch/x86/mm/shadow/common.c | 249 +++++++++++--------- xen/arch/x86/mm/shadow/multi.c | 324 +++++++++++++------------- xen/arch/x86/mm/shadow/multi.h | 28 ++-- xen/arch/x86/mm/shadow/private.h | 56 +++--- xen/include/asm-x86/perfc_defn.h | 2 + xen/include/asm-x86/shadow.h | 8 +- 11 files changed, 371 insertions(+), 341 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 Mar 06 11:12:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:12: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 1YTqBD-0000DM-Hp; Fri, 06 Mar 2015 11:12:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBC-0000Ci-9C for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:30 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 11/95-02995-D9B89F45; Fri, 06 Mar 2015 11:12:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1425640347!13758957!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29791 invoked from network); 6 Mar 2015 11:12:28 -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; 6 Mar 2015 11:12:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqB9-00066U-EJ for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqB9-0001Sh-D5 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:27 +0000 Date: Fri, 06 Mar 2015 11:12:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm32: reduce default size of the xenheap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 67c7e46c7c78b36a3541c48bdb3b4739b932a426 Author: Ian Campbell AuthorDate: Thu Feb 19 17:39:54 2015 +0000 Commit: Ian Campbell CommitDate: Wed Feb 25 13:42:11 2015 +0000 xen: arm32: reduce default size of the xenheap ... and make it tunable via the command line. 1/8 of RAM is 128M on a 1GB system and 256M on a 2GB system etc, which is a lot. 1/32 of RAM seems more reasonable. Also drop the minimum to 32M. Leave the maximum at 1GB. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall Cc: Jintack Lim Cc: Jan Beulich --- docs/misc/xen-command-line.markdown | 11 +++++++++++ xen/arch/arm/setup.c | 30 +++++++++++++++++++++--------- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index bc316be..9b458e1 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -237,6 +237,17 @@ and not running softirqs. Reduce this if softirqs are not being run frequently enough. Setting this to a high value may cause boot failure, particularly if the NMI watchdog is also enabled. +### xenheap\_megabytes (arm32) +> `= ` + +> Default: `0` (1/32 of RAM) + +Amount of RAM to set aside for the Xenheap. + +By default will use 1/32 of the RAM up to a maximum of 1GB and with a +minimum of 32M, subject to a suitably aligned and sized contiguous +region of memory being available. + ### clocksource > `= pit | hpet | acpi` diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index a916ca6..9a1c285 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -50,6 +50,11 @@ struct bootinfo __initdata bootinfo; struct cpuinfo_arm __read_mostly boot_cpu_data; +#ifdef CONFIG_ARM_32 +static unsigned long opt_xenheap_megabytes __initdata; +integer_param("xenheap_megabytes", opt_xenheap_megabytes); +#endif + static __used void init_done(void) { free_init_memory(); @@ -497,20 +502,26 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) total_pages = ram_pages = ram_size >> PAGE_SHIFT; /* - * Locate the xenheap using these constraints: + * If the user has not requested otherwise via the command line + * then locate the xenheap using these constraints: * * - must be 32 MiB aligned * - must not include Xen itself or the boot modules - * - must be at most 1GB or 1/8 the total RAM in the system if less - * - must be at least 128M + * - must be at most 1GB or 1/32 the total RAM in the system if less + * - must be at least 32M * * We try to allocate the largest xenheap possible within these * constraints. */ heap_pages = ram_pages; - xenheap_pages = (heap_pages/8 + 0x1fffUL) & ~0x1fffUL; - xenheap_pages = max(xenheap_pages, 128UL<<(20-PAGE_SHIFT)); - xenheap_pages = min(xenheap_pages, 1UL<<(30-PAGE_SHIFT)); + if ( opt_xenheap_megabytes ) + xenheap_pages = opt_xenheap_megabytes << (20-PAGE_SHIFT); + else + { + xenheap_pages = (heap_pages/32 + 0x1fffUL) & ~0x1fffUL; + xenheap_pages = max(xenheap_pages, 32UL<<(20-PAGE_SHIFT)); + xenheap_pages = min(xenheap_pages, 1UL<<(30-PAGE_SHIFT)); + } do { @@ -521,15 +532,16 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) break; xenheap_pages >>= 1; - } while ( xenheap_pages > 128<<(20-PAGE_SHIFT) ); + } while ( !opt_xenheap_megabytes && xenheap_pages > 32<<(20-PAGE_SHIFT) ); if ( ! e ) panic("Not not enough space for xenheap"); domheap_pages = heap_pages - xenheap_pages; - printk("Xen heap: %"PRIpaddr"-%"PRIpaddr" (%lu pages)\n", - e - (pfn_to_paddr(xenheap_pages)), e, xenheap_pages); + printk("Xen heap: %"PRIpaddr"-%"PRIpaddr" (%lu pages%s)\n", + e - (pfn_to_paddr(xenheap_pages)), e, xenheap_pages, + opt_xenheap_megabytes ? ", from command-line" : ""); printk("Dom heap: %lu pages\n", domheap_pages); setup_xenheap_mappings((e >> PAGE_SHIFT) - xenheap_pages, xenheap_pages); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:12:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:12: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 1YTqBD-0000DM-Hp; Fri, 06 Mar 2015 11:12:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBC-0000Ci-9C for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:30 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 11/95-02995-D9B89F45; Fri, 06 Mar 2015 11:12:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1425640347!13758957!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29791 invoked from network); 6 Mar 2015 11:12:28 -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; 6 Mar 2015 11:12:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqB9-00066U-EJ for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqB9-0001Sh-D5 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:27 +0000 Date: Fri, 06 Mar 2015 11:12:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm32: reduce default size of the xenheap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 67c7e46c7c78b36a3541c48bdb3b4739b932a426 Author: Ian Campbell AuthorDate: Thu Feb 19 17:39:54 2015 +0000 Commit: Ian Campbell CommitDate: Wed Feb 25 13:42:11 2015 +0000 xen: arm32: reduce default size of the xenheap ... and make it tunable via the command line. 1/8 of RAM is 128M on a 1GB system and 256M on a 2GB system etc, which is a lot. 1/32 of RAM seems more reasonable. Also drop the minimum to 32M. Leave the maximum at 1GB. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall Cc: Jintack Lim Cc: Jan Beulich --- docs/misc/xen-command-line.markdown | 11 +++++++++++ xen/arch/arm/setup.c | 30 +++++++++++++++++++++--------- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index bc316be..9b458e1 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -237,6 +237,17 @@ and not running softirqs. Reduce this if softirqs are not being run frequently enough. Setting this to a high value may cause boot failure, particularly if the NMI watchdog is also enabled. +### xenheap\_megabytes (arm32) +> `= ` + +> Default: `0` (1/32 of RAM) + +Amount of RAM to set aside for the Xenheap. + +By default will use 1/32 of the RAM up to a maximum of 1GB and with a +minimum of 32M, subject to a suitably aligned and sized contiguous +region of memory being available. + ### clocksource > `= pit | hpet | acpi` diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index a916ca6..9a1c285 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -50,6 +50,11 @@ struct bootinfo __initdata bootinfo; struct cpuinfo_arm __read_mostly boot_cpu_data; +#ifdef CONFIG_ARM_32 +static unsigned long opt_xenheap_megabytes __initdata; +integer_param("xenheap_megabytes", opt_xenheap_megabytes); +#endif + static __used void init_done(void) { free_init_memory(); @@ -497,20 +502,26 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) total_pages = ram_pages = ram_size >> PAGE_SHIFT; /* - * Locate the xenheap using these constraints: + * If the user has not requested otherwise via the command line + * then locate the xenheap using these constraints: * * - must be 32 MiB aligned * - must not include Xen itself or the boot modules - * - must be at most 1GB or 1/8 the total RAM in the system if less - * - must be at least 128M + * - must be at most 1GB or 1/32 the total RAM in the system if less + * - must be at least 32M * * We try to allocate the largest xenheap possible within these * constraints. */ heap_pages = ram_pages; - xenheap_pages = (heap_pages/8 + 0x1fffUL) & ~0x1fffUL; - xenheap_pages = max(xenheap_pages, 128UL<<(20-PAGE_SHIFT)); - xenheap_pages = min(xenheap_pages, 1UL<<(30-PAGE_SHIFT)); + if ( opt_xenheap_megabytes ) + xenheap_pages = opt_xenheap_megabytes << (20-PAGE_SHIFT); + else + { + xenheap_pages = (heap_pages/32 + 0x1fffUL) & ~0x1fffUL; + xenheap_pages = max(xenheap_pages, 32UL<<(20-PAGE_SHIFT)); + xenheap_pages = min(xenheap_pages, 1UL<<(30-PAGE_SHIFT)); + } do { @@ -521,15 +532,16 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) break; xenheap_pages >>= 1; - } while ( xenheap_pages > 128<<(20-PAGE_SHIFT) ); + } while ( !opt_xenheap_megabytes && xenheap_pages > 32<<(20-PAGE_SHIFT) ); if ( ! e ) panic("Not not enough space for xenheap"); domheap_pages = heap_pages - xenheap_pages; - printk("Xen heap: %"PRIpaddr"-%"PRIpaddr" (%lu pages)\n", - e - (pfn_to_paddr(xenheap_pages)), e, xenheap_pages); + printk("Xen heap: %"PRIpaddr"-%"PRIpaddr" (%lu pages%s)\n", + e - (pfn_to_paddr(xenheap_pages)), e, xenheap_pages, + opt_xenheap_megabytes ? ", from command-line" : ""); printk("Dom heap: %lu pages\n", domheap_pages); setup_xenheap_mappings((e >> PAGE_SHIFT) - xenheap_pages, xenheap_pages); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:12:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:12: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 1YTqBN-0000Hu-6t; Fri, 06 Mar 2015 11:12:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBM-0000GK-7j for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:40 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id EC/BC-03163-7AB89F45; Fri, 06 Mar 2015 11:12:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1425640357!13699716!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11680 invoked from network); 6 Mar 2015 11:12:38 -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; 6 Mar 2015 11:12:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBJ-00066c-Jd for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqBJ-0001T7-IO for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:37 +0000 Date: Fri, 06 Mar 2015 11:12:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: log warning for interrupt configuration mismatch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7eb6564d2339c7c1c94b74a8228f34a8b4d6444f Author: Ian Campbell AuthorDate: Thu Feb 19 15:24:02 2015 +0000 Commit: Ian Campbell CommitDate: Wed Feb 25 13:45:00 2015 +0000 xen: arm: log warning for interrupt configuration mismatch The ICFGR register is not necessarily writeable, in particular it is IMPLEMENTATION DEFINED for a PPI if the configuration register is writeable. Log a warning if the hardware has ignored our write and update the actual type in the irq descriptor so subsequent code can do the right thing. This most likely implies a buggy firmware description (e.g. device-tree). The issue is observed for example on the APM Mustang board where the device tree (as shipped by Linux) describes all 3 timer interrupts as rising edge but the PPI is hard-coded to level triggered (as makes sense for an arch timer interrupt). Signed-off-by: Ian Campbell Reviewed-by: Julien Grall Cc: Pranavkumar Sawargaonkar --- xen/arch/arm/gic-v2.c | 16 +++++++++++++++- xen/arch/arm/gic-v3.c | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index ee400b6..c05b64a 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -211,7 +211,7 @@ static void gicv2_set_irq_properties(struct irq_desc *desc, const cpumask_t *cpu_mask, unsigned int priority) { - uint32_t cfg, edgebit; + uint32_t cfg, actual, edgebit; unsigned int mask = gicv2_cpu_mask(cpu_mask); unsigned int irq = desc->irq; unsigned int type = desc->arch.type; @@ -229,6 +229,20 @@ static void gicv2_set_irq_properties(struct irq_desc *desc, cfg |= edgebit; writel_gicd(cfg, GICD_ICFGR + (irq / 16) * 4); + actual = readl_gicd(GICD_ICFGR + (irq / 16) * 4); + if ( ( cfg & edgebit ) ^ ( actual & edgebit ) ) + { + printk(XENLOG_WARNING "GICv2: WARNING: " + "CPU%d: Failed to configure IRQ%u as %s-triggered. " + "H/w forces to %s-triggered.\n", + smp_processor_id(), desc->irq, + cfg & edgebit ? "Edge" : "Level", + actual & edgebit ? "Edge" : "Level"); + desc->arch.type = actual & edgebit ? + DT_IRQ_TYPE_EDGE_RISING : + DT_IRQ_TYPE_LEVEL_LOW; + } + /* Set target CPU mask (RAZ/WI on uniprocessor) */ writeb_gicd(mask, GICD_ITARGETSR + irq); /* Set priority */ diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 41042ab..1558e17 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -466,7 +466,7 @@ static void gicv3_set_irq_properties(struct irq_desc *desc, const cpumask_t *cpu_mask, unsigned int priority) { - uint32_t cfg, edgebit; + uint32_t cfg, actual, edgebit; uint64_t affinity; void __iomem *base; unsigned int cpu = gicv3_get_cpu_from_mask(cpu_mask); @@ -493,6 +493,20 @@ static void gicv3_set_irq_properties(struct irq_desc *desc, writel_relaxed(cfg, base); + actual = readl_relaxed(base); + if ( ( cfg & edgebit ) ^ ( actual & edgebit ) ) + { + printk(XENLOG_WARNING "GICv3: WARNING: " + "CPU%d: Failed to configure IRQ%u as %s-triggered. " + "H/w forces to %s-triggered.\n", + smp_processor_id(), desc->irq, + cfg & edgebit ? "Edge" : "Level", + actual & edgebit ? "Edge" : "Level"); + desc->arch.type = actual & edgebit ? + DT_IRQ_TYPE_EDGE_RISING : + DT_IRQ_TYPE_LEVEL_LOW; + } + affinity = gicv3_mpidr_to_affinity(cpu); /* Make sure we don't broadcast the interrupt */ affinity &= ~GICD_IROUTER_SPI_MODE_ANY; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:12:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:12: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 1YTqBN-0000Hu-6t; Fri, 06 Mar 2015 11:12:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBM-0000GK-7j for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:40 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id EC/BC-03163-7AB89F45; Fri, 06 Mar 2015 11:12:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1425640357!13699716!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11680 invoked from network); 6 Mar 2015 11:12:38 -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; 6 Mar 2015 11:12:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBJ-00066c-Jd for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqBJ-0001T7-IO for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:37 +0000 Date: Fri, 06 Mar 2015 11:12:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: log warning for interrupt configuration mismatch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7eb6564d2339c7c1c94b74a8228f34a8b4d6444f Author: Ian Campbell AuthorDate: Thu Feb 19 15:24:02 2015 +0000 Commit: Ian Campbell CommitDate: Wed Feb 25 13:45:00 2015 +0000 xen: arm: log warning for interrupt configuration mismatch The ICFGR register is not necessarily writeable, in particular it is IMPLEMENTATION DEFINED for a PPI if the configuration register is writeable. Log a warning if the hardware has ignored our write and update the actual type in the irq descriptor so subsequent code can do the right thing. This most likely implies a buggy firmware description (e.g. device-tree). The issue is observed for example on the APM Mustang board where the device tree (as shipped by Linux) describes all 3 timer interrupts as rising edge but the PPI is hard-coded to level triggered (as makes sense for an arch timer interrupt). Signed-off-by: Ian Campbell Reviewed-by: Julien Grall Cc: Pranavkumar Sawargaonkar --- xen/arch/arm/gic-v2.c | 16 +++++++++++++++- xen/arch/arm/gic-v3.c | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index ee400b6..c05b64a 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -211,7 +211,7 @@ static void gicv2_set_irq_properties(struct irq_desc *desc, const cpumask_t *cpu_mask, unsigned int priority) { - uint32_t cfg, edgebit; + uint32_t cfg, actual, edgebit; unsigned int mask = gicv2_cpu_mask(cpu_mask); unsigned int irq = desc->irq; unsigned int type = desc->arch.type; @@ -229,6 +229,20 @@ static void gicv2_set_irq_properties(struct irq_desc *desc, cfg |= edgebit; writel_gicd(cfg, GICD_ICFGR + (irq / 16) * 4); + actual = readl_gicd(GICD_ICFGR + (irq / 16) * 4); + if ( ( cfg & edgebit ) ^ ( actual & edgebit ) ) + { + printk(XENLOG_WARNING "GICv2: WARNING: " + "CPU%d: Failed to configure IRQ%u as %s-triggered. " + "H/w forces to %s-triggered.\n", + smp_processor_id(), desc->irq, + cfg & edgebit ? "Edge" : "Level", + actual & edgebit ? "Edge" : "Level"); + desc->arch.type = actual & edgebit ? + DT_IRQ_TYPE_EDGE_RISING : + DT_IRQ_TYPE_LEVEL_LOW; + } + /* Set target CPU mask (RAZ/WI on uniprocessor) */ writeb_gicd(mask, GICD_ITARGETSR + irq); /* Set priority */ diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 41042ab..1558e17 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -466,7 +466,7 @@ static void gicv3_set_irq_properties(struct irq_desc *desc, const cpumask_t *cpu_mask, unsigned int priority) { - uint32_t cfg, edgebit; + uint32_t cfg, actual, edgebit; uint64_t affinity; void __iomem *base; unsigned int cpu = gicv3_get_cpu_from_mask(cpu_mask); @@ -493,6 +493,20 @@ static void gicv3_set_irq_properties(struct irq_desc *desc, writel_relaxed(cfg, base); + actual = readl_relaxed(base); + if ( ( cfg & edgebit ) ^ ( actual & edgebit ) ) + { + printk(XENLOG_WARNING "GICv3: WARNING: " + "CPU%d: Failed to configure IRQ%u as %s-triggered. " + "H/w forces to %s-triggered.\n", + smp_processor_id(), desc->irq, + cfg & edgebit ? "Edge" : "Level", + actual & edgebit ? "Edge" : "Level"); + desc->arch.type = actual & edgebit ? + DT_IRQ_TYPE_EDGE_RISING : + DT_IRQ_TYPE_LEVEL_LOW; + } + affinity = gicv3_mpidr_to_affinity(cpu); /* Make sure we don't broadcast the interrupt */ affinity &= ~GICD_IROUTER_SPI_MODE_ANY; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:12:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:12: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 1YTqBY-0000P8-9z; Fri, 06 Mar 2015 11:12:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBW-0000NT-D9 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:50 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id B4/16-02753-1BB89F45; Fri, 06 Mar 2015 11:12:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1425640368!15262703!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5098 invoked from network); 6 Mar 2015 11:12:48 -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; 6 Mar 2015 11:12:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBT-00066j-Pb for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqBT-0001TV-Oc for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:47 +0000 Date: Fri, 06 Mar 2015 11:12:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Warn if timer interrupts are not level triggered X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 61d6a849fd220663462b15990482d1d4b0d3f73b Author: Ian Campbell AuthorDate: Thu Feb 19 15:24:03 2015 +0000 Commit: Ian Campbell CommitDate: Wed Feb 25 13:45:49 2015 +0000 xen: arm: Warn if timer interrupts are not level triggered Edge trigger arch timer interrupts really don't make much sense, so if we discover we are booting on such a system issue a warning. So far this has only been seen on the fast model emulators which have both an incorrect DT description of the interrupt and a writeable ICFGR allowing us to program the incorrect configuration. Other platforms have incorrect DT descriptions (warned about by previous patch) but the corresponding ICFGR isn't actually writeable so the eventual configuration is level as desired. I did consider overriding the incorrect DT on such systems but since so far it has only been observed on emulators and we have code in place to deal with edge triggering here I think warning is sufficient for now. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall [ ijc -- s/contoller/controller twice ] --- xen/arch/arm/time.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 418748d..8977cce 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -198,6 +198,32 @@ static void vtimer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) vgic_vcpu_inject_irq(current, current->arch.virt_timer.irq); } +/* + * Arch timer interrupt really ought to be level triggered, since the + * design of the timer/comparator mechanism is based around that + * concept. + * + * However some firmware (incorrectly) describes the interrupts as + * edge triggered and, worse, some hardware allows us to program the + * interrupt controller as edge triggered. + * + * Check each interrupt and warn if we find ourselves in this situation. + */ +static void check_timer_irq_cfg(unsigned int irq, const char *which) +{ + struct irq_desc *desc = irq_to_desc(irq); + + /* + * The interrupt controller driver will update desc->arch.type with + * the actual type which ended up configured in the hardware. + */ + if ( desc->arch.type & DT_IRQ_TYPE_LEVEL_LOW ) + return; + + printk(XENLOG_WARNING + "WARNING: %s-timer IRQ%u is not level triggered.\n", which, irq); +} + /* Set up the timer interrupt on this CPU */ void __cpuinit init_timer_interrupt(void) { @@ -215,6 +241,10 @@ void __cpuinit init_timer_interrupt(void) "virtimer", NULL); request_irq(timer_irq[TIMER_PHYS_NONSECURE_PPI], 0, timer_interrupt, "phytimer", NULL); + + check_timer_irq_cfg(timer_irq[TIMER_HYP_PPI], "hypervisor"); + check_timer_irq_cfg(timer_irq[TIMER_VIRT_PPI], "virtual"); + check_timer_irq_cfg(timer_irq[TIMER_PHYS_NONSECURE_PPI], "NS-physical"); } /* Wait a set number of microseconds */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:12:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:12: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 1YTqBY-0000P8-9z; Fri, 06 Mar 2015 11:12:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBW-0000NT-D9 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:50 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id B4/16-02753-1BB89F45; Fri, 06 Mar 2015 11:12:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1425640368!15262703!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5098 invoked from network); 6 Mar 2015 11:12:48 -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; 6 Mar 2015 11:12:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBT-00066j-Pb for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqBT-0001TV-Oc for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:47 +0000 Date: Fri, 06 Mar 2015 11:12:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Warn if timer interrupts are not level triggered X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 61d6a849fd220663462b15990482d1d4b0d3f73b Author: Ian Campbell AuthorDate: Thu Feb 19 15:24:03 2015 +0000 Commit: Ian Campbell CommitDate: Wed Feb 25 13:45:49 2015 +0000 xen: arm: Warn if timer interrupts are not level triggered Edge trigger arch timer interrupts really don't make much sense, so if we discover we are booting on such a system issue a warning. So far this has only been seen on the fast model emulators which have both an incorrect DT description of the interrupt and a writeable ICFGR allowing us to program the incorrect configuration. Other platforms have incorrect DT descriptions (warned about by previous patch) but the corresponding ICFGR isn't actually writeable so the eventual configuration is level as desired. I did consider overriding the incorrect DT on such systems but since so far it has only been observed on emulators and we have code in place to deal with edge triggering here I think warning is sufficient for now. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall [ ijc -- s/contoller/controller twice ] --- xen/arch/arm/time.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 418748d..8977cce 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -198,6 +198,32 @@ static void vtimer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) vgic_vcpu_inject_irq(current, current->arch.virt_timer.irq); } +/* + * Arch timer interrupt really ought to be level triggered, since the + * design of the timer/comparator mechanism is based around that + * concept. + * + * However some firmware (incorrectly) describes the interrupts as + * edge triggered and, worse, some hardware allows us to program the + * interrupt controller as edge triggered. + * + * Check each interrupt and warn if we find ourselves in this situation. + */ +static void check_timer_irq_cfg(unsigned int irq, const char *which) +{ + struct irq_desc *desc = irq_to_desc(irq); + + /* + * The interrupt controller driver will update desc->arch.type with + * the actual type which ended up configured in the hardware. + */ + if ( desc->arch.type & DT_IRQ_TYPE_LEVEL_LOW ) + return; + + printk(XENLOG_WARNING + "WARNING: %s-timer IRQ%u is not level triggered.\n", which, irq); +} + /* Set up the timer interrupt on this CPU */ void __cpuinit init_timer_interrupt(void) { @@ -215,6 +241,10 @@ void __cpuinit init_timer_interrupt(void) "virtimer", NULL); request_irq(timer_irq[TIMER_PHYS_NONSECURE_PPI], 0, timer_interrupt, "phytimer", NULL); + + check_timer_irq_cfg(timer_irq[TIMER_HYP_PPI], "hypervisor"); + check_timer_irq_cfg(timer_irq[TIMER_VIRT_PPI], "virtual"); + check_timer_irq_cfg(timer_irq[TIMER_PHYS_NONSECURE_PPI], "NS-physical"); } /* Wait a set number of microseconds */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:13:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11: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 1YTqBi-0000Vv-D6; Fri, 06 Mar 2015 11: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 1YTqBg-0000VM-Qz for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:01 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id B1/FF-03168-CBB89F45; Fri, 06 Mar 2015 11:13:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1425640378!15238445!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26559 invoked from network); 6 Mar 2015 11:12:59 -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; 6 Mar 2015 11:12:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBd-00066v-Ur for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqBd-0001Ts-Tk for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:57 +0000 Date: Fri, 06 Mar 2015 11:12:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic: Keep track of vIRQ used by a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c4159922adf931fa3362963910af8862b4accec Author: Julien Grall AuthorDate: Thu Feb 19 18:12:03 2015 +0000 Commit: Ian Campbell CommitDate: Wed Feb 25 13:49:23 2015 +0000 xen/arm: vgic: Keep track of vIRQ used by a domain While it's easy to know which hardware IRQ is assigned to a domain, there is no way to know which vIRQ is allocated by Xen for a specific domain. Introduce a bitmap to keep track of every vIRQ used by a domain. This will be used later to find free vIRQ for interrupt device assignment and emulated interrupt. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 3 ++ xen/arch/arm/domain_build.c | 6 ++++ xen/arch/arm/platforms/xgene-storm.c | 4 ++ xen/arch/arm/vgic.c | 55 ++++++++++++++++++++++++++++++++++ xen/arch/arm/vtimer.c | 25 +++++++++++++++ xen/include/asm-arm/domain.h | 1 + xen/include/asm-arm/vgic.h | 23 ++++++++++++++ 7 files changed, 117 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 3e3fe92..7a690b2 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -547,6 +547,9 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) else d->arch.evtchn_irq = platform_dom0_evtchn_ppi(); + if ( !vgic_reserve_virq(d, d->arch.evtchn_irq) ) + BUG(); + /* * Virtual UART is only used by linux early printk and decompress code. * Only use it for the hardware domain because the linux kernel may not diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 7b923e0..137cd2a 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -970,6 +970,12 @@ static int map_device(struct domain *d, struct dt_device_node *dev) irq = res; DPRINT("irq %u = %u\n", i, irq); + /* + * Checking the return of vgic_reserve_virq is not + * necessary. It should not fail except when we try to map + * the IRQ twice. This can legitimately happen if the IRQ is shared + */ + vgic_reserve_virq(d, irq); res = route_irq_to_guest(d, irq, dt_node_name(dev)); if ( res ) { diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index 0b3492d..ef3ba63 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -71,6 +71,10 @@ static int map_one_spi(struct domain *d, const char *what, printk("Additional IRQ %u (%s)\n", irq, what); + if ( !vgic_reserve_virq(d, irq) ) + printk("Failed to reserve vIRQ %u on dom%d\n", + irq, d->domain_id); + ret = route_irq_to_guest(d, irq, what); if ( ret ) printk("Failed to route %s to dom%d\n", what, d->domain_id); diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index b272d86..c14d79d 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -110,6 +110,15 @@ int domain_vgic_init(struct domain *d) d->arch.vgic.handler->domain_init(d); + d->arch.vgic.allocated_irqs = + xzalloc_array(unsigned long, BITS_TO_LONGS(vgic_num_irqs(d))); + if ( !d->arch.vgic.allocated_irqs ) + return -ENOMEM; + + /* vIRQ0-15 (SGIs) are reserved */ + for ( i = 0; i < NR_GIC_SGI; i++ ) + set_bit(i, d->arch.vgic.allocated_irqs); + return 0; } @@ -122,6 +131,7 @@ void domain_vgic_free(struct domain *d) { xfree(d->arch.vgic.shared_irqs); xfree(d->arch.vgic.pending_irqs); + xfree(d->arch.vgic.allocated_irqs); } int vcpu_vgic_init(struct vcpu *v) @@ -452,6 +462,51 @@ int vgic_emulate(struct cpu_user_regs *regs, union hsr hsr) return v->domain->arch.vgic.handler->emulate_sysreg(regs, hsr); } +bool_t vgic_reserve_virq(struct domain *d, unsigned int virq) +{ + if ( virq >= vgic_num_irqs(d) ) + return 0; + + return !test_and_set_bit(virq, d->arch.vgic.allocated_irqs); +} + +int vgic_allocate_virq(struct domain *d, bool_t spi) +{ + int first, end; + unsigned int virq; + + if ( !spi ) + { + /* We only allocate PPIs. SGIs are all reserved */ + first = 16; + end = 32; + } + else + { + first = 32; + end = vgic_num_irqs(d); + } + + /* + * There is no spinlock to protect allocated_irqs, therefore + * test_and_set_bit may fail. If so retry it. + */ + do + { + virq = find_next_zero_bit(d->arch.vgic.allocated_irqs, end, first); + if ( virq >= end ) + return -1; + } + while ( test_and_set_bit(virq, d->arch.vgic.allocated_irqs) ); + + return virq; +} + +void vgic_free_virq(struct domain *d, unsigned int virq) +{ + clear_bit(virq, d->arch.vgic.allocated_irqs); +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index 848e2c6..4427ae5 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -56,6 +56,31 @@ int domain_vtimer_init(struct domain *d) { d->arch.phys_timer_base.offset = NOW(); d->arch.virt_timer_base.offset = READ_SYSREG64(CNTPCT_EL0); + + /* At this stage vgic_reserve_virq can't fail */ + if ( is_hardware_domain(d) ) + { + if ( !vgic_reserve_virq(d, timer_get_irq(TIMER_PHYS_SECURE_PPI)) ) + BUG(); + + if ( !vgic_reserve_virq(d, timer_get_irq(TIMER_PHYS_NONSECURE_PPI)) ) + BUG(); + + if ( !vgic_reserve_virq(d, timer_get_irq(TIMER_VIRT_PPI)) ) + BUG(); + } + else + { + if ( !vgic_reserve_virq(d, GUEST_TIMER_PHYS_S_PPI) ) + BUG(); + + if ( !vgic_reserve_virq(d, GUEST_TIMER_PHYS_NS_PPI) ) + BUG(); + + if ( !vgic_reserve_virq(d, GUEST_TIMER_VIRT_PPI) ) + BUG(); + } + return 0; } diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 81e3185..9e0419e 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -90,6 +90,7 @@ struct arch_domain spinlock_t lock; int ctlr; int nr_spis; /* Number of SPIs */ + unsigned long *allocated_irqs; /* bitmap of IRQs allocated */ struct vgic_irq_rank *shared_irqs; /* * SPIs are domain global, SGIs and PPIs are per-VCPU and stored in diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 0c7da7f..dd93872 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -199,6 +199,29 @@ extern int vgic_to_sgi(struct vcpu *v, register_t sgir, enum gic_sgi_mode irqmode, int virq, unsigned long vcpu_mask); extern void vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq); + +/* Reserve a specific guest vIRQ */ +extern bool_t vgic_reserve_virq(struct domain *d, unsigned int virq); + +/* + * Allocate a guest VIRQ + * - spi == 0 => allocate a PPI. It will be the same on every vCPU + * - spi == 1 => allocate an SPI + */ +extern int vgic_allocate_virq(struct domain *d, bool_t spi); + +static inline int vgic_allocate_ppi(struct domain *d) +{ + return vgic_allocate_virq(d, 0 /* ppi */); +} + +static inline int vgic_allocate_spi(struct domain *d) +{ + return vgic_allocate_virq(d, 1 /* spi */); +} + +extern void vgic_free_virq(struct domain *d, unsigned int virq); + #endif /* __ASM_ARM_VGIC_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 Fri Mar 06 11:13:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11: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 1YTqBi-0000Vv-D6; Fri, 06 Mar 2015 11: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 1YTqBg-0000VM-Qz for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:01 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id B1/FF-03168-CBB89F45; Fri, 06 Mar 2015 11:13:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1425640378!15238445!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26559 invoked from network); 6 Mar 2015 11:12:59 -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; 6 Mar 2015 11:12:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBd-00066v-Ur for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqBd-0001Ts-Tk for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:12:57 +0000 Date: Fri, 06 Mar 2015 11:12:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic: Keep track of vIRQ used by a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c4159922adf931fa3362963910af8862b4accec Author: Julien Grall AuthorDate: Thu Feb 19 18:12:03 2015 +0000 Commit: Ian Campbell CommitDate: Wed Feb 25 13:49:23 2015 +0000 xen/arm: vgic: Keep track of vIRQ used by a domain While it's easy to know which hardware IRQ is assigned to a domain, there is no way to know which vIRQ is allocated by Xen for a specific domain. Introduce a bitmap to keep track of every vIRQ used by a domain. This will be used later to find free vIRQ for interrupt device assignment and emulated interrupt. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 3 ++ xen/arch/arm/domain_build.c | 6 ++++ xen/arch/arm/platforms/xgene-storm.c | 4 ++ xen/arch/arm/vgic.c | 55 ++++++++++++++++++++++++++++++++++ xen/arch/arm/vtimer.c | 25 +++++++++++++++ xen/include/asm-arm/domain.h | 1 + xen/include/asm-arm/vgic.h | 23 ++++++++++++++ 7 files changed, 117 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 3e3fe92..7a690b2 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -547,6 +547,9 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) else d->arch.evtchn_irq = platform_dom0_evtchn_ppi(); + if ( !vgic_reserve_virq(d, d->arch.evtchn_irq) ) + BUG(); + /* * Virtual UART is only used by linux early printk and decompress code. * Only use it for the hardware domain because the linux kernel may not diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 7b923e0..137cd2a 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -970,6 +970,12 @@ static int map_device(struct domain *d, struct dt_device_node *dev) irq = res; DPRINT("irq %u = %u\n", i, irq); + /* + * Checking the return of vgic_reserve_virq is not + * necessary. It should not fail except when we try to map + * the IRQ twice. This can legitimately happen if the IRQ is shared + */ + vgic_reserve_virq(d, irq); res = route_irq_to_guest(d, irq, dt_node_name(dev)); if ( res ) { diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index 0b3492d..ef3ba63 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -71,6 +71,10 @@ static int map_one_spi(struct domain *d, const char *what, printk("Additional IRQ %u (%s)\n", irq, what); + if ( !vgic_reserve_virq(d, irq) ) + printk("Failed to reserve vIRQ %u on dom%d\n", + irq, d->domain_id); + ret = route_irq_to_guest(d, irq, what); if ( ret ) printk("Failed to route %s to dom%d\n", what, d->domain_id); diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index b272d86..c14d79d 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -110,6 +110,15 @@ int domain_vgic_init(struct domain *d) d->arch.vgic.handler->domain_init(d); + d->arch.vgic.allocated_irqs = + xzalloc_array(unsigned long, BITS_TO_LONGS(vgic_num_irqs(d))); + if ( !d->arch.vgic.allocated_irqs ) + return -ENOMEM; + + /* vIRQ0-15 (SGIs) are reserved */ + for ( i = 0; i < NR_GIC_SGI; i++ ) + set_bit(i, d->arch.vgic.allocated_irqs); + return 0; } @@ -122,6 +131,7 @@ void domain_vgic_free(struct domain *d) { xfree(d->arch.vgic.shared_irqs); xfree(d->arch.vgic.pending_irqs); + xfree(d->arch.vgic.allocated_irqs); } int vcpu_vgic_init(struct vcpu *v) @@ -452,6 +462,51 @@ int vgic_emulate(struct cpu_user_regs *regs, union hsr hsr) return v->domain->arch.vgic.handler->emulate_sysreg(regs, hsr); } +bool_t vgic_reserve_virq(struct domain *d, unsigned int virq) +{ + if ( virq >= vgic_num_irqs(d) ) + return 0; + + return !test_and_set_bit(virq, d->arch.vgic.allocated_irqs); +} + +int vgic_allocate_virq(struct domain *d, bool_t spi) +{ + int first, end; + unsigned int virq; + + if ( !spi ) + { + /* We only allocate PPIs. SGIs are all reserved */ + first = 16; + end = 32; + } + else + { + first = 32; + end = vgic_num_irqs(d); + } + + /* + * There is no spinlock to protect allocated_irqs, therefore + * test_and_set_bit may fail. If so retry it. + */ + do + { + virq = find_next_zero_bit(d->arch.vgic.allocated_irqs, end, first); + if ( virq >= end ) + return -1; + } + while ( test_and_set_bit(virq, d->arch.vgic.allocated_irqs) ); + + return virq; +} + +void vgic_free_virq(struct domain *d, unsigned int virq) +{ + clear_bit(virq, d->arch.vgic.allocated_irqs); +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index 848e2c6..4427ae5 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -56,6 +56,31 @@ int domain_vtimer_init(struct domain *d) { d->arch.phys_timer_base.offset = NOW(); d->arch.virt_timer_base.offset = READ_SYSREG64(CNTPCT_EL0); + + /* At this stage vgic_reserve_virq can't fail */ + if ( is_hardware_domain(d) ) + { + if ( !vgic_reserve_virq(d, timer_get_irq(TIMER_PHYS_SECURE_PPI)) ) + BUG(); + + if ( !vgic_reserve_virq(d, timer_get_irq(TIMER_PHYS_NONSECURE_PPI)) ) + BUG(); + + if ( !vgic_reserve_virq(d, timer_get_irq(TIMER_VIRT_PPI)) ) + BUG(); + } + else + { + if ( !vgic_reserve_virq(d, GUEST_TIMER_PHYS_S_PPI) ) + BUG(); + + if ( !vgic_reserve_virq(d, GUEST_TIMER_PHYS_NS_PPI) ) + BUG(); + + if ( !vgic_reserve_virq(d, GUEST_TIMER_VIRT_PPI) ) + BUG(); + } + return 0; } diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 81e3185..9e0419e 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -90,6 +90,7 @@ struct arch_domain spinlock_t lock; int ctlr; int nr_spis; /* Number of SPIs */ + unsigned long *allocated_irqs; /* bitmap of IRQs allocated */ struct vgic_irq_rank *shared_irqs; /* * SPIs are domain global, SGIs and PPIs are per-VCPU and stored in diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 0c7da7f..dd93872 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -199,6 +199,29 @@ extern int vgic_to_sgi(struct vcpu *v, register_t sgir, enum gic_sgi_mode irqmode, int virq, unsigned long vcpu_mask); extern void vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq); + +/* Reserve a specific guest vIRQ */ +extern bool_t vgic_reserve_virq(struct domain *d, unsigned int virq); + +/* + * Allocate a guest VIRQ + * - spi == 0 => allocate a PPI. It will be the same on every vCPU + * - spi == 1 => allocate an SPI + */ +extern int vgic_allocate_virq(struct domain *d, bool_t spi); + +static inline int vgic_allocate_ppi(struct domain *d) +{ + return vgic_allocate_virq(d, 0 /* ppi */); +} + +static inline int vgic_allocate_spi(struct domain *d) +{ + return vgic_allocate_virq(d, 1 /* spi */); +} + +extern void vgic_free_virq(struct domain *d, unsigned int virq); + #endif /* __ASM_ARM_VGIC_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 Fri Mar 06 11:13:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:13: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 1YTqBs-0000eB-JS; Fri, 06 Mar 2015 11:13:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBq-0000bn-S6 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:11 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 7F/0E-03164-6CB89F45; Fri, 06 Mar 2015 11:13:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1425640388!10161742!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12994 invoked from network); 6 Mar 2015 11:13:09 -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; 6 Mar 2015 11:13:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBo-00067T-4O for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqBo-0001Uo-2a for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:08 +0000 Date: Fri, 06 Mar 2015 11:13:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Automatically find a PPI for the DOM0 event channel interrupt X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a3214b4b9979320249b46d12d857a5a66cbcb49e Author: Julien Grall AuthorDate: Thu Feb 19 18:12:04 2015 +0000 Commit: Ian Campbell CommitDate: Wed Feb 25 13:49:31 2015 +0000 xen/arm: Automatically find a PPI for the DOM0 event channel interrupt Use the new vgic interface to know which virtual PPI is free and use it for the event channel code. At the DOM0 creation time, Xen doesn't know which vIRQ will be free. All the vIRQ will be reserved when we parse the device tree. So we can allocate the vIRQ just after the device tree has been parsed. It's safe to defer the allocation because no vIRQ can be injected as long as the vCPU is not online. As the device tree node "hypervisor" containing the description of the event channel interrupt is created earlier, add a placeholder which will be fix up once Xen has allocated the PPI. Also correct the check in arch_domain_create to use is_hardware_domain. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 17 +++++++---- xen/arch/arm/domain_build.c | 51 ++++++++++++++++++++++++++++------ xen/arch/arm/platform.c | 7 ---- xen/arch/arm/platforms/xgene-storm.c | 1 - xen/include/asm-arm/platform.h | 4 -- 5 files changed, 53 insertions(+), 27 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 7a690b2..fdba081 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -542,13 +542,18 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) if ( (rc = domain_vtimer_init(d)) != 0 ) goto fail; - if ( d->domain_id ) + /* + * The hardware domain will get a PPI later in + * arch/arm/domain_build.c depending on the + * interrupt map of the hardware. + */ + if ( !is_hardware_domain(d) ) + { d->arch.evtchn_irq = GUEST_EVTCHN_PPI; - else - d->arch.evtchn_irq = platform_dom0_evtchn_ppi(); - - if ( !vgic_reserve_virq(d, d->arch.evtchn_irq) ) - BUG(); + /* At this stage vgic_reserve_virq should never fail */ + if ( !vgic_reserve_virq(d, GUEST_EVTCHN_PPI) ) + BUG(); + } /* * Virtual UART is only used by linux early printk and decompress code. diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 137cd2a..9f1f59f 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -627,16 +627,10 @@ static int make_hypervisor_node(struct domain *d, return res; /* - * interrupts is evtchn upcall: - * - Active-low level-sensitive - * - All cpus - * - * TODO: Handle correctly the cpumask + * Placeholder for the event channel interrupt. The values will be + * replaced later. */ - DPRINT(" Event channel interrupt to %u\n", d->arch.evtchn_irq); - set_interrupt_ppi(intr, d->arch.evtchn_irq, 0xf, - DT_IRQ_TYPE_LEVEL_LOW); - + set_interrupt_ppi(intr, ~0, 0xf, DT_IRQ_TYPE_INVALID); res = fdt_property_interrupts(fdt, &intr, 1); if ( res ) return res; @@ -1277,6 +1271,43 @@ static void initrd_load(struct kernel_info *kinfo) } } +static void evtchn_fixup(struct domain *d, struct kernel_info *kinfo) +{ + int res, node; + gic_interrupt_t intr; + + /* + * The allocation of the event channel IRQ has been deferred until + * now. At this time, all PPIs used by DOM0 have been registered. + */ + res = vgic_allocate_ppi(d); + if ( res < 0 ) + panic("Unable to allocate a PPI for the event channel interrupt\n"); + + d->arch.evtchn_irq = res; + + printk("Allocating PPI %u for event channel interrupt\n", + d->arch.evtchn_irq); + + /* Fix up "interrupts" in /hypervisor node */ + node = fdt_path_offset(kinfo->fdt, "/hypervisor"); + if ( node < 0 ) + panic("Cannot find the /hypervisor node"); + + /* Interrupt event channel upcall: + * - Active-low level-sensitive + * - All CPUs + * + * TODO: Handle properly the cpumask + */ + set_interrupt_ppi(intr, d->arch.evtchn_irq, 0xf, + DT_IRQ_TYPE_LEVEL_LOW); + res = fdt_setprop_inplace(kinfo->fdt, node, "interrupts", + &intr, sizeof(intr)); + if ( res ) + panic("Cannot fix up \"interrupts\" property of the hypervisor node"); +} + int construct_dom0(struct domain *d) { struct kernel_info kinfo = {}; @@ -1338,6 +1369,8 @@ int construct_dom0(struct domain *d) kernel_load(&kinfo); /* initrd_load will fix up the fdt, so call it before dtb_load */ initrd_load(&kinfo); + /* Allocate the event channel IRQ and fix up the device tree */ + evtchn_fixup(d, &kinfo); dtb_load(&kinfo); /* Now that we are done restore the original p2m and current. */ diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c index a79a098..86daf2b 100644 --- a/xen/arch/arm/platform.c +++ b/xen/arch/arm/platform.c @@ -160,13 +160,6 @@ bool_t platform_device_is_blacklisted(const struct dt_device_node *node) return (dt_match_node(blacklist, node) != NULL); } -unsigned int platform_dom0_evtchn_ppi(void) -{ - if ( platform && platform->dom0_evtchn_ppi ) - return platform->dom0_evtchn_ppi; - return GUEST_EVTCHN_PPI; -} - void platform_dom0_gnttab(paddr_t *start, paddr_t *size) { if ( platform && platform->dom0_gnttab_size ) diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index ef3ba63..eee650e 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -232,7 +232,6 @@ PLATFORM_START(xgene_storm, "APM X-GENE STORM") .quirks = xgene_storm_quirks, .specific_mapping = xgene_storm_specific_mapping, - .dom0_evtchn_ppi = 24, .dom0_gnttab_start = 0x1f800000, .dom0_gnttab_size = 0x20000, PLATFORM_END diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index eefaca6..4eba37b 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -38,10 +38,6 @@ struct platform_desc { */ const struct dt_device_match *blacklist_dev; /* - * The IRQ (PPI) to use to inject event channels to dom0. - */ - unsigned int dom0_evtchn_ppi; - /* * The location of a region of physical address space which dom0 * can use for grant table mappings. If size is zero defaults to * 0xb0000000-0xb0020000. -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:13:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:13: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 1YTqBs-0000eB-JS; Fri, 06 Mar 2015 11:13:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBq-0000bn-S6 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:11 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 7F/0E-03164-6CB89F45; Fri, 06 Mar 2015 11:13:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1425640388!10161742!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12994 invoked from network); 6 Mar 2015 11:13:09 -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; 6 Mar 2015 11:13:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBo-00067T-4O for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqBo-0001Uo-2a for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:08 +0000 Date: Fri, 06 Mar 2015 11:13:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Automatically find a PPI for the DOM0 event channel interrupt X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a3214b4b9979320249b46d12d857a5a66cbcb49e Author: Julien Grall AuthorDate: Thu Feb 19 18:12:04 2015 +0000 Commit: Ian Campbell CommitDate: Wed Feb 25 13:49:31 2015 +0000 xen/arm: Automatically find a PPI for the DOM0 event channel interrupt Use the new vgic interface to know which virtual PPI is free and use it for the event channel code. At the DOM0 creation time, Xen doesn't know which vIRQ will be free. All the vIRQ will be reserved when we parse the device tree. So we can allocate the vIRQ just after the device tree has been parsed. It's safe to defer the allocation because no vIRQ can be injected as long as the vCPU is not online. As the device tree node "hypervisor" containing the description of the event channel interrupt is created earlier, add a placeholder which will be fix up once Xen has allocated the PPI. Also correct the check in arch_domain_create to use is_hardware_domain. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 17 +++++++---- xen/arch/arm/domain_build.c | 51 ++++++++++++++++++++++++++++------ xen/arch/arm/platform.c | 7 ---- xen/arch/arm/platforms/xgene-storm.c | 1 - xen/include/asm-arm/platform.h | 4 -- 5 files changed, 53 insertions(+), 27 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 7a690b2..fdba081 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -542,13 +542,18 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) if ( (rc = domain_vtimer_init(d)) != 0 ) goto fail; - if ( d->domain_id ) + /* + * The hardware domain will get a PPI later in + * arch/arm/domain_build.c depending on the + * interrupt map of the hardware. + */ + if ( !is_hardware_domain(d) ) + { d->arch.evtchn_irq = GUEST_EVTCHN_PPI; - else - d->arch.evtchn_irq = platform_dom0_evtchn_ppi(); - - if ( !vgic_reserve_virq(d, d->arch.evtchn_irq) ) - BUG(); + /* At this stage vgic_reserve_virq should never fail */ + if ( !vgic_reserve_virq(d, GUEST_EVTCHN_PPI) ) + BUG(); + } /* * Virtual UART is only used by linux early printk and decompress code. diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 137cd2a..9f1f59f 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -627,16 +627,10 @@ static int make_hypervisor_node(struct domain *d, return res; /* - * interrupts is evtchn upcall: - * - Active-low level-sensitive - * - All cpus - * - * TODO: Handle correctly the cpumask + * Placeholder for the event channel interrupt. The values will be + * replaced later. */ - DPRINT(" Event channel interrupt to %u\n", d->arch.evtchn_irq); - set_interrupt_ppi(intr, d->arch.evtchn_irq, 0xf, - DT_IRQ_TYPE_LEVEL_LOW); - + set_interrupt_ppi(intr, ~0, 0xf, DT_IRQ_TYPE_INVALID); res = fdt_property_interrupts(fdt, &intr, 1); if ( res ) return res; @@ -1277,6 +1271,43 @@ static void initrd_load(struct kernel_info *kinfo) } } +static void evtchn_fixup(struct domain *d, struct kernel_info *kinfo) +{ + int res, node; + gic_interrupt_t intr; + + /* + * The allocation of the event channel IRQ has been deferred until + * now. At this time, all PPIs used by DOM0 have been registered. + */ + res = vgic_allocate_ppi(d); + if ( res < 0 ) + panic("Unable to allocate a PPI for the event channel interrupt\n"); + + d->arch.evtchn_irq = res; + + printk("Allocating PPI %u for event channel interrupt\n", + d->arch.evtchn_irq); + + /* Fix up "interrupts" in /hypervisor node */ + node = fdt_path_offset(kinfo->fdt, "/hypervisor"); + if ( node < 0 ) + panic("Cannot find the /hypervisor node"); + + /* Interrupt event channel upcall: + * - Active-low level-sensitive + * - All CPUs + * + * TODO: Handle properly the cpumask + */ + set_interrupt_ppi(intr, d->arch.evtchn_irq, 0xf, + DT_IRQ_TYPE_LEVEL_LOW); + res = fdt_setprop_inplace(kinfo->fdt, node, "interrupts", + &intr, sizeof(intr)); + if ( res ) + panic("Cannot fix up \"interrupts\" property of the hypervisor node"); +} + int construct_dom0(struct domain *d) { struct kernel_info kinfo = {}; @@ -1338,6 +1369,8 @@ int construct_dom0(struct domain *d) kernel_load(&kinfo); /* initrd_load will fix up the fdt, so call it before dtb_load */ initrd_load(&kinfo); + /* Allocate the event channel IRQ and fix up the device tree */ + evtchn_fixup(d, &kinfo); dtb_load(&kinfo); /* Now that we are done restore the original p2m and current. */ diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c index a79a098..86daf2b 100644 --- a/xen/arch/arm/platform.c +++ b/xen/arch/arm/platform.c @@ -160,13 +160,6 @@ bool_t platform_device_is_blacklisted(const struct dt_device_node *node) return (dt_match_node(blacklist, node) != NULL); } -unsigned int platform_dom0_evtchn_ppi(void) -{ - if ( platform && platform->dom0_evtchn_ppi ) - return platform->dom0_evtchn_ppi; - return GUEST_EVTCHN_PPI; -} - void platform_dom0_gnttab(paddr_t *start, paddr_t *size) { if ( platform && platform->dom0_gnttab_size ) diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index ef3ba63..eee650e 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -232,7 +232,6 @@ PLATFORM_START(xgene_storm, "APM X-GENE STORM") .quirks = xgene_storm_quirks, .specific_mapping = xgene_storm_specific_mapping, - .dom0_evtchn_ppi = 24, .dom0_gnttab_start = 0x1f800000, .dom0_gnttab_size = 0x20000, PLATFORM_END diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index eefaca6..4eba37b 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -38,10 +38,6 @@ struct platform_desc { */ const struct dt_device_match *blacklist_dev; /* - * The IRQ (PPI) to use to inject event channels to dom0. - */ - unsigned int dom0_evtchn_ppi; - /* * The location of a region of physical address space which dom0 * can use for grant table mappings. If size is zero defaults to * 0xb0000000-0xb0020000. -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:13:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:13: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 1YTqC2-0000mI-MW; Fri, 06 Mar 2015 11:13:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqC0-0000lQ-P5 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:20 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 28/FC-10942-0DB89F45; Fri, 06 Mar 2015 11:13:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425640398!13635318!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19355 invoked from network); 6 Mar 2015 11:13:19 -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; 6 Mar 2015 11:13:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBy-00067X-8u for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqBy-0001Vi-7o for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:18 +0000 Date: Fri, 06 Mar 2015 11:13:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] minor modifications to platform.h to make it C++-friendly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0a1403bfbb7e2f6c73ecaf4d3e8ece228c8d9ed Author: Razvan Cojocaru AuthorDate: Thu Feb 26 13:57:34 2015 +0100 Commit: Jan Beulich CommitDate: Thu Feb 26 13:57:34 2015 +0100 minor modifications to platform.h to make it C++-friendly Moved the definition of struct xenpf_efi_guid and struct xenpf_efi_time to file scope to avoid compilation errors with C++ (structs defined inside unnamed structs become unavailable outside their scope with C++). The change allows C++ applications to use platform.h with no consequences for current C clients. Signed-off-by: Razvan Cojocaru --- xen/include/public/platform.h | 39 ++++++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 17 deletions(-) diff --git a/xen/include/public/platform.h b/xen/include/public/platform.h index e4cf65f..82ec84e 100644 --- a/xen/include/public/platform.h +++ b/xen/include/public/platform.h @@ -141,6 +141,26 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_platform_quirk_t); #define XEN_EFI_query_variable_info 9 #define XEN_EFI_query_capsule_capabilities 10 #define XEN_EFI_update_capsule 11 + +struct xenpf_efi_time { + uint16_t year; + uint8_t month; + uint8_t day; + uint8_t hour; + uint8_t min; + uint8_t sec; + uint32_t ns; + int16_t tz; + uint8_t daylight; +}; + +struct xenpf_efi_guid { + uint32_t data1; + uint16_t data2; + uint16_t data3; + uint8_t data4[8]; +}; + struct xenpf_efi_runtime_call { uint32_t function; /* @@ -153,17 +173,7 @@ struct xenpf_efi_runtime_call { union { #define XEN_EFI_GET_TIME_SET_CLEARS_NS 0x00000001 struct { - struct xenpf_efi_time { - uint16_t year; - uint8_t month; - uint8_t day; - uint8_t hour; - uint8_t min; - uint8_t sec; - uint32_t ns; - int16_t tz; - uint8_t daylight; - } time; + struct xenpf_efi_time time; uint32_t resolution; uint32_t accuracy; } get_time; @@ -185,12 +195,7 @@ struct xenpf_efi_runtime_call { XEN_GUEST_HANDLE(void) name; /* UCS-2/UTF-16 string */ xen_ulong_t size; XEN_GUEST_HANDLE(void) data; - struct xenpf_efi_guid { - uint32_t data1; - uint16_t data2; - uint16_t data3; - uint8_t data4[8]; - } vendor_guid; + struct xenpf_efi_guid vendor_guid; } get_variable, set_variable; struct { -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:13:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:13: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 1YTqC2-0000mI-MW; Fri, 06 Mar 2015 11:13:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqC0-0000lQ-P5 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:20 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 28/FC-10942-0DB89F45; Fri, 06 Mar 2015 11:13:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425640398!13635318!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19355 invoked from network); 6 Mar 2015 11:13:19 -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; 6 Mar 2015 11:13:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqBy-00067X-8u for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqBy-0001Vi-7o for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:18 +0000 Date: Fri, 06 Mar 2015 11:13:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] minor modifications to platform.h to make it C++-friendly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0a1403bfbb7e2f6c73ecaf4d3e8ece228c8d9ed Author: Razvan Cojocaru AuthorDate: Thu Feb 26 13:57:34 2015 +0100 Commit: Jan Beulich CommitDate: Thu Feb 26 13:57:34 2015 +0100 minor modifications to platform.h to make it C++-friendly Moved the definition of struct xenpf_efi_guid and struct xenpf_efi_time to file scope to avoid compilation errors with C++ (structs defined inside unnamed structs become unavailable outside their scope with C++). The change allows C++ applications to use platform.h with no consequences for current C clients. Signed-off-by: Razvan Cojocaru --- xen/include/public/platform.h | 39 ++++++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 17 deletions(-) diff --git a/xen/include/public/platform.h b/xen/include/public/platform.h index e4cf65f..82ec84e 100644 --- a/xen/include/public/platform.h +++ b/xen/include/public/platform.h @@ -141,6 +141,26 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_platform_quirk_t); #define XEN_EFI_query_variable_info 9 #define XEN_EFI_query_capsule_capabilities 10 #define XEN_EFI_update_capsule 11 + +struct xenpf_efi_time { + uint16_t year; + uint8_t month; + uint8_t day; + uint8_t hour; + uint8_t min; + uint8_t sec; + uint32_t ns; + int16_t tz; + uint8_t daylight; +}; + +struct xenpf_efi_guid { + uint32_t data1; + uint16_t data2; + uint16_t data3; + uint8_t data4[8]; +}; + struct xenpf_efi_runtime_call { uint32_t function; /* @@ -153,17 +173,7 @@ struct xenpf_efi_runtime_call { union { #define XEN_EFI_GET_TIME_SET_CLEARS_NS 0x00000001 struct { - struct xenpf_efi_time { - uint16_t year; - uint8_t month; - uint8_t day; - uint8_t hour; - uint8_t min; - uint8_t sec; - uint32_t ns; - int16_t tz; - uint8_t daylight; - } time; + struct xenpf_efi_time time; uint32_t resolution; uint32_t accuracy; } get_time; @@ -185,12 +195,7 @@ struct xenpf_efi_runtime_call { XEN_GUEST_HANDLE(void) name; /* UCS-2/UTF-16 string */ xen_ulong_t size; XEN_GUEST_HANDLE(void) data; - struct xenpf_efi_guid { - uint32_t data1; - uint16_t data2; - uint16_t data3; - uint8_t data4[8]; - } vendor_guid; + struct xenpf_efi_guid vendor_guid; } get_variable, set_variable; struct { -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:13:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11: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 1YTqCB-0000tR-Pb; Fri, 06 Mar 2015 11:13:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCA-0000si-Mr for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:30 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 6E/14-02994-ADB89F45; Fri, 06 Mar 2015 11:13:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1425640408!15262997!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12958 invoked from network); 6 Mar 2015 11:13:29 -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; 6 Mar 2015 11:13:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqC8-00067e-D6 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqC8-0001W4-CJ for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:28 +0000 Date: Fri, 06 Mar 2015 11:13:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] honor MEMF_no_refcount in alloc_heap_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 17294e69c4cd299da7ba3ca8077e24be76bd61b1 Author: Jan Beulich AuthorDate: Thu Feb 26 13:58:54 2015 +0100 Commit: Jan Beulich CommitDate: Thu Feb 26 13:58:54 2015 +0100 honor MEMF_no_refcount in alloc_heap_pages() Non-anonymous allocations with this flag set should - for the purpose of the availability check - be treated just like anonymous ones, as they wouldn't lead to a reduction of ->outstanding_pages. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/common/page_alloc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 3c27af9..a7bdbfd 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -617,7 +617,8 @@ static struct page_info *alloc_heap_pages( */ if ( (outstanding_claims + request > total_avail_pages + tmem_freeable_pages()) && - (d == NULL || d->outstanding_pages < request) ) + ((memflags & MEMF_no_refcount) || + !d || d->outstanding_pages < request) ) goto not_found; /* -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:13:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11: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 1YTqCB-0000tR-Pb; Fri, 06 Mar 2015 11:13:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCA-0000si-Mr for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:30 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 6E/14-02994-ADB89F45; Fri, 06 Mar 2015 11:13:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1425640408!15262997!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12958 invoked from network); 6 Mar 2015 11:13:29 -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; 6 Mar 2015 11:13:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqC8-00067e-D6 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqC8-0001W4-CJ for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:28 +0000 Date: Fri, 06 Mar 2015 11:13:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] honor MEMF_no_refcount in alloc_heap_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 17294e69c4cd299da7ba3ca8077e24be76bd61b1 Author: Jan Beulich AuthorDate: Thu Feb 26 13:58:54 2015 +0100 Commit: Jan Beulich CommitDate: Thu Feb 26 13:58:54 2015 +0100 honor MEMF_no_refcount in alloc_heap_pages() Non-anonymous allocations with this flag set should - for the purpose of the availability check - be treated just like anonymous ones, as they wouldn't lead to a reduction of ->outstanding_pages. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/common/page_alloc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 3c27af9..a7bdbfd 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -617,7 +617,8 @@ static struct page_info *alloc_heap_pages( */ if ( (outstanding_claims + request > total_avail_pages + tmem_freeable_pages()) && - (d == NULL || d->outstanding_pages < request) ) + ((memflags & MEMF_no_refcount) || + !d || d->outstanding_pages < request) ) goto not_found; /* -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:13:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:13: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 1YTqCL-0000wx-SW; Fri, 06 Mar 2015 11:13:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCK-0000wB-RY for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:40 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 56/11-03168-4EB89F45; Fri, 06 Mar 2015 11:13:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1425640418!15215161!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7808 invoked from network); 6 Mar 2015 11:13:39 -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; 6 Mar 2015 11:13:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCI-00067n-Hj for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqCI-0001WX-Gr for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:38 +0000 Date: Fri, 06 Mar 2015 11:13:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/Dom0: minor command line parsing adjustments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f7448aea0e425a8b092191ea1741e3669e012a8c Author: Jan Beulich AuthorDate: Thu Feb 26 14:00:21 2015 +0100 Commit: Jan Beulich CommitDate: Thu Feb 26 14:00:21 2015 +0100 x86/Dom0: minor command line parsing adjustments Remove a redundant statement from parse_dom0_mem() and refuse bogus ranges (with a separator other than a dash) passed to parse_dom0_max_vcpus(). Fix coding style issues in the latter function at the same time. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/domain_build.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 4380b57..9b93653 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -78,8 +78,6 @@ static void __init parse_dom0_mem(const char *s) dom0_max_nrpages = parse_amt(s+4, &s); else dom0_nrpages = parse_amt(s, &s); - if ( *s != ',' ) - break; } while ( *s++ == ',' ); } custom_param("dom0_mem", parse_dom0_mem); @@ -89,14 +87,14 @@ static unsigned int __initdata opt_dom0_max_vcpus_max = UINT_MAX; static void __init parse_dom0_max_vcpus(const char *s) { - if (*s == '-') /* -M */ + if ( *s == '-' ) /* -M */ opt_dom0_max_vcpus_max = simple_strtoul(s + 1, &s, 0); - else /* N, N-, or N-M */ + else /* N, N-, or N-M */ { opt_dom0_max_vcpus_min = simple_strtoul(s, &s, 0); - if (*s++ == '\0') /* N */ + if ( !*s ) /* N */ opt_dom0_max_vcpus_max = opt_dom0_max_vcpus_min; - else if (*s != '\0') /* N-M */ + else if ( *s++ == '-' && *s ) /* N-M */ opt_dom0_max_vcpus_max = simple_strtoul(s, &s, 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 Mar 06 11:13:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:13: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 1YTqCL-0000wx-SW; Fri, 06 Mar 2015 11:13:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCK-0000wB-RY for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:40 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 56/11-03168-4EB89F45; Fri, 06 Mar 2015 11:13:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1425640418!15215161!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7808 invoked from network); 6 Mar 2015 11:13:39 -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; 6 Mar 2015 11:13:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCI-00067n-Hj for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqCI-0001WX-Gr for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:38 +0000 Date: Fri, 06 Mar 2015 11:13:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/Dom0: minor command line parsing adjustments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f7448aea0e425a8b092191ea1741e3669e012a8c Author: Jan Beulich AuthorDate: Thu Feb 26 14:00:21 2015 +0100 Commit: Jan Beulich CommitDate: Thu Feb 26 14:00:21 2015 +0100 x86/Dom0: minor command line parsing adjustments Remove a redundant statement from parse_dom0_mem() and refuse bogus ranges (with a separator other than a dash) passed to parse_dom0_max_vcpus(). Fix coding style issues in the latter function at the same time. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/domain_build.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 4380b57..9b93653 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -78,8 +78,6 @@ static void __init parse_dom0_mem(const char *s) dom0_max_nrpages = parse_amt(s+4, &s); else dom0_nrpages = parse_amt(s, &s); - if ( *s != ',' ) - break; } while ( *s++ == ',' ); } custom_param("dom0_mem", parse_dom0_mem); @@ -89,14 +87,14 @@ static unsigned int __initdata opt_dom0_max_vcpus_max = UINT_MAX; static void __init parse_dom0_max_vcpus(const char *s) { - if (*s == '-') /* -M */ + if ( *s == '-' ) /* -M */ opt_dom0_max_vcpus_max = simple_strtoul(s + 1, &s, 0); - else /* N, N-, or N-M */ + else /* N, N-, or N-M */ { opt_dom0_max_vcpus_min = simple_strtoul(s, &s, 0); - if (*s++ == '\0') /* N */ + if ( !*s ) /* N */ opt_dom0_max_vcpus_max = opt_dom0_max_vcpus_min; - else if (*s != '\0') /* N-M */ + else if ( *s++ == '-' && *s ) /* N-M */ opt_dom0_max_vcpus_max = simple_strtoul(s, &s, 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 Mar 06 11:13:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11: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 1YTqCV-000122-VY; Fri, 06 Mar 2015 11:13:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCU-00011X-W9 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:51 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id B5/F0-03511-EEB89F45; Fri, 06 Mar 2015 11:13:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1425640428!9391190!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25825 invoked from network); 6 Mar 2015 11:13:49 -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; 6 Mar 2015 11:13:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCS-00067t-O4 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqCS-0001Wt-Mc for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:48 +0000 Date: Fri, 06 Mar 2015 11:13:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] rework the comments for struct xen_domctl_vnuma X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ccb50193a76ada949cd3707f82c6c17303e4ad74 Author: Dario Faggioli AuthorDate: Thu Feb 26 14:00:58 2015 +0100 Commit: Jan Beulich CommitDate: Thu Feb 26 14:00:58 2015 +0100 rework the comments for struct xen_domctl_vnuma In fact: vnode_to_pnode is an array, not a mask; there was a typo in the one about vmemrange; there was no indication of the data directions. Signed-off-by: Dario Faggioli --- xen/include/public/domctl.h | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index b3413a2..ca0e51e 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -958,27 +958,37 @@ typedef struct xen_domctl_vcpu_msrs xen_domctl_vcpu_msrs_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vcpu_msrs_t); #endif -/* - * Use in XEN_DOMCTL_setvnumainfo to set - * vNUMA domain topology. - */ +/* XEN_DOMCTL_setvnumainfo: specifies a virtual NUMA topology for the guest */ struct xen_domctl_vnuma { + /* IN: number of vNUMA nodes to setup. Shall be greater than 0 */ uint32_t nr_vnodes; + /* IN: number of memory ranges to setup */ uint32_t nr_vmemranges; + /* + * IN: number of vCPUs of the domain (used as size of the vcpu_to_vnode + * array declared below). Shall be equal to the domain's max_vcpus. + */ uint32_t nr_vcpus; - uint32_t pad; + uint32_t pad; /* must be zero */ + + /* + * IN: array for specifying the distances of the vNUMA nodes + * between each others. Shall have nr_vnodes*nr_vnodes elements. + */ XEN_GUEST_HANDLE_64(uint) vdistance; + /* + * IN: array for specifying to what vNUMA node each vCPU belongs. + * Shall have nr_vcpus elements. + */ XEN_GUEST_HANDLE_64(uint) vcpu_to_vnode; - /* - * vnodes to physical NUMA nodes mask. - * This kept on per-domain basis for - * interested consumers, such as numa aware ballooning. + * IN: array for specifying on what physical NUMA node each vNUMA + * node is placed. Shall have nr_vnodes elements. */ XEN_GUEST_HANDLE_64(uint) vnode_to_pnode; - /* - * memory rages for each vNUMA node + * IN: array for specifying the memory ranges. Shall have + * nr_vmemranges elements. */ XEN_GUEST_HANDLE_64(xen_vmemrange_t) vmemrange; }; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:13:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11: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 1YTqCV-000122-VY; Fri, 06 Mar 2015 11:13:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCU-00011X-W9 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:51 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id B5/F0-03511-EEB89F45; Fri, 06 Mar 2015 11:13:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1425640428!9391190!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25825 invoked from network); 6 Mar 2015 11:13:49 -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; 6 Mar 2015 11:13:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCS-00067t-O4 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqCS-0001Wt-Mc for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:48 +0000 Date: Fri, 06 Mar 2015 11:13:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] rework the comments for struct xen_domctl_vnuma X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ccb50193a76ada949cd3707f82c6c17303e4ad74 Author: Dario Faggioli AuthorDate: Thu Feb 26 14:00:58 2015 +0100 Commit: Jan Beulich CommitDate: Thu Feb 26 14:00:58 2015 +0100 rework the comments for struct xen_domctl_vnuma In fact: vnode_to_pnode is an array, not a mask; there was a typo in the one about vmemrange; there was no indication of the data directions. Signed-off-by: Dario Faggioli --- xen/include/public/domctl.h | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index b3413a2..ca0e51e 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -958,27 +958,37 @@ typedef struct xen_domctl_vcpu_msrs xen_domctl_vcpu_msrs_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vcpu_msrs_t); #endif -/* - * Use in XEN_DOMCTL_setvnumainfo to set - * vNUMA domain topology. - */ +/* XEN_DOMCTL_setvnumainfo: specifies a virtual NUMA topology for the guest */ struct xen_domctl_vnuma { + /* IN: number of vNUMA nodes to setup. Shall be greater than 0 */ uint32_t nr_vnodes; + /* IN: number of memory ranges to setup */ uint32_t nr_vmemranges; + /* + * IN: number of vCPUs of the domain (used as size of the vcpu_to_vnode + * array declared below). Shall be equal to the domain's max_vcpus. + */ uint32_t nr_vcpus; - uint32_t pad; + uint32_t pad; /* must be zero */ + + /* + * IN: array for specifying the distances of the vNUMA nodes + * between each others. Shall have nr_vnodes*nr_vnodes elements. + */ XEN_GUEST_HANDLE_64(uint) vdistance; + /* + * IN: array for specifying to what vNUMA node each vCPU belongs. + * Shall have nr_vcpus elements. + */ XEN_GUEST_HANDLE_64(uint) vcpu_to_vnode; - /* - * vnodes to physical NUMA nodes mask. - * This kept on per-domain basis for - * interested consumers, such as numa aware ballooning. + * IN: array for specifying on what physical NUMA node each vNUMA + * node is placed. Shall have nr_vnodes elements. */ XEN_GUEST_HANDLE_64(uint) vnode_to_pnode; - /* - * memory rages for each vNUMA node + * IN: array for specifying the memory ranges. Shall have + * nr_vmemranges elements. */ XEN_GUEST_HANDLE_64(xen_vmemrange_t) vmemrange; }; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:14:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:14: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 1YTqCg-00018X-28; Fri, 06 Mar 2015 11:14:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCf-00018F-Fq for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:01 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id DD/5B-02750-8FB89F45; Fri, 06 Mar 2015 11:14:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1425640439!15238588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5357 invoked from network); 6 Mar 2015 11:13:59 -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; 6 Mar 2015 11:13:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCc-000683-TS for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqCc-0001XI-Rw for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:58 +0000 Date: Fri, 06 Mar 2015 11:13:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/numa: allow arbitrary value of PXM in PXM<->node mapping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ebeefe181c50a05e91052aa0503f69f9f8ea0cba Author: Boris Ostrovsky AuthorDate: Thu Feb 26 14:05:13 2015 +0100 Commit: Jan Beulich CommitDate: Thu Feb 26 14:05:13 2015 +0100 x86/numa: allow arbitrary value of PXM in PXM<->node mapping ACPI defines proximity domain identifier as a 32-bit integer. While in most cases the values will be zero-based this is not guaranteed, making current pxm2node[256] mapping structure not appropriate. We will instead use MAX_NUMNODES-sized array of struct pxm2node to store PXM-to-node mapping. To accommodate common case of zero-based and contiguios PXMs we will, whenever possible, try to use PXM as index into this array for fast lookups. Signed-off-by: Boris Ostrovsky Use ARRAY_SIZE(pxm2node) instead of MAX_NUMNODES in bounds checks. Rename struct pxm_to_node to struct pxm2node (the structure tag aliasing with the array defined using it is better than it aliasing with a function name). Signed-off-by: Jan Beulich --- xen/arch/x86/srat.c | 94 ++++++++++++++++++++++++++++++++------------ xen/include/asm-x86/numa.h | 4 +- 2 files changed, 71 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 29fc724..9702ff2 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -27,35 +27,78 @@ static nodemask_t memory_nodes_parsed __initdata; static nodemask_t processor_nodes_parsed __initdata; static nodemask_t nodes_found __initdata; static struct node nodes[MAX_NUMNODES] __initdata; -static u8 __read_mostly pxm2node[256] = { [0 ... 255] = NUMA_NO_NODE }; +struct pxm2node { + unsigned pxm; + u8 node; +}; +static struct pxm2node __read_mostly pxm2node[MAX_NUMNODES] = + { [0 ... MAX_NUMNODES - 1] = {.node = NUMA_NO_NODE} }; + +static int node_to_pxm(unsigned n); static int num_node_memblks; static struct node node_memblk_range[NR_NODE_MEMBLKS]; static int memblk_nodeid[NR_NODE_MEMBLKS]; +static inline bool_t node_found(unsigned idx, unsigned pxm) +{ + return ((pxm2node[idx].pxm == pxm) && + (pxm2node[idx].node != NUMA_NO_NODE)); +} -static int node_to_pxm(int n); - -int pxm_to_node(int pxm) +int pxm_to_node(unsigned pxm) { - if ((unsigned)pxm >= 256) - return -1; + unsigned i; + + if ((pxm < ARRAY_SIZE(pxm2node)) && node_found(pxm, pxm)) + return pxm2node[pxm].node; + + for (i = 0; i < ARRAY_SIZE(pxm2node); i++) + if (node_found(i, pxm)) + return pxm2node[i].node; + /* Extend 0xff to (int)-1 */ - return (signed char)pxm2node[pxm]; + return (signed char)NUMA_NO_NODE; } -__devinit int setup_node(int pxm) +__devinit int setup_node(unsigned pxm) { - unsigned node = pxm2node[pxm]; - if (node == 0xff) { - if (nodes_weight(nodes_found) >= MAX_NUMNODES) - return -1; - node = first_unset_node(nodes_found); - node_set(node, nodes_found); - pxm2node[pxm] = node; + int node; + unsigned idx; + static bool_t warned; + + BUILD_BUG_ON(MAX_NUMNODES >= NUMA_NO_NODE); + + if (pxm < ARRAY_SIZE(pxm2node)) { + if (node_found(pxm, pxm)) + return pxm2node[pxm].node; + + /* Try to maintain indexing of pxm2node by pxm */ + if (pxm2node[pxm].node == NUMA_NO_NODE) { + idx = pxm; + goto finish; + } + } + + for (idx = 0; idx < ARRAY_SIZE(pxm2node); idx++) + if (pxm2node[idx].node == NUMA_NO_NODE) + goto finish; + + if (!warned) { + printk(XENLOG_WARNING "More PXMs than available nodes\n"); + warned = 1; } - return pxm2node[pxm]; + + return (signed char)NUMA_NO_NODE; + + finish: + node = first_unset_node(nodes_found); + node_set(node, nodes_found); + pxm2node[idx].pxm = pxm; + pxm2node[idx].node = node; + + return node; } int valid_numa_range(u64 start, u64 end, int node) @@ -112,7 +155,7 @@ static __init void bad_srat(void) for (i = 0; i < MAX_LOCAL_APIC; i++) apicid_to_node[i] = NUMA_NO_NODE; for (i = 0; i < ARRAY_SIZE(pxm2node); i++) - pxm2node[i] = NUMA_NO_NODE; + pxm2node[i].node = NUMA_NO_NODE; mem_hotplug = 0; } @@ -438,15 +481,16 @@ int __init acpi_scan_nodes(u64 start, u64 end) return 0; } -static int node_to_pxm(int n) +static int node_to_pxm(unsigned n) { - int i; - if (pxm2node[n] == n) - return n; - for (i = 0; i < 256; i++) - if (pxm2node[i] == n) - return i; - return 0; + unsigned i; + + if ((n < ARRAY_SIZE(pxm2node)) && (pxm2node[n].node == n)) + return pxm2node[n].pxm; + for (i = 0; i < ARRAY_SIZE(pxm2node); i++) + if (pxm2node[i].node == n) + return pxm2node[i].pxm; + return 0; } int __node_distance(int a, int b) diff --git a/xen/include/asm-x86/numa.h b/xen/include/asm-x86/numa.h index 5959860..5fa51ba 100644 --- a/xen/include/asm-x86/numa.h +++ b/xen/include/asm-x86/numa.h @@ -21,7 +21,7 @@ struct node { extern int compute_hash_shift(struct node *nodes, int numnodes, int *nodeids); -extern int pxm_to_node(int nid); +extern int pxm_to_node(unsigned int pxm); #define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT)) #define VIRTUAL_BUG_ON(x) @@ -33,7 +33,7 @@ extern int numa_off; extern int srat_disabled(void); extern void numa_set_node(int cpu, int node); -extern int setup_node(int pxm); +extern int setup_node(unsigned int pxm); extern void srat_detect_node(int cpu); extern void setup_node_bootmem(int nodeid, u64 start, u64 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 Fri Mar 06 11:14:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:14: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 1YTqCg-00018X-28; Fri, 06 Mar 2015 11:14:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCf-00018F-Fq for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:01 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id DD/5B-02750-8FB89F45; Fri, 06 Mar 2015 11:14:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1425640439!15238588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5357 invoked from network); 6 Mar 2015 11:13:59 -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; 6 Mar 2015 11:13:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCc-000683-TS for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqCc-0001XI-Rw for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:13:58 +0000 Date: Fri, 06 Mar 2015 11:13:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/numa: allow arbitrary value of PXM in PXM<->node mapping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ebeefe181c50a05e91052aa0503f69f9f8ea0cba Author: Boris Ostrovsky AuthorDate: Thu Feb 26 14:05:13 2015 +0100 Commit: Jan Beulich CommitDate: Thu Feb 26 14:05:13 2015 +0100 x86/numa: allow arbitrary value of PXM in PXM<->node mapping ACPI defines proximity domain identifier as a 32-bit integer. While in most cases the values will be zero-based this is not guaranteed, making current pxm2node[256] mapping structure not appropriate. We will instead use MAX_NUMNODES-sized array of struct pxm2node to store PXM-to-node mapping. To accommodate common case of zero-based and contiguios PXMs we will, whenever possible, try to use PXM as index into this array for fast lookups. Signed-off-by: Boris Ostrovsky Use ARRAY_SIZE(pxm2node) instead of MAX_NUMNODES in bounds checks. Rename struct pxm_to_node to struct pxm2node (the structure tag aliasing with the array defined using it is better than it aliasing with a function name). Signed-off-by: Jan Beulich --- xen/arch/x86/srat.c | 94 ++++++++++++++++++++++++++++++++------------ xen/include/asm-x86/numa.h | 4 +- 2 files changed, 71 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 29fc724..9702ff2 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -27,35 +27,78 @@ static nodemask_t memory_nodes_parsed __initdata; static nodemask_t processor_nodes_parsed __initdata; static nodemask_t nodes_found __initdata; static struct node nodes[MAX_NUMNODES] __initdata; -static u8 __read_mostly pxm2node[256] = { [0 ... 255] = NUMA_NO_NODE }; +struct pxm2node { + unsigned pxm; + u8 node; +}; +static struct pxm2node __read_mostly pxm2node[MAX_NUMNODES] = + { [0 ... MAX_NUMNODES - 1] = {.node = NUMA_NO_NODE} }; + +static int node_to_pxm(unsigned n); static int num_node_memblks; static struct node node_memblk_range[NR_NODE_MEMBLKS]; static int memblk_nodeid[NR_NODE_MEMBLKS]; +static inline bool_t node_found(unsigned idx, unsigned pxm) +{ + return ((pxm2node[idx].pxm == pxm) && + (pxm2node[idx].node != NUMA_NO_NODE)); +} -static int node_to_pxm(int n); - -int pxm_to_node(int pxm) +int pxm_to_node(unsigned pxm) { - if ((unsigned)pxm >= 256) - return -1; + unsigned i; + + if ((pxm < ARRAY_SIZE(pxm2node)) && node_found(pxm, pxm)) + return pxm2node[pxm].node; + + for (i = 0; i < ARRAY_SIZE(pxm2node); i++) + if (node_found(i, pxm)) + return pxm2node[i].node; + /* Extend 0xff to (int)-1 */ - return (signed char)pxm2node[pxm]; + return (signed char)NUMA_NO_NODE; } -__devinit int setup_node(int pxm) +__devinit int setup_node(unsigned pxm) { - unsigned node = pxm2node[pxm]; - if (node == 0xff) { - if (nodes_weight(nodes_found) >= MAX_NUMNODES) - return -1; - node = first_unset_node(nodes_found); - node_set(node, nodes_found); - pxm2node[pxm] = node; + int node; + unsigned idx; + static bool_t warned; + + BUILD_BUG_ON(MAX_NUMNODES >= NUMA_NO_NODE); + + if (pxm < ARRAY_SIZE(pxm2node)) { + if (node_found(pxm, pxm)) + return pxm2node[pxm].node; + + /* Try to maintain indexing of pxm2node by pxm */ + if (pxm2node[pxm].node == NUMA_NO_NODE) { + idx = pxm; + goto finish; + } + } + + for (idx = 0; idx < ARRAY_SIZE(pxm2node); idx++) + if (pxm2node[idx].node == NUMA_NO_NODE) + goto finish; + + if (!warned) { + printk(XENLOG_WARNING "More PXMs than available nodes\n"); + warned = 1; } - return pxm2node[pxm]; + + return (signed char)NUMA_NO_NODE; + + finish: + node = first_unset_node(nodes_found); + node_set(node, nodes_found); + pxm2node[idx].pxm = pxm; + pxm2node[idx].node = node; + + return node; } int valid_numa_range(u64 start, u64 end, int node) @@ -112,7 +155,7 @@ static __init void bad_srat(void) for (i = 0; i < MAX_LOCAL_APIC; i++) apicid_to_node[i] = NUMA_NO_NODE; for (i = 0; i < ARRAY_SIZE(pxm2node); i++) - pxm2node[i] = NUMA_NO_NODE; + pxm2node[i].node = NUMA_NO_NODE; mem_hotplug = 0; } @@ -438,15 +481,16 @@ int __init acpi_scan_nodes(u64 start, u64 end) return 0; } -static int node_to_pxm(int n) +static int node_to_pxm(unsigned n) { - int i; - if (pxm2node[n] == n) - return n; - for (i = 0; i < 256; i++) - if (pxm2node[i] == n) - return i; - return 0; + unsigned i; + + if ((n < ARRAY_SIZE(pxm2node)) && (pxm2node[n].node == n)) + return pxm2node[n].pxm; + for (i = 0; i < ARRAY_SIZE(pxm2node); i++) + if (pxm2node[i].node == n) + return pxm2node[i].pxm; + return 0; } int __node_distance(int a, int b) diff --git a/xen/include/asm-x86/numa.h b/xen/include/asm-x86/numa.h index 5959860..5fa51ba 100644 --- a/xen/include/asm-x86/numa.h +++ b/xen/include/asm-x86/numa.h @@ -21,7 +21,7 @@ struct node { extern int compute_hash_shift(struct node *nodes, int numnodes, int *nodeids); -extern int pxm_to_node(int nid); +extern int pxm_to_node(unsigned int pxm); #define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT)) #define VIRTUAL_BUG_ON(x) @@ -33,7 +33,7 @@ extern int numa_off; extern int srat_disabled(void); extern void numa_set_node(int cpu, int node); -extern int setup_node(int pxm); +extern int setup_node(unsigned int pxm); extern void srat_detect_node(int cpu); extern void setup_node_bootmem(int nodeid, u64 start, u64 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 Fri Mar 06 11:14:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:14: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 1YTqCr-0001GS-7C; Fri, 06 Mar 2015 11:14:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCq-0001F8-GO for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:12 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 44/ED-03164-30C89F45; Fri, 06 Mar 2015 11:14:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1425640449!13507440!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13730 invoked from network); 6 Mar 2015 11:14:10 -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; 6 Mar 2015 11:14:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCn-00068b-6c for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqCn-0001Xp-1O for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:09 +0000 Date: Fri, 06 Mar 2015 11:14:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/numa: adjust datatypes for node and pxm X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 54ce2db8b8953b17c6b22042df83193299a991eb Author: Boris Ostrovsky AuthorDate: Thu Feb 26 14:06:26 2015 +0100 Commit: Jan Beulich CommitDate: Thu Feb 26 14:06:26 2015 +0100 x86/numa: adjust datatypes for node and pxm Use u8-sized node IDs and unsigned PXMs consistently throughout code (and introduce nodeid_t type). Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- xen/arch/x86/irq.c | 4 +- xen/arch/x86/numa.c | 15 ++++++------ xen/arch/x86/setup.c | 2 +- xen/arch/x86/smpboot.c | 6 +++- xen/arch/x86/srat.c | 41 ++++++++++++++++++---------------- xen/arch/x86/x86_64/mm.c | 5 ++- xen/common/page_alloc.c | 7 +++-- xen/drivers/passthrough/vtd/iommu.c | 5 ++- xen/include/asm-arm/numa.h | 4 ++- xen/include/asm-x86/irq.h | 3 +- xen/include/asm-x86/numa.h | 24 +++++++++++--------- 11 files changed, 65 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 92e1854..786d1fc 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -153,7 +153,7 @@ int __init bind_irq_vector(int irq, int vector, const cpumask_t *cpu_mask) /* * Dynamic irq allocate and deallocation for MSI */ -int create_irq(int node) +int create_irq(nodeid_t node) { int irq, ret; struct irq_desc *desc; @@ -173,7 +173,7 @@ int create_irq(int node) { cpumask_t *mask = NULL; - if (node != NUMA_NO_NODE && node >= 0) + if ( node != NUMA_NO_NODE ) { mask = &node_to_cpumask(node); if (cpumask_empty(mask)) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index e500f33..132d694 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -36,13 +36,13 @@ static typeof(*memnodemap) _memnodemap[64]; unsigned long memnodemapsize; u8 *memnodemap; -unsigned char cpu_to_node[NR_CPUS] __read_mostly = { +nodeid_t cpu_to_node[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = NUMA_NO_NODE }; /* * Keep BIOS's CPU2node information, should not be used for memory allocaion */ -unsigned char apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { +nodeid_t apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE }; cpumask_t node_to_cpumask[MAX_NUMNODES] __read_mostly; @@ -66,7 +66,7 @@ int srat_disabled(void) * -1 if node overlap or lost ram (shift too big) */ static int __init populate_memnodemap(const struct node *nodes, - int numnodes, int shift, int *nodeids) + int numnodes, int shift, nodeid_t *nodeids) { unsigned long spdx, epdx; int i, res = -1; @@ -151,7 +151,7 @@ static int __init extract_lsb_from_nodes(const struct node *nodes, } int __init compute_hash_shift(struct node *nodes, int numnodes, - int *nodeids) + nodeid_t *nodeids) { int shift; @@ -173,7 +173,7 @@ int __init compute_hash_shift(struct node *nodes, int numnodes, return shift; } /* initialize NODE_DATA given nodeid and start/end */ -void __init setup_node_bootmem(int nodeid, u64 start, u64 end) +void __init setup_node_bootmem(nodeid_t nodeid, u64 start, u64 end) { unsigned long start_pfn, end_pfn; @@ -295,7 +295,7 @@ __cpuinit void numa_add_cpu(int cpu) cpumask_set_cpu(cpu, &node_to_cpumask[cpu_to_node(cpu)]); } -void __cpuinit numa_set_node(int cpu, int node) +void __cpuinit numa_set_node(int cpu, nodeid_t node) { cpu_to_node[cpu] = node; } @@ -341,7 +341,8 @@ static __init int numa_setup(char *opt) */ void __init init_cpu_to_node(void) { - int i, node; + unsigned int i; + nodeid_t node; for ( i = 0; i < nr_cpu_ids; i++ ) { diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index d316212..7593533 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -188,7 +188,7 @@ static void __init init_idle_domain(void) void __devinit srat_detect_node(int cpu) { - unsigned node; + nodeid_t node; u32 apicid = x86_cpu_to_apicid[cpu]; node = apicid_to_node[apicid]; diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 7ae561c..314e253 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -843,7 +843,7 @@ void __cpu_die(unsigned int cpu) int cpu_add(uint32_t apic_id, uint32_t acpi_id, uint32_t pxm) { - int node, cpu = -1; + int cpu = -1; dprintk(XENLOG_DEBUG, "cpu_add apic_id %x acpi_id %x pxm %x\n", apic_id, acpi_id, pxm); @@ -877,7 +877,9 @@ int cpu_add(uint32_t apic_id, uint32_t acpi_id, uint32_t pxm) if ( !srat_disabled() ) { - if ( (node = setup_node(pxm)) < 0 ) + nodeid_t node = setup_node(pxm); + + if ( node == NUMA_NO_NODE ) { dprintk(XENLOG_WARNING, "Setup node failed for pxm %x\n", pxm); diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 9702ff2..dfabba3 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -30,16 +30,16 @@ static struct node nodes[MAX_NUMNODES] __initdata; struct pxm2node { unsigned pxm; - u8 node; + nodeid_t node; }; static struct pxm2node __read_mostly pxm2node[MAX_NUMNODES] = { [0 ... MAX_NUMNODES - 1] = {.node = NUMA_NO_NODE} }; -static int node_to_pxm(unsigned n); +static unsigned node_to_pxm(nodeid_t n); static int num_node_memblks; static struct node node_memblk_range[NR_NODE_MEMBLKS]; -static int memblk_nodeid[NR_NODE_MEMBLKS]; +static nodeid_t memblk_nodeid[NR_NODE_MEMBLKS]; static inline bool_t node_found(unsigned idx, unsigned pxm) { @@ -47,7 +47,7 @@ static inline bool_t node_found(unsigned idx, unsigned pxm) (pxm2node[idx].node != NUMA_NO_NODE)); } -int pxm_to_node(unsigned pxm) +nodeid_t pxm_to_node(unsigned pxm) { unsigned i; @@ -58,13 +58,12 @@ int pxm_to_node(unsigned pxm) if (node_found(i, pxm)) return pxm2node[i].node; - /* Extend 0xff to (int)-1 */ - return (signed char)NUMA_NO_NODE; + return NUMA_NO_NODE; } -__devinit int setup_node(unsigned pxm) +__devinit nodeid_t setup_node(unsigned pxm) { - int node; + nodeid_t node; unsigned idx; static bool_t warned; @@ -90,7 +89,7 @@ __devinit int setup_node(unsigned pxm) warned = 1; } - return (signed char)NUMA_NO_NODE; + return NUMA_NO_NODE; finish: node = first_unset_node(nodes_found); @@ -101,7 +100,7 @@ __devinit int setup_node(unsigned pxm) return node; } -int valid_numa_range(u64 start, u64 end, int node) +int valid_numa_range(u64 start, u64 end, nodeid_t node) { int i; @@ -205,8 +204,9 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) void __init acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) { - int pxm, node; - int apic_id; + unsigned pxm; + nodeid_t node; + u32 apic_id; if (srat_disabled()) return; @@ -218,7 +218,7 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) return; pxm = pa->proximity_domain; node = setup_node(pxm); - if (node < 0) { + if (node == NUMA_NO_NODE) { printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm); bad_srat(); return; @@ -235,7 +235,9 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) void __init acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) { - int pxm, node; + unsigned pxm; + nodeid_t node; + if (srat_disabled()) return; if (pa->header.length != sizeof(struct acpi_srat_cpu_affinity)) { @@ -251,7 +253,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) pxm |= pa->proximity_domain_hi[2] << 24; } node = setup_node(pxm); - if (node < 0) { + if (node == NUMA_NO_NODE) { printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm); bad_srat(); return; @@ -269,7 +271,8 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) { struct node *nd; u64 start, end; - int node, pxm; + unsigned pxm; + nodeid_t node; int i; if (srat_disabled()) @@ -295,7 +298,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) if (srat_rev < 2) pxm &= 0xff; node = setup_node(pxm); - if (node < 0) { + if (node == NUMA_NO_NODE) { printk(KERN_ERR "SRAT: Too many proximity domains.\n"); bad_srat(); return; @@ -481,7 +484,7 @@ int __init acpi_scan_nodes(u64 start, u64 end) return 0; } -static int node_to_pxm(unsigned n) +static unsigned node_to_pxm(nodeid_t n) { unsigned i; @@ -493,7 +496,7 @@ static int node_to_pxm(unsigned n) return 0; } -int __node_distance(int a, int b) +int __node_distance(nodeid_t a, nodeid_t b) { int index; diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index d631aee..6875c92 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -1343,7 +1343,8 @@ int mem_hotadd_check(unsigned long spfn, unsigned long epfn) int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm) { struct mem_hotadd_info info; - int ret, node; + int ret; + nodeid_t node; unsigned long old_max = max_page, old_total = total_pages; unsigned long old_node_start, old_node_span, orig_online; unsigned long i; @@ -1353,7 +1354,7 @@ int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm) if ( !mem_hotadd_check(spfn, epfn) ) return -EINVAL; - if ( (node = setup_node(pxm)) == -1 ) + if ( (node = setup_node(pxm)) == NUMA_NO_NODE ) return -EINVAL; if ( !valid_numa_range(spfn << PAGE_SHIFT, epfn << PAGE_SHIFT, node) ) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index a7bdbfd..6bd3b75 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -580,8 +580,8 @@ static struct page_info *alloc_heap_pages( unsigned int order, unsigned int memflags, struct domain *d) { - unsigned int first_node, i, j, zone = 0, nodemask_retry = 0; - unsigned int node = (uint8_t)((memflags >> _MEMF_node) - 1); + unsigned int i, j, zone = 0, nodemask_retry = 0; + nodeid_t first_node, node = (nodeid_t)((memflags >> _MEMF_node) - 1); unsigned long request = 1UL << order; struct page_info *pg; nodemask_t nodemask = (d != NULL ) ? d->node_affinity : node_online_map; @@ -1279,7 +1279,8 @@ static void __init smp_scrub_heap_pages(void *data) unsigned long mfn, start, end; struct page_info *pg; struct scrub_region *r; - unsigned int temp_cpu, node, cpu_idx = 0; + unsigned int temp_cpu, cpu_idx = 0; + nodeid_t node; unsigned int cpu = smp_processor_id(); if ( data ) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 2e113d7..1063677 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -190,14 +190,15 @@ u64 alloc_pgtable_maddr(struct acpi_drhd_unit *drhd, unsigned long npages) struct acpi_rhsa_unit *rhsa; struct page_info *pg, *cur_pg; u64 *vaddr; - int node = -1, i; + nodeid_t node = NUMA_NO_NODE; + unsigned int i; rhsa = drhd_to_rhsa(drhd); if ( rhsa ) node = pxm_to_node(rhsa->proximity_domain); pg = alloc_domheap_pages(NULL, get_order_from_pages(npages), - (node == -1 ) ? 0 : MEMF_node(node)); + (node == NUMA_NO_NODE) ? 0 : MEMF_node(node)); if ( !pg ) return 0; diff --git a/xen/include/asm-arm/numa.h b/xen/include/asm-arm/numa.h index 06a9d5a..a00cb7c 100644 --- a/xen/include/asm-arm/numa.h +++ b/xen/include/asm-arm/numa.h @@ -1,11 +1,13 @@ #ifndef __ARCH_ARM_NUMA_H #define __ARCH_ARM_NUMA_H +typedef u8 nodeid_t; + /* Fake one node for now. See also node_online_map. */ #define cpu_to_node(cpu) 0 #define node_to_cpumask(node) (cpu_online_map) -static inline __attribute__((pure)) int phys_to_nid(paddr_t addr) +static inline __attribute__((pure)) nodeid_t phys_to_nid(paddr_t addr) { return 0; } diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h index d3c55f3..a44305e 100644 --- a/xen/include/asm-x86/irq.h +++ b/xen/include/asm-x86/irq.h @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -155,7 +156,7 @@ int init_irq_data(void); void clear_irq_vector(int irq); int irq_to_vector(int irq); -int create_irq(int node); +int create_irq(nodeid_t node); void destroy_irq(unsigned int irq); int assign_irq_vector(int irq, const cpumask_t *); diff --git a/xen/include/asm-x86/numa.h b/xen/include/asm-x86/numa.h index 5fa51ba..cc5b5d1 100644 --- a/xen/include/asm-x86/numa.h +++ b/xen/include/asm-x86/numa.h @@ -5,6 +5,8 @@ #define NODES_SHIFT 6 +typedef u8 nodeid_t; + extern int srat_rev; extern unsigned char cpu_to_node[]; @@ -20,8 +22,8 @@ struct node { }; extern int compute_hash_shift(struct node *nodes, int numnodes, - int *nodeids); -extern int pxm_to_node(unsigned int pxm); + nodeid_t *nodeids); +extern nodeid_t pxm_to_node(unsigned int pxm); #define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT)) #define VIRTUAL_BUG_ON(x) @@ -32,12 +34,12 @@ extern int numa_off; extern int srat_disabled(void); -extern void numa_set_node(int cpu, int node); -extern int setup_node(unsigned int pxm); +extern void numa_set_node(int cpu, nodeid_t node); +extern nodeid_t setup_node(unsigned int pxm); extern void srat_detect_node(int cpu); -extern void setup_node_bootmem(int nodeid, u64 start, u64 end); -extern unsigned char apicid_to_node[]; +extern void setup_node_bootmem(nodeid_t nodeid, u64 start, u64 end); +extern nodeid_t apicid_to_node[]; #ifdef CONFIG_NUMA extern void init_cpu_to_node(void); @@ -54,14 +56,14 @@ extern u8 *memnodemap; struct node_data { unsigned long node_start_pfn; unsigned long node_spanned_pages; - unsigned int node_id; + nodeid_t node_id; }; extern struct node_data node_data[]; -static inline __attribute__((pure)) int phys_to_nid(paddr_t addr) +static inline __attribute__((pure)) nodeid_t phys_to_nid(paddr_t addr) { - unsigned nid; + nodeid_t nid; VIRTUAL_BUG_ON((paddr_to_pdx(addr) >> memnode_shift) >= memnodemapsize); nid = memnodemap[paddr_to_pdx(addr) >> memnode_shift]; VIRTUAL_BUG_ON(nid >= MAX_NUMNODES || !node_data[nid]); @@ -75,7 +77,7 @@ static inline __attribute__((pure)) int phys_to_nid(paddr_t addr) #define node_end_pfn(nid) (NODE_DATA(nid)->node_start_pfn + \ NODE_DATA(nid)->node_spanned_pages) -extern int valid_numa_range(u64 start, u64 end, int node); +extern int valid_numa_range(u64 start, u64 end, nodeid_t node); #else #define init_cpu_to_node() do {} while (0) #define clear_node_cpumask(cpu) do {} while (0) @@ -83,6 +85,6 @@ extern int valid_numa_range(u64 start, u64 end, int node); #endif void srat_parse_regions(u64 addr); -extern int __node_distance(int a, int b); +extern int __node_distance(nodeid_t a, nodeid_t b); #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 Fri Mar 06 11:14:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:14: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 1YTqCr-0001GS-7C; Fri, 06 Mar 2015 11:14:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCq-0001F8-GO for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:12 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 44/ED-03164-30C89F45; Fri, 06 Mar 2015 11:14:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1425640449!13507440!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13730 invoked from network); 6 Mar 2015 11:14:10 -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; 6 Mar 2015 11:14:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCn-00068b-6c for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqCn-0001Xp-1O for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:09 +0000 Date: Fri, 06 Mar 2015 11:14:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/numa: adjust datatypes for node and pxm X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 54ce2db8b8953b17c6b22042df83193299a991eb Author: Boris Ostrovsky AuthorDate: Thu Feb 26 14:06:26 2015 +0100 Commit: Jan Beulich CommitDate: Thu Feb 26 14:06:26 2015 +0100 x86/numa: adjust datatypes for node and pxm Use u8-sized node IDs and unsigned PXMs consistently throughout code (and introduce nodeid_t type). Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- xen/arch/x86/irq.c | 4 +- xen/arch/x86/numa.c | 15 ++++++------ xen/arch/x86/setup.c | 2 +- xen/arch/x86/smpboot.c | 6 +++- xen/arch/x86/srat.c | 41 ++++++++++++++++++---------------- xen/arch/x86/x86_64/mm.c | 5 ++- xen/common/page_alloc.c | 7 +++-- xen/drivers/passthrough/vtd/iommu.c | 5 ++- xen/include/asm-arm/numa.h | 4 ++- xen/include/asm-x86/irq.h | 3 +- xen/include/asm-x86/numa.h | 24 +++++++++++--------- 11 files changed, 65 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 92e1854..786d1fc 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -153,7 +153,7 @@ int __init bind_irq_vector(int irq, int vector, const cpumask_t *cpu_mask) /* * Dynamic irq allocate and deallocation for MSI */ -int create_irq(int node) +int create_irq(nodeid_t node) { int irq, ret; struct irq_desc *desc; @@ -173,7 +173,7 @@ int create_irq(int node) { cpumask_t *mask = NULL; - if (node != NUMA_NO_NODE && node >= 0) + if ( node != NUMA_NO_NODE ) { mask = &node_to_cpumask(node); if (cpumask_empty(mask)) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index e500f33..132d694 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -36,13 +36,13 @@ static typeof(*memnodemap) _memnodemap[64]; unsigned long memnodemapsize; u8 *memnodemap; -unsigned char cpu_to_node[NR_CPUS] __read_mostly = { +nodeid_t cpu_to_node[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = NUMA_NO_NODE }; /* * Keep BIOS's CPU2node information, should not be used for memory allocaion */ -unsigned char apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { +nodeid_t apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE }; cpumask_t node_to_cpumask[MAX_NUMNODES] __read_mostly; @@ -66,7 +66,7 @@ int srat_disabled(void) * -1 if node overlap or lost ram (shift too big) */ static int __init populate_memnodemap(const struct node *nodes, - int numnodes, int shift, int *nodeids) + int numnodes, int shift, nodeid_t *nodeids) { unsigned long spdx, epdx; int i, res = -1; @@ -151,7 +151,7 @@ static int __init extract_lsb_from_nodes(const struct node *nodes, } int __init compute_hash_shift(struct node *nodes, int numnodes, - int *nodeids) + nodeid_t *nodeids) { int shift; @@ -173,7 +173,7 @@ int __init compute_hash_shift(struct node *nodes, int numnodes, return shift; } /* initialize NODE_DATA given nodeid and start/end */ -void __init setup_node_bootmem(int nodeid, u64 start, u64 end) +void __init setup_node_bootmem(nodeid_t nodeid, u64 start, u64 end) { unsigned long start_pfn, end_pfn; @@ -295,7 +295,7 @@ __cpuinit void numa_add_cpu(int cpu) cpumask_set_cpu(cpu, &node_to_cpumask[cpu_to_node(cpu)]); } -void __cpuinit numa_set_node(int cpu, int node) +void __cpuinit numa_set_node(int cpu, nodeid_t node) { cpu_to_node[cpu] = node; } @@ -341,7 +341,8 @@ static __init int numa_setup(char *opt) */ void __init init_cpu_to_node(void) { - int i, node; + unsigned int i; + nodeid_t node; for ( i = 0; i < nr_cpu_ids; i++ ) { diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index d316212..7593533 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -188,7 +188,7 @@ static void __init init_idle_domain(void) void __devinit srat_detect_node(int cpu) { - unsigned node; + nodeid_t node; u32 apicid = x86_cpu_to_apicid[cpu]; node = apicid_to_node[apicid]; diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 7ae561c..314e253 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -843,7 +843,7 @@ void __cpu_die(unsigned int cpu) int cpu_add(uint32_t apic_id, uint32_t acpi_id, uint32_t pxm) { - int node, cpu = -1; + int cpu = -1; dprintk(XENLOG_DEBUG, "cpu_add apic_id %x acpi_id %x pxm %x\n", apic_id, acpi_id, pxm); @@ -877,7 +877,9 @@ int cpu_add(uint32_t apic_id, uint32_t acpi_id, uint32_t pxm) if ( !srat_disabled() ) { - if ( (node = setup_node(pxm)) < 0 ) + nodeid_t node = setup_node(pxm); + + if ( node == NUMA_NO_NODE ) { dprintk(XENLOG_WARNING, "Setup node failed for pxm %x\n", pxm); diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 9702ff2..dfabba3 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -30,16 +30,16 @@ static struct node nodes[MAX_NUMNODES] __initdata; struct pxm2node { unsigned pxm; - u8 node; + nodeid_t node; }; static struct pxm2node __read_mostly pxm2node[MAX_NUMNODES] = { [0 ... MAX_NUMNODES - 1] = {.node = NUMA_NO_NODE} }; -static int node_to_pxm(unsigned n); +static unsigned node_to_pxm(nodeid_t n); static int num_node_memblks; static struct node node_memblk_range[NR_NODE_MEMBLKS]; -static int memblk_nodeid[NR_NODE_MEMBLKS]; +static nodeid_t memblk_nodeid[NR_NODE_MEMBLKS]; static inline bool_t node_found(unsigned idx, unsigned pxm) { @@ -47,7 +47,7 @@ static inline bool_t node_found(unsigned idx, unsigned pxm) (pxm2node[idx].node != NUMA_NO_NODE)); } -int pxm_to_node(unsigned pxm) +nodeid_t pxm_to_node(unsigned pxm) { unsigned i; @@ -58,13 +58,12 @@ int pxm_to_node(unsigned pxm) if (node_found(i, pxm)) return pxm2node[i].node; - /* Extend 0xff to (int)-1 */ - return (signed char)NUMA_NO_NODE; + return NUMA_NO_NODE; } -__devinit int setup_node(unsigned pxm) +__devinit nodeid_t setup_node(unsigned pxm) { - int node; + nodeid_t node; unsigned idx; static bool_t warned; @@ -90,7 +89,7 @@ __devinit int setup_node(unsigned pxm) warned = 1; } - return (signed char)NUMA_NO_NODE; + return NUMA_NO_NODE; finish: node = first_unset_node(nodes_found); @@ -101,7 +100,7 @@ __devinit int setup_node(unsigned pxm) return node; } -int valid_numa_range(u64 start, u64 end, int node) +int valid_numa_range(u64 start, u64 end, nodeid_t node) { int i; @@ -205,8 +204,9 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) void __init acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) { - int pxm, node; - int apic_id; + unsigned pxm; + nodeid_t node; + u32 apic_id; if (srat_disabled()) return; @@ -218,7 +218,7 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) return; pxm = pa->proximity_domain; node = setup_node(pxm); - if (node < 0) { + if (node == NUMA_NO_NODE) { printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm); bad_srat(); return; @@ -235,7 +235,9 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) void __init acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) { - int pxm, node; + unsigned pxm; + nodeid_t node; + if (srat_disabled()) return; if (pa->header.length != sizeof(struct acpi_srat_cpu_affinity)) { @@ -251,7 +253,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) pxm |= pa->proximity_domain_hi[2] << 24; } node = setup_node(pxm); - if (node < 0) { + if (node == NUMA_NO_NODE) { printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm); bad_srat(); return; @@ -269,7 +271,8 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) { struct node *nd; u64 start, end; - int node, pxm; + unsigned pxm; + nodeid_t node; int i; if (srat_disabled()) @@ -295,7 +298,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) if (srat_rev < 2) pxm &= 0xff; node = setup_node(pxm); - if (node < 0) { + if (node == NUMA_NO_NODE) { printk(KERN_ERR "SRAT: Too many proximity domains.\n"); bad_srat(); return; @@ -481,7 +484,7 @@ int __init acpi_scan_nodes(u64 start, u64 end) return 0; } -static int node_to_pxm(unsigned n) +static unsigned node_to_pxm(nodeid_t n) { unsigned i; @@ -493,7 +496,7 @@ static int node_to_pxm(unsigned n) return 0; } -int __node_distance(int a, int b) +int __node_distance(nodeid_t a, nodeid_t b) { int index; diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index d631aee..6875c92 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -1343,7 +1343,8 @@ int mem_hotadd_check(unsigned long spfn, unsigned long epfn) int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm) { struct mem_hotadd_info info; - int ret, node; + int ret; + nodeid_t node; unsigned long old_max = max_page, old_total = total_pages; unsigned long old_node_start, old_node_span, orig_online; unsigned long i; @@ -1353,7 +1354,7 @@ int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm) if ( !mem_hotadd_check(spfn, epfn) ) return -EINVAL; - if ( (node = setup_node(pxm)) == -1 ) + if ( (node = setup_node(pxm)) == NUMA_NO_NODE ) return -EINVAL; if ( !valid_numa_range(spfn << PAGE_SHIFT, epfn << PAGE_SHIFT, node) ) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index a7bdbfd..6bd3b75 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -580,8 +580,8 @@ static struct page_info *alloc_heap_pages( unsigned int order, unsigned int memflags, struct domain *d) { - unsigned int first_node, i, j, zone = 0, nodemask_retry = 0; - unsigned int node = (uint8_t)((memflags >> _MEMF_node) - 1); + unsigned int i, j, zone = 0, nodemask_retry = 0; + nodeid_t first_node, node = (nodeid_t)((memflags >> _MEMF_node) - 1); unsigned long request = 1UL << order; struct page_info *pg; nodemask_t nodemask = (d != NULL ) ? d->node_affinity : node_online_map; @@ -1279,7 +1279,8 @@ static void __init smp_scrub_heap_pages(void *data) unsigned long mfn, start, end; struct page_info *pg; struct scrub_region *r; - unsigned int temp_cpu, node, cpu_idx = 0; + unsigned int temp_cpu, cpu_idx = 0; + nodeid_t node; unsigned int cpu = smp_processor_id(); if ( data ) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 2e113d7..1063677 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -190,14 +190,15 @@ u64 alloc_pgtable_maddr(struct acpi_drhd_unit *drhd, unsigned long npages) struct acpi_rhsa_unit *rhsa; struct page_info *pg, *cur_pg; u64 *vaddr; - int node = -1, i; + nodeid_t node = NUMA_NO_NODE; + unsigned int i; rhsa = drhd_to_rhsa(drhd); if ( rhsa ) node = pxm_to_node(rhsa->proximity_domain); pg = alloc_domheap_pages(NULL, get_order_from_pages(npages), - (node == -1 ) ? 0 : MEMF_node(node)); + (node == NUMA_NO_NODE) ? 0 : MEMF_node(node)); if ( !pg ) return 0; diff --git a/xen/include/asm-arm/numa.h b/xen/include/asm-arm/numa.h index 06a9d5a..a00cb7c 100644 --- a/xen/include/asm-arm/numa.h +++ b/xen/include/asm-arm/numa.h @@ -1,11 +1,13 @@ #ifndef __ARCH_ARM_NUMA_H #define __ARCH_ARM_NUMA_H +typedef u8 nodeid_t; + /* Fake one node for now. See also node_online_map. */ #define cpu_to_node(cpu) 0 #define node_to_cpumask(node) (cpu_online_map) -static inline __attribute__((pure)) int phys_to_nid(paddr_t addr) +static inline __attribute__((pure)) nodeid_t phys_to_nid(paddr_t addr) { return 0; } diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h index d3c55f3..a44305e 100644 --- a/xen/include/asm-x86/irq.h +++ b/xen/include/asm-x86/irq.h @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -155,7 +156,7 @@ int init_irq_data(void); void clear_irq_vector(int irq); int irq_to_vector(int irq); -int create_irq(int node); +int create_irq(nodeid_t node); void destroy_irq(unsigned int irq); int assign_irq_vector(int irq, const cpumask_t *); diff --git a/xen/include/asm-x86/numa.h b/xen/include/asm-x86/numa.h index 5fa51ba..cc5b5d1 100644 --- a/xen/include/asm-x86/numa.h +++ b/xen/include/asm-x86/numa.h @@ -5,6 +5,8 @@ #define NODES_SHIFT 6 +typedef u8 nodeid_t; + extern int srat_rev; extern unsigned char cpu_to_node[]; @@ -20,8 +22,8 @@ struct node { }; extern int compute_hash_shift(struct node *nodes, int numnodes, - int *nodeids); -extern int pxm_to_node(unsigned int pxm); + nodeid_t *nodeids); +extern nodeid_t pxm_to_node(unsigned int pxm); #define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT)) #define VIRTUAL_BUG_ON(x) @@ -32,12 +34,12 @@ extern int numa_off; extern int srat_disabled(void); -extern void numa_set_node(int cpu, int node); -extern int setup_node(unsigned int pxm); +extern void numa_set_node(int cpu, nodeid_t node); +extern nodeid_t setup_node(unsigned int pxm); extern void srat_detect_node(int cpu); -extern void setup_node_bootmem(int nodeid, u64 start, u64 end); -extern unsigned char apicid_to_node[]; +extern void setup_node_bootmem(nodeid_t nodeid, u64 start, u64 end); +extern nodeid_t apicid_to_node[]; #ifdef CONFIG_NUMA extern void init_cpu_to_node(void); @@ -54,14 +56,14 @@ extern u8 *memnodemap; struct node_data { unsigned long node_start_pfn; unsigned long node_spanned_pages; - unsigned int node_id; + nodeid_t node_id; }; extern struct node_data node_data[]; -static inline __attribute__((pure)) int phys_to_nid(paddr_t addr) +static inline __attribute__((pure)) nodeid_t phys_to_nid(paddr_t addr) { - unsigned nid; + nodeid_t nid; VIRTUAL_BUG_ON((paddr_to_pdx(addr) >> memnode_shift) >= memnodemapsize); nid = memnodemap[paddr_to_pdx(addr) >> memnode_shift]; VIRTUAL_BUG_ON(nid >= MAX_NUMNODES || !node_data[nid]); @@ -75,7 +77,7 @@ static inline __attribute__((pure)) int phys_to_nid(paddr_t addr) #define node_end_pfn(nid) (NODE_DATA(nid)->node_start_pfn + \ NODE_DATA(nid)->node_spanned_pages) -extern int valid_numa_range(u64 start, u64 end, int node); +extern int valid_numa_range(u64 start, u64 end, nodeid_t node); #else #define init_cpu_to_node() do {} while (0) #define clear_node_cpumask(cpu) do {} while (0) @@ -83,6 +85,6 @@ extern int valid_numa_range(u64 start, u64 end, int node); #endif void srat_parse_regions(u64 addr); -extern int __node_distance(int a, int b); +extern int __node_distance(nodeid_t a, nodeid_t b); #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 Fri Mar 06 11:14:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:14: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 1YTqD1-0001RD-O1; Fri, 06 Mar 2015 11:14:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqD0-0001OB-2Y for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:22 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id C3/55-03710-D0C89F45; Fri, 06 Mar 2015 11:14:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425640459!13635742!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29395 invoked from network); 6 Mar 2015 11:14:20 -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; 6 Mar 2015 11:14:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCx-00068k-C7 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqCx-0001Yw-B6 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:19 +0000 Date: Fri, 06 Mar 2015 11:14:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mm: MEMF_node should handle changes in nodeid_t 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 befe0a0da90d7ac063fd8b5891c7d0caeeeefa5f Author: Boris Ostrovsky AuthorDate: Thu Feb 26 14:08:34 2015 +0100 Commit: Jan Beulich CommitDate: Thu Feb 26 14:10:24 2015 +0100 mm: MEMF_node should handle changes in nodeid_t size Instead of using a hardcoded constant to extract nodeID from memflags use a macro whose value is based on nodeid_t size. Also provide a macro for extracting nodeID from memflags so that users don't need to remember to decrement the value. Signed-off-by: Boris Ostrovsky MASK_EXTR() can't be used in MEMF2NODE() (also renamed to MEMF_get_node()). Signed-off-by: Jan Beulich --- xen/common/page_alloc.c | 5 ++++- xen/include/xen/mm.h | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 6bd3b75..d96d25b 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -581,13 +581,16 @@ static struct page_info *alloc_heap_pages( struct domain *d) { unsigned int i, j, zone = 0, nodemask_retry = 0; - nodeid_t first_node, node = (nodeid_t)((memflags >> _MEMF_node) - 1); + nodeid_t first_node, node = MEMF_get_node(memflags); unsigned long request = 1UL << order; struct page_info *pg; nodemask_t nodemask = (d != NULL ) ? d->node_affinity : node_online_map; bool_t need_tlbflush = 0; uint32_t tlbflush_timestamp = 0; + /* Make sure there are enough bits in memflags for nodeID. */ + BUILD_BUG_ON((_MEMF_bits - _MEMF_node) < (8 * sizeof(nodeid_t))); + if ( node == NUMA_NO_NODE ) { memflags &= ~MEMF_exact_node; diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index a62ee1e..6ea8b8c 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -121,7 +121,9 @@ struct npfec { #define _MEMF_exact_node 4 #define MEMF_exact_node (1U<<_MEMF_exact_node) #define _MEMF_node 8 -#define MEMF_node(n) ((((n)+1)&0xff)<<_MEMF_node) +#define MEMF_node_mask ((1U << (8 * sizeof(nodeid_t))) - 1) +#define MEMF_node(n) ((((n) + 1) & MEMF_node_mask) << _MEMF_node) +#define MEMF_get_node(f) ((((f) >> _MEMF_node) - 1) & MEMF_node_mask) #define _MEMF_bits 24 #define MEMF_bits(n) ((n)<<_MEMF_bits) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:14:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:14: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 1YTqD1-0001RD-O1; Fri, 06 Mar 2015 11:14:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqD0-0001OB-2Y for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:22 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id C3/55-03710-D0C89F45; Fri, 06 Mar 2015 11:14:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425640459!13635742!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29395 invoked from network); 6 Mar 2015 11:14:20 -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; 6 Mar 2015 11:14:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqCx-00068k-C7 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqCx-0001Yw-B6 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:19 +0000 Date: Fri, 06 Mar 2015 11:14:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mm: MEMF_node should handle changes in nodeid_t 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 befe0a0da90d7ac063fd8b5891c7d0caeeeefa5f Author: Boris Ostrovsky AuthorDate: Thu Feb 26 14:08:34 2015 +0100 Commit: Jan Beulich CommitDate: Thu Feb 26 14:10:24 2015 +0100 mm: MEMF_node should handle changes in nodeid_t size Instead of using a hardcoded constant to extract nodeID from memflags use a macro whose value is based on nodeid_t size. Also provide a macro for extracting nodeID from memflags so that users don't need to remember to decrement the value. Signed-off-by: Boris Ostrovsky MASK_EXTR() can't be used in MEMF2NODE() (also renamed to MEMF_get_node()). Signed-off-by: Jan Beulich --- xen/common/page_alloc.c | 5 ++++- xen/include/xen/mm.h | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 6bd3b75..d96d25b 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -581,13 +581,16 @@ static struct page_info *alloc_heap_pages( struct domain *d) { unsigned int i, j, zone = 0, nodemask_retry = 0; - nodeid_t first_node, node = (nodeid_t)((memflags >> _MEMF_node) - 1); + nodeid_t first_node, node = MEMF_get_node(memflags); unsigned long request = 1UL << order; struct page_info *pg; nodemask_t nodemask = (d != NULL ) ? d->node_affinity : node_online_map; bool_t need_tlbflush = 0; uint32_t tlbflush_timestamp = 0; + /* Make sure there are enough bits in memflags for nodeID. */ + BUILD_BUG_ON((_MEMF_bits - _MEMF_node) < (8 * sizeof(nodeid_t))); + if ( node == NUMA_NO_NODE ) { memflags &= ~MEMF_exact_node; diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index a62ee1e..6ea8b8c 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -121,7 +121,9 @@ struct npfec { #define _MEMF_exact_node 4 #define MEMF_exact_node (1U<<_MEMF_exact_node) #define _MEMF_node 8 -#define MEMF_node(n) ((((n)+1)&0xff)<<_MEMF_node) +#define MEMF_node_mask ((1U << (8 * sizeof(nodeid_t))) - 1) +#define MEMF_node(n) ((((n) + 1) & MEMF_node_mask) << _MEMF_node) +#define MEMF_get_node(f) ((((f) >> _MEMF_node) - 1) & MEMF_node_mask) #define _MEMF_bits 24 #define MEMF_bits(n) ((n)<<_MEMF_bits) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:14:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:14: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 1YTqDB-0001Vh-QX; Fri, 06 Mar 2015 11:14:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDA-0001VI-60 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:32 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id E8/44-03132-71C89F45; Fri, 06 Mar 2015 11:14:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1425640469!13507551!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16432 invoked from network); 6 Mar 2015 11:14:30 -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; 6 Mar 2015 11:14:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqD7-00068r-HQ for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqD7-0001ZK-GA for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:29 +0000 Date: Fri, 06 Mar 2015 11:14:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Automatically check xen's public headers for C++ pitfalls. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7721bee28d7a130abd0e316da64a6c995130cee Author: Tim Deegan AuthorDate: Fri Feb 27 09:46:34 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 27 09:46:34 2015 +0000 Automatically check xen's public headers for C++ pitfalls. Add a check, like the existing check for non-ANSI C in the public headers, that runs the public headers through a C++ compiler to flag non-C++-friendly constructs. Unlike the ANSI C check, we accept GCC-isms (gnu++98), and we also check various tools-only headers. Also tidy up the runes for these checks to be a bit more readable. io/ring.h uses 'private' as a field name, which is a keyword in C++; this patch doesn't change that. Instead the check works around it. Reported-by: Razvan Cojocaru Signed-off-by: Tim Deegan Acked-by: Jan Beulich Tested-by: Don Slutz --- .gitignore | 1 + config/StdGNU.mk | 2 ++ config/SunOS.mk | 1 + xen/include/Makefile | 28 ++++++++++++++++++++++++---- xen/include/public/xsm/flask_op.h | 2 ++ 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 13ee05b..78958ea 100644 --- a/.gitignore +++ b/.gitignore @@ -233,6 +233,7 @@ xen/arch/*/efi/compat.c xen/arch/*/efi/efi.h xen/arch/*/efi/runtime.c xen/include/headers.chk +xen/include/headers++.chk xen/include/asm xen/include/asm-*/asm-offsets.h xen/include/compat/* diff --git a/config/StdGNU.mk b/config/StdGNU.mk index 4efebe3..e10ed39 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -2,9 +2,11 @@ AS = $(CROSS_COMPILE)as LD = $(CROSS_COMPILE)ld ifeq ($(clang),y) CC = $(CROSS_COMPILE)clang +CXX = $(CROSS_COMPILE)clang++ LD_LTO = $(CROSS_COMPILE)llvm-ld else CC = $(CROSS_COMPILE)gcc +CXX = $(CROSS_COMPILE)g++ LD_LTO = $(CROSS_COMPILE)ld endif CPP = $(CC) -E diff --git a/config/SunOS.mk b/config/SunOS.mk index 3316280..c2be37d 100644 --- a/config/SunOS.mk +++ b/config/SunOS.mk @@ -2,6 +2,7 @@ AS = $(CROSS_COMPILE)gas LD = $(CROSS_COMPILE)gld CC = $(CROSS_COMPILE)gcc CPP = $(CROSS_COMPILE)gcc -E +CXX = $(CROSS_COMPILE)g++ AR = $(CROSS_COMPILE)gar RANLIB = $(CROSS_COMPILE)granlib NM = $(CROSS_COMPILE)gnm diff --git a/xen/include/Makefile b/xen/include/Makefile index 94112d1..d48a642 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -87,13 +87,33 @@ compat/xlat.h: $(addprefix compat/.xlat/,$(xlat-y)) Makefile ifeq ($(XEN_TARGET_ARCH),$(XEN_COMPILE_ARCH)) -all: headers.chk +all: headers.chk headers++.chk -headers.chk: $(filter-out public/arch-% public/%ctl.h public/xsm/% public/%hvm/save.h, $(wildcard public/*.h public/*/*.h) $(public-y)) Makefile - for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -Werror -S -o /dev/null -x c $$i || exit 1; echo $$i; done >$@.new +PUBLIC_HEADERS := $(filter-out public/arch-% public/dom0_ops.h, $(wildcard public/*.h public/*/*.h) $(public-y)) + +PUBLIC_ANSI_HEADERS := $(filter-out public/%ctl.h public/xsm/% public/%hvm/save.h, $(PUBLIC_HEADERS)) + +headers.chk: $(PUBLIC_ANSI_HEADERS) Makefile + for i in $(filter %.h,$^); do \ + $(CC) -x c -ansi -Wall -Werror -include stdint.h \ + -S -o /dev/null $$i || exit 1; \ + echo $$i; \ + done >$@.new + mv $@.new $@ + +headers++.chk: $(PUBLIC_HEADERS) Makefile + if $(CXX) -v >/dev/null 2>&1; then \ + for i in $(filter %.h,$^); do \ + $(CXX) -x c++ -std=gnu++98 -Wall -Werror \ + -D__XEN_TOOLS__ -Dprivate=private_is_a_keyword_in_cpp \ + -include stdint.h -include public/xen.h \ + -S -o /dev/null $$i || exit 1; \ + echo $$i; \ + done ; \ + fi >$@.new mv $@.new $@ endif clean:: - rm -rf compat headers.chk + rm -rf compat headers.chk headers++.chk diff --git a/xen/include/public/xsm/flask_op.h b/xen/include/public/xsm/flask_op.h index 233de81..f874589 100644 --- a/xen/include/public/xsm/flask_op.h +++ b/xen/include/public/xsm/flask_op.h @@ -25,6 +25,8 @@ #ifndef __FLASK_OP_H__ #define __FLASK_OP_H__ +#include "../event_channel.h" + #define XEN_FLASK_INTERFACE_VERSION 1 struct xen_flask_load { -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:14:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:14: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 1YTqDB-0001Vh-QX; Fri, 06 Mar 2015 11:14:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDA-0001VI-60 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:32 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id E8/44-03132-71C89F45; Fri, 06 Mar 2015 11:14:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1425640469!13507551!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16432 invoked from network); 6 Mar 2015 11:14:30 -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; 6 Mar 2015 11:14:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqD7-00068r-HQ for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqD7-0001ZK-GA for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:29 +0000 Date: Fri, 06 Mar 2015 11:14:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Automatically check xen's public headers for C++ pitfalls. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7721bee28d7a130abd0e316da64a6c995130cee Author: Tim Deegan AuthorDate: Fri Feb 27 09:46:34 2015 +0000 Commit: Tim Deegan CommitDate: Fri Feb 27 09:46:34 2015 +0000 Automatically check xen's public headers for C++ pitfalls. Add a check, like the existing check for non-ANSI C in the public headers, that runs the public headers through a C++ compiler to flag non-C++-friendly constructs. Unlike the ANSI C check, we accept GCC-isms (gnu++98), and we also check various tools-only headers. Also tidy up the runes for these checks to be a bit more readable. io/ring.h uses 'private' as a field name, which is a keyword in C++; this patch doesn't change that. Instead the check works around it. Reported-by: Razvan Cojocaru Signed-off-by: Tim Deegan Acked-by: Jan Beulich Tested-by: Don Slutz --- .gitignore | 1 + config/StdGNU.mk | 2 ++ config/SunOS.mk | 1 + xen/include/Makefile | 28 ++++++++++++++++++++++++---- xen/include/public/xsm/flask_op.h | 2 ++ 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 13ee05b..78958ea 100644 --- a/.gitignore +++ b/.gitignore @@ -233,6 +233,7 @@ xen/arch/*/efi/compat.c xen/arch/*/efi/efi.h xen/arch/*/efi/runtime.c xen/include/headers.chk +xen/include/headers++.chk xen/include/asm xen/include/asm-*/asm-offsets.h xen/include/compat/* diff --git a/config/StdGNU.mk b/config/StdGNU.mk index 4efebe3..e10ed39 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -2,9 +2,11 @@ AS = $(CROSS_COMPILE)as LD = $(CROSS_COMPILE)ld ifeq ($(clang),y) CC = $(CROSS_COMPILE)clang +CXX = $(CROSS_COMPILE)clang++ LD_LTO = $(CROSS_COMPILE)llvm-ld else CC = $(CROSS_COMPILE)gcc +CXX = $(CROSS_COMPILE)g++ LD_LTO = $(CROSS_COMPILE)ld endif CPP = $(CC) -E diff --git a/config/SunOS.mk b/config/SunOS.mk index 3316280..c2be37d 100644 --- a/config/SunOS.mk +++ b/config/SunOS.mk @@ -2,6 +2,7 @@ AS = $(CROSS_COMPILE)gas LD = $(CROSS_COMPILE)gld CC = $(CROSS_COMPILE)gcc CPP = $(CROSS_COMPILE)gcc -E +CXX = $(CROSS_COMPILE)g++ AR = $(CROSS_COMPILE)gar RANLIB = $(CROSS_COMPILE)granlib NM = $(CROSS_COMPILE)gnm diff --git a/xen/include/Makefile b/xen/include/Makefile index 94112d1..d48a642 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -87,13 +87,33 @@ compat/xlat.h: $(addprefix compat/.xlat/,$(xlat-y)) Makefile ifeq ($(XEN_TARGET_ARCH),$(XEN_COMPILE_ARCH)) -all: headers.chk +all: headers.chk headers++.chk -headers.chk: $(filter-out public/arch-% public/%ctl.h public/xsm/% public/%hvm/save.h, $(wildcard public/*.h public/*/*.h) $(public-y)) Makefile - for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -Werror -S -o /dev/null -x c $$i || exit 1; echo $$i; done >$@.new +PUBLIC_HEADERS := $(filter-out public/arch-% public/dom0_ops.h, $(wildcard public/*.h public/*/*.h) $(public-y)) + +PUBLIC_ANSI_HEADERS := $(filter-out public/%ctl.h public/xsm/% public/%hvm/save.h, $(PUBLIC_HEADERS)) + +headers.chk: $(PUBLIC_ANSI_HEADERS) Makefile + for i in $(filter %.h,$^); do \ + $(CC) -x c -ansi -Wall -Werror -include stdint.h \ + -S -o /dev/null $$i || exit 1; \ + echo $$i; \ + done >$@.new + mv $@.new $@ + +headers++.chk: $(PUBLIC_HEADERS) Makefile + if $(CXX) -v >/dev/null 2>&1; then \ + for i in $(filter %.h,$^); do \ + $(CXX) -x c++ -std=gnu++98 -Wall -Werror \ + -D__XEN_TOOLS__ -Dprivate=private_is_a_keyword_in_cpp \ + -include stdint.h -include public/xen.h \ + -S -o /dev/null $$i || exit 1; \ + echo $$i; \ + done ; \ + fi >$@.new mv $@.new $@ endif clean:: - rm -rf compat headers.chk + rm -rf compat headers.chk headers++.chk diff --git a/xen/include/public/xsm/flask_op.h b/xen/include/public/xsm/flask_op.h index 233de81..f874589 100644 --- a/xen/include/public/xsm/flask_op.h +++ b/xen/include/public/xsm/flask_op.h @@ -25,6 +25,8 @@ #ifndef __FLASK_OP_H__ #define __FLASK_OP_H__ +#include "../event_channel.h" + #define XEN_FLASK_INTERFACE_VERSION 1 struct xen_flask_load { -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:14:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:14: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 1YTqDL-0001Xz-Uk; Fri, 06 Mar 2015 11:14:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDK-0001XU-CR for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:42 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id F0/B8-02770-12C89F45; Fri, 06 Mar 2015 11:14:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1425640479!10622424!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21387 invoked from network); 6 Mar 2015 11:14:40 -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; 6 Mar 2015 11:14:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDH-00068z-M0 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqDH-0001Zt-Kq for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:39 +0000 Date: Fri, 06 Mar 2015 11:14:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Config.mk: update OVMF revision X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b28da5fc1c13ba2e5fdde2ce66a85e2af0ee2312 Author: Wei Liu AuthorDate: Thu Feb 26 15:38:16 2015 +0000 Commit: Ian Campbell CommitDate: Fri Feb 27 13:26:06 2015 +0000 Config.mk: update OVMF revision Update OVMF revision to the latest tested commit. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Anthony Perard Acked-by: Ian Campbell --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 27b0997..811485a 100644 --- a/Config.mk +++ b/Config.mk @@ -251,7 +251,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif -OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 +OVMF_UPSTREAM_REVISION ?= a065efc7c7ce8bb3e5cb3e463099d023d4a92927 QEMU_UPSTREAM_REVISION ?= master SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 # Wed Feb 18 12:49:59 2015 -0500 -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:14:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:14: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 1YTqDL-0001Xz-Uk; Fri, 06 Mar 2015 11:14:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDK-0001XU-CR for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:42 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id F0/B8-02770-12C89F45; Fri, 06 Mar 2015 11:14:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1425640479!10622424!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21387 invoked from network); 6 Mar 2015 11:14:40 -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; 6 Mar 2015 11:14:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDH-00068z-M0 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqDH-0001Zt-Kq for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:39 +0000 Date: Fri, 06 Mar 2015 11:14:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Config.mk: update OVMF revision X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b28da5fc1c13ba2e5fdde2ce66a85e2af0ee2312 Author: Wei Liu AuthorDate: Thu Feb 26 15:38:16 2015 +0000 Commit: Ian Campbell CommitDate: Fri Feb 27 13:26:06 2015 +0000 Config.mk: update OVMF revision Update OVMF revision to the latest tested commit. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Anthony Perard Acked-by: Ian Campbell --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 27b0997..811485a 100644 --- a/Config.mk +++ b/Config.mk @@ -251,7 +251,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif -OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 +OVMF_UPSTREAM_REVISION ?= a065efc7c7ce8bb3e5cb3e463099d023d4a92927 QEMU_UPSTREAM_REVISION ?= master SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 # Wed Feb 18 12:49:59 2015 -0500 -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:14:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11: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 1YTqDW-0001bH-4d; Fri, 06 Mar 2015 11:14:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDU-0001ao-Da for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:52 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id F1/23-02755-B2C89F45; Fri, 06 Mar 2015 11:14:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1425640490!15229573!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3559 invoked from network); 6 Mar 2015 11:14:51 -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; 6 Mar 2015 11:14:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDS-000695-51 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqDS-0001b4-39 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:50 +0000 Date: Fri, 06 Mar 2015 11:14:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] complete conversion set_bit() -> __cpumask_set_cpu() by 4aaca0e9cd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5dbdf33c57e3c95125b92f86d847ed8432e28f1c Author: Jan Beulich AuthorDate: Fri Feb 27 16:09:27 2015 +0100 Commit: Jan Beulich CommitDate: Fri Feb 27 16:09:27 2015 +0100 complete conversion set_bit() -> __cpumask_set_cpu() by 4aaca0e9cd While converting to __cpumask_set_cpu() was correct, the first argument passed should have been corrected to be "cpu" instead of "nr" at once. The wrong construct results in problems on systems with relatively few CPUs. Reported-by: Sander Eikelenboom Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/common/softirq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/softirq.c b/xen/common/softirq.c index bb79aac..11e3345 100644 --- a/xen/common/softirq.c +++ b/xen/common/softirq.c @@ -106,7 +106,7 @@ void cpu_raise_softirq(unsigned int cpu, unsigned int nr) if ( !per_cpu(batching, this_cpu) || in_irq() ) smp_send_event_check_cpu(cpu); else - __cpumask_set_cpu(nr, &per_cpu(batch_mask, this_cpu)); + __cpumask_set_cpu(cpu, &per_cpu(batch_mask, this_cpu)); } void cpu_raise_softirq_batch_begin(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 Fri Mar 06 11:14:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11: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 1YTqDW-0001bH-4d; Fri, 06 Mar 2015 11:14:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDU-0001ao-Da for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:52 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id F1/23-02755-B2C89F45; Fri, 06 Mar 2015 11:14:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1425640490!15229573!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3559 invoked from network); 6 Mar 2015 11:14:51 -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; 6 Mar 2015 11:14:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDS-000695-51 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqDS-0001b4-39 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:14:50 +0000 Date: Fri, 06 Mar 2015 11:14:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] complete conversion set_bit() -> __cpumask_set_cpu() by 4aaca0e9cd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5dbdf33c57e3c95125b92f86d847ed8432e28f1c Author: Jan Beulich AuthorDate: Fri Feb 27 16:09:27 2015 +0100 Commit: Jan Beulich CommitDate: Fri Feb 27 16:09:27 2015 +0100 complete conversion set_bit() -> __cpumask_set_cpu() by 4aaca0e9cd While converting to __cpumask_set_cpu() was correct, the first argument passed should have been corrected to be "cpu" instead of "nr" at once. The wrong construct results in problems on systems with relatively few CPUs. Reported-by: Sander Eikelenboom Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/common/softirq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/softirq.c b/xen/common/softirq.c index bb79aac..11e3345 100644 --- a/xen/common/softirq.c +++ b/xen/common/softirq.c @@ -106,7 +106,7 @@ void cpu_raise_softirq(unsigned int cpu, unsigned int nr) if ( !per_cpu(batching, this_cpu) || in_irq() ) smp_send_event_check_cpu(cpu); else - __cpumask_set_cpu(nr, &per_cpu(batch_mask, this_cpu)); + __cpumask_set_cpu(cpu, &per_cpu(batch_mask, this_cpu)); } void cpu_raise_softirq_batch_begin(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 Fri Mar 06 11:15:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:15: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 1YTqDg-0001dl-8I; Fri, 06 Mar 2015 11:15:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDe-0001dI-Sr for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:03 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 69/37-02991-63C89F45; Fri, 06 Mar 2015 11:15:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1425640500!13719690!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30844 invoked from network); 6 Mar 2015 11:15:01 -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; 6 Mar 2015 11:15:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDc-00069F-B9 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqDc-0001bT-9v for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:00 +0000 Date: Fri, 06 Mar 2015 11:15:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/Dom0: account for shadow/HAP allocation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c4b7c3654bab290b4e1662224526bcfec24725b6 Author: Jan Beulich AuthorDate: Fri Feb 27 16:11:07 2015 +0100 Commit: Jan Beulich CommitDate: Fri Feb 27 16:11:07 2015 +0100 x86/Dom0: account for shadow/HAP allocation ... when calculating how many pages to allocate for Dom0. This is basically equivalent to the already present IOMMU related adjustment. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/domain_build.c | 71 +++++++++++++++++++++++++++---------------- 1 files changed, 45 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 9b93653..a7d55ca 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -130,6 +130,8 @@ struct vcpu *__init alloc_dom0_vcpu0(struct domain *dom0) #ifdef CONFIG_SHADOW_PAGING static bool_t __initdata opt_dom0_shadow; boolean_param("dom0_shadow", opt_dom0_shadow); +#else +#define opt_dom0_shadow 0 #endif static char __initdata opt_dom0_ioports_disable[200] = ""; @@ -201,13 +203,23 @@ static struct page_info * __init alloc_chunk( return page; } +static unsigned long __init dom0_paging_pages(const struct domain *d, + unsigned long nr_pages) +{ + /* Copied from: libxl_get_required_shadow_memory() */ + unsigned long memkb = nr_pages * (PAGE_SIZE / 1024); + + memkb = 4 * (256 * d->max_vcpus + 2 * (memkb / 1024)); + + return ((memkb + 1023) / 1024) << (20 - PAGE_SHIFT); +} + static unsigned long __init compute_dom0_nr_pages( struct domain *d, struct elf_dom_parms *parms, unsigned long initrd_len) { unsigned long avail = avail_domheap_pages() + initial_images_nrpages(); - unsigned long nr_pages = dom0_nrpages; - unsigned long min_pages = dom0_min_nrpages; - unsigned long max_pages = dom0_max_nrpages; + unsigned long nr_pages, min_pages, max_pages; + bool_t need_paging; /* Reserve memory for further dom0 vcpu-struct allocations... */ avail -= (d->max_vcpus - 1UL) @@ -225,23 +237,37 @@ static unsigned long __init compute_dom0_nr_pages( avail -= max_pdx >> s; } - /* - * If domain 0 allocation isn't specified, reserve 1/16th of available - * memory for things like DMA buffers. This reservation is clamped to - * a maximum of 128MB. - */ - if ( nr_pages == 0 ) - nr_pages = -min(avail / 16, 128UL << (20 - PAGE_SHIFT)); + need_paging = opt_dom0_shadow || (is_pvh_domain(d) && !iommu_hap_pt_share); + for ( ; ; need_paging = 0 ) + { + nr_pages = dom0_nrpages; + min_pages = dom0_min_nrpages; + max_pages = dom0_max_nrpages; + + /* + * If allocation isn't specified, reserve 1/16th of available memory + * for things like DMA buffers. This reservation is clamped to a + * maximum of 128MB. + */ + if ( nr_pages == 0 ) + nr_pages = -min(avail / 16, 128UL << (20 - PAGE_SHIFT)); - /* Negative memory specification means "all memory - specified amount". */ - if ( (long)nr_pages < 0 ) nr_pages += avail; - if ( (long)min_pages < 0 ) min_pages += avail; - if ( (long)max_pages < 0 ) max_pages += avail; + /* Negative specification means "all memory - specified amount". */ + if ( (long)nr_pages < 0 ) nr_pages += avail; + if ( (long)min_pages < 0 ) min_pages += avail; + if ( (long)max_pages < 0 ) max_pages += avail; - /* Clamp dom0 memory according to min/max limits and available memory. */ - nr_pages = max(nr_pages, min_pages); - nr_pages = min(nr_pages, max_pages); - nr_pages = min(nr_pages, avail); + /* Clamp according to min/max limits and available memory. */ + nr_pages = max(nr_pages, min_pages); + nr_pages = min(nr_pages, max_pages); + nr_pages = min(nr_pages, avail); + + if ( !need_paging ) + break; + + /* Reserve memory for shadow or HAP. */ + avail -= dom0_paging_pages(d, nr_pages); + } if ( (parms->p2m_base == UNSET_ADDR) && (dom0_nrpages <= 0) && ((dom0_min_nrpages <= 0) || (nr_pages > min_pages)) ) @@ -1285,14 +1311,7 @@ int __init construct_dom0( } if ( is_pvh_domain(d) ) - { - unsigned long hap_pages, memkb = nr_pages * (PAGE_SIZE / 1024); - - /* Copied from: libxl_get_required_shadow_memory() */ - memkb = 4 * (256 * d->max_vcpus + 2 * (memkb / 1024)); - hap_pages = ( (memkb + 1023) / 1024) << (20 - PAGE_SHIFT); - hap_set_alloc_for_pvh_dom0(d, hap_pages); - } + hap_set_alloc_for_pvh_dom0(d, dom0_paging_pages(d, nr_pages)); /* * We enable paging mode again so guest_physmap_add_page will do the -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:15:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:15: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 1YTqDg-0001dl-8I; Fri, 06 Mar 2015 11:15:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDe-0001dI-Sr for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:03 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 69/37-02991-63C89F45; Fri, 06 Mar 2015 11:15:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1425640500!13719690!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30844 invoked from network); 6 Mar 2015 11:15:01 -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; 6 Mar 2015 11:15:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDc-00069F-B9 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqDc-0001bT-9v for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:00 +0000 Date: Fri, 06 Mar 2015 11:15:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/Dom0: account for shadow/HAP allocation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c4b7c3654bab290b4e1662224526bcfec24725b6 Author: Jan Beulich AuthorDate: Fri Feb 27 16:11:07 2015 +0100 Commit: Jan Beulich CommitDate: Fri Feb 27 16:11:07 2015 +0100 x86/Dom0: account for shadow/HAP allocation ... when calculating how many pages to allocate for Dom0. This is basically equivalent to the already present IOMMU related adjustment. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/domain_build.c | 71 +++++++++++++++++++++++++++---------------- 1 files changed, 45 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 9b93653..a7d55ca 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -130,6 +130,8 @@ struct vcpu *__init alloc_dom0_vcpu0(struct domain *dom0) #ifdef CONFIG_SHADOW_PAGING static bool_t __initdata opt_dom0_shadow; boolean_param("dom0_shadow", opt_dom0_shadow); +#else +#define opt_dom0_shadow 0 #endif static char __initdata opt_dom0_ioports_disable[200] = ""; @@ -201,13 +203,23 @@ static struct page_info * __init alloc_chunk( return page; } +static unsigned long __init dom0_paging_pages(const struct domain *d, + unsigned long nr_pages) +{ + /* Copied from: libxl_get_required_shadow_memory() */ + unsigned long memkb = nr_pages * (PAGE_SIZE / 1024); + + memkb = 4 * (256 * d->max_vcpus + 2 * (memkb / 1024)); + + return ((memkb + 1023) / 1024) << (20 - PAGE_SHIFT); +} + static unsigned long __init compute_dom0_nr_pages( struct domain *d, struct elf_dom_parms *parms, unsigned long initrd_len) { unsigned long avail = avail_domheap_pages() + initial_images_nrpages(); - unsigned long nr_pages = dom0_nrpages; - unsigned long min_pages = dom0_min_nrpages; - unsigned long max_pages = dom0_max_nrpages; + unsigned long nr_pages, min_pages, max_pages; + bool_t need_paging; /* Reserve memory for further dom0 vcpu-struct allocations... */ avail -= (d->max_vcpus - 1UL) @@ -225,23 +237,37 @@ static unsigned long __init compute_dom0_nr_pages( avail -= max_pdx >> s; } - /* - * If domain 0 allocation isn't specified, reserve 1/16th of available - * memory for things like DMA buffers. This reservation is clamped to - * a maximum of 128MB. - */ - if ( nr_pages == 0 ) - nr_pages = -min(avail / 16, 128UL << (20 - PAGE_SHIFT)); + need_paging = opt_dom0_shadow || (is_pvh_domain(d) && !iommu_hap_pt_share); + for ( ; ; need_paging = 0 ) + { + nr_pages = dom0_nrpages; + min_pages = dom0_min_nrpages; + max_pages = dom0_max_nrpages; + + /* + * If allocation isn't specified, reserve 1/16th of available memory + * for things like DMA buffers. This reservation is clamped to a + * maximum of 128MB. + */ + if ( nr_pages == 0 ) + nr_pages = -min(avail / 16, 128UL << (20 - PAGE_SHIFT)); - /* Negative memory specification means "all memory - specified amount". */ - if ( (long)nr_pages < 0 ) nr_pages += avail; - if ( (long)min_pages < 0 ) min_pages += avail; - if ( (long)max_pages < 0 ) max_pages += avail; + /* Negative specification means "all memory - specified amount". */ + if ( (long)nr_pages < 0 ) nr_pages += avail; + if ( (long)min_pages < 0 ) min_pages += avail; + if ( (long)max_pages < 0 ) max_pages += avail; - /* Clamp dom0 memory according to min/max limits and available memory. */ - nr_pages = max(nr_pages, min_pages); - nr_pages = min(nr_pages, max_pages); - nr_pages = min(nr_pages, avail); + /* Clamp according to min/max limits and available memory. */ + nr_pages = max(nr_pages, min_pages); + nr_pages = min(nr_pages, max_pages); + nr_pages = min(nr_pages, avail); + + if ( !need_paging ) + break; + + /* Reserve memory for shadow or HAP. */ + avail -= dom0_paging_pages(d, nr_pages); + } if ( (parms->p2m_base == UNSET_ADDR) && (dom0_nrpages <= 0) && ((dom0_min_nrpages <= 0) || (nr_pages > min_pages)) ) @@ -1285,14 +1311,7 @@ int __init construct_dom0( } if ( is_pvh_domain(d) ) - { - unsigned long hap_pages, memkb = nr_pages * (PAGE_SIZE / 1024); - - /* Copied from: libxl_get_required_shadow_memory() */ - memkb = 4 * (256 * d->max_vcpus + 2 * (memkb / 1024)); - hap_pages = ( (memkb + 1023) / 1024) << (20 - PAGE_SHIFT); - hap_set_alloc_for_pvh_dom0(d, hap_pages); - } + hap_set_alloc_for_pvh_dom0(d, dom0_paging_pages(d, nr_pages)); /* * We enable paging mode again so guest_physmap_add_page will do the -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:15:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:15: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 1YTqDr-0001gM-BD; Fri, 06 Mar 2015 11:15:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDq-0001g7-Mh for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:14 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id C4/C6-02756-24C89F45; Fri, 06 Mar 2015 11:15:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1425640511!13495980!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31342 invoked from network); 6 Mar 2015 11:15:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:15:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDn-0006AF-EP for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqDm-0001c8-Eu for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:11 +0000 Date: Fri, 06 Mar 2015 11:15:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/traps: consolidate PV RDMSR emulation 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 27fa184b9c2faacb16dfd22773b5bfe9a35e740f Author: Jan Beulich AuthorDate: Fri Feb 27 16:12:39 2015 +0100 Commit: Jan Beulich CommitDate: Fri Feb 27 16:12:39 2015 +0100 x86/traps: consolidate PV RDMSR emulation paths Settle on just using one variable (val), and move the other into WRMSR's local scope. Chain up further success paths to the rdmsr_writeback label rather than open coding them. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/traps.c | 36 +++++++++++++++--------------------- 1 files changed, 15 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 14e2563..7a2e2d4 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2008,7 +2008,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) unsigned long code_base, code_limit; char io_emul_stub[32]; void (*io_emul)(struct cpu_user_regs *) __attribute__((__regparm__(1))); - uint64_t val, msr_content; + uint64_t val; if ( !read_descriptor(regs->cs, v, regs, &code_base, &code_limit, &ar, @@ -2498,8 +2498,9 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case 0x30: /* WRMSR */ { uint32_t eax = regs->eax; uint32_t edx = regs->edx; - msr_content = ((uint64_t)edx << 32) | eax; - switch ( (u32)regs->ecx ) + uint64_t msr_content = ((uint64_t)edx << 32) | eax; + + switch ( regs->_ecx ) { case MSR_FS_BASE: if ( is_pv_32on64_vcpu(v) ) @@ -2670,7 +2671,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) break; case 0x32: /* RDMSR */ - switch ( (u32)regs->ecx ) + switch ( regs->_ecx ) { case MSR_FS_BASE: if ( is_pv_32on64_vcpu(v) ) @@ -2686,9 +2687,8 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case MSR_SHADOW_GS_BASE: if ( is_pv_32on64_vcpu(v) ) goto fail; - regs->eax = v->arch.pv_vcpu.gs_base_user & 0xFFFFFFFFUL; - regs->edx = v->arch.pv_vcpu.gs_base_user >> 32; - break; + val = v->arch.pv_vcpu.gs_base_user; + goto rdmsr_writeback; case MSR_K7_FID_VID_CTL: case MSR_K7_FID_VID_STATUS: case MSR_K8_PSTATE_LIMIT: @@ -2720,12 +2720,10 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) } goto rdmsr_normal; case MSR_IA32_MISC_ENABLE: - if ( rdmsr_safe(regs->ecx, msr_content) ) + if ( rdmsr_safe(regs->ecx, val) ) goto fail; - msr_content = guest_misc_enable(msr_content); - regs->eax = (uint32_t)msr_content; - regs->edx = (uint32_t)(msr_content >> 32); - break; + val = guest_misc_enable(val); + goto rdmsr_writeback; case MSR_AMD64_DR0_ADDRESS_MASK: if ( !boot_cpu_has(X86_FEATURE_DBEXT) ) @@ -2743,12 +2741,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) default: if ( rdmsr_hypervisor_regs(regs->ecx, &val) ) - { - rdmsr_writeback: - regs->eax = (uint32_t)val; - regs->edx = (uint32_t)(val >> 32); - break; - } + goto rdmsr_writeback; rc = vmce_rdmsr(regs->ecx, &val); if ( rc < 0 ) @@ -2761,10 +2754,11 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) /* Everyone can read the MSR space. */ /* gdprintk(XENLOG_WARNING,"Domain attempted RDMSR %p.\n", _p(regs->ecx));*/ - if ( rdmsr_safe(regs->ecx, msr_content) ) + if ( rdmsr_safe(regs->ecx, val) ) goto fail; - regs->eax = (uint32_t)msr_content; - regs->edx = (uint32_t)(msr_content >> 32); + rdmsr_writeback: + regs->eax = (uint32_t)val; + regs->edx = (uint32_t)(val >> 32); break; } 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 Fri Mar 06 11:15:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:15: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 1YTqDr-0001gM-BD; Fri, 06 Mar 2015 11:15:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDq-0001g7-Mh for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:14 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id C4/C6-02756-24C89F45; Fri, 06 Mar 2015 11:15:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1425640511!13495980!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31342 invoked from network); 6 Mar 2015 11:15:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:15:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDn-0006AF-EP for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqDm-0001c8-Eu for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:11 +0000 Date: Fri, 06 Mar 2015 11:15:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/traps: consolidate PV RDMSR emulation 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 27fa184b9c2faacb16dfd22773b5bfe9a35e740f Author: Jan Beulich AuthorDate: Fri Feb 27 16:12:39 2015 +0100 Commit: Jan Beulich CommitDate: Fri Feb 27 16:12:39 2015 +0100 x86/traps: consolidate PV RDMSR emulation paths Settle on just using one variable (val), and move the other into WRMSR's local scope. Chain up further success paths to the rdmsr_writeback label rather than open coding them. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/traps.c | 36 +++++++++++++++--------------------- 1 files changed, 15 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 14e2563..7a2e2d4 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2008,7 +2008,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) unsigned long code_base, code_limit; char io_emul_stub[32]; void (*io_emul)(struct cpu_user_regs *) __attribute__((__regparm__(1))); - uint64_t val, msr_content; + uint64_t val; if ( !read_descriptor(regs->cs, v, regs, &code_base, &code_limit, &ar, @@ -2498,8 +2498,9 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case 0x30: /* WRMSR */ { uint32_t eax = regs->eax; uint32_t edx = regs->edx; - msr_content = ((uint64_t)edx << 32) | eax; - switch ( (u32)regs->ecx ) + uint64_t msr_content = ((uint64_t)edx << 32) | eax; + + switch ( regs->_ecx ) { case MSR_FS_BASE: if ( is_pv_32on64_vcpu(v) ) @@ -2670,7 +2671,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) break; case 0x32: /* RDMSR */ - switch ( (u32)regs->ecx ) + switch ( regs->_ecx ) { case MSR_FS_BASE: if ( is_pv_32on64_vcpu(v) ) @@ -2686,9 +2687,8 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case MSR_SHADOW_GS_BASE: if ( is_pv_32on64_vcpu(v) ) goto fail; - regs->eax = v->arch.pv_vcpu.gs_base_user & 0xFFFFFFFFUL; - regs->edx = v->arch.pv_vcpu.gs_base_user >> 32; - break; + val = v->arch.pv_vcpu.gs_base_user; + goto rdmsr_writeback; case MSR_K7_FID_VID_CTL: case MSR_K7_FID_VID_STATUS: case MSR_K8_PSTATE_LIMIT: @@ -2720,12 +2720,10 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) } goto rdmsr_normal; case MSR_IA32_MISC_ENABLE: - if ( rdmsr_safe(regs->ecx, msr_content) ) + if ( rdmsr_safe(regs->ecx, val) ) goto fail; - msr_content = guest_misc_enable(msr_content); - regs->eax = (uint32_t)msr_content; - regs->edx = (uint32_t)(msr_content >> 32); - break; + val = guest_misc_enable(val); + goto rdmsr_writeback; case MSR_AMD64_DR0_ADDRESS_MASK: if ( !boot_cpu_has(X86_FEATURE_DBEXT) ) @@ -2743,12 +2741,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) default: if ( rdmsr_hypervisor_regs(regs->ecx, &val) ) - { - rdmsr_writeback: - regs->eax = (uint32_t)val; - regs->edx = (uint32_t)(val >> 32); - break; - } + goto rdmsr_writeback; rc = vmce_rdmsr(regs->ecx, &val); if ( rc < 0 ) @@ -2761,10 +2754,11 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) /* Everyone can read the MSR space. */ /* gdprintk(XENLOG_WARNING,"Domain attempted RDMSR %p.\n", _p(regs->ecx));*/ - if ( rdmsr_safe(regs->ecx, msr_content) ) + if ( rdmsr_safe(regs->ecx, val) ) goto fail; - regs->eax = (uint32_t)msr_content; - regs->edx = (uint32_t)(msr_content >> 32); + rdmsr_writeback: + regs->eax = (uint32_t)val; + regs->edx = (uint32_t)(val >> 32); break; } 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 Fri Mar 06 11:15:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:15: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 1YTqE1-0001ki-EF; Fri, 06 Mar 2015 11:15:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqE0-0001j8-5X for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:24 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id F8/43-03163-B4C89F45; Fri, 06 Mar 2015 11:15:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1425640521!9287422!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4085 invoked from network); 6 Mar 2015 11:15:22 -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; 6 Mar 2015 11:15:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDx-0006AL-Ka for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqDx-0001d1-Ip for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:21 +0000 Date: Fri, 06 Mar 2015 11:15:21 +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 d568f5b668b19b8f257dc60eb3252b74bf70ec10 Merge: b28da5fc1c13ba2e5fdde2ce66a85e2af0ee2312 27fa184b9c2faacb16dfd22773b5bfe9a35e740f Author: Ian Campbell AuthorDate: Fri Feb 27 15:35:03 2015 +0000 Commit: Ian Campbell CommitDate: Fri Feb 27 15:35:03 2015 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/arch/x86/domain_build.c | 71 +++++++++++++++++++++++++++---------------- xen/arch/x86/traps.c | 36 +++++++++------------- xen/common/softirq.c | 2 +- 3 files changed, 61 insertions(+), 48 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 Mar 06 11:15:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:15: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 1YTqE1-0001ki-EF; Fri, 06 Mar 2015 11:15:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqE0-0001j8-5X for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:24 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id F8/43-03163-B4C89F45; Fri, 06 Mar 2015 11:15:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1425640521!9287422!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4085 invoked from network); 6 Mar 2015 11:15:22 -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; 6 Mar 2015 11:15:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqDx-0006AL-Ka for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqDx-0001d1-Ip for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:21 +0000 Date: Fri, 06 Mar 2015 11:15:21 +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 d568f5b668b19b8f257dc60eb3252b74bf70ec10 Merge: b28da5fc1c13ba2e5fdde2ce66a85e2af0ee2312 27fa184b9c2faacb16dfd22773b5bfe9a35e740f Author: Ian Campbell AuthorDate: Fri Feb 27 15:35:03 2015 +0000 Commit: Ian Campbell CommitDate: Fri Feb 27 15:35:03 2015 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/arch/x86/domain_build.c | 71 +++++++++++++++++++++++++++---------------- xen/arch/x86/traps.c | 36 +++++++++------------- xen/common/softirq.c | 2 +- 3 files changed, 61 insertions(+), 48 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 Mar 06 11:15:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:15: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 1YTqEB-0001sP-HI; Fri, 06 Mar 2015 11:15:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEA-0001rI-Qm for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:34 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id A3/7F-03164-65C89F45; Fri, 06 Mar 2015 11:15:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1425640532!15212667!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16220 invoked from network); 6 Mar 2015 11:15:33 -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; 6 Mar 2015 11:15:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqE8-0006AT-9B for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqE8-0001eN-6x for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:32 +0000 Date: Fri, 06 Mar 2015 11:15:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] stubdom: fix "make build" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0356d94e31bd09b84bba8dd378729ccd4c7fb5c0 Author: Wei Liu AuthorDate: Fri Jan 30 14:15:02 2015 +0000 Commit: Wei Liu CommitDate: Fri Feb 20 10:12:28 2015 +0000 stubdom: fix "make build" Cross compiling libxc requires some symlinks to exist. Note that make -C tools/include requires running tools/configure. But at least now the error message is much better than just a "file not found" error. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jakcson Acked-by: Ian Campbell Acked-by: Samuel Thibault --- stubdom/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index 8fb885a..58ca08c 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -333,6 +333,8 @@ $(TARGETS_MINIOS): mini-os-%: .PHONY: libxc libxc: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a libxc-$(XEN_TARGET_ARCH)/libxenguest.a libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: cross-zlib + $(MAKE) -C $(XEN_ROOT)/tools/include + $(MAKE) DESTDIR= -C $(MINI_OS) links CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= CONFIG_LIBXC_MINIOS=y -C libxc-$(XEN_TARGET_ARCH) libxc-$(XEN_TARGET_ARCH)/libxenguest.a: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:15:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:15: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 1YTqEB-0001sP-HI; Fri, 06 Mar 2015 11:15:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEA-0001rI-Qm for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:34 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id A3/7F-03164-65C89F45; Fri, 06 Mar 2015 11:15:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1425640532!15212667!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16220 invoked from network); 6 Mar 2015 11:15:33 -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; 6 Mar 2015 11:15:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqE8-0006AT-9B for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqE8-0001eN-6x for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:32 +0000 Date: Fri, 06 Mar 2015 11:15:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] stubdom: fix "make build" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0356d94e31bd09b84bba8dd378729ccd4c7fb5c0 Author: Wei Liu AuthorDate: Fri Jan 30 14:15:02 2015 +0000 Commit: Wei Liu CommitDate: Fri Feb 20 10:12:28 2015 +0000 stubdom: fix "make build" Cross compiling libxc requires some symlinks to exist. Note that make -C tools/include requires running tools/configure. But at least now the error message is much better than just a "file not found" error. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jakcson Acked-by: Ian Campbell Acked-by: Samuel Thibault --- stubdom/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index 8fb885a..58ca08c 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -333,6 +333,8 @@ $(TARGETS_MINIOS): mini-os-%: .PHONY: libxc libxc: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a libxc-$(XEN_TARGET_ARCH)/libxenguest.a libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: cross-zlib + $(MAKE) -C $(XEN_ROOT)/tools/include + $(MAKE) DESTDIR= -C $(MINI_OS) links CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= CONFIG_LIBXC_MINIOS=y -C libxc-$(XEN_TARGET_ARCH) libxc-$(XEN_TARGET_ARCH)/libxenguest.a: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:15:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:15: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 1YTqEM-0001uu-KR; Fri, 06 Mar 2015 11:15:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEL-0001ue-2i for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:45 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id D0/36-03185-06C89F45; Fri, 06 Mar 2015 11:15:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1425640542!13760441!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4380 invoked from network); 6 Mar 2015 11:15:43 -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; 6 Mar 2015 11:15:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEI-0006Ah-Dx for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqEI-0001em-D8 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:42 +0000 Date: Fri, 06 Mar 2015 11:15:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Makefile: refactor build/clean/distclean targets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 56c002976f18dc0ff1a43bb14a339096c977a9da Author: Wei Liu AuthorDate: Sun Jan 25 14:12:51 2015 +0000 Commit: Wei Liu CommitDate: Fri Feb 20 10:12:39 2015 +0000 Makefile: refactor build/clean/distclean targets Factor out per-subsystem build/clean/distclean-% targets, so that we can build subsystems independently in top level directory. The motive behind this is after splitting out mini-os from Xen tree, stubdom is in effect a downstream of mini-os. I would like to have the ability to build it independently and instrument OSSTest to test it. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- Makefile | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 44 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 6e9a4c7..ad6f917 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,9 @@ all: dist SUBSYSTEMS?=xen tools stubdom docs TARGS_DIST=$(patsubst %, dist-%, $(SUBSYSTEMS)) TARGS_INSTALL=$(patsubst %, install-%, $(SUBSYSTEMS)) +TARGS_BUILD=$(patsubst %, build-%, $(SUBSYSTEMS)) +TARGS_CLEAN=$(patsubst %, clean-%, $(SUBSYSTEMS)) +TARGS_DISTCLEAN=$(patsubst %, distclean-%, $(SUBSYSTEMS)) export XEN_ROOT=$(CURDIR) include Config.mk @@ -23,13 +26,25 @@ export DESTDIR install: $(TARGS_INSTALL) .PHONY: build -build: +build: $(TARGS_BUILD) + +.PHONY: build-xen +build-xen: $(MAKE) -C xen build + +.PHONY: build-tools +build-tools: $(MAKE) -C tools build + +.PHONY: build-stubdom +build-stubdom: $(MAKE) -C stubdom build ifeq (x86_64,$(XEN_TARGET_ARCH)) XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom pv-grub endif + +.PHONY: build-docs +build-docs: $(MAKE) -C docs build # The test target is for unit tests that can run without an installation. Of @@ -135,28 +150,52 @@ src-tarball: subtree-force-update-all bash ./tools/misc/mktarball $(XEN_ROOT) $$(git describe) .PHONY: clean -clean:: +clean: $(TARGS_CLEAN) + +.PHONY: clean-xen +clean-xen: $(MAKE) -C xen clean + +.PHONY: clean-tools +clean-tools: $(MAKE) -C tools clean + +.PHONY: clean-stubdom +clean-stubdom: $(MAKE) -C stubdom crossclean ifeq (x86_64,$(XEN_TARGET_ARCH)) XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom crossclean endif + +.PHONY: clean-docs +clean-docs: $(MAKE) -C docs clean # clean, but blow away tarballs .PHONY: distclean -distclean: +distclean: $(TARGS_DISTCLEAN) rm -f config/Toplevel.mk + rm -rf dist + rm -rf config.log config.status config.cache autom4te.cache + +.PHONY: distclean-xen +distclean-xen: $(MAKE) -C xen distclean + +.PHONY: distclean-tools +distclean-tools: $(MAKE) -C tools distclean + +.PHONY: distclean-stubdom +distclean-stubdom: $(MAKE) -C stubdom distclean ifeq (x86_64,$(XEN_TARGET_ARCH)) XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom distclean endif + +.PHONY: distclean-docs +distclean-docs: $(MAKE) -C docs distclean - rm -rf dist - rm -rf config.log config.status config.cache autom4te.cache # Linux name for GNU distclean .PHONY: mrproper -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:15:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:15: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 1YTqEM-0001uu-KR; Fri, 06 Mar 2015 11:15:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEL-0001ue-2i for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:45 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id D0/36-03185-06C89F45; Fri, 06 Mar 2015 11:15:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1425640542!13760441!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4380 invoked from network); 6 Mar 2015 11:15:43 -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; 6 Mar 2015 11:15:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEI-0006Ah-Dx for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqEI-0001em-D8 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:42 +0000 Date: Fri, 06 Mar 2015 11:15:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Makefile: refactor build/clean/distclean targets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 56c002976f18dc0ff1a43bb14a339096c977a9da Author: Wei Liu AuthorDate: Sun Jan 25 14:12:51 2015 +0000 Commit: Wei Liu CommitDate: Fri Feb 20 10:12:39 2015 +0000 Makefile: refactor build/clean/distclean targets Factor out per-subsystem build/clean/distclean-% targets, so that we can build subsystems independently in top level directory. The motive behind this is after splitting out mini-os from Xen tree, stubdom is in effect a downstream of mini-os. I would like to have the ability to build it independently and instrument OSSTest to test it. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- Makefile | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 44 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 6e9a4c7..ad6f917 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,9 @@ all: dist SUBSYSTEMS?=xen tools stubdom docs TARGS_DIST=$(patsubst %, dist-%, $(SUBSYSTEMS)) TARGS_INSTALL=$(patsubst %, install-%, $(SUBSYSTEMS)) +TARGS_BUILD=$(patsubst %, build-%, $(SUBSYSTEMS)) +TARGS_CLEAN=$(patsubst %, clean-%, $(SUBSYSTEMS)) +TARGS_DISTCLEAN=$(patsubst %, distclean-%, $(SUBSYSTEMS)) export XEN_ROOT=$(CURDIR) include Config.mk @@ -23,13 +26,25 @@ export DESTDIR install: $(TARGS_INSTALL) .PHONY: build -build: +build: $(TARGS_BUILD) + +.PHONY: build-xen +build-xen: $(MAKE) -C xen build + +.PHONY: build-tools +build-tools: $(MAKE) -C tools build + +.PHONY: build-stubdom +build-stubdom: $(MAKE) -C stubdom build ifeq (x86_64,$(XEN_TARGET_ARCH)) XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom pv-grub endif + +.PHONY: build-docs +build-docs: $(MAKE) -C docs build # The test target is for unit tests that can run without an installation. Of @@ -135,28 +150,52 @@ src-tarball: subtree-force-update-all bash ./tools/misc/mktarball $(XEN_ROOT) $$(git describe) .PHONY: clean -clean:: +clean: $(TARGS_CLEAN) + +.PHONY: clean-xen +clean-xen: $(MAKE) -C xen clean + +.PHONY: clean-tools +clean-tools: $(MAKE) -C tools clean + +.PHONY: clean-stubdom +clean-stubdom: $(MAKE) -C stubdom crossclean ifeq (x86_64,$(XEN_TARGET_ARCH)) XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom crossclean endif + +.PHONY: clean-docs +clean-docs: $(MAKE) -C docs clean # clean, but blow away tarballs .PHONY: distclean -distclean: +distclean: $(TARGS_DISTCLEAN) rm -f config/Toplevel.mk + rm -rf dist + rm -rf config.log config.status config.cache autom4te.cache + +.PHONY: distclean-xen +distclean-xen: $(MAKE) -C xen distclean + +.PHONY: distclean-tools +distclean-tools: $(MAKE) -C tools distclean + +.PHONY: distclean-stubdom +distclean-stubdom: $(MAKE) -C stubdom distclean ifeq (x86_64,$(XEN_TARGET_ARCH)) XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom distclean endif + +.PHONY: distclean-docs +distclean-docs: $(MAKE) -C docs distclean - rm -rf dist - rm -rf config.log config.status config.cache autom4te.cache # Linux name for GNU distclean .PHONY: mrproper -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:15:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:15: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 1YTqEW-0001wm-NA; Fri, 06 Mar 2015 11:15:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEV-0001wX-K1 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:55 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 46/F8-02994-B6C89F45; Fri, 06 Mar 2015 11:15:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1425640552!15207552!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30944 invoked from network); 6 Mar 2015 11:15: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; 6 Mar 2015 11:15:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqES-0006Aq-L2 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqES-0001f8-JQ for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:52 +0000 Date: Fri, 06 Mar 2015 11:15:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] stubdom: don't look for mini-os source file during 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 3f73a91625bc91c51ac415e74fe3b2e898b16ed9 Author: Wei Liu AuthorDate: Sun Jan 25 14:43:43 2015 +0000 Commit: Wei Liu CommitDate: Fri Feb 27 16:00:19 2015 +0000 stubdom: don't look for mini-os source file during configure Don't look for mini-os source file during configure. Mini-os source code will be fetched during build. Instead look for xenstore-minios.cfg. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- stubdom/configure | 2 +- stubdom/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stubdom/configure b/stubdom/configure index 74c5d1d..f4b1cd3 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -584,7 +584,7 @@ PACKAGE_STRING='Xen Hypervisor Stub Domains 4.6' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' -ac_unique_file="../extras/mini-os/kernel.c" +ac_unique_file="xenstore-minios.cfg" ac_subst_vars='LTLIBOBJS LIBOBJS STUBDOM_INSTALL diff --git a/stubdom/configure.ac b/stubdom/configure.ac index 6468203..9fec853 100644 --- a/stubdom/configure.ac +++ b/stubdom/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ([2.67]) AC_INIT([Xen Hypervisor Stub Domains], m4_esyscmd([../version.sh ../xen/Makefile]), [xen-devel@lists.xen.org], [xen], [http://www.xen.org/]) -AC_CONFIG_SRCDIR([../extras/mini-os/kernel.c]) +AC_CONFIG_SRCDIR([xenstore-minios.cfg]) AC_CONFIG_FILES([../config/Stubdom.mk]) AC_CONFIG_AUX_DIR([../]) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:15:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:15: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 1YTqEW-0001wm-NA; Fri, 06 Mar 2015 11:15:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEV-0001wX-K1 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:55 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 46/F8-02994-B6C89F45; Fri, 06 Mar 2015 11:15:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1425640552!15207552!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30944 invoked from network); 6 Mar 2015 11:15: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; 6 Mar 2015 11:15:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqES-0006Aq-L2 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqES-0001f8-JQ for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:15:52 +0000 Date: Fri, 06 Mar 2015 11:15:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] stubdom: don't look for mini-os source file during 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 3f73a91625bc91c51ac415e74fe3b2e898b16ed9 Author: Wei Liu AuthorDate: Sun Jan 25 14:43:43 2015 +0000 Commit: Wei Liu CommitDate: Fri Feb 27 16:00:19 2015 +0000 stubdom: don't look for mini-os source file during configure Don't look for mini-os source file during configure. Mini-os source code will be fetched during build. Instead look for xenstore-minios.cfg. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- stubdom/configure | 2 +- stubdom/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stubdom/configure b/stubdom/configure index 74c5d1d..f4b1cd3 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -584,7 +584,7 @@ PACKAGE_STRING='Xen Hypervisor Stub Domains 4.6' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' -ac_unique_file="../extras/mini-os/kernel.c" +ac_unique_file="xenstore-minios.cfg" ac_subst_vars='LTLIBOBJS LIBOBJS STUBDOM_INSTALL diff --git a/stubdom/configure.ac b/stubdom/configure.ac index 6468203..9fec853 100644 --- a/stubdom/configure.ac +++ b/stubdom/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ([2.67]) AC_INIT([Xen Hypervisor Stub Domains], m4_esyscmd([../version.sh ../xen/Makefile]), [xen-devel@lists.xen.org], [xen], [http://www.xen.org/]) -AC_CONFIG_SRCDIR([../extras/mini-os/kernel.c]) +AC_CONFIG_SRCDIR([xenstore-minios.cfg]) AC_CONFIG_FILES([../config/Stubdom.mk]) AC_CONFIG_AUX_DIR([../]) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:16:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:16: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 1YTqEf-00020x-Rw; Fri, 06 Mar 2015 11:16:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEf-00020j-18 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:05 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id C2/67-10964-47C89F45; Fri, 06 Mar 2015 11:16:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1425640563!15232637!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15126 invoked from network); 6 Mar 2015 11:16:03 -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; 6 Mar 2015 11:16:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEc-0006BS-Rg for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqEc-0001fh-PH for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:02 +0000 Date: Fri, 06 Mar 2015 11:16:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] stubdom: no need to clean mini-os X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec51ec27f26b085c0f85c76fb865b1d932dfe825 Author: Wei Liu AuthorDate: Tue Feb 24 17:37:04 2015 +0000 Commit: Wei Liu CommitDate: Fri Feb 27 16:00:32 2015 +0000 stubdom: no need to clean mini-os All objects are placed inside stubdom's directories, so there is no need to enter mini-os and clean. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Samuel Thibault Cc: Stefano Stabellini Acked-by: Samuel Thibault Acked-by: Ian Campbell --- stubdom/Makefile | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index 58ca08c..6e6876b 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -504,7 +504,6 @@ clean: rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstore rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpm rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpmmgr - $(MAKE) DESTDIR= -C $(MINI_OS) clean $(MAKE) DESTDIR= -C caml clean $(MAKE) DESTDIR= -C c clean $(MAKE) -C vtpm 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 Fri Mar 06 11:16:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:16: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 1YTqEf-00020x-Rw; Fri, 06 Mar 2015 11:16:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEf-00020j-18 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:05 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id C2/67-10964-47C89F45; Fri, 06 Mar 2015 11:16:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1425640563!15232637!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15126 invoked from network); 6 Mar 2015 11:16:03 -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; 6 Mar 2015 11:16:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEc-0006BS-Rg for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqEc-0001fh-PH for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:02 +0000 Date: Fri, 06 Mar 2015 11:16:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] stubdom: no need to clean mini-os X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec51ec27f26b085c0f85c76fb865b1d932dfe825 Author: Wei Liu AuthorDate: Tue Feb 24 17:37:04 2015 +0000 Commit: Wei Liu CommitDate: Fri Feb 27 16:00:32 2015 +0000 stubdom: no need to clean mini-os All objects are placed inside stubdom's directories, so there is no need to enter mini-os and clean. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Samuel Thibault Cc: Stefano Stabellini Acked-by: Samuel Thibault Acked-by: Ian Campbell --- stubdom/Makefile | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index 58ca08c..6e6876b 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -504,7 +504,6 @@ clean: rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstore rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpm rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpmmgr - $(MAKE) DESTDIR= -C $(MINI_OS) clean $(MAKE) DESTDIR= -C caml clean $(MAKE) DESTDIR= -C c clean $(MAKE) -C vtpm 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 Fri Mar 06 11:16:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:16: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 1YTqEq-000231-Ub; Fri, 06 Mar 2015 11:16:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEp-00022h-JH for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:15 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id B4/C0-03164-E7C89F45; Fri, 06 Mar 2015 11:16:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1425640573!15216196!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1335 invoked from network); 6 Mar 2015 11:16:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:16:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEn-0006BY-17 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqEm-0001g5-W5 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:13 +0000 Date: Fri, 06 Mar 2015 11:16:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] git-checkout.sh: use "mkdir -p" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4a659273b920e4e158dd1a1a3e0d59ef4392709d Author: Wei Liu AuthorDate: Sun Jan 25 16:30:21 2015 +0000 Commit: Wei Liu CommitDate: Fri Feb 27 16:00:32 2015 +0000 git-checkout.sh: use "mkdir -p" Otherwise mkdir extras/mini-os fails because extras doesn't exist. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- scripts/git-checkout.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/git-checkout.sh b/scripts/git-checkout.sh index 15b3ce9..20ae31f 100755 --- a/scripts/git-checkout.sh +++ b/scripts/git-checkout.sh @@ -13,7 +13,7 @@ set -e if test \! -d $DIR-remote; then rm -rf $DIR-remote $DIR-remote.tmp - mkdir $DIR-remote.tmp; rmdir $DIR-remote.tmp + mkdir -p $DIR-remote.tmp; rmdir $DIR-remote.tmp $GIT clone $TREE $DIR-remote.tmp if test "$TAG" ; then cd $DIR-remote.tmp -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:16:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:16: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 1YTqEq-000231-Ub; Fri, 06 Mar 2015 11:16:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEp-00022h-JH for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:15 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id B4/C0-03164-E7C89F45; Fri, 06 Mar 2015 11:16:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1425640573!15216196!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1335 invoked from network); 6 Mar 2015 11:16:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:16:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEn-0006BY-17 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqEm-0001g5-W5 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:13 +0000 Date: Fri, 06 Mar 2015 11:16:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] git-checkout.sh: use "mkdir -p" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4a659273b920e4e158dd1a1a3e0d59ef4392709d Author: Wei Liu AuthorDate: Sun Jan 25 16:30:21 2015 +0000 Commit: Wei Liu CommitDate: Fri Feb 27 16:00:32 2015 +0000 git-checkout.sh: use "mkdir -p" Otherwise mkdir extras/mini-os fails because extras doesn't exist. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- scripts/git-checkout.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/git-checkout.sh b/scripts/git-checkout.sh index 15b3ce9..20ae31f 100755 --- a/scripts/git-checkout.sh +++ b/scripts/git-checkout.sh @@ -13,7 +13,7 @@ set -e if test \! -d $DIR-remote; then rm -rf $DIR-remote $DIR-remote.tmp - mkdir $DIR-remote.tmp; rmdir $DIR-remote.tmp + mkdir -p $DIR-remote.tmp; rmdir $DIR-remote.tmp $GIT clone $TREE $DIR-remote.tmp if test "$TAG" ; then cd $DIR-remote.tmp -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:16:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:16: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 1YTqF8-00025c-1V; Fri, 06 Mar 2015 11:16:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqF6-00025P-6c for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:32 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id A6/85-02755-F8C89F45; Fri, 06 Mar 2015 11:16:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1425640583!9843461!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6039 invoked from network); 6 Mar 2015 11:16:24 -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; 6 Mar 2015 11:16:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEx-0006Bb-8R for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqEx-0001hA-5i for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:23 +0000 Date: Fri, 06 Mar 2015 11:16:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Mini-OS: standalone build X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4af58a26becdac6a8697e9a488d265a28520a17d Author: Wei Liu AuthorDate: Thu Jan 29 19:10:04 2015 +0000 Commit: Wei Liu CommitDate: Fri Feb 27 16:00:32 2015 +0000 Mini-OS: standalone build In order to keep the tree bisectable all the changes are done in one single commit. Things done in this commit: 1. Import necessary .mk files from Xen. 2. Move all XEN_ related variables to MINIOS_ namespace. 3. Import Xen public header files. 4. Import BSD's list.h and helper script. Mini-OS's vanilla Config.mk is modified to contain some macros copied from Xen's Config.mk. It also contains compatibility handling logic for Xen's stubdom build environment. Files modified: Config.mk Makefile arch/x86/Makefile arch/x86/arch.mk minios.mk All other files are just imported from Xen. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell Acked-by: Samuel Thibault --- .gitignore | 1 - extras/mini-os/Config.mk | 50 +- extras/mini-os/Makefile | 16 +- extras/mini-os/arch/x86/Makefile | 5 +- extras/mini-os/arch/x86/arch.mk | 8 +- extras/mini-os/config/MiniOS.mk | 10 + extras/mini-os/config/StdGNU.mk | 47 + extras/mini-os/config/arm32.mk | 22 + extras/mini-os/config/arm64.mk | 19 + extras/mini-os/config/x86_32.mk | 20 + extras/mini-os/config/x86_64.mk | 33 + extras/mini-os/include/minios-external/README | 24 + .../mini-os/include/minios-external/bsd-COPYRIGHT | 126 +++ extras/mini-os/include/minios-external/bsd-queue.3 | 1044 ++++++++++++++++++ .../minios-external/bsd-sys-queue-h-seddery | 72 ++ .../include/minios-external/bsd-sys-queue.h | 637 +++++++++++ extras/mini-os/include/xen/COPYING | 38 + extras/mini-os/include/xen/arch-arm.h | 432 ++++++++ extras/mini-os/include/xen/arch-arm/hvm/save.h | 39 + extras/mini-os/include/xen/arch-x86/cpuid.h | 90 ++ extras/mini-os/include/xen/arch-x86/hvm/save.h | 630 +++++++++++ extras/mini-os/include/xen/arch-x86/xen-mca.h | 440 ++++++++ extras/mini-os/include/xen/arch-x86/xen-x86_32.h | 171 +++ extras/mini-os/include/xen/arch-x86/xen-x86_64.h | 202 ++++ extras/mini-os/include/xen/arch-x86/xen.h | 303 +++++ extras/mini-os/include/xen/arch-x86_32.h | 27 + extras/mini-os/include/xen/arch-x86_64.h | 43 + extras/mini-os/include/xen/callback.h | 121 ++ extras/mini-os/include/xen/dom0_ops.h | 120 ++ extras/mini-os/include/xen/domctl.h | 1154 ++++++++++++++++++++ extras/mini-os/include/xen/elfnote.h | 271 +++++ extras/mini-os/include/xen/event_channel.h | 385 +++++++ extras/mini-os/include/xen/features.h | 114 ++ extras/mini-os/include/xen/gcov.h | 115 ++ extras/mini-os/include/xen/grant_table.h | 682 ++++++++++++ extras/mini-os/include/xen/hvm/e820.h | 34 + extras/mini-os/include/xen/hvm/hvm_info_table.h | 72 ++ extras/mini-os/include/xen/hvm/hvm_op.h | 402 +++++++ extras/mini-os/include/xen/hvm/hvm_xs_strings.h | 80 ++ extras/mini-os/include/xen/hvm/ioreq.h | 129 +++ extras/mini-os/include/xen/hvm/params.h | 199 ++++ extras/mini-os/include/xen/hvm/pvdrivers.h | 49 + extras/mini-os/include/xen/hvm/save.h | 111 ++ extras/mini-os/include/xen/io/blkif.h | 640 +++++++++++ extras/mini-os/include/xen/io/console.h | 51 + extras/mini-os/include/xen/io/fbif.h | 176 +++ extras/mini-os/include/xen/io/fsif.h | 192 ++++ extras/mini-os/include/xen/io/kbdif.h | 132 +++ extras/mini-os/include/xen/io/libxenvchan.h | 97 ++ extras/mini-os/include/xen/io/netif.h | 305 ++++++ extras/mini-os/include/xen/io/pciif.h | 125 +++ extras/mini-os/include/xen/io/protocols.h | 40 + extras/mini-os/include/xen/io/ring.h | 312 ++++++ extras/mini-os/include/xen/io/tpmif.h | 143 +++ extras/mini-os/include/xen/io/usbif.h | 150 +++ extras/mini-os/include/xen/io/vscsiif.h | 260 +++++ extras/mini-os/include/xen/io/xenbus.h | 80 ++ extras/mini-os/include/xen/io/xs_wire.h | 149 +++ extras/mini-os/include/xen/kexec.h | 249 +++++ extras/mini-os/include/xen/mem_event.h | 134 +++ extras/mini-os/include/xen/memory.h | 587 ++++++++++ extras/mini-os/include/xen/nmi.h | 85 ++ extras/mini-os/include/xen/physdev.h | 380 +++++++ extras/mini-os/include/xen/platform.h | 606 ++++++++++ extras/mini-os/include/xen/sched.h | 175 +++ extras/mini-os/include/xen/sysctl.h | 719 ++++++++++++ extras/mini-os/include/xen/tmem.h | 152 +++ extras/mini-os/include/xen/trace.h | 331 ++++++ extras/mini-os/include/xen/vcpu.h | 240 ++++ extras/mini-os/include/xen/version.h | 96 ++ extras/mini-os/include/xen/xen-compat.h | 44 + extras/mini-os/include/xen/xen.h | 899 +++++++++++++++ extras/mini-os/include/xen/xencomm.h | 41 + extras/mini-os/include/xen/xenoprof.h | 152 +++ extras/mini-os/include/xen/xsm/flask_op.h | 201 ++++ extras/mini-os/minios.mk | 4 +- 76 files changed, 16511 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 13ee05b..cdbdca7 100644 --- a/.gitignore +++ b/.gitignore @@ -48,7 +48,6 @@ docs/pdf/ docs/txt/ extras/mini-os/include/mini-os extras/mini-os/include/x86/mini-os -extras/mini-os/include/xen extras/mini-os/include/list.h extras/mini-os/mini-os* install/* diff --git a/extras/mini-os/Config.mk b/extras/mini-os/Config.mk index 4852443..e5d8ade 100644 --- a/extras/mini-os/Config.mk +++ b/extras/mini-os/Config.mk @@ -1,7 +1,49 @@ -# Set mini-os root path, used in mini-os.mk. +# +# Compare $(1) and $(2) and replace $(2) with $(1) if they differ +# +# Typically $(1) is a newly generated file and $(2) is the target file +# being regenerated. This prevents changing the timestamp of $(2) only +# due to being auto regenereated with the same contents. +define move-if-changed + if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi +endef + +# cc-option: Check if compiler supports first option, else fall back to second. +# +# This is complicated by the fact that unrecognised -Wno-* options: +# (a) are ignored unless the compilation emits a warning; and +# (b) even then produce a warning rather than an error +# To handle this we do a test compile, passing the option-under-test, on a code +# fragment that will always produce a warning (integer assigned to pointer). +# We then grep for the option-under-test in the compiler's output, the presence +# of which would indicate an "unrecognized command-line option" warning/error. +# +# Usage: cflags-y += $(call cc-option,$(CC),-march=winchip-c6,-march=i586) +cc-option = $(shell if test -z "`echo 'void*p=1;' | \ + $(1) $(2) -S -o /dev/null -x c - 2>&1 | grep -- $(2) -`"; \ + then echo "$(2)"; else echo "$(3)"; fi ;) + +# Compatibility with Xen's stubdom build environment. If we are building +# stubdom, some XEN_ variables are set, set MINIOS_ variables accordingly. +# +ifneq ($(XEN_ROOT),) MINI-OS_ROOT=$(XEN_ROOT)/extras/mini-os +else +MINI-OS_ROOT=$(TOPLEVEL_DIR) +endif export MINI-OS_ROOT +ifneq ($(XEN_TARGET_ARCH),) +MINIOS_TARGET_ARCH = $(XEN_TARGET_ARCH) +else +MINIOS_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/ \ + -e s/i86pc/x86_32/ -e s/amd64/x86_64/ \ + -e s/armv7.*/arm32/ -e s/armv8.*/arm64/ \ + -e s/aarch64/arm64/) + +MINIOS_TARGET_ARCH ?= $(MINIOS_COMPILE_ARCH) +endif + libc = $(stubdom) XEN_INTERFACE_VERSION := 0x00030205 @@ -9,11 +51,11 @@ export XEN_INTERFACE_VERSION # Try to find out the architecture family TARGET_ARCH_FAM. # First check whether x86_... is contained (for x86_32, x86_32y, x86_64). -# If not x86 then use $(XEN_TARGET_ARCH) -ifeq ($(findstring x86_,$(XEN_TARGET_ARCH)),x86_) +# If not x86 then use $(MINIOS_TARGET_ARCH) +ifeq ($(findstring x86_,$(MINIOS_TARGET_ARCH)),x86_) TARGET_ARCH_FAM = x86 else -TARGET_ARCH_FAM = $(XEN_TARGET_ARCH) +TARGET_ARCH_FAM = $(MINIOS_TARGET_ARCH) endif # The architecture family directory below mini-os. diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile index 6d6537e..f16520e 100644 --- a/extras/mini-os/Makefile +++ b/extras/mini-os/Makefile @@ -4,9 +4,8 @@ # Makefile and a arch.mk. # -export XEN_ROOT = $(CURDIR)/../.. -include $(XEN_ROOT)/Config.mk -OBJ_DIR ?= $(CURDIR) +OBJ_DIR=$(CURDIR) +TOPLEVEL_DIR=$(CURDIR) ifeq ($(MINIOS_CONFIG),) include Config.mk @@ -15,6 +14,8 @@ EXTRA_DEPS += $(MINIOS_CONFIG) include $(MINIOS_CONFIG) endif +include $(MINI-OS_ROOT)/config/MiniOS.mk + # Configuration defaults CONFIG_START_NETWORK ?= y CONFIG_SPARSE_BSS ?= y @@ -51,7 +52,7 @@ flags-$(CONFIG_XENBUS) += -DCONFIG_XENBUS DEF_CFLAGS += $(flags-y) # Symlinks and headers that must be created before building the C files -GENERATED_HEADERS := include/list.h $(ARCH_LINKS) include/mini-os include/xen include/$(TARGET_ARCH_FAM)/mini-os +GENERATED_HEADERS := include/list.h $(ARCH_LINKS) include/mini-os include/$(TARGET_ARCH_FAM)/mini-os EXTRA_DEPS += $(GENERATED_HEADERS) @@ -65,7 +66,7 @@ include minios.mk LDLIBS := APP_LDLIBS := LDARCHLIB := -L$(OBJ_DIR)/$(TARGET_ARCH_DIR) -l$(ARCH_LIB_NAME) -LDFLAGS_FINAL := -T $(TARGET_ARCH_DIR)/minios-$(XEN_TARGET_ARCH).lds +LDFLAGS_FINAL := -T $(TARGET_ARCH_DIR)/minios-$(MINIOS_TARGET_ARCH).lds # Prefix for global API names. All other symbols are localised before # linking with EXTRA_OBJS. @@ -125,7 +126,7 @@ $(ARCH_LINKS): $(arch_links) endif -include/list.h: $(XEN_ROOT)/tools/include/xen-external/bsd-sys-queue-h-seddery $(XEN_ROOT)/tools/include/xen-external/bsd-sys-queue.h +include/list.h: include/minios-external/bsd-sys-queue-h-seddery include/minios-external/bsd-sys-queue.h perl $^ --prefix=minios >$@.new $(call move-if-changed,$@.new,$@) @@ -133,9 +134,6 @@ include/list.h: $(XEN_ROOT)/tools/include/xen-external/bsd-sys-queue-h-seddery $ .PHONY: links links: $(GENERATED_HEADERS) -include/xen: - ln -sf ../../../xen/include/public $@ - include/mini-os: ln -sf . $@ diff --git a/extras/mini-os/arch/x86/Makefile b/extras/mini-os/arch/x86/Makefile index 1073e36..9f04a93 100644 --- a/extras/mini-os/arch/x86/Makefile +++ b/extras/mini-os/arch/x86/Makefile @@ -3,8 +3,7 @@ # It's is used for x86_32, x86_32y and x86_64 # -XEN_ROOT = $(CURDIR)/../../../.. -include $(XEN_ROOT)/Config.mk +TOPLEVEL_DIR = $(CURDIR)/../.. include ../../Config.mk # include arch.mk has to be before mini-os.mk! @@ -12,7 +11,7 @@ include ../../Config.mk include arch.mk include ../../minios.mk -# Sources here are all *.c *.S without $(XEN_TARGET_ARCH).S +# Sources here are all *.c *.S without $(MINIOS_TARGET_ARCH).S # This is handled in $(HEAD_ARCH_OBJ) ARCH_SRCS := $(wildcard *.c) diff --git a/extras/mini-os/arch/x86/arch.mk b/extras/mini-os/arch/x86/arch.mk index b27f322..81e8118 100644 --- a/extras/mini-os/arch/x86/arch.mk +++ b/extras/mini-os/arch/x86/arch.mk @@ -3,20 +3,20 @@ # (including x86_32, x86_32y and x86_64). # -ifeq ($(XEN_TARGET_ARCH),x86_32) +ifeq ($(MINIOS_TARGET_ARCH),x86_32) ARCH_CFLAGS := -m32 -march=i686 ARCH_LDFLAGS := -m elf_i386 ARCH_ASFLAGS := -m32 -EXTRA_INC += $(TARGET_ARCH_FAM)/$(XEN_TARGET_ARCH) +EXTRA_INC += $(TARGET_ARCH_FAM)/$(MINIOS_TARGET_ARCH) EXTRA_SRC += arch/$(EXTRA_INC) endif -ifeq ($(XEN_TARGET_ARCH),x86_64) +ifeq ($(MINIOS_TARGET_ARCH),x86_64) ARCH_CFLAGS := -m64 -mno-red-zone -fno-reorder-blocks ARCH_CFLAGS += -fno-asynchronous-unwind-tables ARCH_ASFLAGS := -m64 ARCH_LDFLAGS := -m elf_x86_64 -EXTRA_INC += $(TARGET_ARCH_FAM)/$(XEN_TARGET_ARCH) +EXTRA_INC += $(TARGET_ARCH_FAM)/$(MINIOS_TARGET_ARCH) EXTRA_SRC += arch/$(EXTRA_INC) endif diff --git a/extras/mini-os/config/MiniOS.mk b/extras/mini-os/config/MiniOS.mk new file mode 100644 index 0000000..e4febe4 --- /dev/null +++ b/extras/mini-os/config/MiniOS.mk @@ -0,0 +1,10 @@ +include $(MINI-OS_ROOT)/config/StdGNU.mk +include $(MINI-OS_ROOT)/Config.mk +CFLAGS += $(DEF_CFLAGS) $(ARCH_CFLAGS) +CPPFLAGS += $(DEF_CPPFLAGS) $(ARCH_CPPFLAGS) $(extra_incl) +ASFLAGS += $(DEF_ASFLAGS) $(ARCH_ASFLAGS) +LDFLAGS += $(DEF_LDFLAGS) $(ARCH_LDFLAGS) + +# Override settings for this OS +PTHREAD_LIBS = +nosharedlibs=y diff --git a/extras/mini-os/config/StdGNU.mk b/extras/mini-os/config/StdGNU.mk new file mode 100644 index 0000000..4efebe3 --- /dev/null +++ b/extras/mini-os/config/StdGNU.mk @@ -0,0 +1,47 @@ +AS = $(CROSS_COMPILE)as +LD = $(CROSS_COMPILE)ld +ifeq ($(clang),y) +CC = $(CROSS_COMPILE)clang +LD_LTO = $(CROSS_COMPILE)llvm-ld +else +CC = $(CROSS_COMPILE)gcc +LD_LTO = $(CROSS_COMPILE)ld +endif +CPP = $(CC) -E +AR = $(CROSS_COMPILE)ar +RANLIB = $(CROSS_COMPILE)ranlib +NM = $(CROSS_COMPILE)nm +STRIP = $(CROSS_COMPILE)strip +OBJCOPY = $(CROSS_COMPILE)objcopy +OBJDUMP = $(CROSS_COMPILE)objdump +SIZEUTIL = $(CROSS_COMPILE)size + +# Allow git to be wrappered in the environment +GIT ?= git + +INSTALL = install +INSTALL_DIR = $(INSTALL) -d -m0755 -p +INSTALL_DATA = $(INSTALL) -m0644 -p +INSTALL_PROG = $(INSTALL) -m0755 -p + +BOOT_DIR ?= /boot + +SOCKET_LIBS = +UTIL_LIBS = -lutil +DLOPEN_LIBS = -ldl + +SONAME_LDFLAG = -soname +SHLIB_LDFLAGS = -shared + +ifneq ($(debug),y) +CFLAGS += -O2 -fomit-frame-pointer +else +# Less than -O1 produces bad code and large stack frames +CFLAGS += -O1 -fno-omit-frame-pointer +CFLAGS-$(gcc) += -fno-optimize-sibling-calls +endif + +ifeq ($(lto),y) +CFLAGS += -flto +LDFLAGS-$(clang) += -plugin LLVMgold.so +endif diff --git a/extras/mini-os/config/arm32.mk b/extras/mini-os/config/arm32.mk new file mode 100644 index 0000000..4f83a63 --- /dev/null +++ b/extras/mini-os/config/arm32.mk @@ -0,0 +1,22 @@ +CONFIG_ARM := y +CONFIG_ARM_32 := y +CONFIG_ARM_$(XEN_OS) := y + +CONFIG_XEN_INSTALL_SUFFIX := + +# -march= -mcpu= + +# Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: +CFLAGS += -marm + +HAS_PL011 := y +HAS_EXYNOS4210 := y +HAS_OMAP := y +HAS_NS16550 := y + +# Use only if calling $(LD) directly. +LDFLAGS_DIRECT += -EL + +CONFIG_LOAD_ADDRESS ?= 0x80000000 + +IOEMU_CPU_ARCH ?= arm diff --git a/extras/mini-os/config/arm64.mk b/extras/mini-os/config/arm64.mk new file mode 100644 index 0000000..6eafda2 --- /dev/null +++ b/extras/mini-os/config/arm64.mk @@ -0,0 +1,19 @@ +CONFIG_ARM := y +CONFIG_ARM_64 := y +CONFIG_ARM_$(XEN_OS) := y + +CONFIG_XEN_INSTALL_SUFFIX := + +CFLAGS += #-marm -march= -mcpu= etc + +HAS_PL011 := y +HAS_NS16550 := y + +# Use only if calling $(LD) directly. +LDFLAGS_DIRECT += -EL + +CONFIG_LOAD_ADDRESS ?= 0x80000000 + +IOEMU_CPU_ARCH ?= aarch64 + +EFI_DIR ?= /usr/lib64/efi diff --git a/extras/mini-os/config/x86_32.mk b/extras/mini-os/config/x86_32.mk new file mode 100644 index 0000000..c2d785e --- /dev/null +++ b/extras/mini-os/config/x86_32.mk @@ -0,0 +1,20 @@ +CONFIG_X86 := y +CONFIG_X86_32 := y +CONFIG_X86_$(XEN_OS) := y + +CONFIG_HVM := y +CONFIG_MIGRATE := y +CONFIG_XCUTILS := y + +HAS_MEM_ACCESS := y +HAS_MEM_PAGING := y +HAS_MEM_SHARING := y + +CFLAGS += -m32 -march=i686 + +# Use only if calling $(LD) directly. +LDFLAGS_DIRECT_OpenBSD = _obsd +LDFLAGS_DIRECT_FreeBSD = _fbsd +LDFLAGS_DIRECT += -melf_i386$(LDFLAGS_DIRECT_$(XEN_OS)) + +IOEMU_CPU_ARCH ?= i386 diff --git a/extras/mini-os/config/x86_64.mk b/extras/mini-os/config/x86_64.mk new file mode 100644 index 0000000..bf104c2 --- /dev/null +++ b/extras/mini-os/config/x86_64.mk @@ -0,0 +1,33 @@ +CONFIG_X86 := y +CONFIG_X86_64 := y +CONFIG_X86_$(XEN_OS) := y + +CONFIG_COMPAT := y +CONFIG_HVM := y +CONFIG_MIGRATE := y +CONFIG_XCUTILS := y + +HAS_MEM_ACCESS := y +HAS_MEM_PAGING := y +HAS_MEM_SHARING := y + +CONFIG_XEN_INSTALL_SUFFIX := .gz + +CFLAGS += -m64 + +SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64) + +EFI_DIR ?= /usr/lib64/efi + +# Use only if calling $(LD) directly. +ifeq ($(XEN_OS),OpenBSD) +LDFLAGS_DIRECT += -melf_x86_64_obsd +else +ifeq ($(XEN_OS),FreeBSD) +LDFLAGS_DIRECT += -melf_x86_64_fbsd +else +LDFLAGS_DIRECT += -melf_x86_64 +endif +endif + +IOEMU_CPU_ARCH ?= x86_64 diff --git a/extras/mini-os/include/minios-external/README b/extras/mini-os/include/minios-external/README new file mode 100644 index 0000000..93c2bc9 --- /dev/null +++ b/extras/mini-os/include/minios-external/README @@ -0,0 +1,24 @@ +WARNING - DO NOT EDIT THINGS IN THIS DIRECTORY +---------------------------------------------- + +These files were obtained elsewhere and should only be updated by +copying new versions from the source location, as documented below: + +bsd-COPYRIGHT +bsd-sys-queue.h +bsd-queue.3 + + Obtained from the FreeBSD SVN using the following commands: + svn co -r 221843 svn://svn.freebsd.org/base/head/sys/sys/ + svn co -r 221843 svn://svn.freebsd.org/base/head/share/man/man3 + svn cat -r 221843 http://svn.freebsd.org/base/head/COPYRIGHT >tools/libxl/external/bsd-COPYRIGHT + +Exceptions: + +README + + This file + +bsd-sys-queue-h-seddery + + Script to transform the above into a new namespace. diff --git a/extras/mini-os/include/minios-external/bsd-COPYRIGHT b/extras/mini-os/include/minios-external/bsd-COPYRIGHT new file mode 100644 index 0000000..6dc5d16 --- /dev/null +++ b/extras/mini-os/include/minios-external/bsd-COPYRIGHT @@ -0,0 +1,126 @@ +# $FreeBSD$ +# @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 + +The compilation of software known as FreeBSD is distributed under the +following terms: + +Copyright (c) 1992-2011 The FreeBSD Project. All rights reserved. + +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 AUTHOR 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 AUTHOR 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. + +The 4.4BSD and 4.4BSD-Lite software is distributed under the following +terms: + +All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite +Releases is copyrighted by The Regents of the University of California. + +Copyright 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 + The Regents of the University of California. All rights reserved. + +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. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by the University of +California, Berkeley and its contributors. +4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. + +The Institute of Electrical and Electronics Engineers and the American +National Standards Committee X3, on Information Processing Systems have +given us permission to reprint portions of their documentation. + +In the following statement, the phrase ``this text'' refers to portions +of the system documentation. + +Portions of this text are reprinted and reproduced in electronic form in +the second BSD Networking Software Release, from IEEE Std 1003.1-1988, IEEE +Standard Portable Operating System Interface for Computer Environments +(POSIX), copyright C 1988 by the Institute of Electrical and Electronics +Engineers, Inc. In the event of any discrepancy between these versions +and the original IEEE Standard, the original IEEE Standard is the referee +document. + +In the following statement, the phrase ``This material'' refers to portions +of the system documentation. + +This material is reproduced with permission from American National +Standards Committee X3, on Information Processing Systems. Computer and +Business Equipment Manufacturers Association (CBEMA), 311 First St., NW, +Suite 500, Washington, DC 20001-2178. The developmental work of +Programming Language C was completed by the X3J11 Technical Committee. + +The views and conclusions contained in the software and documentation are +those of the authors and should not be interpreted as representing official +policies, either expressed or implied, of the Regents of the University +of California. + + +NOTE: The copyright of UC Berkeley's Berkeley Software Distribution ("BSD") +source has been updated. The copyright addendum may be found at +ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change and is +included below. + +July 22, 1999 + +To All Licensees, Distributors of Any Version of BSD: + +As you know, certain of the Berkeley Software Distribution ("BSD") source +code files require that further distributions of products containing all or +portions of the software, acknowledge within their advertising materials +that such products contain software developed by UC Berkeley and its +contributors. + +Specifically, the provision reads: + +" * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors." + +Effective immediately, licensees and distributors are no longer required to +include the acknowledgement within advertising materials. Accordingly, the +foregoing paragraph of those BSD Unix files containing it is hereby deleted +in its entirety. + +William Hoskins +Director, Office of Technology Licensing +University of California, Berkeley diff --git a/extras/mini-os/include/minios-external/bsd-queue.3 b/extras/mini-os/include/minios-external/bsd-queue.3 new file mode 100644 index 0000000..007ca5c --- /dev/null +++ b/extras/mini-os/include/minios-external/bsd-queue.3 @@ -0,0 +1,1044 @@ +.\" Copyright (c) 1993 +.\" The Regents of the University of California. All rights reserved. +.\" +.\" 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. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by the University of +.\" California, Berkeley and its contributors. +.\" 4. Neither the name of the University nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. +.\" +.\" @(#)queue.3 8.2 (Berkeley) 1/24/94 +.\" $FreeBSD$ +.\" +.Dd May 13, 2011 +.Dt QUEUE 3 +.Os +.Sh NAME +.Nm SLIST_EMPTY , +.Nm SLIST_ENTRY , +.Nm SLIST_FIRST , +.Nm SLIST_FOREACH , +.Nm SLIST_FOREACH_SAFE , +.Nm SLIST_HEAD , +.Nm SLIST_HEAD_INITIALIZER , +.Nm SLIST_INIT , +.Nm SLIST_INSERT_AFTER , +.Nm SLIST_INSERT_HEAD , +.Nm SLIST_NEXT , +.Nm SLIST_REMOVE_AFTER , +.Nm SLIST_REMOVE_HEAD , +.Nm SLIST_REMOVE , +.Nm SLIST_SWAP , +.Nm STAILQ_CONCAT , +.Nm STAILQ_EMPTY , +.Nm STAILQ_ENTRY , +.Nm STAILQ_FIRST , +.Nm STAILQ_FOREACH , +.Nm STAILQ_FOREACH_SAFE , +.Nm STAILQ_HEAD , +.Nm STAILQ_HEAD_INITIALIZER , +.Nm STAILQ_INIT , +.Nm STAILQ_INSERT_AFTER , +.Nm STAILQ_INSERT_HEAD , +.Nm STAILQ_INSERT_TAIL , +.Nm STAILQ_LAST , +.Nm STAILQ_NEXT , +.Nm STAILQ_REMOVE_AFTER , +.Nm STAILQ_REMOVE_HEAD , +.Nm STAILQ_REMOVE , +.Nm STAILQ_SWAP , +.Nm LIST_EMPTY , +.Nm LIST_ENTRY , +.Nm LIST_FIRST , +.Nm LIST_FOREACH , +.Nm LIST_FOREACH_SAFE , +.Nm LIST_HEAD , +.Nm LIST_HEAD_INITIALIZER , +.Nm LIST_INIT , +.Nm LIST_INSERT_AFTER , +.Nm LIST_INSERT_BEFORE , +.Nm LIST_INSERT_HEAD , +.Nm LIST_NEXT , +.Nm LIST_REMOVE , +.Nm LIST_SWAP , +.Nm TAILQ_CONCAT , +.Nm TAILQ_EMPTY , +.Nm TAILQ_ENTRY , +.Nm TAILQ_FIRST , +.Nm TAILQ_FOREACH , +.Nm TAILQ_FOREACH_SAFE , +.Nm TAILQ_FOREACH_REVERSE , +.Nm TAILQ_FOREACH_REVERSE_SAFE , +.Nm TAILQ_HEAD , +.Nm TAILQ_HEAD_INITIALIZER , +.Nm TAILQ_INIT , +.Nm TAILQ_INSERT_AFTER , +.Nm TAILQ_INSERT_BEFORE , +.Nm TAILQ_INSERT_HEAD , +.Nm TAILQ_INSERT_TAIL , +.Nm TAILQ_LAST , +.Nm TAILQ_NEXT , +.Nm TAILQ_PREV , +.Nm TAILQ_REMOVE , +.Nm TAILQ_SWAP +.Nd implementations of singly-linked lists, singly-linked tail queues, +lists and tail queues +.Sh SYNOPSIS +.In sys/queue.h +.\" +.Fn SLIST_EMPTY "SLIST_HEAD *head" +.Fn SLIST_ENTRY "TYPE" +.Fn SLIST_FIRST "SLIST_HEAD *head" +.Fn SLIST_FOREACH "TYPE *var" "SLIST_HEAD *head" "SLIST_ENTRY NAME" +.Fn SLIST_FOREACH_SAFE "TYPE *var" "SLIST_HEAD *head" "SLIST_ENTRY NAME" "TYPE *temp_var" +.Fn SLIST_HEAD "HEADNAME" "TYPE" +.Fn SLIST_HEAD_INITIALIZER "SLIST_HEAD head" +.Fn SLIST_INIT "SLIST_HEAD *head" +.Fn SLIST_INSERT_AFTER "TYPE *listelm" "TYPE *elm" "SLIST_ENTRY NAME" +.Fn SLIST_INSERT_HEAD "SLIST_HEAD *head" "TYPE *elm" "SLIST_ENTRY NAME" +.Fn SLIST_NEXT "TYPE *elm" "SLIST_ENTRY NAME" +.Fn SLIST_REMOVE_AFTER "TYPE *elm" "SLIST_ENTRY NAME" +.Fn SLIST_REMOVE_HEAD "SLIST_HEAD *head" "SLIST_ENTRY NAME" +.Fn SLIST_REMOVE "SLIST_HEAD *head" "TYPE *elm" "TYPE" "SLIST_ENTRY NAME" +.Fn SLIST_SWAP "SLIST_HEAD *head1" "SLIST_HEAD *head2" "SLIST_ENTRY NAME" +.\" +.Fn STAILQ_CONCAT "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" +.Fn STAILQ_EMPTY "STAILQ_HEAD *head" +.Fn STAILQ_ENTRY "TYPE" +.Fn STAILQ_FIRST "STAILQ_HEAD *head" +.Fn STAILQ_FOREACH "TYPE *var" "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" +.Fn STAILQ_FOREACH_SAFE "TYPE *var" "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" "TYPE *temp_var" +.Fn STAILQ_HEAD "HEADNAME" "TYPE" +.Fn STAILQ_HEAD_INITIALIZER "STAILQ_HEAD head" +.Fn STAILQ_INIT "STAILQ_HEAD *head" +.Fn STAILQ_INSERT_AFTER "STAILQ_HEAD *head" "TYPE *listelm" "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_INSERT_HEAD "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_INSERT_TAIL "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_LAST "STAILQ_HEAD *head" "TYPE" "STAILQ_ENTRY NAME" +.Fn STAILQ_NEXT "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_REMOVE_AFTER "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_REMOVE_HEAD "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" +.Fn STAILQ_REMOVE "STAILQ_HEAD *head" "TYPE *elm" "TYPE" "STAILQ_ENTRY NAME" +.Fn STAILQ_SWAP "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" "STAILQ_ENTRY NAME" +.\" +.Fn LIST_EMPTY "LIST_HEAD *head" +.Fn LIST_ENTRY "TYPE" +.Fn LIST_FIRST "LIST_HEAD *head" +.Fn LIST_FOREACH "TYPE *var" "LIST_HEAD *head" "LIST_ENTRY NAME" +.Fn LIST_FOREACH_SAFE "TYPE *var" "LIST_HEAD *head" "LIST_ENTRY NAME" "TYPE *temp_var" +.Fn LIST_HEAD "HEADNAME" "TYPE" +.Fn LIST_HEAD_INITIALIZER "LIST_HEAD head" +.Fn LIST_INIT "LIST_HEAD *head" +.Fn LIST_INSERT_AFTER "TYPE *listelm" "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_INSERT_BEFORE "TYPE *listelm" "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_INSERT_HEAD "LIST_HEAD *head" "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_NEXT "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_REMOVE "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_SWAP "LIST_HEAD *head1" "LIST_HEAD *head2" "TYPE" "LIST_ENTRY NAME" +.\" +.Fn TAILQ_CONCAT "TAILQ_HEAD *head1" "TAILQ_HEAD *head2" "TAILQ_ENTRY NAME" +.Fn TAILQ_EMPTY "TAILQ_HEAD *head" +.Fn TAILQ_ENTRY "TYPE" +.Fn TAILQ_FIRST "TAILQ_HEAD *head" +.Fn TAILQ_FOREACH "TYPE *var" "TAILQ_HEAD *head" "TAILQ_ENTRY NAME" +.Fn TAILQ_FOREACH_SAFE "TYPE *var" "TAILQ_HEAD *head" "TAILQ_ENTRY NAME" "TYPE *temp_var" +.Fn TAILQ_FOREACH_REVERSE "TYPE *var" "TAILQ_HEAD *head" "HEADNAME" "TAILQ_ENTRY NAME" +.Fn TAILQ_FOREACH_REVERSE_SAFE "TYPE *var" "TAILQ_HEAD *head" "HEADNAME" "TAILQ_ENTRY NAME" "TYPE *temp_var" +.Fn TAILQ_HEAD "HEADNAME" "TYPE" +.Fn TAILQ_HEAD_INITIALIZER "TAILQ_HEAD head" +.Fn TAILQ_INIT "TAILQ_HEAD *head" +.Fn TAILQ_INSERT_AFTER "TAILQ_HEAD *head" "TYPE *listelm" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_INSERT_BEFORE "TYPE *listelm" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_INSERT_HEAD "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_INSERT_TAIL "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_LAST "TAILQ_HEAD *head" "HEADNAME" +.Fn TAILQ_NEXT "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_PREV "TYPE *elm" "HEADNAME" "TAILQ_ENTRY NAME" +.Fn TAILQ_REMOVE "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_SWAP "TAILQ_HEAD *head1" "TAILQ_HEAD *head2" "TYPE" "TAILQ_ENTRY NAME" +.\" +.Sh DESCRIPTION +These macros define and operate on four types of data structures: +singly-linked lists, singly-linked tail queues, lists, and tail queues. +All four structures support the following functionality: +.Bl -enum -compact -offset indent +.It +Insertion of a new entry at the head of the list. +.It +Insertion of a new entry after any element in the list. +.It +O(1) removal of an entry from the head of the list. +.It +Forward traversal through the list. +.It +Swawpping the contents of two lists. +.El +.Pp +Singly-linked lists are the simplest of the four data structures +and support only the above functionality. +Singly-linked lists are ideal for applications with large datasets +and few or no removals, +or for implementing a LIFO queue. +Singly-linked lists add the following functionality: +.Bl -enum -compact -offset indent +.It +O(n) removal of any entry in the list. +.El +.Pp +Singly-linked tail queues add the following functionality: +.Bl -enum -compact -offset indent +.It +Entries can be added at the end of a list. +.It +O(n) removal of any entry in the list. +.It +They may be concatenated. +.El +However: +.Bl -enum -compact -offset indent +.It +All list insertions must specify the head of the list. +.It +Each head entry requires two pointers rather than one. +.It +Code size is about 15% greater and operations run about 20% slower +than singly-linked lists. +.El +.Pp +Singly-linked tailqs are ideal for applications with large datasets and +few or no removals, +or for implementing a FIFO queue. +.Pp +All doubly linked types of data structures (lists and tail queues) +additionally allow: +.Bl -enum -compact -offset indent +.It +Insertion of a new entry before any element in the list. +.It +O(1) removal of any entry in the list. +.El +However: +.Bl -enum -compact -offset indent +.It +Each element requires two pointers rather than one. +.It +Code size and execution time of operations (except for removal) is about +twice that of the singly-linked data-structures. +.El +.Pp +Linked lists are the simplest of the doubly linked data structures and support +only the above functionality over singly-linked lists. +.Pp +Tail queues add the following functionality: +.Bl -enum -compact -offset indent +.It +Entries can be added at the end of a list. +.It +They may be traversed backwards, from tail to head. +.It +They may be concatenated. +.El +However: +.Bl -enum -compact -offset indent +.It +All list insertions and removals must specify the head of the list. +.It +Each head entry requires two pointers rather than one. +.It +Code size is about 15% greater and operations run about 20% slower +than singly-linked lists. +.El +.Pp +In the macro definitions, +.Fa TYPE +is the name of a user defined structure, +that must contain a field of type +.Li SLIST_ENTRY , +.Li STAILQ_ENTRY , +.Li LIST_ENTRY , +or +.Li TAILQ_ENTRY , +named +.Fa NAME . +The argument +.Fa HEADNAME +is the name of a user defined structure that must be declared +using the macros +.Li SLIST_HEAD , +.Li STAILQ_HEAD , +.Li LIST_HEAD , +or +.Li TAILQ_HEAD . +See the examples below for further explanation of how these +macros are used. +.Sh SINGLY-LINKED LISTS +A singly-linked list is headed by a structure defined by the +.Nm SLIST_HEAD +macro. +This structure contains a single pointer to the first element +on the list. +The elements are singly linked for minimum space and pointer manipulation +overhead at the expense of O(n) removal for arbitrary elements. +New elements can be added to the list after an existing element or +at the head of the list. +An +.Fa SLIST_HEAD +structure is declared as follows: +.Bd -literal -offset indent +SLIST_HEAD(HEADNAME, TYPE) head; +.Ed +.Pp +where +.Fa HEADNAME +is the name of the structure to be defined, and +.Fa TYPE +is the type of the elements to be linked into the list. +A pointer to the head of the list can later be declared as: +.Bd -literal -offset indent +struct HEADNAME *headp; +.Ed +.Pp +(The names +.Li head +and +.Li headp +are user selectable.) +.Pp +The macro +.Nm SLIST_HEAD_INITIALIZER +evaluates to an initializer for the list +.Fa head . +.Pp +The macro +.Nm SLIST_EMPTY +evaluates to true if there are no elements in the list. +.Pp +The macro +.Nm SLIST_ENTRY +declares a structure that connects the elements in +the list. +.Pp +The macro +.Nm SLIST_FIRST +returns the first element in the list or NULL if the list is empty. +.Pp +The macro +.Nm SLIST_FOREACH +traverses the list referenced by +.Fa head +in the forward direction, assigning each element in +turn to +.Fa var . +.Pp +The macro +.Nm SLIST_FOREACH_SAFE +traverses the list referenced by +.Fa head +in the forward direction, assigning each element in +turn to +.Fa var . +However, unlike +.Fn SLIST_FOREACH +here it is permitted to both remove +.Fa var +as well as free it from within the loop safely without interfering with the +traversal. +.Pp +The macro +.Nm SLIST_INIT +initializes the list referenced by +.Fa head . +.Pp +The macro +.Nm SLIST_INSERT_HEAD +inserts the new element +.Fa elm +at the head of the list. +.Pp +The macro +.Nm SLIST_INSERT_AFTER +inserts the new element +.Fa elm +after the element +.Fa listelm . +.Pp +The macro +.Nm SLIST_NEXT +returns the next element in the list. +.Pp +The macro +.Nm SLIST_REMOVE_AFTER +removes the element after +.Fa elm +from the list. Unlike +.Fa SLIST_REMOVE , +this macro does not traverse the entire list. +.Pp +The macro +.Nm SLIST_REMOVE_HEAD +removes the element +.Fa elm +from the head of the list. +For optimum efficiency, +elements being removed from the head of the list should explicitly use +this macro instead of the generic +.Fa SLIST_REMOVE +macro. +.Pp +The macro +.Nm SLIST_REMOVE +removes the element +.Fa elm +from the list. +.Pp +The macro +.Nm SLIST_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . +.Sh SINGLY-LINKED LIST EXAMPLE +.Bd -literal +SLIST_HEAD(slisthead, entry) head = + SLIST_HEAD_INITIALIZER(head); +struct slisthead *headp; /* Singly-linked List head. */ +struct entry { + ... + SLIST_ENTRY(entry) entries; /* Singly-linked List. */ + ... +} *n1, *n2, *n3, *np; + +SLIST_INIT(&head); /* Initialize the list. */ + +n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ +SLIST_INSERT_HEAD(&head, n1, entries); + +n2 = malloc(sizeof(struct entry)); /* Insert after. */ +SLIST_INSERT_AFTER(n1, n2, entries); + +SLIST_REMOVE(&head, n2, entry, entries);/* Deletion. */ +free(n2); + +n3 = SLIST_FIRST(&head); +SLIST_REMOVE_HEAD(&head, entries); /* Deletion from the head. */ +free(n3); + /* Forward traversal. */ +SLIST_FOREACH(np, &head, entries) + np-> ... + /* Safe forward traversal. */ +SLIST_FOREACH_SAFE(np, &head, entries, np_temp) { + np->do_stuff(); + ... + SLIST_REMOVE(&head, np, entry, entries); + free(np); +} + +while (!SLIST_EMPTY(&head)) { /* List Deletion. */ + n1 = SLIST_FIRST(&head); + SLIST_REMOVE_HEAD(&head, entries); + free(n1); +} +.Ed +.Sh SINGLY-LINKED TAIL QUEUES +A singly-linked tail queue is headed by a structure defined by the +.Nm STAILQ_HEAD +macro. +This structure contains a pair of pointers, +one to the first element in the tail queue and the other to +the last element in the tail queue. +The elements are singly linked for minimum space and pointer +manipulation overhead at the expense of O(n) removal for arbitrary +elements. +New elements can be added to the tail queue after an existing element, +at the head of the tail queue, or at the end of the tail queue. +A +.Fa STAILQ_HEAD +structure is declared as follows: +.Bd -literal -offset indent +STAILQ_HEAD(HEADNAME, TYPE) head; +.Ed +.Pp +where +.Li HEADNAME +is the name of the structure to be defined, and +.Li TYPE +is the type of the elements to be linked into the tail queue. +A pointer to the head of the tail queue can later be declared as: +.Bd -literal -offset indent +struct HEADNAME *headp; +.Ed +.Pp +(The names +.Li head +and +.Li headp +are user selectable.) +.Pp +The macro +.Nm STAILQ_HEAD_INITIALIZER +evaluates to an initializer for the tail queue +.Fa head . +.Pp +The macro +.Nm STAILQ_CONCAT +concatenates the tail queue headed by +.Fa head2 +onto the end of the one headed by +.Fa head1 +removing all entries from the former. +.Pp +The macro +.Nm STAILQ_EMPTY +evaluates to true if there are no items on the tail queue. +.Pp +The macro +.Nm STAILQ_ENTRY +declares a structure that connects the elements in +the tail queue. +.Pp +The macro +.Nm STAILQ_FIRST +returns the first item on the tail queue or NULL if the tail queue +is empty. +.Pp +The macro +.Nm STAILQ_FOREACH +traverses the tail queue referenced by +.Fa head +in the forward direction, assigning each element +in turn to +.Fa var . +.Pp +The macro +.Nm STAILQ_FOREACH_SAFE +traverses the tail queue referenced by +.Fa head +in the forward direction, assigning each element +in turn to +.Fa var . +However, unlike +.Fn STAILQ_FOREACH +here it is permitted to both remove +.Fa var +as well as free it from within the loop safely without interfering with the +traversal. +.Pp +The macro +.Nm STAILQ_INIT +initializes the tail queue referenced by +.Fa head . +.Pp +The macro +.Nm STAILQ_INSERT_HEAD +inserts the new element +.Fa elm +at the head of the tail queue. +.Pp +The macro +.Nm STAILQ_INSERT_TAIL +inserts the new element +.Fa elm +at the end of the tail queue. +.Pp +The macro +.Nm STAILQ_INSERT_AFTER +inserts the new element +.Fa elm +after the element +.Fa listelm . +.Pp +The macro +.Nm STAILQ_LAST +returns the last item on the tail queue. +If the tail queue is empty the return value is +.Dv NULL . +.Pp +The macro +.Nm STAILQ_NEXT +returns the next item on the tail queue, or NULL this item is the last. +.Pp +The macro +.Nm STAILQ_REMOVE_AFTER +removes the element after +.Fa elm +from the tail queue. Unlike +.Fa STAILQ_REMOVE , +this macro does not traverse the entire tail queue. +.Pp +The macro +.Nm STAILQ_REMOVE_HEAD +removes the element at the head of the tail queue. +For optimum efficiency, +elements being removed from the head of the tail queue should +use this macro explicitly rather than the generic +.Fa STAILQ_REMOVE +macro. +.Pp +The macro +.Nm STAILQ_REMOVE +removes the element +.Fa elm +from the tail queue. +.Pp +The macro +.Nm STAILQ_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . +.Sh SINGLY-LINKED TAIL QUEUE EXAMPLE +.Bd -literal +STAILQ_HEAD(stailhead, entry) head = + STAILQ_HEAD_INITIALIZER(head); +struct stailhead *headp; /* Singly-linked tail queue head. */ +struct entry { + ... + STAILQ_ENTRY(entry) entries; /* Tail queue. */ + ... +} *n1, *n2, *n3, *np; + +STAILQ_INIT(&head); /* Initialize the queue. */ + +n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ +STAILQ_INSERT_HEAD(&head, n1, entries); + +n1 = malloc(sizeof(struct entry)); /* Insert at the tail. */ +STAILQ_INSERT_TAIL(&head, n1, entries); + +n2 = malloc(sizeof(struct entry)); /* Insert after. */ +STAILQ_INSERT_AFTER(&head, n1, n2, entries); + /* Deletion. */ +STAILQ_REMOVE(&head, n2, entry, entries); +free(n2); + /* Deletion from the head. */ +n3 = STAILQ_FIRST(&head); +STAILQ_REMOVE_HEAD(&head, entries); +free(n3); + /* Forward traversal. */ +STAILQ_FOREACH(np, &head, entries) + np-> ... + /* Safe forward traversal. */ +STAILQ_FOREACH_SAFE(np, &head, entries, np_temp) { + np->do_stuff(); + ... + STAILQ_REMOVE(&head, np, entry, entries); + free(np); +} + /* TailQ Deletion. */ +while (!STAILQ_EMPTY(&head)) { + n1 = STAILQ_FIRST(&head); + STAILQ_REMOVE_HEAD(&head, entries); + free(n1); +} + /* Faster TailQ Deletion. */ +n1 = STAILQ_FIRST(&head); +while (n1 != NULL) { + n2 = STAILQ_NEXT(n1, entries); + free(n1); + n1 = n2; +} +STAILQ_INIT(&head); +.Ed +.Sh LISTS +A list is headed by a structure defined by the +.Nm LIST_HEAD +macro. +This structure contains a single pointer to the first element +on the list. +The elements are doubly linked so that an arbitrary element can be +removed without traversing the list. +New elements can be added to the list after an existing element, +before an existing element, or at the head of the list. +A +.Fa LIST_HEAD +structure is declared as follows: +.Bd -literal -offset indent +LIST_HEAD(HEADNAME, TYPE) head; +.Ed +.Pp +where +.Fa HEADNAME +is the name of the structure to be defined, and +.Fa TYPE +is the type of the elements to be linked into the list. +A pointer to the head of the list can later be declared as: +.Bd -literal -offset indent +struct HEADNAME *headp; +.Ed +.Pp +(The names +.Li head +and +.Li headp +are user selectable.) +.Pp +The macro +.Nm LIST_HEAD_INITIALIZER +evaluates to an initializer for the list +.Fa head . +.Pp +The macro +.Nm LIST_EMPTY +evaluates to true if there are no elements in the list. +.Pp +The macro +.Nm LIST_ENTRY +declares a structure that connects the elements in +the list. +.Pp +The macro +.Nm LIST_FIRST +returns the first element in the list or NULL if the list +is empty. +.Pp +The macro +.Nm LIST_FOREACH +traverses the list referenced by +.Fa head +in the forward direction, assigning each element in turn to +.Fa var . +.Pp +The macro +.Nm LIST_FOREACH_SAFE +traverses the list referenced by +.Fa head +in the forward direction, assigning each element in turn to +.Fa var . +However, unlike +.Fn LIST_FOREACH +here it is permitted to both remove +.Fa var +as well as free it from within the loop safely without interfering with the +traversal. +.Pp +The macro +.Nm LIST_INIT +initializes the list referenced by +.Fa head . +.Pp +The macro +.Nm LIST_INSERT_HEAD +inserts the new element +.Fa elm +at the head of the list. +.Pp +The macro +.Nm LIST_INSERT_AFTER +inserts the new element +.Fa elm +after the element +.Fa listelm . +.Pp +The macro +.Nm LIST_INSERT_BEFORE +inserts the new element +.Fa elm +before the element +.Fa listelm . +.Pp +The macro +.Nm LIST_NEXT +returns the next element in the list, or NULL if this is the last. +.Pp +The macro +.Nm LIST_REMOVE +removes the element +.Fa elm +from the list. +.Pp +The macro +.Nm LIST_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . +.Sh LIST EXAMPLE +.Bd -literal +LIST_HEAD(listhead, entry) head = + LIST_HEAD_INITIALIZER(head); +struct listhead *headp; /* List head. */ +struct entry { + ... + LIST_ENTRY(entry) entries; /* List. */ + ... +} *n1, *n2, *n3, *np, *np_temp; + +LIST_INIT(&head); /* Initialize the list. */ + +n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ +LIST_INSERT_HEAD(&head, n1, entries); + +n2 = malloc(sizeof(struct entry)); /* Insert after. */ +LIST_INSERT_AFTER(n1, n2, entries); + +n3 = malloc(sizeof(struct entry)); /* Insert before. */ +LIST_INSERT_BEFORE(n2, n3, entries); + +LIST_REMOVE(n2, entries); /* Deletion. */ +free(n2); + /* Forward traversal. */ +LIST_FOREACH(np, &head, entries) + np-> ... + + /* Safe forward traversal. */ +LIST_FOREACH_SAFE(np, &head, entries, np_temp) { + np->do_stuff(); + ... + LIST_REMOVE(np, entries); + free(np); +} + +while (!LIST_EMPTY(&head)) { /* List Deletion. */ + n1 = LIST_FIRST(&head); + LIST_REMOVE(n1, entries); + free(n1); +} + +n1 = LIST_FIRST(&head); /* Faster List Deletion. */ +while (n1 != NULL) { + n2 = LIST_NEXT(n1, entries); + free(n1); + n1 = n2; +} +LIST_INIT(&head); +.Ed +.Sh TAIL QUEUES +A tail queue is headed by a structure defined by the +.Nm TAILQ_HEAD +macro. +This structure contains a pair of pointers, +one to the first element in the tail queue and the other to +the last element in the tail queue. +The elements are doubly linked so that an arbitrary element can be +removed without traversing the tail queue. +New elements can be added to the tail queue after an existing element, +before an existing element, at the head of the tail queue, +or at the end of the tail queue. +A +.Fa TAILQ_HEAD +structure is declared as follows: +.Bd -literal -offset indent +TAILQ_HEAD(HEADNAME, TYPE) head; +.Ed +.Pp +where +.Li HEADNAME +is the name of the structure to be defined, and +.Li TYPE +is the type of the elements to be linked into the tail queue. +A pointer to the head of the tail queue can later be declared as: +.Bd -literal -offset indent +struct HEADNAME *headp; +.Ed +.Pp +(The names +.Li head +and +.Li headp +are user selectable.) +.Pp +The macro +.Nm TAILQ_HEAD_INITIALIZER +evaluates to an initializer for the tail queue +.Fa head . +.Pp +The macro +.Nm TAILQ_CONCAT +concatenates the tail queue headed by +.Fa head2 +onto the end of the one headed by +.Fa head1 +removing all entries from the former. +.Pp +The macro +.Nm TAILQ_EMPTY +evaluates to true if there are no items on the tail queue. +.Pp +The macro +.Nm TAILQ_ENTRY +declares a structure that connects the elements in +the tail queue. +.Pp +The macro +.Nm TAILQ_FIRST +returns the first item on the tail queue or NULL if the tail queue +is empty. +.Pp +The macro +.Nm TAILQ_FOREACH +traverses the tail queue referenced by +.Fa head +in the forward direction, assigning each element in turn to +.Fa var . +.Fa var +is set to +.Dv NULL +if the loop completes normally, or if there were no elements. +.Pp +The macro +.Nm TAILQ_FOREACH_REVERSE +traverses the tail queue referenced by +.Fa head +in the reverse direction, assigning each element in turn to +.Fa var . +.Pp +The macros +.Nm TAILQ_FOREACH_SAFE +and +.Nm TAILQ_FOREACH_REVERSE_SAFE +traverse the list referenced by +.Fa head +in the forward or reverse direction respectively, +assigning each element in turn to +.Fa var . +However, unlike their unsafe counterparts, +.Nm TAILQ_FOREACH +and +.Nm TAILQ_FOREACH_REVERSE +permit to both remove +.Fa var +as well as free it from within the loop safely without interfering with the +traversal. +.Pp +The macro +.Nm TAILQ_INIT +initializes the tail queue referenced by +.Fa head . +.Pp +The macro +.Nm TAILQ_INSERT_HEAD +inserts the new element +.Fa elm +at the head of the tail queue. +.Pp +The macro +.Nm TAILQ_INSERT_TAIL +inserts the new element +.Fa elm +at the end of the tail queue. +.Pp +The macro +.Nm TAILQ_INSERT_AFTER +inserts the new element +.Fa elm +after the element +.Fa listelm . +.Pp +The macro +.Nm TAILQ_INSERT_BEFORE +inserts the new element +.Fa elm +before the element +.Fa listelm . +.Pp +The macro +.Nm TAILQ_LAST +returns the last item on the tail queue. +If the tail queue is empty the return value is +.Dv NULL . +.Pp +The macro +.Nm TAILQ_NEXT +returns the next item on the tail queue, or NULL if this item is the last. +.Pp +The macro +.Nm TAILQ_PREV +returns the previous item on the tail queue, or NULL if this item +is the first. +.Pp +The macro +.Nm TAILQ_REMOVE +removes the element +.Fa elm +from the tail queue. +.Pp +The macro +.Nm TAILQ_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . +.Sh TAIL QUEUE EXAMPLE +.Bd -literal +TAILQ_HEAD(tailhead, entry) head = + TAILQ_HEAD_INITIALIZER(head); +struct tailhead *headp; /* Tail queue head. */ +struct entry { + ... + TAILQ_ENTRY(entry) entries; /* Tail queue. */ + ... +} *n1, *n2, *n3, *np; + +TAILQ_INIT(&head); /* Initialize the queue. */ + +n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ +TAILQ_INSERT_HEAD(&head, n1, entries); + +n1 = malloc(sizeof(struct entry)); /* Insert at the tail. */ +TAILQ_INSERT_TAIL(&head, n1, entries); + +n2 = malloc(sizeof(struct entry)); /* Insert after. */ +TAILQ_INSERT_AFTER(&head, n1, n2, entries); + +n3 = malloc(sizeof(struct entry)); /* Insert before. */ +TAILQ_INSERT_BEFORE(n2, n3, entries); + +TAILQ_REMOVE(&head, n2, entries); /* Deletion. */ +free(n2); + /* Forward traversal. */ +TAILQ_FOREACH(np, &head, entries) + np-> ... + /* Safe forward traversal. */ +TAILQ_FOREACH_SAFE(np, &head, entries, np_temp) { + np->do_stuff(); + ... + TAILQ_REMOVE(&head, np, entries); + free(np); +} + /* Reverse traversal. */ +TAILQ_FOREACH_REVERSE(np, &head, tailhead, entries) + np-> ... + /* TailQ Deletion. */ +while (!TAILQ_EMPTY(&head)) { + n1 = TAILQ_FIRST(&head); + TAILQ_REMOVE(&head, n1, entries); + free(n1); +} + /* Faster TailQ Deletion. */ +n1 = TAILQ_FIRST(&head); +while (n1 != NULL) { + n2 = TAILQ_NEXT(n1, entries); + free(n1); + n1 = n2; +} +TAILQ_INIT(&head); +.Ed +.Sh SEE ALSO +.Xr tree 3 +.Sh HISTORY +The +.Nm queue +functions first appeared in +.Bx 4.4 . diff --git a/extras/mini-os/include/minios-external/bsd-sys-queue-h-seddery b/extras/mini-os/include/minios-external/bsd-sys-queue-h-seddery new file mode 100755 index 0000000..7a957e3 --- /dev/null +++ b/extras/mini-os/include/minios-external/bsd-sys-queue-h-seddery @@ -0,0 +1,72 @@ +#!/usr/bin/perl -p +# +# This script is part of the Xen build system. It has a very +# permissive licence to avoid complicating the licence of the +# generated header file and to allow this seddery to be reused by +# other projects. +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this individual file (the "Software"), to deal +# in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, +# sublicense, and/or sell copies of the Software, and to permit +# persons to whom the Software is furnished to do so, subject to the +# following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# Copyright (C) 2011 Citrix Ltd + +our $namespace, $ucnamespace; + +BEGIN { + die unless @ARGV; + $namespace = pop @ARGV; + $namespace =~ s/^--prefix=// or die; + $ucnamespace = uc $namespace; + + print < + +/* + * This file defines four types of data structures: singly-linked lists, + * singly-linked tail queues, lists and tail queues. + * + * A singly-linked list is headed by a single forward pointer. The elements + * are singly linked for minimum space and pointer manipulation overhead at + * the expense of O(n) removal for arbitrary elements. New elements can be + * added to the list after an existing element or at the head of the list. + * Elements being removed from the head of the list should use the explicit + * macro for this purpose for optimum efficiency. A singly-linked list may + * only be traversed in the forward direction. Singly-linked lists are ideal + * for applications with large datasets and few or no removals or for + * implementing a LIFO queue. + * + * A singly-linked tail queue is headed by a pair of pointers, one to the + * head of the list and the other to the tail of the list. The elements are + * singly linked for minimum space and pointer manipulation overhead at the + * expense of O(n) removal for arbitrary elements. New elements can be added + * to the list after an existing element, at the head of the list, or at the + * end of the list. Elements being removed from the head of the tail queue + * should use the explicit macro for this purpose for optimum efficiency. + * A singly-linked tail queue may only be traversed in the forward direction. + * Singly-linked tail queues are ideal for applications with large datasets + * and few or no removals or for implementing a FIFO queue. + * + * A list is headed by a single forward pointer (or an array of forward + * pointers for a hash table header). The elements are doubly linked + * so that an arbitrary element can be removed without a need to + * traverse the list. New elements can be added to the list before + * or after an existing element or at the head of the list. A list + * may only be traversed in the forward direction. + * + * A tail queue is headed by a pair of pointers, one to the head of the + * list and the other to the tail of the list. The elements are doubly + * linked so that an arbitrary element can be removed without a need to + * traverse the list. New elements can be added to the list before or + * after an existing element, at the head of the list, or at the end of + * the list. A tail queue may be traversed in either direction. + * + * For details on the use of these macros, see the queue(3) manual page. + * + * + * SLIST LIST STAILQ TAILQ + * _HEAD + + + + + * _HEAD_INITIALIZER + + + + + * _ENTRY + + + + + * _INIT + + + + + * _EMPTY + + + + + * _FIRST + + + + + * _NEXT + + + + + * _PREV - - - + + * _LAST - - + + + * _FOREACH + + + + + * _FOREACH_SAFE + + + + + * _FOREACH_REVERSE - - - + + * _FOREACH_REVERSE_SAFE - - - + + * _INSERT_HEAD + + + + + * _INSERT_BEFORE - + - + + * _INSERT_AFTER + + + + + * _INSERT_TAIL - - + + + * _CONCAT - - + + + * _REMOVE_AFTER + - + - + * _REMOVE_HEAD + - + - + * _REMOVE + + + + + * _SWAP + + + + + * + */ +#ifdef QUEUE_MACRO_DEBUG +/* Store the last 2 places the queue element or head was altered */ +struct qm_trace { + char * lastfile; + int lastline; + char * prevfile; + int prevline; +}; + +#define TRACEBUF struct qm_trace trace; +#define TRASHIT(x) do {(x) = (void *)-1;} while (0) +#define QMD_SAVELINK(name, link) void **name = (void *)&(link) + +#define QMD_TRACE_HEAD(head) do { \ + (head)->trace.prevline = (head)->trace.lastline; \ + (head)->trace.prevfile = (head)->trace.lastfile; \ + (head)->trace.lastline = __LINE__; \ + (head)->trace.lastfile = __FILE__; \ +} while (0) + +#define QMD_TRACE_ELEM(elem) do { \ + (elem)->trace.prevline = (elem)->trace.lastline; \ + (elem)->trace.prevfile = (elem)->trace.lastfile; \ + (elem)->trace.lastline = __LINE__; \ + (elem)->trace.lastfile = __FILE__; \ +} while (0) + +#else +#define QMD_TRACE_ELEM(elem) +#define QMD_TRACE_HEAD(head) +#define QMD_SAVELINK(name, link) +#define TRACEBUF +#define TRASHIT(x) +#endif /* QUEUE_MACRO_DEBUG */ + +/* + * Singly-linked List declarations. + */ +#define SLIST_HEAD(name, type) \ +struct name { \ + struct type *slh_first; /* first element */ \ +} + +#define SLIST_HEAD_INITIALIZER(head) \ + { NULL } + +#define SLIST_ENTRY(type) \ +struct { \ + struct type *sle_next; /* next element */ \ +} + +/* + * Singly-linked List functions. + */ +#define SLIST_EMPTY(head) ((head)->slh_first == NULL) + +#define SLIST_FIRST(head) ((head)->slh_first) + +#define SLIST_FOREACH(var, head, field) \ + for ((var) = SLIST_FIRST((head)); \ + (var); \ + (var) = SLIST_NEXT((var), field)) + +#define SLIST_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = SLIST_FIRST((head)); \ + (var) && ((tvar) = SLIST_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define SLIST_FOREACH_PREVPTR(var, varp, head, field) \ + for ((varp) = &SLIST_FIRST((head)); \ + ((var) = *(varp)) != NULL; \ + (varp) = &SLIST_NEXT((var), field)) + +#define SLIST_INIT(head) do { \ + SLIST_FIRST((head)) = NULL; \ +} while (0) + +#define SLIST_INSERT_AFTER(slistelm, elm, field) do { \ + SLIST_NEXT((elm), field) = SLIST_NEXT((slistelm), field); \ + SLIST_NEXT((slistelm), field) = (elm); \ +} while (0) + +#define SLIST_INSERT_HEAD(head, elm, field) do { \ + SLIST_NEXT((elm), field) = SLIST_FIRST((head)); \ + SLIST_FIRST((head)) = (elm); \ +} while (0) + +#define SLIST_NEXT(elm, field) ((elm)->field.sle_next) + +#define SLIST_REMOVE(head, elm, type, field) do { \ + QMD_SAVELINK(oldnext, (elm)->field.sle_next); \ + if (SLIST_FIRST((head)) == (elm)) { \ + SLIST_REMOVE_HEAD((head), field); \ + } \ + else { \ + struct type *curelm = SLIST_FIRST((head)); \ + while (SLIST_NEXT(curelm, field) != (elm)) \ + curelm = SLIST_NEXT(curelm, field); \ + SLIST_REMOVE_AFTER(curelm, field); \ + } \ + TRASHIT(*oldnext); \ +} while (0) + +#define SLIST_REMOVE_AFTER(elm, field) do { \ + SLIST_NEXT(elm, field) = \ + SLIST_NEXT(SLIST_NEXT(elm, field), field); \ +} while (0) + +#define SLIST_REMOVE_HEAD(head, field) do { \ + SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \ +} while (0) + +#define SLIST_SWAP(head1, head2, type) do { \ + struct type *swap_first = SLIST_FIRST(head1); \ + SLIST_FIRST(head1) = SLIST_FIRST(head2); \ + SLIST_FIRST(head2) = swap_first; \ +} while (0) + +/* + * Singly-linked Tail queue declarations. + */ +#define STAILQ_HEAD(name, type) \ +struct name { \ + struct type *stqh_first;/* first element */ \ + struct type **stqh_last;/* addr of last next element */ \ +} + +#define STAILQ_HEAD_INITIALIZER(head) \ + { NULL, &(head).stqh_first } + +#define STAILQ_ENTRY(type) \ +struct { \ + struct type *stqe_next; /* next element */ \ +} + +/* + * Singly-linked Tail queue functions. + */ +#define STAILQ_CONCAT(head1, head2) do { \ + if (!STAILQ_EMPTY((head2))) { \ + *(head1)->stqh_last = (head2)->stqh_first; \ + (head1)->stqh_last = (head2)->stqh_last; \ + STAILQ_INIT((head2)); \ + } \ +} while (0) + +#define STAILQ_EMPTY(head) ((head)->stqh_first == NULL) + +#define STAILQ_FIRST(head) ((head)->stqh_first) + +#define STAILQ_FOREACH(var, head, field) \ + for((var) = STAILQ_FIRST((head)); \ + (var); \ + (var) = STAILQ_NEXT((var), field)) + + +#define STAILQ_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = STAILQ_FIRST((head)); \ + (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define STAILQ_INIT(head) do { \ + STAILQ_FIRST((head)) = NULL; \ + (head)->stqh_last = &STAILQ_FIRST((head)); \ +} while (0) + +#define STAILQ_INSERT_AFTER(head, tqelm, elm, field) do { \ + if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ + STAILQ_NEXT((tqelm), field) = (elm); \ +} while (0) + +#define STAILQ_INSERT_HEAD(head, elm, field) do { \ + if ((STAILQ_NEXT((elm), field) = STAILQ_FIRST((head))) == NULL) \ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ + STAILQ_FIRST((head)) = (elm); \ +} while (0) + +#define STAILQ_INSERT_TAIL(head, elm, field) do { \ + STAILQ_NEXT((elm), field) = NULL; \ + *(head)->stqh_last = (elm); \ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ +} while (0) + +#define STAILQ_LAST(head, type, field) \ + (STAILQ_EMPTY((head)) ? \ + NULL : \ + ((struct type *)(void *) \ + ((char *)((head)->stqh_last) - __offsetof(struct type, field)))) + +#define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next) + +#define STAILQ_REMOVE(head, elm, type, field) do { \ + QMD_SAVELINK(oldnext, (elm)->field.stqe_next); \ + if (STAILQ_FIRST((head)) == (elm)) { \ + STAILQ_REMOVE_HEAD((head), field); \ + } \ + else { \ + struct type *curelm = STAILQ_FIRST((head)); \ + while (STAILQ_NEXT(curelm, field) != (elm)) \ + curelm = STAILQ_NEXT(curelm, field); \ + STAILQ_REMOVE_AFTER(head, curelm, field); \ + } \ + TRASHIT(*oldnext); \ +} while (0) + +#define STAILQ_REMOVE_AFTER(head, elm, field) do { \ + if ((STAILQ_NEXT(elm, field) = \ + STAILQ_NEXT(STAILQ_NEXT(elm, field), field)) == NULL) \ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ +} while (0) + +#define STAILQ_REMOVE_HEAD(head, field) do { \ + if ((STAILQ_FIRST((head)) = \ + STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL) \ + (head)->stqh_last = &STAILQ_FIRST((head)); \ +} while (0) + +#define STAILQ_SWAP(head1, head2, type) do { \ + struct type *swap_first = STAILQ_FIRST(head1); \ + struct type **swap_last = (head1)->stqh_last; \ + STAILQ_FIRST(head1) = STAILQ_FIRST(head2); \ + (head1)->stqh_last = (head2)->stqh_last; \ + STAILQ_FIRST(head2) = swap_first; \ + (head2)->stqh_last = swap_last; \ + if (STAILQ_EMPTY(head1)) \ + (head1)->stqh_last = &STAILQ_FIRST(head1); \ + if (STAILQ_EMPTY(head2)) \ + (head2)->stqh_last = &STAILQ_FIRST(head2); \ +} while (0) + + +/* + * List declarations. + */ +#define LIST_HEAD(name, type) \ +struct name { \ + struct type *lh_first; /* first element */ \ +} + +#define LIST_HEAD_INITIALIZER(head) \ + { NULL } + +#define LIST_ENTRY(type) \ +struct { \ + struct type *le_next; /* next element */ \ + struct type **le_prev; /* address of previous next element */ \ +} + +/* + * List functions. + */ + +#if (defined(_KERNEL) && defined(INVARIANTS)) +#define QMD_LIST_CHECK_HEAD(head, field) do { \ + if (LIST_FIRST((head)) != NULL && \ + LIST_FIRST((head))->field.le_prev != \ + &LIST_FIRST((head))) \ + panic("Bad list head %p first->prev != head", (head)); \ +} while (0) + +#define QMD_LIST_CHECK_NEXT(elm, field) do { \ + if (LIST_NEXT((elm), field) != NULL && \ + LIST_NEXT((elm), field)->field.le_prev != \ + &((elm)->field.le_next)) \ + panic("Bad link elm %p next->prev != elm", (elm)); \ +} while (0) + +#define QMD_LIST_CHECK_PREV(elm, field) do { \ + if (*(elm)->field.le_prev != (elm)) \ + panic("Bad link elm %p prev->next != elm", (elm)); \ +} while (0) +#else +#define QMD_LIST_CHECK_HEAD(head, field) +#define QMD_LIST_CHECK_NEXT(elm, field) +#define QMD_LIST_CHECK_PREV(elm, field) +#endif /* (_KERNEL && INVARIANTS) */ + +#define LIST_EMPTY(head) ((head)->lh_first == NULL) + +#define LIST_FIRST(head) ((head)->lh_first) + +#define LIST_FOREACH(var, head, field) \ + for ((var) = LIST_FIRST((head)); \ + (var); \ + (var) = LIST_NEXT((var), field)) + +#define LIST_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = LIST_FIRST((head)); \ + (var) && ((tvar) = LIST_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define LIST_INIT(head) do { \ + LIST_FIRST((head)) = NULL; \ +} while (0) + +#define LIST_INSERT_AFTER(listelm, elm, field) do { \ + QMD_LIST_CHECK_NEXT(listelm, field); \ + if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\ + LIST_NEXT((listelm), field)->field.le_prev = \ + &LIST_NEXT((elm), field); \ + LIST_NEXT((listelm), field) = (elm); \ + (elm)->field.le_prev = &LIST_NEXT((listelm), field); \ +} while (0) + +#define LIST_INSERT_BEFORE(listelm, elm, field) do { \ + QMD_LIST_CHECK_PREV(listelm, field); \ + (elm)->field.le_prev = (listelm)->field.le_prev; \ + LIST_NEXT((elm), field) = (listelm); \ + *(listelm)->field.le_prev = (elm); \ + (listelm)->field.le_prev = &LIST_NEXT((elm), field); \ +} while (0) + +#define LIST_INSERT_HEAD(head, elm, field) do { \ + QMD_LIST_CHECK_HEAD((head), field); \ + if ((LIST_NEXT((elm), field) = LIST_FIRST((head))) != NULL) \ + LIST_FIRST((head))->field.le_prev = &LIST_NEXT((elm), field);\ + LIST_FIRST((head)) = (elm); \ + (elm)->field.le_prev = &LIST_FIRST((head)); \ +} while (0) + +#define LIST_NEXT(elm, field) ((elm)->field.le_next) + +#define LIST_REMOVE(elm, field) do { \ + QMD_SAVELINK(oldnext, (elm)->field.le_next); \ + QMD_SAVELINK(oldprev, (elm)->field.le_prev); \ + QMD_LIST_CHECK_NEXT(elm, field); \ + QMD_LIST_CHECK_PREV(elm, field); \ + if (LIST_NEXT((elm), field) != NULL) \ + LIST_NEXT((elm), field)->field.le_prev = \ + (elm)->field.le_prev; \ + *(elm)->field.le_prev = LIST_NEXT((elm), field); \ + TRASHIT(*oldnext); \ + TRASHIT(*oldprev); \ +} while (0) + +#define LIST_SWAP(head1, head2, type, field) do { \ + struct type *swap_tmp = LIST_FIRST((head1)); \ + LIST_FIRST((head1)) = LIST_FIRST((head2)); \ + LIST_FIRST((head2)) = swap_tmp; \ + if ((swap_tmp = LIST_FIRST((head1))) != NULL) \ + swap_tmp->field.le_prev = &LIST_FIRST((head1)); \ + if ((swap_tmp = LIST_FIRST((head2))) != NULL) \ + swap_tmp->field.le_prev = &LIST_FIRST((head2)); \ +} while (0) + +/* + * Tail queue declarations. + */ +#define TAILQ_HEAD(name, type) \ +struct name { \ + struct type *tqh_first; /* first element */ \ + struct type **tqh_last; /* addr of last next element */ \ + TRACEBUF \ +} + +#define TAILQ_HEAD_INITIALIZER(head) \ + { NULL, &(head).tqh_first } + +#define TAILQ_ENTRY(type) \ +struct { \ + struct type *tqe_next; /* next element */ \ + struct type **tqe_prev; /* address of previous next element */ \ + TRACEBUF \ +} + +/* + * Tail queue functions. + */ +#if (defined(_KERNEL) && defined(INVARIANTS)) +#define QMD_TAILQ_CHECK_HEAD(head, field) do { \ + if (!TAILQ_EMPTY(head) && \ + TAILQ_FIRST((head))->field.tqe_prev != \ + &TAILQ_FIRST((head))) \ + panic("Bad tailq head %p first->prev != head", (head)); \ +} while (0) + +#define QMD_TAILQ_CHECK_TAIL(head, field) do { \ + if (*(head)->tqh_last != NULL) \ + panic("Bad tailq NEXT(%p->tqh_last) != NULL", (head)); \ +} while (0) + +#define QMD_TAILQ_CHECK_NEXT(elm, field) do { \ + if (TAILQ_NEXT((elm), field) != NULL && \ + TAILQ_NEXT((elm), field)->field.tqe_prev != \ + &((elm)->field.tqe_next)) \ + panic("Bad link elm %p next->prev != elm", (elm)); \ +} while (0) + +#define QMD_TAILQ_CHECK_PREV(elm, field) do { \ + if (*(elm)->field.tqe_prev != (elm)) \ + panic("Bad link elm %p prev->next != elm", (elm)); \ +} while (0) +#else +#define QMD_TAILQ_CHECK_HEAD(head, field) +#define QMD_TAILQ_CHECK_TAIL(head, headname) +#define QMD_TAILQ_CHECK_NEXT(elm, field) +#define QMD_TAILQ_CHECK_PREV(elm, field) +#endif /* (_KERNEL && INVARIANTS) */ + +#define TAILQ_CONCAT(head1, head2, field) do { \ + if (!TAILQ_EMPTY(head2)) { \ + *(head1)->tqh_last = (head2)->tqh_first; \ + (head2)->tqh_first->field.tqe_prev = (head1)->tqh_last; \ + (head1)->tqh_last = (head2)->tqh_last; \ + TAILQ_INIT((head2)); \ + QMD_TRACE_HEAD(head1); \ + QMD_TRACE_HEAD(head2); \ + } \ +} while (0) + +#define TAILQ_EMPTY(head) ((head)->tqh_first == NULL) + +#define TAILQ_FIRST(head) ((head)->tqh_first) + +#define TAILQ_FOREACH(var, head, field) \ + for ((var) = TAILQ_FIRST((head)); \ + (var); \ + (var) = TAILQ_NEXT((var), field)) + +#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = TAILQ_FIRST((head)); \ + (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define TAILQ_FOREACH_REVERSE(var, head, headname, field) \ + for ((var) = TAILQ_LAST((head), headname); \ + (var); \ + (var) = TAILQ_PREV((var), headname, field)) + +#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar) \ + for ((var) = TAILQ_LAST((head), headname); \ + (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1); \ + (var) = (tvar)) + +#define TAILQ_INIT(head) do { \ + TAILQ_FIRST((head)) = NULL; \ + (head)->tqh_last = &TAILQ_FIRST((head)); \ + QMD_TRACE_HEAD(head); \ +} while (0) + +#define TAILQ_INSERT_AFTER(head, listelm, elm, field) do { \ + QMD_TAILQ_CHECK_NEXT(listelm, field); \ + if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\ + TAILQ_NEXT((elm), field)->field.tqe_prev = \ + &TAILQ_NEXT((elm), field); \ + else { \ + (head)->tqh_last = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_HEAD(head); \ + } \ + TAILQ_NEXT((listelm), field) = (elm); \ + (elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field); \ + QMD_TRACE_ELEM(&(elm)->field); \ + QMD_TRACE_ELEM(&listelm->field); \ +} while (0) + +#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \ + QMD_TAILQ_CHECK_PREV(listelm, field); \ + (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \ + TAILQ_NEXT((elm), field) = (listelm); \ + *(listelm)->field.tqe_prev = (elm); \ + (listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_ELEM(&(elm)->field); \ + QMD_TRACE_ELEM(&listelm->field); \ +} while (0) + +#define TAILQ_INSERT_HEAD(head, elm, field) do { \ + QMD_TAILQ_CHECK_HEAD(head, field); \ + if ((TAILQ_NEXT((elm), field) = TAILQ_FIRST((head))) != NULL) \ + TAILQ_FIRST((head))->field.tqe_prev = \ + &TAILQ_NEXT((elm), field); \ + else \ + (head)->tqh_last = &TAILQ_NEXT((elm), field); \ + TAILQ_FIRST((head)) = (elm); \ + (elm)->field.tqe_prev = &TAILQ_FIRST((head)); \ + QMD_TRACE_HEAD(head); \ + QMD_TRACE_ELEM(&(elm)->field); \ +} while (0) + +#define TAILQ_INSERT_TAIL(head, elm, field) do { \ + QMD_TAILQ_CHECK_TAIL(head, field); \ + TAILQ_NEXT((elm), field) = NULL; \ + (elm)->field.tqe_prev = (head)->tqh_last; \ + *(head)->tqh_last = (elm); \ + (head)->tqh_last = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_HEAD(head); \ + QMD_TRACE_ELEM(&(elm)->field); \ +} while (0) + +#define TAILQ_LAST(head, headname) \ + (*(((struct headname *)((head)->tqh_last))->tqh_last)) + +#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) + +#define TAILQ_PREV(elm, headname, field) \ + (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last)) + +#define TAILQ_REMOVE(head, elm, field) do { \ + QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \ + QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \ + QMD_TAILQ_CHECK_NEXT(elm, field); \ + QMD_TAILQ_CHECK_PREV(elm, field); \ + if ((TAILQ_NEXT((elm), field)) != NULL) \ + TAILQ_NEXT((elm), field)->field.tqe_prev = \ + (elm)->field.tqe_prev; \ + else { \ + (head)->tqh_last = (elm)->field.tqe_prev; \ + QMD_TRACE_HEAD(head); \ + } \ + *(elm)->field.tqe_prev = TAILQ_NEXT((elm), field); \ + TRASHIT(*oldnext); \ + TRASHIT(*oldprev); \ + QMD_TRACE_ELEM(&(elm)->field); \ +} while (0) + +#define TAILQ_SWAP(head1, head2, type, field) do { \ + struct type *swap_first = (head1)->tqh_first; \ + struct type **swap_last = (head1)->tqh_last; \ + (head1)->tqh_first = (head2)->tqh_first; \ + (head1)->tqh_last = (head2)->tqh_last; \ + (head2)->tqh_first = swap_first; \ + (head2)->tqh_last = swap_last; \ + if ((swap_first = (head1)->tqh_first) != NULL) \ + swap_first->field.tqe_prev = &(head1)->tqh_first; \ + else \ + (head1)->tqh_last = &(head1)->tqh_first; \ + if ((swap_first = (head2)->tqh_first) != NULL) \ + swap_first->field.tqe_prev = &(head2)->tqh_first; \ + else \ + (head2)->tqh_last = &(head2)->tqh_first; \ +} while (0) + +#endif /* !_SYS_QUEUE_H_ */ diff --git a/extras/mini-os/include/xen/COPYING b/extras/mini-os/include/xen/COPYING new file mode 100644 index 0000000..ffc6d61 --- /dev/null +++ b/extras/mini-os/include/xen/COPYING @@ -0,0 +1,38 @@ +XEN NOTICE +========== + +This copyright applies to all files within this subdirectory and its +subdirectories: + include/public/*.h + include/public/hvm/*.h + include/public/io/*.h + +The intention is that these files can be freely copied into the source +tree of an operating system when porting that OS to run on Xen. Doing +so does *not* cause the OS to become subject to the terms of the GPL. + +All other files in the Xen source distribution are covered by version +2 of the GNU General Public License except where explicitly stated +otherwise within individual source files. + + -- Keir Fraser (on behalf of the Xen team) + +===================================================================== + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to +deal in the Software without restriction, including without limitation the +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/extras/mini-os/include/xen/arch-arm.h b/extras/mini-os/include/xen/arch-arm.h new file mode 100644 index 0000000..124fc90 --- /dev/null +++ b/extras/mini-os/include/xen/arch-arm.h @@ -0,0 +1,432 @@ +/****************************************************************************** + * arch-arm.h + * + * Guest OS interface to ARM Xen. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Copyright 2011 (C) Citrix Systems + */ + +#ifndef __XEN_PUBLIC_ARCH_ARM_H__ +#define __XEN_PUBLIC_ARCH_ARM_H__ + +/* + * `incontents 50 arm_abi Hypercall Calling Convention + * + * A hypercall is issued using the ARM HVC instruction. + * + * A hypercall can take up to 5 arguments. These are passed in + * registers, the first argument in x0/r0 (for arm64/arm32 guests + * respectively irrespective of whether the underlying hypervisor is + * 32- or 64-bit), the second argument in x1/r1, the third in x2/r2, + * the forth in x3/r3 and the fifth in x4/r4. + * + * The hypercall number is passed in r12 (arm) or x16 (arm64). In both + * cases the relevant ARM procedure calling convention specifies this + * is an inter-procedure-call scratch register (e.g. for use in linker + * stubs). This use does not conflict with use during a hypercall. + * + * The HVC ISS must contain a Xen specific TAG: XEN_HYPERCALL_TAG. + * + * The return value is in x0/r0. + * + * The hypercall will clobber x16/r12 and the argument registers used + * by that hypercall (except r0 which is the return value) i.e. in + * addition to x16/r12 a 2 argument hypercall will clobber x1/r1 and a + * 4 argument hypercall will clobber x1/r1, x2/r2 and x3/r3. + * + * Parameter structs passed to hypercalls are laid out according to + * the Procedure Call Standard for the ARM Architecture (AAPCS, AKA + * EABI) and Procedure Call Standard for the ARM 64-bit Architecture + * (AAPCS64). Where there is a conflict the 64-bit standard should be + * used regardless of guest type. Structures which are passed as + * hypercall arguments are always little endian. + * + * All memory which is shared with other entities in the system + * (including the hypervisor and other guests) must reside in memory + * which is mapped as Normal Inner-cacheable. This applies to: + * - hypercall arguments passed via a pointer to guest memory. + * - memory shared via the grant table mechanism (including PV I/O + * rings etc). + * - memory shared with the hypervisor (struct shared_info, struct + * vcpu_info, the grant table, etc). + * + * Any Inner cache allocation strategy (Write-Back, Write-Through etc) + * is acceptable. There is no restriction on the Outer-cacheability. + */ + +/* + * `incontents 55 arm_hcall Supported Hypercalls + * + * Xen on ARM makes extensive use of hardware facilities and therefore + * only a subset of the potential hypercalls are required. + * + * Since ARM uses second stage paging any machine/physical addresses + * passed to hypercalls are Guest Physical Addresses (Intermediate + * Physical Addresses) unless otherwise noted. + * + * The following hypercalls (and sub operations) are supported on the + * ARM platform. Other hypercalls should be considered + * unavailable/unsupported. + * + * HYPERVISOR_memory_op + * All generic sub-operations + * + * HYPERVISOR_domctl + * All generic sub-operations, with the exception of: + * * XEN_DOMCTL_irq_permission (not yet implemented) + * + * HYPERVISOR_sched_op + * All generic sub-operations, with the exception of: + * * SCHEDOP_block -- prefer wfi hardware instruction + * + * HYPERVISOR_console_io + * All generic sub-operations + * + * HYPERVISOR_xen_version + * All generic sub-operations + * + * HYPERVISOR_event_channel_op + * All generic sub-operations + * + * HYPERVISOR_physdev_op + * No sub-operations are currenty supported + * + * HYPERVISOR_sysctl + * All generic sub-operations, with the exception of: + * * XEN_SYSCTL_page_offline_op + * * XEN_SYSCTL_get_pmstat + * * XEN_SYSCTL_pm_op + * + * HYPERVISOR_hvm_op + * Exactly these sub-operations are supported: + * * HVMOP_set_param + * * HVMOP_get_param + * + * HYPERVISOR_grant_table_op + * All generic sub-operations + * + * HYPERVISOR_vcpu_op + * Exactly these sub-operations are supported: + * * VCPUOP_register_vcpu_info + * * VCPUOP_register_runstate_memory_area + * + * + * Other notes on the ARM ABI: + * + * - struct start_info is not exported to ARM guests. + * + * - struct shared_info is mapped by ARM guests using the + * HYPERVISOR_memory_op sub-op XENMEM_add_to_physmap, passing + * XENMAPSPACE_shared_info as space parameter. + * + * - All the per-cpu struct vcpu_info are mapped by ARM guests using the + * HYPERVISOR_vcpu_op sub-op VCPUOP_register_vcpu_info, including cpu0 + * struct vcpu_info. + * + * - The grant table is mapped using the HYPERVISOR_memory_op sub-op + * XENMEM_add_to_physmap, passing XENMAPSPACE_grant_table as space + * parameter. The memory range specified under the Xen compatible + * hypervisor node on device tree can be used as target gpfn for the + * mapping. + * + * - Xenstore is initialized by using the two hvm_params + * HVM_PARAM_STORE_PFN and HVM_PARAM_STORE_EVTCHN. They can be read + * with the HYPERVISOR_hvm_op sub-op HVMOP_get_param. + * + * - The paravirtualized console is initialized by using the two + * hvm_params HVM_PARAM_CONSOLE_PFN and HVM_PARAM_CONSOLE_EVTCHN. They + * can be read with the HYPERVISOR_hvm_op sub-op HVMOP_get_param. + * + * - Event channel notifications are delivered using the percpu GIC + * interrupt specified under the Xen compatible hypervisor node on + * device tree. + * + * - The device tree Xen compatible node is fully described under Linux + * at Documentation/devicetree/bindings/arm/xen.txt. + */ + +#define XEN_HYPERCALL_TAG 0XEA1 + +#define uint64_aligned_t uint64_t __attribute__((aligned(8))) + +#ifndef __ASSEMBLY__ +#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \ + typedef union { type *p; unsigned long q; } \ + __guest_handle_ ## name; \ + typedef union { type *p; uint64_aligned_t q; } \ + __guest_handle_64_ ## name; + +/* + * XEN_GUEST_HANDLE represents a guest pointer, when passed as a field + * in a struct in memory. On ARM is always 8 bytes sizes and 8 bytes + * aligned. + * XEN_GUEST_HANDLE_PARAM represents a guest pointer, when passed as an + * hypercall argument. It is 4 bytes on aarch32 and 8 bytes on aarch64. + */ +#define __DEFINE_XEN_GUEST_HANDLE(name, type) \ + ___DEFINE_XEN_GUEST_HANDLE(name, type); \ + ___DEFINE_XEN_GUEST_HANDLE(const_##name, const type) +#define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name) +#define __XEN_GUEST_HANDLE(name) __guest_handle_64_ ## name +#define XEN_GUEST_HANDLE(name) __XEN_GUEST_HANDLE(name) +#define XEN_GUEST_HANDLE_PARAM(name) __guest_handle_ ## name +#define set_xen_guest_handle_raw(hnd, val) \ + do { \ + typeof(&(hnd)) _sxghr_tmp = &(hnd); \ + _sxghr_tmp->q = 0; \ + _sxghr_tmp->p = val; \ + } while ( 0 ) +#ifdef __XEN_TOOLS__ +#define get_xen_guest_handle(val, hnd) do { val = (hnd).p; } while (0) +#endif +#define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val) + +#if defined(__GNUC__) && !defined(__STRICT_ANSI__) +/* Anonymous union includes both 32- and 64-bit names (e.g., r0/x0). */ +# define __DECL_REG(n64, n32) union { \ + uint64_t n64; \ + uint32_t n32; \ + } +#else +/* Non-gcc sources must always use the proper 64-bit name (e.g., x0). */ +#define __DECL_REG(n64, n32) uint64_t n64 +#endif + +struct vcpu_guest_core_regs +{ + /* Aarch64 Aarch32 */ + __DECL_REG(x0, r0_usr); + __DECL_REG(x1, r1_usr); + __DECL_REG(x2, r2_usr); + __DECL_REG(x3, r3_usr); + __DECL_REG(x4, r4_usr); + __DECL_REG(x5, r5_usr); + __DECL_REG(x6, r6_usr); + __DECL_REG(x7, r7_usr); + __DECL_REG(x8, r8_usr); + __DECL_REG(x9, r9_usr); + __DECL_REG(x10, r10_usr); + __DECL_REG(x11, r11_usr); + __DECL_REG(x12, r12_usr); + + __DECL_REG(x13, sp_usr); + __DECL_REG(x14, lr_usr); + + __DECL_REG(x15, __unused_sp_hyp); + + __DECL_REG(x16, lr_irq); + __DECL_REG(x17, sp_irq); + + __DECL_REG(x18, lr_svc); + __DECL_REG(x19, sp_svc); + + __DECL_REG(x20, lr_abt); + __DECL_REG(x21, sp_abt); + + __DECL_REG(x22, lr_und); + __DECL_REG(x23, sp_und); + + __DECL_REG(x24, r8_fiq); + __DECL_REG(x25, r9_fiq); + __DECL_REG(x26, r10_fiq); + __DECL_REG(x27, r11_fiq); + __DECL_REG(x28, r12_fiq); + + __DECL_REG(x29, sp_fiq); + __DECL_REG(x30, lr_fiq); + + /* Return address and mode */ + __DECL_REG(pc64, pc32); /* ELR_EL2 */ + uint32_t cpsr; /* SPSR_EL2 */ + + union { + uint32_t spsr_el1; /* AArch64 */ + uint32_t spsr_svc; /* AArch32 */ + }; + + /* AArch32 guests only */ + uint32_t spsr_fiq, spsr_irq, spsr_und, spsr_abt; + + /* AArch64 guests only */ + uint64_t sp_el0; + uint64_t sp_el1, elr_el1; +}; +typedef struct vcpu_guest_core_regs vcpu_guest_core_regs_t; +DEFINE_XEN_GUEST_HANDLE(vcpu_guest_core_regs_t); + +#undef __DECL_REG + +typedef uint64_t xen_pfn_t; +#define PRI_xen_pfn PRIx64 + +/* Maximum number of virtual CPUs in legacy multi-processor guests. */ +/* Only one. All other VCPUS must use VCPUOP_register_vcpu_info */ +#define XEN_LEGACY_MAX_VCPUS 1 + +typedef uint64_t xen_ulong_t; +#define PRI_xen_ulong PRIx64 + +#if defined(__XEN__) || defined(__XEN_TOOLS__) +struct vcpu_guest_context { +#define _VGCF_online 0 +#define VGCF_online (1<<_VGCF_online) + uint32_t flags; /* VGCF_* */ + + struct vcpu_guest_core_regs user_regs; /* Core CPU registers */ + + uint32_t sctlr; + uint64_t ttbcr, ttbr0, ttbr1; +}; +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; + +#endif + +#if defined(__XEN__) || defined(__XEN_TOOLS__) + +/* PSR bits (CPSR, SPSR) */ + +#define PSR_THUMB (1<<5) /* Thumb Mode enable */ +#define PSR_FIQ_MASK (1<<6) /* Fast Interrupt mask */ +#define PSR_IRQ_MASK (1<<7) /* Interrupt mask */ +#define PSR_ABT_MASK (1<<8) /* Asynchronous Abort mask */ +#define PSR_BIG_ENDIAN (1<<9) /* arm32: Big Endian Mode */ +#define PSR_DBG_MASK (1<<9) /* arm64: Debug Exception mask */ +#define PSR_IT_MASK (0x0600fc00) /* Thumb If-Then Mask */ +#define PSR_JAZELLE (1<<24) /* Jazelle Mode */ + +/* 32 bit modes */ +#define PSR_MODE_USR 0x10 +#define PSR_MODE_FIQ 0x11 +#define PSR_MODE_IRQ 0x12 +#define PSR_MODE_SVC 0x13 +#define PSR_MODE_MON 0x16 +#define PSR_MODE_ABT 0x17 +#define PSR_MODE_HYP 0x1a +#define PSR_MODE_UND 0x1b +#define PSR_MODE_SYS 0x1f + +/* 64 bit modes */ +#define PSR_MODE_BIT 0x10 /* Set iff AArch32 */ +#define PSR_MODE_EL3h 0x0d +#define PSR_MODE_EL3t 0x0c +#define PSR_MODE_EL2h 0x09 +#define PSR_MODE_EL2t 0x08 +#define PSR_MODE_EL1h 0x05 +#define PSR_MODE_EL1t 0x04 +#define PSR_MODE_EL0t 0x00 + +#define PSR_GUEST32_INIT (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_SVC) +#define PSR_GUEST64_INIT (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_EL1h) + +#define SCTLR_GUEST_INIT 0x00c50078 + +/* + * Virtual machine platform (memory layout, interrupts) + * + * These are defined for consistency between the tools and the + * hypervisor. Guests must not rely on these hardcoded values but + * should instead use the FDT. + */ + +/* Physical Address Space */ + +/* + * vGIC mappings: Only one set of mapping is used by the guest. + * Therefore they can overlap. + */ + +/* vGIC v2 mappings */ +#define GUEST_GICD_BASE 0x03001000ULL +#define GUEST_GICD_SIZE 0x00001000ULL +#define GUEST_GICC_BASE 0x03002000ULL +#define GUEST_GICC_SIZE 0x00000100ULL + +/* vGIC v3 mappings */ +#define GUEST_GICV3_GICD_BASE 0x03001000ULL +#define GUEST_GICV3_GICD_SIZE 0x00010000ULL + +#define GUEST_GICV3_RDIST_STRIDE 0x20000ULL +#define GUEST_GICV3_RDIST_REGIONS 1 + +#define GUEST_GICV3_GICR0_BASE 0x03020000ULL /* vCPU0 - vCPU7 */ +#define GUEST_GICV3_GICR0_SIZE 0x00100000ULL + +/* + * 16MB == 4096 pages reserved for guest to use as a region to map its + * grant table in. + */ +#define GUEST_GNTTAB_BASE 0x38000000ULL +#define GUEST_GNTTAB_SIZE 0x01000000ULL + +#define GUEST_MAGIC_BASE 0x39000000ULL +#define GUEST_MAGIC_SIZE 0x01000000ULL + +#define GUEST_RAM_BANKS 2 + +#define GUEST_RAM0_BASE 0x40000000ULL /* 3GB of low RAM @ 1GB */ +#define GUEST_RAM0_SIZE 0xc0000000ULL + +#define GUEST_RAM1_BASE 0x0200000000ULL /* 1016GB of RAM @ 8GB */ +#define GUEST_RAM1_SIZE 0xfe00000000ULL + +#define GUEST_RAM_BASE GUEST_RAM0_BASE /* Lowest RAM address */ +/* Largest amount of actual RAM, not including holes */ +#define GUEST_RAM_MAX (GUEST_RAM0_SIZE + GUEST_RAM1_SIZE) +/* Suitable for e.g. const uint64_t ramfoo[] = GUEST_RAM_BANK_FOOS; */ +#define GUEST_RAM_BANK_BASES { GUEST_RAM0_BASE, GUEST_RAM1_BASE } +#define GUEST_RAM_BANK_SIZES { GUEST_RAM0_SIZE, GUEST_RAM1_SIZE } + +/* Interrupts */ +#define GUEST_TIMER_VIRT_PPI 27 +#define GUEST_TIMER_PHYS_S_PPI 29 +#define GUEST_TIMER_PHYS_NS_PPI 30 +#define GUEST_EVTCHN_PPI 31 + +/* PSCI functions */ +#define PSCI_cpu_suspend 0 +#define PSCI_cpu_off 1 +#define PSCI_cpu_on 2 +#define PSCI_migrate 3 + +#endif + +#endif /* __XEN_PUBLIC_ARCH_ARM_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/extras/mini-os/include/xen/arch-arm/hvm/save.h b/extras/mini-os/include/xen/arch-arm/hvm/save.h new file mode 100644 index 0000000..75b8e65 --- /dev/null +++ b/extras/mini-os/include/xen/arch-arm/hvm/save.h @@ -0,0 +1,39 @@ +/* + * Structure definitions for HVM state that is held by Xen and must + * be saved along with the domain's memory and device-model state. + * + * Copyright (c) 2012 Citrix Systems Ltd. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef __XEN_PUBLIC_HVM_SAVE_ARM_H__ +#define __XEN_PUBLIC_HVM_SAVE_ARM_H__ + +#endif + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/extras/mini-os/include/xen/arch-x86/cpuid.h b/extras/mini-os/include/xen/arch-x86/cpuid.h new file mode 100644 index 0000000..d709340 --- /dev/null +++ b/extras/mini-os/include/xen/arch-x86/cpuid.h @@ -0,0 +1,90 @@ +/****************************************************************************** + * arch-x86/cpuid.h + * + * CPUID interface to Xen. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Copyright (c) 2007 Citrix Systems, Inc. + * + * Authors: + * Keir Fraser + */ + +#ifndef __XEN_PUBLIC_ARCH_X86_CPUID_H__ +#define __XEN_PUBLIC_ARCH_X86_CPUID_H__ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:16:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:16: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 1YTqF8-00025c-1V; Fri, 06 Mar 2015 11:16:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqF6-00025P-6c for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:32 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id A6/85-02755-F8C89F45; Fri, 06 Mar 2015 11:16:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1425640583!9843461!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6039 invoked from network); 6 Mar 2015 11:16:24 -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; 6 Mar 2015 11:16:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqEx-0006Bb-8R for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqEx-0001hA-5i for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:23 +0000 Date: Fri, 06 Mar 2015 11:16:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Mini-OS: standalone build X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4af58a26becdac6a8697e9a488d265a28520a17d Author: Wei Liu AuthorDate: Thu Jan 29 19:10:04 2015 +0000 Commit: Wei Liu CommitDate: Fri Feb 27 16:00:32 2015 +0000 Mini-OS: standalone build In order to keep the tree bisectable all the changes are done in one single commit. Things done in this commit: 1. Import necessary .mk files from Xen. 2. Move all XEN_ related variables to MINIOS_ namespace. 3. Import Xen public header files. 4. Import BSD's list.h and helper script. Mini-OS's vanilla Config.mk is modified to contain some macros copied from Xen's Config.mk. It also contains compatibility handling logic for Xen's stubdom build environment. Files modified: Config.mk Makefile arch/x86/Makefile arch/x86/arch.mk minios.mk All other files are just imported from Xen. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell Acked-by: Samuel Thibault --- .gitignore | 1 - extras/mini-os/Config.mk | 50 +- extras/mini-os/Makefile | 16 +- extras/mini-os/arch/x86/Makefile | 5 +- extras/mini-os/arch/x86/arch.mk | 8 +- extras/mini-os/config/MiniOS.mk | 10 + extras/mini-os/config/StdGNU.mk | 47 + extras/mini-os/config/arm32.mk | 22 + extras/mini-os/config/arm64.mk | 19 + extras/mini-os/config/x86_32.mk | 20 + extras/mini-os/config/x86_64.mk | 33 + extras/mini-os/include/minios-external/README | 24 + .../mini-os/include/minios-external/bsd-COPYRIGHT | 126 +++ extras/mini-os/include/minios-external/bsd-queue.3 | 1044 ++++++++++++++++++ .../minios-external/bsd-sys-queue-h-seddery | 72 ++ .../include/minios-external/bsd-sys-queue.h | 637 +++++++++++ extras/mini-os/include/xen/COPYING | 38 + extras/mini-os/include/xen/arch-arm.h | 432 ++++++++ extras/mini-os/include/xen/arch-arm/hvm/save.h | 39 + extras/mini-os/include/xen/arch-x86/cpuid.h | 90 ++ extras/mini-os/include/xen/arch-x86/hvm/save.h | 630 +++++++++++ extras/mini-os/include/xen/arch-x86/xen-mca.h | 440 ++++++++ extras/mini-os/include/xen/arch-x86/xen-x86_32.h | 171 +++ extras/mini-os/include/xen/arch-x86/xen-x86_64.h | 202 ++++ extras/mini-os/include/xen/arch-x86/xen.h | 303 +++++ extras/mini-os/include/xen/arch-x86_32.h | 27 + extras/mini-os/include/xen/arch-x86_64.h | 43 + extras/mini-os/include/xen/callback.h | 121 ++ extras/mini-os/include/xen/dom0_ops.h | 120 ++ extras/mini-os/include/xen/domctl.h | 1154 ++++++++++++++++++++ extras/mini-os/include/xen/elfnote.h | 271 +++++ extras/mini-os/include/xen/event_channel.h | 385 +++++++ extras/mini-os/include/xen/features.h | 114 ++ extras/mini-os/include/xen/gcov.h | 115 ++ extras/mini-os/include/xen/grant_table.h | 682 ++++++++++++ extras/mini-os/include/xen/hvm/e820.h | 34 + extras/mini-os/include/xen/hvm/hvm_info_table.h | 72 ++ extras/mini-os/include/xen/hvm/hvm_op.h | 402 +++++++ extras/mini-os/include/xen/hvm/hvm_xs_strings.h | 80 ++ extras/mini-os/include/xen/hvm/ioreq.h | 129 +++ extras/mini-os/include/xen/hvm/params.h | 199 ++++ extras/mini-os/include/xen/hvm/pvdrivers.h | 49 + extras/mini-os/include/xen/hvm/save.h | 111 ++ extras/mini-os/include/xen/io/blkif.h | 640 +++++++++++ extras/mini-os/include/xen/io/console.h | 51 + extras/mini-os/include/xen/io/fbif.h | 176 +++ extras/mini-os/include/xen/io/fsif.h | 192 ++++ extras/mini-os/include/xen/io/kbdif.h | 132 +++ extras/mini-os/include/xen/io/libxenvchan.h | 97 ++ extras/mini-os/include/xen/io/netif.h | 305 ++++++ extras/mini-os/include/xen/io/pciif.h | 125 +++ extras/mini-os/include/xen/io/protocols.h | 40 + extras/mini-os/include/xen/io/ring.h | 312 ++++++ extras/mini-os/include/xen/io/tpmif.h | 143 +++ extras/mini-os/include/xen/io/usbif.h | 150 +++ extras/mini-os/include/xen/io/vscsiif.h | 260 +++++ extras/mini-os/include/xen/io/xenbus.h | 80 ++ extras/mini-os/include/xen/io/xs_wire.h | 149 +++ extras/mini-os/include/xen/kexec.h | 249 +++++ extras/mini-os/include/xen/mem_event.h | 134 +++ extras/mini-os/include/xen/memory.h | 587 ++++++++++ extras/mini-os/include/xen/nmi.h | 85 ++ extras/mini-os/include/xen/physdev.h | 380 +++++++ extras/mini-os/include/xen/platform.h | 606 ++++++++++ extras/mini-os/include/xen/sched.h | 175 +++ extras/mini-os/include/xen/sysctl.h | 719 ++++++++++++ extras/mini-os/include/xen/tmem.h | 152 +++ extras/mini-os/include/xen/trace.h | 331 ++++++ extras/mini-os/include/xen/vcpu.h | 240 ++++ extras/mini-os/include/xen/version.h | 96 ++ extras/mini-os/include/xen/xen-compat.h | 44 + extras/mini-os/include/xen/xen.h | 899 +++++++++++++++ extras/mini-os/include/xen/xencomm.h | 41 + extras/mini-os/include/xen/xenoprof.h | 152 +++ extras/mini-os/include/xen/xsm/flask_op.h | 201 ++++ extras/mini-os/minios.mk | 4 +- 76 files changed, 16511 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 13ee05b..cdbdca7 100644 --- a/.gitignore +++ b/.gitignore @@ -48,7 +48,6 @@ docs/pdf/ docs/txt/ extras/mini-os/include/mini-os extras/mini-os/include/x86/mini-os -extras/mini-os/include/xen extras/mini-os/include/list.h extras/mini-os/mini-os* install/* diff --git a/extras/mini-os/Config.mk b/extras/mini-os/Config.mk index 4852443..e5d8ade 100644 --- a/extras/mini-os/Config.mk +++ b/extras/mini-os/Config.mk @@ -1,7 +1,49 @@ -# Set mini-os root path, used in mini-os.mk. +# +# Compare $(1) and $(2) and replace $(2) with $(1) if they differ +# +# Typically $(1) is a newly generated file and $(2) is the target file +# being regenerated. This prevents changing the timestamp of $(2) only +# due to being auto regenereated with the same contents. +define move-if-changed + if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi +endef + +# cc-option: Check if compiler supports first option, else fall back to second. +# +# This is complicated by the fact that unrecognised -Wno-* options: +# (a) are ignored unless the compilation emits a warning; and +# (b) even then produce a warning rather than an error +# To handle this we do a test compile, passing the option-under-test, on a code +# fragment that will always produce a warning (integer assigned to pointer). +# We then grep for the option-under-test in the compiler's output, the presence +# of which would indicate an "unrecognized command-line option" warning/error. +# +# Usage: cflags-y += $(call cc-option,$(CC),-march=winchip-c6,-march=i586) +cc-option = $(shell if test -z "`echo 'void*p=1;' | \ + $(1) $(2) -S -o /dev/null -x c - 2>&1 | grep -- $(2) -`"; \ + then echo "$(2)"; else echo "$(3)"; fi ;) + +# Compatibility with Xen's stubdom build environment. If we are building +# stubdom, some XEN_ variables are set, set MINIOS_ variables accordingly. +# +ifneq ($(XEN_ROOT),) MINI-OS_ROOT=$(XEN_ROOT)/extras/mini-os +else +MINI-OS_ROOT=$(TOPLEVEL_DIR) +endif export MINI-OS_ROOT +ifneq ($(XEN_TARGET_ARCH),) +MINIOS_TARGET_ARCH = $(XEN_TARGET_ARCH) +else +MINIOS_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/ \ + -e s/i86pc/x86_32/ -e s/amd64/x86_64/ \ + -e s/armv7.*/arm32/ -e s/armv8.*/arm64/ \ + -e s/aarch64/arm64/) + +MINIOS_TARGET_ARCH ?= $(MINIOS_COMPILE_ARCH) +endif + libc = $(stubdom) XEN_INTERFACE_VERSION := 0x00030205 @@ -9,11 +51,11 @@ export XEN_INTERFACE_VERSION # Try to find out the architecture family TARGET_ARCH_FAM. # First check whether x86_... is contained (for x86_32, x86_32y, x86_64). -# If not x86 then use $(XEN_TARGET_ARCH) -ifeq ($(findstring x86_,$(XEN_TARGET_ARCH)),x86_) +# If not x86 then use $(MINIOS_TARGET_ARCH) +ifeq ($(findstring x86_,$(MINIOS_TARGET_ARCH)),x86_) TARGET_ARCH_FAM = x86 else -TARGET_ARCH_FAM = $(XEN_TARGET_ARCH) +TARGET_ARCH_FAM = $(MINIOS_TARGET_ARCH) endif # The architecture family directory below mini-os. diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile index 6d6537e..f16520e 100644 --- a/extras/mini-os/Makefile +++ b/extras/mini-os/Makefile @@ -4,9 +4,8 @@ # Makefile and a arch.mk. # -export XEN_ROOT = $(CURDIR)/../.. -include $(XEN_ROOT)/Config.mk -OBJ_DIR ?= $(CURDIR) +OBJ_DIR=$(CURDIR) +TOPLEVEL_DIR=$(CURDIR) ifeq ($(MINIOS_CONFIG),) include Config.mk @@ -15,6 +14,8 @@ EXTRA_DEPS += $(MINIOS_CONFIG) include $(MINIOS_CONFIG) endif +include $(MINI-OS_ROOT)/config/MiniOS.mk + # Configuration defaults CONFIG_START_NETWORK ?= y CONFIG_SPARSE_BSS ?= y @@ -51,7 +52,7 @@ flags-$(CONFIG_XENBUS) += -DCONFIG_XENBUS DEF_CFLAGS += $(flags-y) # Symlinks and headers that must be created before building the C files -GENERATED_HEADERS := include/list.h $(ARCH_LINKS) include/mini-os include/xen include/$(TARGET_ARCH_FAM)/mini-os +GENERATED_HEADERS := include/list.h $(ARCH_LINKS) include/mini-os include/$(TARGET_ARCH_FAM)/mini-os EXTRA_DEPS += $(GENERATED_HEADERS) @@ -65,7 +66,7 @@ include minios.mk LDLIBS := APP_LDLIBS := LDARCHLIB := -L$(OBJ_DIR)/$(TARGET_ARCH_DIR) -l$(ARCH_LIB_NAME) -LDFLAGS_FINAL := -T $(TARGET_ARCH_DIR)/minios-$(XEN_TARGET_ARCH).lds +LDFLAGS_FINAL := -T $(TARGET_ARCH_DIR)/minios-$(MINIOS_TARGET_ARCH).lds # Prefix for global API names. All other symbols are localised before # linking with EXTRA_OBJS. @@ -125,7 +126,7 @@ $(ARCH_LINKS): $(arch_links) endif -include/list.h: $(XEN_ROOT)/tools/include/xen-external/bsd-sys-queue-h-seddery $(XEN_ROOT)/tools/include/xen-external/bsd-sys-queue.h +include/list.h: include/minios-external/bsd-sys-queue-h-seddery include/minios-external/bsd-sys-queue.h perl $^ --prefix=minios >$@.new $(call move-if-changed,$@.new,$@) @@ -133,9 +134,6 @@ include/list.h: $(XEN_ROOT)/tools/include/xen-external/bsd-sys-queue-h-seddery $ .PHONY: links links: $(GENERATED_HEADERS) -include/xen: - ln -sf ../../../xen/include/public $@ - include/mini-os: ln -sf . $@ diff --git a/extras/mini-os/arch/x86/Makefile b/extras/mini-os/arch/x86/Makefile index 1073e36..9f04a93 100644 --- a/extras/mini-os/arch/x86/Makefile +++ b/extras/mini-os/arch/x86/Makefile @@ -3,8 +3,7 @@ # It's is used for x86_32, x86_32y and x86_64 # -XEN_ROOT = $(CURDIR)/../../../.. -include $(XEN_ROOT)/Config.mk +TOPLEVEL_DIR = $(CURDIR)/../.. include ../../Config.mk # include arch.mk has to be before mini-os.mk! @@ -12,7 +11,7 @@ include ../../Config.mk include arch.mk include ../../minios.mk -# Sources here are all *.c *.S without $(XEN_TARGET_ARCH).S +# Sources here are all *.c *.S without $(MINIOS_TARGET_ARCH).S # This is handled in $(HEAD_ARCH_OBJ) ARCH_SRCS := $(wildcard *.c) diff --git a/extras/mini-os/arch/x86/arch.mk b/extras/mini-os/arch/x86/arch.mk index b27f322..81e8118 100644 --- a/extras/mini-os/arch/x86/arch.mk +++ b/extras/mini-os/arch/x86/arch.mk @@ -3,20 +3,20 @@ # (including x86_32, x86_32y and x86_64). # -ifeq ($(XEN_TARGET_ARCH),x86_32) +ifeq ($(MINIOS_TARGET_ARCH),x86_32) ARCH_CFLAGS := -m32 -march=i686 ARCH_LDFLAGS := -m elf_i386 ARCH_ASFLAGS := -m32 -EXTRA_INC += $(TARGET_ARCH_FAM)/$(XEN_TARGET_ARCH) +EXTRA_INC += $(TARGET_ARCH_FAM)/$(MINIOS_TARGET_ARCH) EXTRA_SRC += arch/$(EXTRA_INC) endif -ifeq ($(XEN_TARGET_ARCH),x86_64) +ifeq ($(MINIOS_TARGET_ARCH),x86_64) ARCH_CFLAGS := -m64 -mno-red-zone -fno-reorder-blocks ARCH_CFLAGS += -fno-asynchronous-unwind-tables ARCH_ASFLAGS := -m64 ARCH_LDFLAGS := -m elf_x86_64 -EXTRA_INC += $(TARGET_ARCH_FAM)/$(XEN_TARGET_ARCH) +EXTRA_INC += $(TARGET_ARCH_FAM)/$(MINIOS_TARGET_ARCH) EXTRA_SRC += arch/$(EXTRA_INC) endif diff --git a/extras/mini-os/config/MiniOS.mk b/extras/mini-os/config/MiniOS.mk new file mode 100644 index 0000000..e4febe4 --- /dev/null +++ b/extras/mini-os/config/MiniOS.mk @@ -0,0 +1,10 @@ +include $(MINI-OS_ROOT)/config/StdGNU.mk +include $(MINI-OS_ROOT)/Config.mk +CFLAGS += $(DEF_CFLAGS) $(ARCH_CFLAGS) +CPPFLAGS += $(DEF_CPPFLAGS) $(ARCH_CPPFLAGS) $(extra_incl) +ASFLAGS += $(DEF_ASFLAGS) $(ARCH_ASFLAGS) +LDFLAGS += $(DEF_LDFLAGS) $(ARCH_LDFLAGS) + +# Override settings for this OS +PTHREAD_LIBS = +nosharedlibs=y diff --git a/extras/mini-os/config/StdGNU.mk b/extras/mini-os/config/StdGNU.mk new file mode 100644 index 0000000..4efebe3 --- /dev/null +++ b/extras/mini-os/config/StdGNU.mk @@ -0,0 +1,47 @@ +AS = $(CROSS_COMPILE)as +LD = $(CROSS_COMPILE)ld +ifeq ($(clang),y) +CC = $(CROSS_COMPILE)clang +LD_LTO = $(CROSS_COMPILE)llvm-ld +else +CC = $(CROSS_COMPILE)gcc +LD_LTO = $(CROSS_COMPILE)ld +endif +CPP = $(CC) -E +AR = $(CROSS_COMPILE)ar +RANLIB = $(CROSS_COMPILE)ranlib +NM = $(CROSS_COMPILE)nm +STRIP = $(CROSS_COMPILE)strip +OBJCOPY = $(CROSS_COMPILE)objcopy +OBJDUMP = $(CROSS_COMPILE)objdump +SIZEUTIL = $(CROSS_COMPILE)size + +# Allow git to be wrappered in the environment +GIT ?= git + +INSTALL = install +INSTALL_DIR = $(INSTALL) -d -m0755 -p +INSTALL_DATA = $(INSTALL) -m0644 -p +INSTALL_PROG = $(INSTALL) -m0755 -p + +BOOT_DIR ?= /boot + +SOCKET_LIBS = +UTIL_LIBS = -lutil +DLOPEN_LIBS = -ldl + +SONAME_LDFLAG = -soname +SHLIB_LDFLAGS = -shared + +ifneq ($(debug),y) +CFLAGS += -O2 -fomit-frame-pointer +else +# Less than -O1 produces bad code and large stack frames +CFLAGS += -O1 -fno-omit-frame-pointer +CFLAGS-$(gcc) += -fno-optimize-sibling-calls +endif + +ifeq ($(lto),y) +CFLAGS += -flto +LDFLAGS-$(clang) += -plugin LLVMgold.so +endif diff --git a/extras/mini-os/config/arm32.mk b/extras/mini-os/config/arm32.mk new file mode 100644 index 0000000..4f83a63 --- /dev/null +++ b/extras/mini-os/config/arm32.mk @@ -0,0 +1,22 @@ +CONFIG_ARM := y +CONFIG_ARM_32 := y +CONFIG_ARM_$(XEN_OS) := y + +CONFIG_XEN_INSTALL_SUFFIX := + +# -march= -mcpu= + +# Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: +CFLAGS += -marm + +HAS_PL011 := y +HAS_EXYNOS4210 := y +HAS_OMAP := y +HAS_NS16550 := y + +# Use only if calling $(LD) directly. +LDFLAGS_DIRECT += -EL + +CONFIG_LOAD_ADDRESS ?= 0x80000000 + +IOEMU_CPU_ARCH ?= arm diff --git a/extras/mini-os/config/arm64.mk b/extras/mini-os/config/arm64.mk new file mode 100644 index 0000000..6eafda2 --- /dev/null +++ b/extras/mini-os/config/arm64.mk @@ -0,0 +1,19 @@ +CONFIG_ARM := y +CONFIG_ARM_64 := y +CONFIG_ARM_$(XEN_OS) := y + +CONFIG_XEN_INSTALL_SUFFIX := + +CFLAGS += #-marm -march= -mcpu= etc + +HAS_PL011 := y +HAS_NS16550 := y + +# Use only if calling $(LD) directly. +LDFLAGS_DIRECT += -EL + +CONFIG_LOAD_ADDRESS ?= 0x80000000 + +IOEMU_CPU_ARCH ?= aarch64 + +EFI_DIR ?= /usr/lib64/efi diff --git a/extras/mini-os/config/x86_32.mk b/extras/mini-os/config/x86_32.mk new file mode 100644 index 0000000..c2d785e --- /dev/null +++ b/extras/mini-os/config/x86_32.mk @@ -0,0 +1,20 @@ +CONFIG_X86 := y +CONFIG_X86_32 := y +CONFIG_X86_$(XEN_OS) := y + +CONFIG_HVM := y +CONFIG_MIGRATE := y +CONFIG_XCUTILS := y + +HAS_MEM_ACCESS := y +HAS_MEM_PAGING := y +HAS_MEM_SHARING := y + +CFLAGS += -m32 -march=i686 + +# Use only if calling $(LD) directly. +LDFLAGS_DIRECT_OpenBSD = _obsd +LDFLAGS_DIRECT_FreeBSD = _fbsd +LDFLAGS_DIRECT += -melf_i386$(LDFLAGS_DIRECT_$(XEN_OS)) + +IOEMU_CPU_ARCH ?= i386 diff --git a/extras/mini-os/config/x86_64.mk b/extras/mini-os/config/x86_64.mk new file mode 100644 index 0000000..bf104c2 --- /dev/null +++ b/extras/mini-os/config/x86_64.mk @@ -0,0 +1,33 @@ +CONFIG_X86 := y +CONFIG_X86_64 := y +CONFIG_X86_$(XEN_OS) := y + +CONFIG_COMPAT := y +CONFIG_HVM := y +CONFIG_MIGRATE := y +CONFIG_XCUTILS := y + +HAS_MEM_ACCESS := y +HAS_MEM_PAGING := y +HAS_MEM_SHARING := y + +CONFIG_XEN_INSTALL_SUFFIX := .gz + +CFLAGS += -m64 + +SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64) + +EFI_DIR ?= /usr/lib64/efi + +# Use only if calling $(LD) directly. +ifeq ($(XEN_OS),OpenBSD) +LDFLAGS_DIRECT += -melf_x86_64_obsd +else +ifeq ($(XEN_OS),FreeBSD) +LDFLAGS_DIRECT += -melf_x86_64_fbsd +else +LDFLAGS_DIRECT += -melf_x86_64 +endif +endif + +IOEMU_CPU_ARCH ?= x86_64 diff --git a/extras/mini-os/include/minios-external/README b/extras/mini-os/include/minios-external/README new file mode 100644 index 0000000..93c2bc9 --- /dev/null +++ b/extras/mini-os/include/minios-external/README @@ -0,0 +1,24 @@ +WARNING - DO NOT EDIT THINGS IN THIS DIRECTORY +---------------------------------------------- + +These files were obtained elsewhere and should only be updated by +copying new versions from the source location, as documented below: + +bsd-COPYRIGHT +bsd-sys-queue.h +bsd-queue.3 + + Obtained from the FreeBSD SVN using the following commands: + svn co -r 221843 svn://svn.freebsd.org/base/head/sys/sys/ + svn co -r 221843 svn://svn.freebsd.org/base/head/share/man/man3 + svn cat -r 221843 http://svn.freebsd.org/base/head/COPYRIGHT >tools/libxl/external/bsd-COPYRIGHT + +Exceptions: + +README + + This file + +bsd-sys-queue-h-seddery + + Script to transform the above into a new namespace. diff --git a/extras/mini-os/include/minios-external/bsd-COPYRIGHT b/extras/mini-os/include/minios-external/bsd-COPYRIGHT new file mode 100644 index 0000000..6dc5d16 --- /dev/null +++ b/extras/mini-os/include/minios-external/bsd-COPYRIGHT @@ -0,0 +1,126 @@ +# $FreeBSD$ +# @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 + +The compilation of software known as FreeBSD is distributed under the +following terms: + +Copyright (c) 1992-2011 The FreeBSD Project. All rights reserved. + +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 AUTHOR 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 AUTHOR 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. + +The 4.4BSD and 4.4BSD-Lite software is distributed under the following +terms: + +All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite +Releases is copyrighted by The Regents of the University of California. + +Copyright 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 + The Regents of the University of California. All rights reserved. + +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. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by the University of +California, Berkeley and its contributors. +4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. + +The Institute of Electrical and Electronics Engineers and the American +National Standards Committee X3, on Information Processing Systems have +given us permission to reprint portions of their documentation. + +In the following statement, the phrase ``this text'' refers to portions +of the system documentation. + +Portions of this text are reprinted and reproduced in electronic form in +the second BSD Networking Software Release, from IEEE Std 1003.1-1988, IEEE +Standard Portable Operating System Interface for Computer Environments +(POSIX), copyright C 1988 by the Institute of Electrical and Electronics +Engineers, Inc. In the event of any discrepancy between these versions +and the original IEEE Standard, the original IEEE Standard is the referee +document. + +In the following statement, the phrase ``This material'' refers to portions +of the system documentation. + +This material is reproduced with permission from American National +Standards Committee X3, on Information Processing Systems. Computer and +Business Equipment Manufacturers Association (CBEMA), 311 First St., NW, +Suite 500, Washington, DC 20001-2178. The developmental work of +Programming Language C was completed by the X3J11 Technical Committee. + +The views and conclusions contained in the software and documentation are +those of the authors and should not be interpreted as representing official +policies, either expressed or implied, of the Regents of the University +of California. + + +NOTE: The copyright of UC Berkeley's Berkeley Software Distribution ("BSD") +source has been updated. The copyright addendum may be found at +ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change and is +included below. + +July 22, 1999 + +To All Licensees, Distributors of Any Version of BSD: + +As you know, certain of the Berkeley Software Distribution ("BSD") source +code files require that further distributions of products containing all or +portions of the software, acknowledge within their advertising materials +that such products contain software developed by UC Berkeley and its +contributors. + +Specifically, the provision reads: + +" * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors." + +Effective immediately, licensees and distributors are no longer required to +include the acknowledgement within advertising materials. Accordingly, the +foregoing paragraph of those BSD Unix files containing it is hereby deleted +in its entirety. + +William Hoskins +Director, Office of Technology Licensing +University of California, Berkeley diff --git a/extras/mini-os/include/minios-external/bsd-queue.3 b/extras/mini-os/include/minios-external/bsd-queue.3 new file mode 100644 index 0000000..007ca5c --- /dev/null +++ b/extras/mini-os/include/minios-external/bsd-queue.3 @@ -0,0 +1,1044 @@ +.\" Copyright (c) 1993 +.\" The Regents of the University of California. All rights reserved. +.\" +.\" 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. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by the University of +.\" California, Berkeley and its contributors. +.\" 4. Neither the name of the University nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. +.\" +.\" @(#)queue.3 8.2 (Berkeley) 1/24/94 +.\" $FreeBSD$ +.\" +.Dd May 13, 2011 +.Dt QUEUE 3 +.Os +.Sh NAME +.Nm SLIST_EMPTY , +.Nm SLIST_ENTRY , +.Nm SLIST_FIRST , +.Nm SLIST_FOREACH , +.Nm SLIST_FOREACH_SAFE , +.Nm SLIST_HEAD , +.Nm SLIST_HEAD_INITIALIZER , +.Nm SLIST_INIT , +.Nm SLIST_INSERT_AFTER , +.Nm SLIST_INSERT_HEAD , +.Nm SLIST_NEXT , +.Nm SLIST_REMOVE_AFTER , +.Nm SLIST_REMOVE_HEAD , +.Nm SLIST_REMOVE , +.Nm SLIST_SWAP , +.Nm STAILQ_CONCAT , +.Nm STAILQ_EMPTY , +.Nm STAILQ_ENTRY , +.Nm STAILQ_FIRST , +.Nm STAILQ_FOREACH , +.Nm STAILQ_FOREACH_SAFE , +.Nm STAILQ_HEAD , +.Nm STAILQ_HEAD_INITIALIZER , +.Nm STAILQ_INIT , +.Nm STAILQ_INSERT_AFTER , +.Nm STAILQ_INSERT_HEAD , +.Nm STAILQ_INSERT_TAIL , +.Nm STAILQ_LAST , +.Nm STAILQ_NEXT , +.Nm STAILQ_REMOVE_AFTER , +.Nm STAILQ_REMOVE_HEAD , +.Nm STAILQ_REMOVE , +.Nm STAILQ_SWAP , +.Nm LIST_EMPTY , +.Nm LIST_ENTRY , +.Nm LIST_FIRST , +.Nm LIST_FOREACH , +.Nm LIST_FOREACH_SAFE , +.Nm LIST_HEAD , +.Nm LIST_HEAD_INITIALIZER , +.Nm LIST_INIT , +.Nm LIST_INSERT_AFTER , +.Nm LIST_INSERT_BEFORE , +.Nm LIST_INSERT_HEAD , +.Nm LIST_NEXT , +.Nm LIST_REMOVE , +.Nm LIST_SWAP , +.Nm TAILQ_CONCAT , +.Nm TAILQ_EMPTY , +.Nm TAILQ_ENTRY , +.Nm TAILQ_FIRST , +.Nm TAILQ_FOREACH , +.Nm TAILQ_FOREACH_SAFE , +.Nm TAILQ_FOREACH_REVERSE , +.Nm TAILQ_FOREACH_REVERSE_SAFE , +.Nm TAILQ_HEAD , +.Nm TAILQ_HEAD_INITIALIZER , +.Nm TAILQ_INIT , +.Nm TAILQ_INSERT_AFTER , +.Nm TAILQ_INSERT_BEFORE , +.Nm TAILQ_INSERT_HEAD , +.Nm TAILQ_INSERT_TAIL , +.Nm TAILQ_LAST , +.Nm TAILQ_NEXT , +.Nm TAILQ_PREV , +.Nm TAILQ_REMOVE , +.Nm TAILQ_SWAP +.Nd implementations of singly-linked lists, singly-linked tail queues, +lists and tail queues +.Sh SYNOPSIS +.In sys/queue.h +.\" +.Fn SLIST_EMPTY "SLIST_HEAD *head" +.Fn SLIST_ENTRY "TYPE" +.Fn SLIST_FIRST "SLIST_HEAD *head" +.Fn SLIST_FOREACH "TYPE *var" "SLIST_HEAD *head" "SLIST_ENTRY NAME" +.Fn SLIST_FOREACH_SAFE "TYPE *var" "SLIST_HEAD *head" "SLIST_ENTRY NAME" "TYPE *temp_var" +.Fn SLIST_HEAD "HEADNAME" "TYPE" +.Fn SLIST_HEAD_INITIALIZER "SLIST_HEAD head" +.Fn SLIST_INIT "SLIST_HEAD *head" +.Fn SLIST_INSERT_AFTER "TYPE *listelm" "TYPE *elm" "SLIST_ENTRY NAME" +.Fn SLIST_INSERT_HEAD "SLIST_HEAD *head" "TYPE *elm" "SLIST_ENTRY NAME" +.Fn SLIST_NEXT "TYPE *elm" "SLIST_ENTRY NAME" +.Fn SLIST_REMOVE_AFTER "TYPE *elm" "SLIST_ENTRY NAME" +.Fn SLIST_REMOVE_HEAD "SLIST_HEAD *head" "SLIST_ENTRY NAME" +.Fn SLIST_REMOVE "SLIST_HEAD *head" "TYPE *elm" "TYPE" "SLIST_ENTRY NAME" +.Fn SLIST_SWAP "SLIST_HEAD *head1" "SLIST_HEAD *head2" "SLIST_ENTRY NAME" +.\" +.Fn STAILQ_CONCAT "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" +.Fn STAILQ_EMPTY "STAILQ_HEAD *head" +.Fn STAILQ_ENTRY "TYPE" +.Fn STAILQ_FIRST "STAILQ_HEAD *head" +.Fn STAILQ_FOREACH "TYPE *var" "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" +.Fn STAILQ_FOREACH_SAFE "TYPE *var" "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" "TYPE *temp_var" +.Fn STAILQ_HEAD "HEADNAME" "TYPE" +.Fn STAILQ_HEAD_INITIALIZER "STAILQ_HEAD head" +.Fn STAILQ_INIT "STAILQ_HEAD *head" +.Fn STAILQ_INSERT_AFTER "STAILQ_HEAD *head" "TYPE *listelm" "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_INSERT_HEAD "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_INSERT_TAIL "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_LAST "STAILQ_HEAD *head" "TYPE" "STAILQ_ENTRY NAME" +.Fn STAILQ_NEXT "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_REMOVE_AFTER "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_REMOVE_HEAD "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" +.Fn STAILQ_REMOVE "STAILQ_HEAD *head" "TYPE *elm" "TYPE" "STAILQ_ENTRY NAME" +.Fn STAILQ_SWAP "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" "STAILQ_ENTRY NAME" +.\" +.Fn LIST_EMPTY "LIST_HEAD *head" +.Fn LIST_ENTRY "TYPE" +.Fn LIST_FIRST "LIST_HEAD *head" +.Fn LIST_FOREACH "TYPE *var" "LIST_HEAD *head" "LIST_ENTRY NAME" +.Fn LIST_FOREACH_SAFE "TYPE *var" "LIST_HEAD *head" "LIST_ENTRY NAME" "TYPE *temp_var" +.Fn LIST_HEAD "HEADNAME" "TYPE" +.Fn LIST_HEAD_INITIALIZER "LIST_HEAD head" +.Fn LIST_INIT "LIST_HEAD *head" +.Fn LIST_INSERT_AFTER "TYPE *listelm" "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_INSERT_BEFORE "TYPE *listelm" "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_INSERT_HEAD "LIST_HEAD *head" "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_NEXT "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_REMOVE "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_SWAP "LIST_HEAD *head1" "LIST_HEAD *head2" "TYPE" "LIST_ENTRY NAME" +.\" +.Fn TAILQ_CONCAT "TAILQ_HEAD *head1" "TAILQ_HEAD *head2" "TAILQ_ENTRY NAME" +.Fn TAILQ_EMPTY "TAILQ_HEAD *head" +.Fn TAILQ_ENTRY "TYPE" +.Fn TAILQ_FIRST "TAILQ_HEAD *head" +.Fn TAILQ_FOREACH "TYPE *var" "TAILQ_HEAD *head" "TAILQ_ENTRY NAME" +.Fn TAILQ_FOREACH_SAFE "TYPE *var" "TAILQ_HEAD *head" "TAILQ_ENTRY NAME" "TYPE *temp_var" +.Fn TAILQ_FOREACH_REVERSE "TYPE *var" "TAILQ_HEAD *head" "HEADNAME" "TAILQ_ENTRY NAME" +.Fn TAILQ_FOREACH_REVERSE_SAFE "TYPE *var" "TAILQ_HEAD *head" "HEADNAME" "TAILQ_ENTRY NAME" "TYPE *temp_var" +.Fn TAILQ_HEAD "HEADNAME" "TYPE" +.Fn TAILQ_HEAD_INITIALIZER "TAILQ_HEAD head" +.Fn TAILQ_INIT "TAILQ_HEAD *head" +.Fn TAILQ_INSERT_AFTER "TAILQ_HEAD *head" "TYPE *listelm" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_INSERT_BEFORE "TYPE *listelm" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_INSERT_HEAD "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_INSERT_TAIL "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_LAST "TAILQ_HEAD *head" "HEADNAME" +.Fn TAILQ_NEXT "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_PREV "TYPE *elm" "HEADNAME" "TAILQ_ENTRY NAME" +.Fn TAILQ_REMOVE "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_SWAP "TAILQ_HEAD *head1" "TAILQ_HEAD *head2" "TYPE" "TAILQ_ENTRY NAME" +.\" +.Sh DESCRIPTION +These macros define and operate on four types of data structures: +singly-linked lists, singly-linked tail queues, lists, and tail queues. +All four structures support the following functionality: +.Bl -enum -compact -offset indent +.It +Insertion of a new entry at the head of the list. +.It +Insertion of a new entry after any element in the list. +.It +O(1) removal of an entry from the head of the list. +.It +Forward traversal through the list. +.It +Swawpping the contents of two lists. +.El +.Pp +Singly-linked lists are the simplest of the four data structures +and support only the above functionality. +Singly-linked lists are ideal for applications with large datasets +and few or no removals, +or for implementing a LIFO queue. +Singly-linked lists add the following functionality: +.Bl -enum -compact -offset indent +.It +O(n) removal of any entry in the list. +.El +.Pp +Singly-linked tail queues add the following functionality: +.Bl -enum -compact -offset indent +.It +Entries can be added at the end of a list. +.It +O(n) removal of any entry in the list. +.It +They may be concatenated. +.El +However: +.Bl -enum -compact -offset indent +.It +All list insertions must specify the head of the list. +.It +Each head entry requires two pointers rather than one. +.It +Code size is about 15% greater and operations run about 20% slower +than singly-linked lists. +.El +.Pp +Singly-linked tailqs are ideal for applications with large datasets and +few or no removals, +or for implementing a FIFO queue. +.Pp +All doubly linked types of data structures (lists and tail queues) +additionally allow: +.Bl -enum -compact -offset indent +.It +Insertion of a new entry before any element in the list. +.It +O(1) removal of any entry in the list. +.El +However: +.Bl -enum -compact -offset indent +.It +Each element requires two pointers rather than one. +.It +Code size and execution time of operations (except for removal) is about +twice that of the singly-linked data-structures. +.El +.Pp +Linked lists are the simplest of the doubly linked data structures and support +only the above functionality over singly-linked lists. +.Pp +Tail queues add the following functionality: +.Bl -enum -compact -offset indent +.It +Entries can be added at the end of a list. +.It +They may be traversed backwards, from tail to head. +.It +They may be concatenated. +.El +However: +.Bl -enum -compact -offset indent +.It +All list insertions and removals must specify the head of the list. +.It +Each head entry requires two pointers rather than one. +.It +Code size is about 15% greater and operations run about 20% slower +than singly-linked lists. +.El +.Pp +In the macro definitions, +.Fa TYPE +is the name of a user defined structure, +that must contain a field of type +.Li SLIST_ENTRY , +.Li STAILQ_ENTRY , +.Li LIST_ENTRY , +or +.Li TAILQ_ENTRY , +named +.Fa NAME . +The argument +.Fa HEADNAME +is the name of a user defined structure that must be declared +using the macros +.Li SLIST_HEAD , +.Li STAILQ_HEAD , +.Li LIST_HEAD , +or +.Li TAILQ_HEAD . +See the examples below for further explanation of how these +macros are used. +.Sh SINGLY-LINKED LISTS +A singly-linked list is headed by a structure defined by the +.Nm SLIST_HEAD +macro. +This structure contains a single pointer to the first element +on the list. +The elements are singly linked for minimum space and pointer manipulation +overhead at the expense of O(n) removal for arbitrary elements. +New elements can be added to the list after an existing element or +at the head of the list. +An +.Fa SLIST_HEAD +structure is declared as follows: +.Bd -literal -offset indent +SLIST_HEAD(HEADNAME, TYPE) head; +.Ed +.Pp +where +.Fa HEADNAME +is the name of the structure to be defined, and +.Fa TYPE +is the type of the elements to be linked into the list. +A pointer to the head of the list can later be declared as: +.Bd -literal -offset indent +struct HEADNAME *headp; +.Ed +.Pp +(The names +.Li head +and +.Li headp +are user selectable.) +.Pp +The macro +.Nm SLIST_HEAD_INITIALIZER +evaluates to an initializer for the list +.Fa head . +.Pp +The macro +.Nm SLIST_EMPTY +evaluates to true if there are no elements in the list. +.Pp +The macro +.Nm SLIST_ENTRY +declares a structure that connects the elements in +the list. +.Pp +The macro +.Nm SLIST_FIRST +returns the first element in the list or NULL if the list is empty. +.Pp +The macro +.Nm SLIST_FOREACH +traverses the list referenced by +.Fa head +in the forward direction, assigning each element in +turn to +.Fa var . +.Pp +The macro +.Nm SLIST_FOREACH_SAFE +traverses the list referenced by +.Fa head +in the forward direction, assigning each element in +turn to +.Fa var . +However, unlike +.Fn SLIST_FOREACH +here it is permitted to both remove +.Fa var +as well as free it from within the loop safely without interfering with the +traversal. +.Pp +The macro +.Nm SLIST_INIT +initializes the list referenced by +.Fa head . +.Pp +The macro +.Nm SLIST_INSERT_HEAD +inserts the new element +.Fa elm +at the head of the list. +.Pp +The macro +.Nm SLIST_INSERT_AFTER +inserts the new element +.Fa elm +after the element +.Fa listelm . +.Pp +The macro +.Nm SLIST_NEXT +returns the next element in the list. +.Pp +The macro +.Nm SLIST_REMOVE_AFTER +removes the element after +.Fa elm +from the list. Unlike +.Fa SLIST_REMOVE , +this macro does not traverse the entire list. +.Pp +The macro +.Nm SLIST_REMOVE_HEAD +removes the element +.Fa elm +from the head of the list. +For optimum efficiency, +elements being removed from the head of the list should explicitly use +this macro instead of the generic +.Fa SLIST_REMOVE +macro. +.Pp +The macro +.Nm SLIST_REMOVE +removes the element +.Fa elm +from the list. +.Pp +The macro +.Nm SLIST_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . +.Sh SINGLY-LINKED LIST EXAMPLE +.Bd -literal +SLIST_HEAD(slisthead, entry) head = + SLIST_HEAD_INITIALIZER(head); +struct slisthead *headp; /* Singly-linked List head. */ +struct entry { + ... + SLIST_ENTRY(entry) entries; /* Singly-linked List. */ + ... +} *n1, *n2, *n3, *np; + +SLIST_INIT(&head); /* Initialize the list. */ + +n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ +SLIST_INSERT_HEAD(&head, n1, entries); + +n2 = malloc(sizeof(struct entry)); /* Insert after. */ +SLIST_INSERT_AFTER(n1, n2, entries); + +SLIST_REMOVE(&head, n2, entry, entries);/* Deletion. */ +free(n2); + +n3 = SLIST_FIRST(&head); +SLIST_REMOVE_HEAD(&head, entries); /* Deletion from the head. */ +free(n3); + /* Forward traversal. */ +SLIST_FOREACH(np, &head, entries) + np-> ... + /* Safe forward traversal. */ +SLIST_FOREACH_SAFE(np, &head, entries, np_temp) { + np->do_stuff(); + ... + SLIST_REMOVE(&head, np, entry, entries); + free(np); +} + +while (!SLIST_EMPTY(&head)) { /* List Deletion. */ + n1 = SLIST_FIRST(&head); + SLIST_REMOVE_HEAD(&head, entries); + free(n1); +} +.Ed +.Sh SINGLY-LINKED TAIL QUEUES +A singly-linked tail queue is headed by a structure defined by the +.Nm STAILQ_HEAD +macro. +This structure contains a pair of pointers, +one to the first element in the tail queue and the other to +the last element in the tail queue. +The elements are singly linked for minimum space and pointer +manipulation overhead at the expense of O(n) removal for arbitrary +elements. +New elements can be added to the tail queue after an existing element, +at the head of the tail queue, or at the end of the tail queue. +A +.Fa STAILQ_HEAD +structure is declared as follows: +.Bd -literal -offset indent +STAILQ_HEAD(HEADNAME, TYPE) head; +.Ed +.Pp +where +.Li HEADNAME +is the name of the structure to be defined, and +.Li TYPE +is the type of the elements to be linked into the tail queue. +A pointer to the head of the tail queue can later be declared as: +.Bd -literal -offset indent +struct HEADNAME *headp; +.Ed +.Pp +(The names +.Li head +and +.Li headp +are user selectable.) +.Pp +The macro +.Nm STAILQ_HEAD_INITIALIZER +evaluates to an initializer for the tail queue +.Fa head . +.Pp +The macro +.Nm STAILQ_CONCAT +concatenates the tail queue headed by +.Fa head2 +onto the end of the one headed by +.Fa head1 +removing all entries from the former. +.Pp +The macro +.Nm STAILQ_EMPTY +evaluates to true if there are no items on the tail queue. +.Pp +The macro +.Nm STAILQ_ENTRY +declares a structure that connects the elements in +the tail queue. +.Pp +The macro +.Nm STAILQ_FIRST +returns the first item on the tail queue or NULL if the tail queue +is empty. +.Pp +The macro +.Nm STAILQ_FOREACH +traverses the tail queue referenced by +.Fa head +in the forward direction, assigning each element +in turn to +.Fa var . +.Pp +The macro +.Nm STAILQ_FOREACH_SAFE +traverses the tail queue referenced by +.Fa head +in the forward direction, assigning each element +in turn to +.Fa var . +However, unlike +.Fn STAILQ_FOREACH +here it is permitted to both remove +.Fa var +as well as free it from within the loop safely without interfering with the +traversal. +.Pp +The macro +.Nm STAILQ_INIT +initializes the tail queue referenced by +.Fa head . +.Pp +The macro +.Nm STAILQ_INSERT_HEAD +inserts the new element +.Fa elm +at the head of the tail queue. +.Pp +The macro +.Nm STAILQ_INSERT_TAIL +inserts the new element +.Fa elm +at the end of the tail queue. +.Pp +The macro +.Nm STAILQ_INSERT_AFTER +inserts the new element +.Fa elm +after the element +.Fa listelm . +.Pp +The macro +.Nm STAILQ_LAST +returns the last item on the tail queue. +If the tail queue is empty the return value is +.Dv NULL . +.Pp +The macro +.Nm STAILQ_NEXT +returns the next item on the tail queue, or NULL this item is the last. +.Pp +The macro +.Nm STAILQ_REMOVE_AFTER +removes the element after +.Fa elm +from the tail queue. Unlike +.Fa STAILQ_REMOVE , +this macro does not traverse the entire tail queue. +.Pp +The macro +.Nm STAILQ_REMOVE_HEAD +removes the element at the head of the tail queue. +For optimum efficiency, +elements being removed from the head of the tail queue should +use this macro explicitly rather than the generic +.Fa STAILQ_REMOVE +macro. +.Pp +The macro +.Nm STAILQ_REMOVE +removes the element +.Fa elm +from the tail queue. +.Pp +The macro +.Nm STAILQ_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . +.Sh SINGLY-LINKED TAIL QUEUE EXAMPLE +.Bd -literal +STAILQ_HEAD(stailhead, entry) head = + STAILQ_HEAD_INITIALIZER(head); +struct stailhead *headp; /* Singly-linked tail queue head. */ +struct entry { + ... + STAILQ_ENTRY(entry) entries; /* Tail queue. */ + ... +} *n1, *n2, *n3, *np; + +STAILQ_INIT(&head); /* Initialize the queue. */ + +n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ +STAILQ_INSERT_HEAD(&head, n1, entries); + +n1 = malloc(sizeof(struct entry)); /* Insert at the tail. */ +STAILQ_INSERT_TAIL(&head, n1, entries); + +n2 = malloc(sizeof(struct entry)); /* Insert after. */ +STAILQ_INSERT_AFTER(&head, n1, n2, entries); + /* Deletion. */ +STAILQ_REMOVE(&head, n2, entry, entries); +free(n2); + /* Deletion from the head. */ +n3 = STAILQ_FIRST(&head); +STAILQ_REMOVE_HEAD(&head, entries); +free(n3); + /* Forward traversal. */ +STAILQ_FOREACH(np, &head, entries) + np-> ... + /* Safe forward traversal. */ +STAILQ_FOREACH_SAFE(np, &head, entries, np_temp) { + np->do_stuff(); + ... + STAILQ_REMOVE(&head, np, entry, entries); + free(np); +} + /* TailQ Deletion. */ +while (!STAILQ_EMPTY(&head)) { + n1 = STAILQ_FIRST(&head); + STAILQ_REMOVE_HEAD(&head, entries); + free(n1); +} + /* Faster TailQ Deletion. */ +n1 = STAILQ_FIRST(&head); +while (n1 != NULL) { + n2 = STAILQ_NEXT(n1, entries); + free(n1); + n1 = n2; +} +STAILQ_INIT(&head); +.Ed +.Sh LISTS +A list is headed by a structure defined by the +.Nm LIST_HEAD +macro. +This structure contains a single pointer to the first element +on the list. +The elements are doubly linked so that an arbitrary element can be +removed without traversing the list. +New elements can be added to the list after an existing element, +before an existing element, or at the head of the list. +A +.Fa LIST_HEAD +structure is declared as follows: +.Bd -literal -offset indent +LIST_HEAD(HEADNAME, TYPE) head; +.Ed +.Pp +where +.Fa HEADNAME +is the name of the structure to be defined, and +.Fa TYPE +is the type of the elements to be linked into the list. +A pointer to the head of the list can later be declared as: +.Bd -literal -offset indent +struct HEADNAME *headp; +.Ed +.Pp +(The names +.Li head +and +.Li headp +are user selectable.) +.Pp +The macro +.Nm LIST_HEAD_INITIALIZER +evaluates to an initializer for the list +.Fa head . +.Pp +The macro +.Nm LIST_EMPTY +evaluates to true if there are no elements in the list. +.Pp +The macro +.Nm LIST_ENTRY +declares a structure that connects the elements in +the list. +.Pp +The macro +.Nm LIST_FIRST +returns the first element in the list or NULL if the list +is empty. +.Pp +The macro +.Nm LIST_FOREACH +traverses the list referenced by +.Fa head +in the forward direction, assigning each element in turn to +.Fa var . +.Pp +The macro +.Nm LIST_FOREACH_SAFE +traverses the list referenced by +.Fa head +in the forward direction, assigning each element in turn to +.Fa var . +However, unlike +.Fn LIST_FOREACH +here it is permitted to both remove +.Fa var +as well as free it from within the loop safely without interfering with the +traversal. +.Pp +The macro +.Nm LIST_INIT +initializes the list referenced by +.Fa head . +.Pp +The macro +.Nm LIST_INSERT_HEAD +inserts the new element +.Fa elm +at the head of the list. +.Pp +The macro +.Nm LIST_INSERT_AFTER +inserts the new element +.Fa elm +after the element +.Fa listelm . +.Pp +The macro +.Nm LIST_INSERT_BEFORE +inserts the new element +.Fa elm +before the element +.Fa listelm . +.Pp +The macro +.Nm LIST_NEXT +returns the next element in the list, or NULL if this is the last. +.Pp +The macro +.Nm LIST_REMOVE +removes the element +.Fa elm +from the list. +.Pp +The macro +.Nm LIST_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . +.Sh LIST EXAMPLE +.Bd -literal +LIST_HEAD(listhead, entry) head = + LIST_HEAD_INITIALIZER(head); +struct listhead *headp; /* List head. */ +struct entry { + ... + LIST_ENTRY(entry) entries; /* List. */ + ... +} *n1, *n2, *n3, *np, *np_temp; + +LIST_INIT(&head); /* Initialize the list. */ + +n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ +LIST_INSERT_HEAD(&head, n1, entries); + +n2 = malloc(sizeof(struct entry)); /* Insert after. */ +LIST_INSERT_AFTER(n1, n2, entries); + +n3 = malloc(sizeof(struct entry)); /* Insert before. */ +LIST_INSERT_BEFORE(n2, n3, entries); + +LIST_REMOVE(n2, entries); /* Deletion. */ +free(n2); + /* Forward traversal. */ +LIST_FOREACH(np, &head, entries) + np-> ... + + /* Safe forward traversal. */ +LIST_FOREACH_SAFE(np, &head, entries, np_temp) { + np->do_stuff(); + ... + LIST_REMOVE(np, entries); + free(np); +} + +while (!LIST_EMPTY(&head)) { /* List Deletion. */ + n1 = LIST_FIRST(&head); + LIST_REMOVE(n1, entries); + free(n1); +} + +n1 = LIST_FIRST(&head); /* Faster List Deletion. */ +while (n1 != NULL) { + n2 = LIST_NEXT(n1, entries); + free(n1); + n1 = n2; +} +LIST_INIT(&head); +.Ed +.Sh TAIL QUEUES +A tail queue is headed by a structure defined by the +.Nm TAILQ_HEAD +macro. +This structure contains a pair of pointers, +one to the first element in the tail queue and the other to +the last element in the tail queue. +The elements are doubly linked so that an arbitrary element can be +removed without traversing the tail queue. +New elements can be added to the tail queue after an existing element, +before an existing element, at the head of the tail queue, +or at the end of the tail queue. +A +.Fa TAILQ_HEAD +structure is declared as follows: +.Bd -literal -offset indent +TAILQ_HEAD(HEADNAME, TYPE) head; +.Ed +.Pp +where +.Li HEADNAME +is the name of the structure to be defined, and +.Li TYPE +is the type of the elements to be linked into the tail queue. +A pointer to the head of the tail queue can later be declared as: +.Bd -literal -offset indent +struct HEADNAME *headp; +.Ed +.Pp +(The names +.Li head +and +.Li headp +are user selectable.) +.Pp +The macro +.Nm TAILQ_HEAD_INITIALIZER +evaluates to an initializer for the tail queue +.Fa head . +.Pp +The macro +.Nm TAILQ_CONCAT +concatenates the tail queue headed by +.Fa head2 +onto the end of the one headed by +.Fa head1 +removing all entries from the former. +.Pp +The macro +.Nm TAILQ_EMPTY +evaluates to true if there are no items on the tail queue. +.Pp +The macro +.Nm TAILQ_ENTRY +declares a structure that connects the elements in +the tail queue. +.Pp +The macro +.Nm TAILQ_FIRST +returns the first item on the tail queue or NULL if the tail queue +is empty. +.Pp +The macro +.Nm TAILQ_FOREACH +traverses the tail queue referenced by +.Fa head +in the forward direction, assigning each element in turn to +.Fa var . +.Fa var +is set to +.Dv NULL +if the loop completes normally, or if there were no elements. +.Pp +The macro +.Nm TAILQ_FOREACH_REVERSE +traverses the tail queue referenced by +.Fa head +in the reverse direction, assigning each element in turn to +.Fa var . +.Pp +The macros +.Nm TAILQ_FOREACH_SAFE +and +.Nm TAILQ_FOREACH_REVERSE_SAFE +traverse the list referenced by +.Fa head +in the forward or reverse direction respectively, +assigning each element in turn to +.Fa var . +However, unlike their unsafe counterparts, +.Nm TAILQ_FOREACH +and +.Nm TAILQ_FOREACH_REVERSE +permit to both remove +.Fa var +as well as free it from within the loop safely without interfering with the +traversal. +.Pp +The macro +.Nm TAILQ_INIT +initializes the tail queue referenced by +.Fa head . +.Pp +The macro +.Nm TAILQ_INSERT_HEAD +inserts the new element +.Fa elm +at the head of the tail queue. +.Pp +The macro +.Nm TAILQ_INSERT_TAIL +inserts the new element +.Fa elm +at the end of the tail queue. +.Pp +The macro +.Nm TAILQ_INSERT_AFTER +inserts the new element +.Fa elm +after the element +.Fa listelm . +.Pp +The macro +.Nm TAILQ_INSERT_BEFORE +inserts the new element +.Fa elm +before the element +.Fa listelm . +.Pp +The macro +.Nm TAILQ_LAST +returns the last item on the tail queue. +If the tail queue is empty the return value is +.Dv NULL . +.Pp +The macro +.Nm TAILQ_NEXT +returns the next item on the tail queue, or NULL if this item is the last. +.Pp +The macro +.Nm TAILQ_PREV +returns the previous item on the tail queue, or NULL if this item +is the first. +.Pp +The macro +.Nm TAILQ_REMOVE +removes the element +.Fa elm +from the tail queue. +.Pp +The macro +.Nm TAILQ_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . +.Sh TAIL QUEUE EXAMPLE +.Bd -literal +TAILQ_HEAD(tailhead, entry) head = + TAILQ_HEAD_INITIALIZER(head); +struct tailhead *headp; /* Tail queue head. */ +struct entry { + ... + TAILQ_ENTRY(entry) entries; /* Tail queue. */ + ... +} *n1, *n2, *n3, *np; + +TAILQ_INIT(&head); /* Initialize the queue. */ + +n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ +TAILQ_INSERT_HEAD(&head, n1, entries); + +n1 = malloc(sizeof(struct entry)); /* Insert at the tail. */ +TAILQ_INSERT_TAIL(&head, n1, entries); + +n2 = malloc(sizeof(struct entry)); /* Insert after. */ +TAILQ_INSERT_AFTER(&head, n1, n2, entries); + +n3 = malloc(sizeof(struct entry)); /* Insert before. */ +TAILQ_INSERT_BEFORE(n2, n3, entries); + +TAILQ_REMOVE(&head, n2, entries); /* Deletion. */ +free(n2); + /* Forward traversal. */ +TAILQ_FOREACH(np, &head, entries) + np-> ... + /* Safe forward traversal. */ +TAILQ_FOREACH_SAFE(np, &head, entries, np_temp) { + np->do_stuff(); + ... + TAILQ_REMOVE(&head, np, entries); + free(np); +} + /* Reverse traversal. */ +TAILQ_FOREACH_REVERSE(np, &head, tailhead, entries) + np-> ... + /* TailQ Deletion. */ +while (!TAILQ_EMPTY(&head)) { + n1 = TAILQ_FIRST(&head); + TAILQ_REMOVE(&head, n1, entries); + free(n1); +} + /* Faster TailQ Deletion. */ +n1 = TAILQ_FIRST(&head); +while (n1 != NULL) { + n2 = TAILQ_NEXT(n1, entries); + free(n1); + n1 = n2; +} +TAILQ_INIT(&head); +.Ed +.Sh SEE ALSO +.Xr tree 3 +.Sh HISTORY +The +.Nm queue +functions first appeared in +.Bx 4.4 . diff --git a/extras/mini-os/include/minios-external/bsd-sys-queue-h-seddery b/extras/mini-os/include/minios-external/bsd-sys-queue-h-seddery new file mode 100755 index 0000000..7a957e3 --- /dev/null +++ b/extras/mini-os/include/minios-external/bsd-sys-queue-h-seddery @@ -0,0 +1,72 @@ +#!/usr/bin/perl -p +# +# This script is part of the Xen build system. It has a very +# permissive licence to avoid complicating the licence of the +# generated header file and to allow this seddery to be reused by +# other projects. +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this individual file (the "Software"), to deal +# in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, +# sublicense, and/or sell copies of the Software, and to permit +# persons to whom the Software is furnished to do so, subject to the +# following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# Copyright (C) 2011 Citrix Ltd + +our $namespace, $ucnamespace; + +BEGIN { + die unless @ARGV; + $namespace = pop @ARGV; + $namespace =~ s/^--prefix=// or die; + $ucnamespace = uc $namespace; + + print < + +/* + * This file defines four types of data structures: singly-linked lists, + * singly-linked tail queues, lists and tail queues. + * + * A singly-linked list is headed by a single forward pointer. The elements + * are singly linked for minimum space and pointer manipulation overhead at + * the expense of O(n) removal for arbitrary elements. New elements can be + * added to the list after an existing element or at the head of the list. + * Elements being removed from the head of the list should use the explicit + * macro for this purpose for optimum efficiency. A singly-linked list may + * only be traversed in the forward direction. Singly-linked lists are ideal + * for applications with large datasets and few or no removals or for + * implementing a LIFO queue. + * + * A singly-linked tail queue is headed by a pair of pointers, one to the + * head of the list and the other to the tail of the list. The elements are + * singly linked for minimum space and pointer manipulation overhead at the + * expense of O(n) removal for arbitrary elements. New elements can be added + * to the list after an existing element, at the head of the list, or at the + * end of the list. Elements being removed from the head of the tail queue + * should use the explicit macro for this purpose for optimum efficiency. + * A singly-linked tail queue may only be traversed in the forward direction. + * Singly-linked tail queues are ideal for applications with large datasets + * and few or no removals or for implementing a FIFO queue. + * + * A list is headed by a single forward pointer (or an array of forward + * pointers for a hash table header). The elements are doubly linked + * so that an arbitrary element can be removed without a need to + * traverse the list. New elements can be added to the list before + * or after an existing element or at the head of the list. A list + * may only be traversed in the forward direction. + * + * A tail queue is headed by a pair of pointers, one to the head of the + * list and the other to the tail of the list. The elements are doubly + * linked so that an arbitrary element can be removed without a need to + * traverse the list. New elements can be added to the list before or + * after an existing element, at the head of the list, or at the end of + * the list. A tail queue may be traversed in either direction. + * + * For details on the use of these macros, see the queue(3) manual page. + * + * + * SLIST LIST STAILQ TAILQ + * _HEAD + + + + + * _HEAD_INITIALIZER + + + + + * _ENTRY + + + + + * _INIT + + + + + * _EMPTY + + + + + * _FIRST + + + + + * _NEXT + + + + + * _PREV - - - + + * _LAST - - + + + * _FOREACH + + + + + * _FOREACH_SAFE + + + + + * _FOREACH_REVERSE - - - + + * _FOREACH_REVERSE_SAFE - - - + + * _INSERT_HEAD + + + + + * _INSERT_BEFORE - + - + + * _INSERT_AFTER + + + + + * _INSERT_TAIL - - + + + * _CONCAT - - + + + * _REMOVE_AFTER + - + - + * _REMOVE_HEAD + - + - + * _REMOVE + + + + + * _SWAP + + + + + * + */ +#ifdef QUEUE_MACRO_DEBUG +/* Store the last 2 places the queue element or head was altered */ +struct qm_trace { + char * lastfile; + int lastline; + char * prevfile; + int prevline; +}; + +#define TRACEBUF struct qm_trace trace; +#define TRASHIT(x) do {(x) = (void *)-1;} while (0) +#define QMD_SAVELINK(name, link) void **name = (void *)&(link) + +#define QMD_TRACE_HEAD(head) do { \ + (head)->trace.prevline = (head)->trace.lastline; \ + (head)->trace.prevfile = (head)->trace.lastfile; \ + (head)->trace.lastline = __LINE__; \ + (head)->trace.lastfile = __FILE__; \ +} while (0) + +#define QMD_TRACE_ELEM(elem) do { \ + (elem)->trace.prevline = (elem)->trace.lastline; \ + (elem)->trace.prevfile = (elem)->trace.lastfile; \ + (elem)->trace.lastline = __LINE__; \ + (elem)->trace.lastfile = __FILE__; \ +} while (0) + +#else +#define QMD_TRACE_ELEM(elem) +#define QMD_TRACE_HEAD(head) +#define QMD_SAVELINK(name, link) +#define TRACEBUF +#define TRASHIT(x) +#endif /* QUEUE_MACRO_DEBUG */ + +/* + * Singly-linked List declarations. + */ +#define SLIST_HEAD(name, type) \ +struct name { \ + struct type *slh_first; /* first element */ \ +} + +#define SLIST_HEAD_INITIALIZER(head) \ + { NULL } + +#define SLIST_ENTRY(type) \ +struct { \ + struct type *sle_next; /* next element */ \ +} + +/* + * Singly-linked List functions. + */ +#define SLIST_EMPTY(head) ((head)->slh_first == NULL) + +#define SLIST_FIRST(head) ((head)->slh_first) + +#define SLIST_FOREACH(var, head, field) \ + for ((var) = SLIST_FIRST((head)); \ + (var); \ + (var) = SLIST_NEXT((var), field)) + +#define SLIST_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = SLIST_FIRST((head)); \ + (var) && ((tvar) = SLIST_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define SLIST_FOREACH_PREVPTR(var, varp, head, field) \ + for ((varp) = &SLIST_FIRST((head)); \ + ((var) = *(varp)) != NULL; \ + (varp) = &SLIST_NEXT((var), field)) + +#define SLIST_INIT(head) do { \ + SLIST_FIRST((head)) = NULL; \ +} while (0) + +#define SLIST_INSERT_AFTER(slistelm, elm, field) do { \ + SLIST_NEXT((elm), field) = SLIST_NEXT((slistelm), field); \ + SLIST_NEXT((slistelm), field) = (elm); \ +} while (0) + +#define SLIST_INSERT_HEAD(head, elm, field) do { \ + SLIST_NEXT((elm), field) = SLIST_FIRST((head)); \ + SLIST_FIRST((head)) = (elm); \ +} while (0) + +#define SLIST_NEXT(elm, field) ((elm)->field.sle_next) + +#define SLIST_REMOVE(head, elm, type, field) do { \ + QMD_SAVELINK(oldnext, (elm)->field.sle_next); \ + if (SLIST_FIRST((head)) == (elm)) { \ + SLIST_REMOVE_HEAD((head), field); \ + } \ + else { \ + struct type *curelm = SLIST_FIRST((head)); \ + while (SLIST_NEXT(curelm, field) != (elm)) \ + curelm = SLIST_NEXT(curelm, field); \ + SLIST_REMOVE_AFTER(curelm, field); \ + } \ + TRASHIT(*oldnext); \ +} while (0) + +#define SLIST_REMOVE_AFTER(elm, field) do { \ + SLIST_NEXT(elm, field) = \ + SLIST_NEXT(SLIST_NEXT(elm, field), field); \ +} while (0) + +#define SLIST_REMOVE_HEAD(head, field) do { \ + SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \ +} while (0) + +#define SLIST_SWAP(head1, head2, type) do { \ + struct type *swap_first = SLIST_FIRST(head1); \ + SLIST_FIRST(head1) = SLIST_FIRST(head2); \ + SLIST_FIRST(head2) = swap_first; \ +} while (0) + +/* + * Singly-linked Tail queue declarations. + */ +#define STAILQ_HEAD(name, type) \ +struct name { \ + struct type *stqh_first;/* first element */ \ + struct type **stqh_last;/* addr of last next element */ \ +} + +#define STAILQ_HEAD_INITIALIZER(head) \ + { NULL, &(head).stqh_first } + +#define STAILQ_ENTRY(type) \ +struct { \ + struct type *stqe_next; /* next element */ \ +} + +/* + * Singly-linked Tail queue functions. + */ +#define STAILQ_CONCAT(head1, head2) do { \ + if (!STAILQ_EMPTY((head2))) { \ + *(head1)->stqh_last = (head2)->stqh_first; \ + (head1)->stqh_last = (head2)->stqh_last; \ + STAILQ_INIT((head2)); \ + } \ +} while (0) + +#define STAILQ_EMPTY(head) ((head)->stqh_first == NULL) + +#define STAILQ_FIRST(head) ((head)->stqh_first) + +#define STAILQ_FOREACH(var, head, field) \ + for((var) = STAILQ_FIRST((head)); \ + (var); \ + (var) = STAILQ_NEXT((var), field)) + + +#define STAILQ_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = STAILQ_FIRST((head)); \ + (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define STAILQ_INIT(head) do { \ + STAILQ_FIRST((head)) = NULL; \ + (head)->stqh_last = &STAILQ_FIRST((head)); \ +} while (0) + +#define STAILQ_INSERT_AFTER(head, tqelm, elm, field) do { \ + if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ + STAILQ_NEXT((tqelm), field) = (elm); \ +} while (0) + +#define STAILQ_INSERT_HEAD(head, elm, field) do { \ + if ((STAILQ_NEXT((elm), field) = STAILQ_FIRST((head))) == NULL) \ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ + STAILQ_FIRST((head)) = (elm); \ +} while (0) + +#define STAILQ_INSERT_TAIL(head, elm, field) do { \ + STAILQ_NEXT((elm), field) = NULL; \ + *(head)->stqh_last = (elm); \ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ +} while (0) + +#define STAILQ_LAST(head, type, field) \ + (STAILQ_EMPTY((head)) ? \ + NULL : \ + ((struct type *)(void *) \ + ((char *)((head)->stqh_last) - __offsetof(struct type, field)))) + +#define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next) + +#define STAILQ_REMOVE(head, elm, type, field) do { \ + QMD_SAVELINK(oldnext, (elm)->field.stqe_next); \ + if (STAILQ_FIRST((head)) == (elm)) { \ + STAILQ_REMOVE_HEAD((head), field); \ + } \ + else { \ + struct type *curelm = STAILQ_FIRST((head)); \ + while (STAILQ_NEXT(curelm, field) != (elm)) \ + curelm = STAILQ_NEXT(curelm, field); \ + STAILQ_REMOVE_AFTER(head, curelm, field); \ + } \ + TRASHIT(*oldnext); \ +} while (0) + +#define STAILQ_REMOVE_AFTER(head, elm, field) do { \ + if ((STAILQ_NEXT(elm, field) = \ + STAILQ_NEXT(STAILQ_NEXT(elm, field), field)) == NULL) \ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ +} while (0) + +#define STAILQ_REMOVE_HEAD(head, field) do { \ + if ((STAILQ_FIRST((head)) = \ + STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL) \ + (head)->stqh_last = &STAILQ_FIRST((head)); \ +} while (0) + +#define STAILQ_SWAP(head1, head2, type) do { \ + struct type *swap_first = STAILQ_FIRST(head1); \ + struct type **swap_last = (head1)->stqh_last; \ + STAILQ_FIRST(head1) = STAILQ_FIRST(head2); \ + (head1)->stqh_last = (head2)->stqh_last; \ + STAILQ_FIRST(head2) = swap_first; \ + (head2)->stqh_last = swap_last; \ + if (STAILQ_EMPTY(head1)) \ + (head1)->stqh_last = &STAILQ_FIRST(head1); \ + if (STAILQ_EMPTY(head2)) \ + (head2)->stqh_last = &STAILQ_FIRST(head2); \ +} while (0) + + +/* + * List declarations. + */ +#define LIST_HEAD(name, type) \ +struct name { \ + struct type *lh_first; /* first element */ \ +} + +#define LIST_HEAD_INITIALIZER(head) \ + { NULL } + +#define LIST_ENTRY(type) \ +struct { \ + struct type *le_next; /* next element */ \ + struct type **le_prev; /* address of previous next element */ \ +} + +/* + * List functions. + */ + +#if (defined(_KERNEL) && defined(INVARIANTS)) +#define QMD_LIST_CHECK_HEAD(head, field) do { \ + if (LIST_FIRST((head)) != NULL && \ + LIST_FIRST((head))->field.le_prev != \ + &LIST_FIRST((head))) \ + panic("Bad list head %p first->prev != head", (head)); \ +} while (0) + +#define QMD_LIST_CHECK_NEXT(elm, field) do { \ + if (LIST_NEXT((elm), field) != NULL && \ + LIST_NEXT((elm), field)->field.le_prev != \ + &((elm)->field.le_next)) \ + panic("Bad link elm %p next->prev != elm", (elm)); \ +} while (0) + +#define QMD_LIST_CHECK_PREV(elm, field) do { \ + if (*(elm)->field.le_prev != (elm)) \ + panic("Bad link elm %p prev->next != elm", (elm)); \ +} while (0) +#else +#define QMD_LIST_CHECK_HEAD(head, field) +#define QMD_LIST_CHECK_NEXT(elm, field) +#define QMD_LIST_CHECK_PREV(elm, field) +#endif /* (_KERNEL && INVARIANTS) */ + +#define LIST_EMPTY(head) ((head)->lh_first == NULL) + +#define LIST_FIRST(head) ((head)->lh_first) + +#define LIST_FOREACH(var, head, field) \ + for ((var) = LIST_FIRST((head)); \ + (var); \ + (var) = LIST_NEXT((var), field)) + +#define LIST_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = LIST_FIRST((head)); \ + (var) && ((tvar) = LIST_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define LIST_INIT(head) do { \ + LIST_FIRST((head)) = NULL; \ +} while (0) + +#define LIST_INSERT_AFTER(listelm, elm, field) do { \ + QMD_LIST_CHECK_NEXT(listelm, field); \ + if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\ + LIST_NEXT((listelm), field)->field.le_prev = \ + &LIST_NEXT((elm), field); \ + LIST_NEXT((listelm), field) = (elm); \ + (elm)->field.le_prev = &LIST_NEXT((listelm), field); \ +} while (0) + +#define LIST_INSERT_BEFORE(listelm, elm, field) do { \ + QMD_LIST_CHECK_PREV(listelm, field); \ + (elm)->field.le_prev = (listelm)->field.le_prev; \ + LIST_NEXT((elm), field) = (listelm); \ + *(listelm)->field.le_prev = (elm); \ + (listelm)->field.le_prev = &LIST_NEXT((elm), field); \ +} while (0) + +#define LIST_INSERT_HEAD(head, elm, field) do { \ + QMD_LIST_CHECK_HEAD((head), field); \ + if ((LIST_NEXT((elm), field) = LIST_FIRST((head))) != NULL) \ + LIST_FIRST((head))->field.le_prev = &LIST_NEXT((elm), field);\ + LIST_FIRST((head)) = (elm); \ + (elm)->field.le_prev = &LIST_FIRST((head)); \ +} while (0) + +#define LIST_NEXT(elm, field) ((elm)->field.le_next) + +#define LIST_REMOVE(elm, field) do { \ + QMD_SAVELINK(oldnext, (elm)->field.le_next); \ + QMD_SAVELINK(oldprev, (elm)->field.le_prev); \ + QMD_LIST_CHECK_NEXT(elm, field); \ + QMD_LIST_CHECK_PREV(elm, field); \ + if (LIST_NEXT((elm), field) != NULL) \ + LIST_NEXT((elm), field)->field.le_prev = \ + (elm)->field.le_prev; \ + *(elm)->field.le_prev = LIST_NEXT((elm), field); \ + TRASHIT(*oldnext); \ + TRASHIT(*oldprev); \ +} while (0) + +#define LIST_SWAP(head1, head2, type, field) do { \ + struct type *swap_tmp = LIST_FIRST((head1)); \ + LIST_FIRST((head1)) = LIST_FIRST((head2)); \ + LIST_FIRST((head2)) = swap_tmp; \ + if ((swap_tmp = LIST_FIRST((head1))) != NULL) \ + swap_tmp->field.le_prev = &LIST_FIRST((head1)); \ + if ((swap_tmp = LIST_FIRST((head2))) != NULL) \ + swap_tmp->field.le_prev = &LIST_FIRST((head2)); \ +} while (0) + +/* + * Tail queue declarations. + */ +#define TAILQ_HEAD(name, type) \ +struct name { \ + struct type *tqh_first; /* first element */ \ + struct type **tqh_last; /* addr of last next element */ \ + TRACEBUF \ +} + +#define TAILQ_HEAD_INITIALIZER(head) \ + { NULL, &(head).tqh_first } + +#define TAILQ_ENTRY(type) \ +struct { \ + struct type *tqe_next; /* next element */ \ + struct type **tqe_prev; /* address of previous next element */ \ + TRACEBUF \ +} + +/* + * Tail queue functions. + */ +#if (defined(_KERNEL) && defined(INVARIANTS)) +#define QMD_TAILQ_CHECK_HEAD(head, field) do { \ + if (!TAILQ_EMPTY(head) && \ + TAILQ_FIRST((head))->field.tqe_prev != \ + &TAILQ_FIRST((head))) \ + panic("Bad tailq head %p first->prev != head", (head)); \ +} while (0) + +#define QMD_TAILQ_CHECK_TAIL(head, field) do { \ + if (*(head)->tqh_last != NULL) \ + panic("Bad tailq NEXT(%p->tqh_last) != NULL", (head)); \ +} while (0) + +#define QMD_TAILQ_CHECK_NEXT(elm, field) do { \ + if (TAILQ_NEXT((elm), field) != NULL && \ + TAILQ_NEXT((elm), field)->field.tqe_prev != \ + &((elm)->field.tqe_next)) \ + panic("Bad link elm %p next->prev != elm", (elm)); \ +} while (0) + +#define QMD_TAILQ_CHECK_PREV(elm, field) do { \ + if (*(elm)->field.tqe_prev != (elm)) \ + panic("Bad link elm %p prev->next != elm", (elm)); \ +} while (0) +#else +#define QMD_TAILQ_CHECK_HEAD(head, field) +#define QMD_TAILQ_CHECK_TAIL(head, headname) +#define QMD_TAILQ_CHECK_NEXT(elm, field) +#define QMD_TAILQ_CHECK_PREV(elm, field) +#endif /* (_KERNEL && INVARIANTS) */ + +#define TAILQ_CONCAT(head1, head2, field) do { \ + if (!TAILQ_EMPTY(head2)) { \ + *(head1)->tqh_last = (head2)->tqh_first; \ + (head2)->tqh_first->field.tqe_prev = (head1)->tqh_last; \ + (head1)->tqh_last = (head2)->tqh_last; \ + TAILQ_INIT((head2)); \ + QMD_TRACE_HEAD(head1); \ + QMD_TRACE_HEAD(head2); \ + } \ +} while (0) + +#define TAILQ_EMPTY(head) ((head)->tqh_first == NULL) + +#define TAILQ_FIRST(head) ((head)->tqh_first) + +#define TAILQ_FOREACH(var, head, field) \ + for ((var) = TAILQ_FIRST((head)); \ + (var); \ + (var) = TAILQ_NEXT((var), field)) + +#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = TAILQ_FIRST((head)); \ + (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define TAILQ_FOREACH_REVERSE(var, head, headname, field) \ + for ((var) = TAILQ_LAST((head), headname); \ + (var); \ + (var) = TAILQ_PREV((var), headname, field)) + +#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar) \ + for ((var) = TAILQ_LAST((head), headname); \ + (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1); \ + (var) = (tvar)) + +#define TAILQ_INIT(head) do { \ + TAILQ_FIRST((head)) = NULL; \ + (head)->tqh_last = &TAILQ_FIRST((head)); \ + QMD_TRACE_HEAD(head); \ +} while (0) + +#define TAILQ_INSERT_AFTER(head, listelm, elm, field) do { \ + QMD_TAILQ_CHECK_NEXT(listelm, field); \ + if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\ + TAILQ_NEXT((elm), field)->field.tqe_prev = \ + &TAILQ_NEXT((elm), field); \ + else { \ + (head)->tqh_last = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_HEAD(head); \ + } \ + TAILQ_NEXT((listelm), field) = (elm); \ + (elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field); \ + QMD_TRACE_ELEM(&(elm)->field); \ + QMD_TRACE_ELEM(&listelm->field); \ +} while (0) + +#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \ + QMD_TAILQ_CHECK_PREV(listelm, field); \ + (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \ + TAILQ_NEXT((elm), field) = (listelm); \ + *(listelm)->field.tqe_prev = (elm); \ + (listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_ELEM(&(elm)->field); \ + QMD_TRACE_ELEM(&listelm->field); \ +} while (0) + +#define TAILQ_INSERT_HEAD(head, elm, field) do { \ + QMD_TAILQ_CHECK_HEAD(head, field); \ + if ((TAILQ_NEXT((elm), field) = TAILQ_FIRST((head))) != NULL) \ + TAILQ_FIRST((head))->field.tqe_prev = \ + &TAILQ_NEXT((elm), field); \ + else \ + (head)->tqh_last = &TAILQ_NEXT((elm), field); \ + TAILQ_FIRST((head)) = (elm); \ + (elm)->field.tqe_prev = &TAILQ_FIRST((head)); \ + QMD_TRACE_HEAD(head); \ + QMD_TRACE_ELEM(&(elm)->field); \ +} while (0) + +#define TAILQ_INSERT_TAIL(head, elm, field) do { \ + QMD_TAILQ_CHECK_TAIL(head, field); \ + TAILQ_NEXT((elm), field) = NULL; \ + (elm)->field.tqe_prev = (head)->tqh_last; \ + *(head)->tqh_last = (elm); \ + (head)->tqh_last = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_HEAD(head); \ + QMD_TRACE_ELEM(&(elm)->field); \ +} while (0) + +#define TAILQ_LAST(head, headname) \ + (*(((struct headname *)((head)->tqh_last))->tqh_last)) + +#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) + +#define TAILQ_PREV(elm, headname, field) \ + (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last)) + +#define TAILQ_REMOVE(head, elm, field) do { \ + QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \ + QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \ + QMD_TAILQ_CHECK_NEXT(elm, field); \ + QMD_TAILQ_CHECK_PREV(elm, field); \ + if ((TAILQ_NEXT((elm), field)) != NULL) \ + TAILQ_NEXT((elm), field)->field.tqe_prev = \ + (elm)->field.tqe_prev; \ + else { \ + (head)->tqh_last = (elm)->field.tqe_prev; \ + QMD_TRACE_HEAD(head); \ + } \ + *(elm)->field.tqe_prev = TAILQ_NEXT((elm), field); \ + TRASHIT(*oldnext); \ + TRASHIT(*oldprev); \ + QMD_TRACE_ELEM(&(elm)->field); \ +} while (0) + +#define TAILQ_SWAP(head1, head2, type, field) do { \ + struct type *swap_first = (head1)->tqh_first; \ + struct type **swap_last = (head1)->tqh_last; \ + (head1)->tqh_first = (head2)->tqh_first; \ + (head1)->tqh_last = (head2)->tqh_last; \ + (head2)->tqh_first = swap_first; \ + (head2)->tqh_last = swap_last; \ + if ((swap_first = (head1)->tqh_first) != NULL) \ + swap_first->field.tqe_prev = &(head1)->tqh_first; \ + else \ + (head1)->tqh_last = &(head1)->tqh_first; \ + if ((swap_first = (head2)->tqh_first) != NULL) \ + swap_first->field.tqe_prev = &(head2)->tqh_first; \ + else \ + (head2)->tqh_last = &(head2)->tqh_first; \ +} while (0) + +#endif /* !_SYS_QUEUE_H_ */ diff --git a/extras/mini-os/include/xen/COPYING b/extras/mini-os/include/xen/COPYING new file mode 100644 index 0000000..ffc6d61 --- /dev/null +++ b/extras/mini-os/include/xen/COPYING @@ -0,0 +1,38 @@ +XEN NOTICE +========== + +This copyright applies to all files within this subdirectory and its +subdirectories: + include/public/*.h + include/public/hvm/*.h + include/public/io/*.h + +The intention is that these files can be freely copied into the source +tree of an operating system when porting that OS to run on Xen. Doing +so does *not* cause the OS to become subject to the terms of the GPL. + +All other files in the Xen source distribution are covered by version +2 of the GNU General Public License except where explicitly stated +otherwise within individual source files. + + -- Keir Fraser (on behalf of the Xen team) + +===================================================================== + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to +deal in the Software without restriction, including without limitation the +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/extras/mini-os/include/xen/arch-arm.h b/extras/mini-os/include/xen/arch-arm.h new file mode 100644 index 0000000..124fc90 --- /dev/null +++ b/extras/mini-os/include/xen/arch-arm.h @@ -0,0 +1,432 @@ +/****************************************************************************** + * arch-arm.h + * + * Guest OS interface to ARM Xen. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Copyright 2011 (C) Citrix Systems + */ + +#ifndef __XEN_PUBLIC_ARCH_ARM_H__ +#define __XEN_PUBLIC_ARCH_ARM_H__ + +/* + * `incontents 50 arm_abi Hypercall Calling Convention + * + * A hypercall is issued using the ARM HVC instruction. + * + * A hypercall can take up to 5 arguments. These are passed in + * registers, the first argument in x0/r0 (for arm64/arm32 guests + * respectively irrespective of whether the underlying hypervisor is + * 32- or 64-bit), the second argument in x1/r1, the third in x2/r2, + * the forth in x3/r3 and the fifth in x4/r4. + * + * The hypercall number is passed in r12 (arm) or x16 (arm64). In both + * cases the relevant ARM procedure calling convention specifies this + * is an inter-procedure-call scratch register (e.g. for use in linker + * stubs). This use does not conflict with use during a hypercall. + * + * The HVC ISS must contain a Xen specific TAG: XEN_HYPERCALL_TAG. + * + * The return value is in x0/r0. + * + * The hypercall will clobber x16/r12 and the argument registers used + * by that hypercall (except r0 which is the return value) i.e. in + * addition to x16/r12 a 2 argument hypercall will clobber x1/r1 and a + * 4 argument hypercall will clobber x1/r1, x2/r2 and x3/r3. + * + * Parameter structs passed to hypercalls are laid out according to + * the Procedure Call Standard for the ARM Architecture (AAPCS, AKA + * EABI) and Procedure Call Standard for the ARM 64-bit Architecture + * (AAPCS64). Where there is a conflict the 64-bit standard should be + * used regardless of guest type. Structures which are passed as + * hypercall arguments are always little endian. + * + * All memory which is shared with other entities in the system + * (including the hypervisor and other guests) must reside in memory + * which is mapped as Normal Inner-cacheable. This applies to: + * - hypercall arguments passed via a pointer to guest memory. + * - memory shared via the grant table mechanism (including PV I/O + * rings etc). + * - memory shared with the hypervisor (struct shared_info, struct + * vcpu_info, the grant table, etc). + * + * Any Inner cache allocation strategy (Write-Back, Write-Through etc) + * is acceptable. There is no restriction on the Outer-cacheability. + */ + +/* + * `incontents 55 arm_hcall Supported Hypercalls + * + * Xen on ARM makes extensive use of hardware facilities and therefore + * only a subset of the potential hypercalls are required. + * + * Since ARM uses second stage paging any machine/physical addresses + * passed to hypercalls are Guest Physical Addresses (Intermediate + * Physical Addresses) unless otherwise noted. + * + * The following hypercalls (and sub operations) are supported on the + * ARM platform. Other hypercalls should be considered + * unavailable/unsupported. + * + * HYPERVISOR_memory_op + * All generic sub-operations + * + * HYPERVISOR_domctl + * All generic sub-operations, with the exception of: + * * XEN_DOMCTL_irq_permission (not yet implemented) + * + * HYPERVISOR_sched_op + * All generic sub-operations, with the exception of: + * * SCHEDOP_block -- prefer wfi hardware instruction + * + * HYPERVISOR_console_io + * All generic sub-operations + * + * HYPERVISOR_xen_version + * All generic sub-operations + * + * HYPERVISOR_event_channel_op + * All generic sub-operations + * + * HYPERVISOR_physdev_op + * No sub-operations are currenty supported + * + * HYPERVISOR_sysctl + * All generic sub-operations, with the exception of: + * * XEN_SYSCTL_page_offline_op + * * XEN_SYSCTL_get_pmstat + * * XEN_SYSCTL_pm_op + * + * HYPERVISOR_hvm_op + * Exactly these sub-operations are supported: + * * HVMOP_set_param + * * HVMOP_get_param + * + * HYPERVISOR_grant_table_op + * All generic sub-operations + * + * HYPERVISOR_vcpu_op + * Exactly these sub-operations are supported: + * * VCPUOP_register_vcpu_info + * * VCPUOP_register_runstate_memory_area + * + * + * Other notes on the ARM ABI: + * + * - struct start_info is not exported to ARM guests. + * + * - struct shared_info is mapped by ARM guests using the + * HYPERVISOR_memory_op sub-op XENMEM_add_to_physmap, passing + * XENMAPSPACE_shared_info as space parameter. + * + * - All the per-cpu struct vcpu_info are mapped by ARM guests using the + * HYPERVISOR_vcpu_op sub-op VCPUOP_register_vcpu_info, including cpu0 + * struct vcpu_info. + * + * - The grant table is mapped using the HYPERVISOR_memory_op sub-op + * XENMEM_add_to_physmap, passing XENMAPSPACE_grant_table as space + * parameter. The memory range specified under the Xen compatible + * hypervisor node on device tree can be used as target gpfn for the + * mapping. + * + * - Xenstore is initialized by using the two hvm_params + * HVM_PARAM_STORE_PFN and HVM_PARAM_STORE_EVTCHN. They can be read + * with the HYPERVISOR_hvm_op sub-op HVMOP_get_param. + * + * - The paravirtualized console is initialized by using the two + * hvm_params HVM_PARAM_CONSOLE_PFN and HVM_PARAM_CONSOLE_EVTCHN. They + * can be read with the HYPERVISOR_hvm_op sub-op HVMOP_get_param. + * + * - Event channel notifications are delivered using the percpu GIC + * interrupt specified under the Xen compatible hypervisor node on + * device tree. + * + * - The device tree Xen compatible node is fully described under Linux + * at Documentation/devicetree/bindings/arm/xen.txt. + */ + +#define XEN_HYPERCALL_TAG 0XEA1 + +#define uint64_aligned_t uint64_t __attribute__((aligned(8))) + +#ifndef __ASSEMBLY__ +#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \ + typedef union { type *p; unsigned long q; } \ + __guest_handle_ ## name; \ + typedef union { type *p; uint64_aligned_t q; } \ + __guest_handle_64_ ## name; + +/* + * XEN_GUEST_HANDLE represents a guest pointer, when passed as a field + * in a struct in memory. On ARM is always 8 bytes sizes and 8 bytes + * aligned. + * XEN_GUEST_HANDLE_PARAM represents a guest pointer, when passed as an + * hypercall argument. It is 4 bytes on aarch32 and 8 bytes on aarch64. + */ +#define __DEFINE_XEN_GUEST_HANDLE(name, type) \ + ___DEFINE_XEN_GUEST_HANDLE(name, type); \ + ___DEFINE_XEN_GUEST_HANDLE(const_##name, const type) +#define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name) +#define __XEN_GUEST_HANDLE(name) __guest_handle_64_ ## name +#define XEN_GUEST_HANDLE(name) __XEN_GUEST_HANDLE(name) +#define XEN_GUEST_HANDLE_PARAM(name) __guest_handle_ ## name +#define set_xen_guest_handle_raw(hnd, val) \ + do { \ + typeof(&(hnd)) _sxghr_tmp = &(hnd); \ + _sxghr_tmp->q = 0; \ + _sxghr_tmp->p = val; \ + } while ( 0 ) +#ifdef __XEN_TOOLS__ +#define get_xen_guest_handle(val, hnd) do { val = (hnd).p; } while (0) +#endif +#define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val) + +#if defined(__GNUC__) && !defined(__STRICT_ANSI__) +/* Anonymous union includes both 32- and 64-bit names (e.g., r0/x0). */ +# define __DECL_REG(n64, n32) union { \ + uint64_t n64; \ + uint32_t n32; \ + } +#else +/* Non-gcc sources must always use the proper 64-bit name (e.g., x0). */ +#define __DECL_REG(n64, n32) uint64_t n64 +#endif + +struct vcpu_guest_core_regs +{ + /* Aarch64 Aarch32 */ + __DECL_REG(x0, r0_usr); + __DECL_REG(x1, r1_usr); + __DECL_REG(x2, r2_usr); + __DECL_REG(x3, r3_usr); + __DECL_REG(x4, r4_usr); + __DECL_REG(x5, r5_usr); + __DECL_REG(x6, r6_usr); + __DECL_REG(x7, r7_usr); + __DECL_REG(x8, r8_usr); + __DECL_REG(x9, r9_usr); + __DECL_REG(x10, r10_usr); + __DECL_REG(x11, r11_usr); + __DECL_REG(x12, r12_usr); + + __DECL_REG(x13, sp_usr); + __DECL_REG(x14, lr_usr); + + __DECL_REG(x15, __unused_sp_hyp); + + __DECL_REG(x16, lr_irq); + __DECL_REG(x17, sp_irq); + + __DECL_REG(x18, lr_svc); + __DECL_REG(x19, sp_svc); + + __DECL_REG(x20, lr_abt); + __DECL_REG(x21, sp_abt); + + __DECL_REG(x22, lr_und); + __DECL_REG(x23, sp_und); + + __DECL_REG(x24, r8_fiq); + __DECL_REG(x25, r9_fiq); + __DECL_REG(x26, r10_fiq); + __DECL_REG(x27, r11_fiq); + __DECL_REG(x28, r12_fiq); + + __DECL_REG(x29, sp_fiq); + __DECL_REG(x30, lr_fiq); + + /* Return address and mode */ + __DECL_REG(pc64, pc32); /* ELR_EL2 */ + uint32_t cpsr; /* SPSR_EL2 */ + + union { + uint32_t spsr_el1; /* AArch64 */ + uint32_t spsr_svc; /* AArch32 */ + }; + + /* AArch32 guests only */ + uint32_t spsr_fiq, spsr_irq, spsr_und, spsr_abt; + + /* AArch64 guests only */ + uint64_t sp_el0; + uint64_t sp_el1, elr_el1; +}; +typedef struct vcpu_guest_core_regs vcpu_guest_core_regs_t; +DEFINE_XEN_GUEST_HANDLE(vcpu_guest_core_regs_t); + +#undef __DECL_REG + +typedef uint64_t xen_pfn_t; +#define PRI_xen_pfn PRIx64 + +/* Maximum number of virtual CPUs in legacy multi-processor guests. */ +/* Only one. All other VCPUS must use VCPUOP_register_vcpu_info */ +#define XEN_LEGACY_MAX_VCPUS 1 + +typedef uint64_t xen_ulong_t; +#define PRI_xen_ulong PRIx64 + +#if defined(__XEN__) || defined(__XEN_TOOLS__) +struct vcpu_guest_context { +#define _VGCF_online 0 +#define VGCF_online (1<<_VGCF_online) + uint32_t flags; /* VGCF_* */ + + struct vcpu_guest_core_regs user_regs; /* Core CPU registers */ + + uint32_t sctlr; + uint64_t ttbcr, ttbr0, ttbr1; +}; +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; + +#endif + +#if defined(__XEN__) || defined(__XEN_TOOLS__) + +/* PSR bits (CPSR, SPSR) */ + +#define PSR_THUMB (1<<5) /* Thumb Mode enable */ +#define PSR_FIQ_MASK (1<<6) /* Fast Interrupt mask */ +#define PSR_IRQ_MASK (1<<7) /* Interrupt mask */ +#define PSR_ABT_MASK (1<<8) /* Asynchronous Abort mask */ +#define PSR_BIG_ENDIAN (1<<9) /* arm32: Big Endian Mode */ +#define PSR_DBG_MASK (1<<9) /* arm64: Debug Exception mask */ +#define PSR_IT_MASK (0x0600fc00) /* Thumb If-Then Mask */ +#define PSR_JAZELLE (1<<24) /* Jazelle Mode */ + +/* 32 bit modes */ +#define PSR_MODE_USR 0x10 +#define PSR_MODE_FIQ 0x11 +#define PSR_MODE_IRQ 0x12 +#define PSR_MODE_SVC 0x13 +#define PSR_MODE_MON 0x16 +#define PSR_MODE_ABT 0x17 +#define PSR_MODE_HYP 0x1a +#define PSR_MODE_UND 0x1b +#define PSR_MODE_SYS 0x1f + +/* 64 bit modes */ +#define PSR_MODE_BIT 0x10 /* Set iff AArch32 */ +#define PSR_MODE_EL3h 0x0d +#define PSR_MODE_EL3t 0x0c +#define PSR_MODE_EL2h 0x09 +#define PSR_MODE_EL2t 0x08 +#define PSR_MODE_EL1h 0x05 +#define PSR_MODE_EL1t 0x04 +#define PSR_MODE_EL0t 0x00 + +#define PSR_GUEST32_INIT (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_SVC) +#define PSR_GUEST64_INIT (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_EL1h) + +#define SCTLR_GUEST_INIT 0x00c50078 + +/* + * Virtual machine platform (memory layout, interrupts) + * + * These are defined for consistency between the tools and the + * hypervisor. Guests must not rely on these hardcoded values but + * should instead use the FDT. + */ + +/* Physical Address Space */ + +/* + * vGIC mappings: Only one set of mapping is used by the guest. + * Therefore they can overlap. + */ + +/* vGIC v2 mappings */ +#define GUEST_GICD_BASE 0x03001000ULL +#define GUEST_GICD_SIZE 0x00001000ULL +#define GUEST_GICC_BASE 0x03002000ULL +#define GUEST_GICC_SIZE 0x00000100ULL + +/* vGIC v3 mappings */ +#define GUEST_GICV3_GICD_BASE 0x03001000ULL +#define GUEST_GICV3_GICD_SIZE 0x00010000ULL + +#define GUEST_GICV3_RDIST_STRIDE 0x20000ULL +#define GUEST_GICV3_RDIST_REGIONS 1 + +#define GUEST_GICV3_GICR0_BASE 0x03020000ULL /* vCPU0 - vCPU7 */ +#define GUEST_GICV3_GICR0_SIZE 0x00100000ULL + +/* + * 16MB == 4096 pages reserved for guest to use as a region to map its + * grant table in. + */ +#define GUEST_GNTTAB_BASE 0x38000000ULL +#define GUEST_GNTTAB_SIZE 0x01000000ULL + +#define GUEST_MAGIC_BASE 0x39000000ULL +#define GUEST_MAGIC_SIZE 0x01000000ULL + +#define GUEST_RAM_BANKS 2 + +#define GUEST_RAM0_BASE 0x40000000ULL /* 3GB of low RAM @ 1GB */ +#define GUEST_RAM0_SIZE 0xc0000000ULL + +#define GUEST_RAM1_BASE 0x0200000000ULL /* 1016GB of RAM @ 8GB */ +#define GUEST_RAM1_SIZE 0xfe00000000ULL + +#define GUEST_RAM_BASE GUEST_RAM0_BASE /* Lowest RAM address */ +/* Largest amount of actual RAM, not including holes */ +#define GUEST_RAM_MAX (GUEST_RAM0_SIZE + GUEST_RAM1_SIZE) +/* Suitable for e.g. const uint64_t ramfoo[] = GUEST_RAM_BANK_FOOS; */ +#define GUEST_RAM_BANK_BASES { GUEST_RAM0_BASE, GUEST_RAM1_BASE } +#define GUEST_RAM_BANK_SIZES { GUEST_RAM0_SIZE, GUEST_RAM1_SIZE } + +/* Interrupts */ +#define GUEST_TIMER_VIRT_PPI 27 +#define GUEST_TIMER_PHYS_S_PPI 29 +#define GUEST_TIMER_PHYS_NS_PPI 30 +#define GUEST_EVTCHN_PPI 31 + +/* PSCI functions */ +#define PSCI_cpu_suspend 0 +#define PSCI_cpu_off 1 +#define PSCI_cpu_on 2 +#define PSCI_migrate 3 + +#endif + +#endif /* __XEN_PUBLIC_ARCH_ARM_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/extras/mini-os/include/xen/arch-arm/hvm/save.h b/extras/mini-os/include/xen/arch-arm/hvm/save.h new file mode 100644 index 0000000..75b8e65 --- /dev/null +++ b/extras/mini-os/include/xen/arch-arm/hvm/save.h @@ -0,0 +1,39 @@ +/* + * Structure definitions for HVM state that is held by Xen and must + * be saved along with the domain's memory and device-model state. + * + * Copyright (c) 2012 Citrix Systems Ltd. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef __XEN_PUBLIC_HVM_SAVE_ARM_H__ +#define __XEN_PUBLIC_HVM_SAVE_ARM_H__ + +#endif + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/extras/mini-os/include/xen/arch-x86/cpuid.h b/extras/mini-os/include/xen/arch-x86/cpuid.h new file mode 100644 index 0000000..d709340 --- /dev/null +++ b/extras/mini-os/include/xen/arch-x86/cpuid.h @@ -0,0 +1,90 @@ +/****************************************************************************** + * arch-x86/cpuid.h + * + * CPUID interface to Xen. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Copyright (c) 2007 Citrix Systems, Inc. + * + * Authors: + * Keir Fraser + */ + +#ifndef __XEN_PUBLIC_ARCH_X86_CPUID_H__ +#define __XEN_PUBLIC_ARCH_X86_CPUID_H__ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:16:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:16: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 1YTqFH-000272-9t; Fri, 06 Mar 2015 11:16:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFF-00026n-HP for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:42 +0000 Content-Length: 107656 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 2F/91-03164-89C89F45; Fri, 06 Mar 2015 11:16:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1425640593!13690854!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19152 invoked from network); 6 Mar 2015 11:16: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; 6 Mar 2015 11:16:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqF7-0006Bj-Lb for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqF7-0001ha-H0 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:33 +0000 Date: Fri, 06 Mar 2015 11:16:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build system: stubdom targets now depends on mini-os target X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============3270912304271382760==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3270912304271382760== Content-Length: 110197 Content-Transfer-Encoding: quoted-printable commit 42ddf48a29d2109e6b33fddd6dafd75e0747fd09 Author: Wei Liu AuthorDate: Fri Jan 30 15:58:38 2015 +0000 Commit: Wei Liu CommitDate: Fri Feb 27 16:04:50 2015 +0000 build system: stubdom targets now depends on mini-os target Provide mini-os url and revision in Config.mk Make stubdom targets depend on mini-os-dir target. Make subtree-force-update{,-all} depend on mini-os-dir-force-update. Also make mktarball script generate mini-os archive. Original mini-os directory is renamed to mini-os-intree to help reduce patch length. That directory will be deleted in a separate patch. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- Changes in v3: 1. Put mini-os targets in main Makefile. 2. Stubdom clean and distclean don't depend on mini-os-dir. Changes in v2: 1. Use hash in Config.mk. --- .gitignore | 6 +- Config.mk | 6 + Makefile | 24 +- extras/mini-os-intree/COPYING | 36 + extras/mini-os-intree/Config.mk | 99 ++ extras/mini-os-intree/Makefile | 224 +++ extras/mini-os-intree/README | 46 + extras/mini-os-intree/app.lds | 11 + extras/mini-os-intree/arch/arm/arm32.S | 294 ++++ extras/mini-os-intree/arch/arm/events.c | 31 + extras/mini-os-intree/arch/arm/hypercalls32.S | 64 + extras/mini-os-intree/arch/arm/minios-arm32.lds | 83 ++ extras/mini-os-intree/arch/arm/mm.c | 139 ++ extras/mini-os-intree/arch/arm/panic.c | 98 ++ extras/mini-os-intree/arch/arm/sched.c | 47 + extras/mini-os-intree/arch/arm/setup.c | 119 ++ extras/mini-os-intree/arch/arm/time.c | 136 ++ extras/mini-os-intree/arch/x86/Makefile | 30 + extras/mini-os-intree/arch/x86/arch.mk | 22 + extras/mini-os-intree/arch/x86/events.c | 35 + extras/mini-os-intree/arch/x86/ioremap.c | 75 + extras/mini-os-intree/arch/x86/iorw.c | 35 + extras/mini-os-intree/arch/x86/minios-x86_32.lds | 74 + extras/mini-os-intree/arch/x86/minios-x86_64.lds | 74 + extras/mini-os-intree/arch/x86/mm.c | 957 ++++++++++++ extras/mini-os-intree/arch/x86/sched.c | 139 ++ extras/mini-os-intree/arch/x86/setup.c | 168 +++ extras/mini-os-intree/arch/x86/time.c | 238 +++ extras/mini-os-intree/arch/x86/traps.c | 333 +++++ extras/mini-os-intree/arch/x86/x86_32.S | 305 ++++ extras/mini-os-intree/arch/x86/x86_64.S | 383 +++++ extras/mini-os-intree/blkfront.c | 736 ++++++++++ extras/mini-os-intree/config/MiniOS.mk | 10 + extras/mini-os-intree/config/StdGNU.mk | 47 + extras/mini-os-intree/config/arm32.mk | 22 + extras/mini-os-intree/config/arm64.mk | 19 + extras/mini-os-intree/config/x86_32.mk | 20 + extras/mini-os-intree/config/x86_64.mk | 33 + extras/mini-os-intree/console/console.c | 164 ++ extras/mini-os-intree/console/console.h | 2 + extras/mini-os-intree/console/xenbus.c | 195 +++ extras/mini-os-intree/console/xencons_ring.c | 195 +++ extras/mini-os-intree/daytime.c | 67 + extras/mini-os-intree/domain_config | 19 + extras/mini-os-intree/events.c | 269 ++++ extras/mini-os-intree/fbfront.c | 710 +++++++++ extras/mini-os-intree/gntmap.c | 250 ++++ extras/mini-os-intree/gnttab.c | 196 +++ extras/mini-os-intree/hypervisor.c | 132 ++ extras/mini-os-intree/include/arch/cc.h | 87 ++ extras/mini-os-intree/include/arch/perf.h | 15 + extras/mini-os-intree/include/arch/sys_arch.h | 35 + extras/mini-os-intree/include/arm/arch_endian.h | 7 + extras/mini-os-intree/include/arm/arch_limits.h | 9 + extras/mini-os-intree/include/arm/arch_mm.h | 38 + extras/mini-os-intree/include/arm/arch_sched.h | 19 + extras/mini-os-intree/include/arm/arch_spinlock.h | 36 + .../include/arm/arm32/arch_wordsize.h | 1 + extras/mini-os-intree/include/arm/gic.h | 1 + extras/mini-os-intree/include/arm/hypercall-arm.h | 98 ++ extras/mini-os-intree/include/arm/os.h | 216 +++ extras/mini-os-intree/include/arm/traps.h | 20 + extras/mini-os-intree/include/blkfront.h | 54 + extras/mini-os-intree/include/byteorder.h | 36 + extras/mini-os-intree/include/byteswap.h | 39 + extras/mini-os-intree/include/compiler.h | 10 + extras/mini-os-intree/include/console.h | 89 ++ extras/mini-os-intree/include/ctype.h | 60 + extras/mini-os-intree/include/endian.h | 19 + extras/mini-os-intree/include/err.h | 31 + extras/mini-os-intree/include/errno-base.h | 39 + extras/mini-os-intree/include/errno.h | 122 ++ extras/mini-os-intree/include/events.h | 59 + extras/mini-os-intree/include/fbfront.h | 46 + extras/mini-os-intree/include/fcntl.h | 99 ++ extras/mini-os-intree/include/gntmap.h | 35 + extras/mini-os-intree/include/gnttab.h | 17 + extras/mini-os-intree/include/hypervisor.h | 48 + extras/mini-os-intree/include/ioremap.h | 33 + extras/mini-os-intree/include/iorw.h | 16 + extras/mini-os-intree/include/kernel.h | 9 + extras/mini-os-intree/include/lib-gpl.h | 59 + extras/mini-os-intree/include/lib.h | 230 +++ extras/mini-os-intree/include/linux/types.h | 5 + extras/mini-os-intree/include/lwipopts.h | 23 + .../mini-os-intree/include/minios-external/README | 24 + .../include/minios-external/bsd-COPYRIGHT | 126 ++ .../include/minios-external/bsd-queue.3 | 1044 +++++++++++++ .../minios-external/bsd-sys-queue-h-seddery | 72 + .../include/minios-external/bsd-sys-queue.h | 637 ++++++++ extras/mini-os-intree/include/mm.h | 82 + extras/mini-os-intree/include/netfront.h | 24 + extras/mini-os-intree/include/pcifront.h | 29 + extras/mini-os-intree/include/posix/arpa/inet.h | 7 + extras/mini-os-intree/include/posix/dirent.h | 24 + extras/mini-os-intree/include/posix/err.h | 15 + extras/mini-os-intree/include/posix/fcntl.h | 11 + extras/mini-os-intree/include/posix/limits.h | 48 + extras/mini-os-intree/include/posix/net/if.h | 85 ++ extras/mini-os-intree/include/posix/netdb.h | 9 + extras/mini-os-intree/include/posix/netinet/in.h | 7 + extras/mini-os-intree/include/posix/netinet/tcp.h | 6 + extras/mini-os-intree/include/posix/poll.h | 1 + extras/mini-os-intree/include/posix/pthread.h | 64 + extras/mini-os-intree/include/posix/signal.h | 10 + extras/mini-os-intree/include/posix/stdlib.h | 8 + extras/mini-os-intree/include/posix/strings.h | 12 + extras/mini-os-intree/include/posix/sys/ioctl.h | 16 + extras/mini-os-intree/include/posix/sys/mman.h | 22 + extras/mini-os-intree/include/posix/sys/poll.h | 79 + extras/mini-os-intree/include/posix/sys/select.h | 7 + extras/mini-os-intree/include/posix/sys/socket.h | 31 + extras/mini-os-intree/include/posix/sys/stat.h | 7 + extras/mini-os-intree/include/posix/syslog.h | 37 + extras/mini-os-intree/include/posix/termios.h | 87 ++ extras/mini-os-intree/include/posix/time.h | 11 + extras/mini-os-intree/include/posix/unistd.h | 16 + extras/mini-os-intree/include/sched.h | 55 + extras/mini-os-intree/include/semaphore.h | 110 ++ extras/mini-os-intree/include/spinlock.h | 55 + extras/mini-os-intree/include/sys/lock.h | 52 + extras/mini-os-intree/include/sys/time.h | 47 + extras/mini-os-intree/include/time.h | 63 + extras/mini-os-intree/include/tpm_tis.h | 61 + extras/mini-os-intree/include/tpmback.h | 104 ++ extras/mini-os-intree/include/tpmfront.h | 97 ++ extras/mini-os-intree/include/types.h | 74 + extras/mini-os-intree/include/wait.h | 105 ++ extras/mini-os-intree/include/waittypes.h | 32 + extras/mini-os-intree/include/x86/arch_endian.h | 7 + extras/mini-os-intree/include/x86/arch_limits.h | 20 + extras/mini-os-intree/include/x86/arch_mm.h | 233 +++ extras/mini-os-intree/include/x86/arch_sched.h | 25 + extras/mini-os-intree/include/x86/arch_spinlock.h | 94 ++ extras/mini-os-intree/include/x86/os.h | 572 ++++++++ extras/mini-os-intree/include/x86/traps.h | 78 + .../include/x86/x86_32/arch_wordsize.h | 1 + .../include/x86/x86_32/hypercall-x86_32.h | 337 +++++ .../include/x86/x86_64/arch_wordsize.h | 2 + .../include/x86/x86_64/hypercall-x86_64.h | 344 +++++ extras/mini-os-intree/include/xen/COPYING | 38 + extras/mini-os-intree/include/xen/arch-arm.h | 432 ++++++ .../mini-os-intree/include/xen/arch-arm/hvm/save.h | 39 + extras/mini-os-intree/include/xen/arch-x86/cpuid.h | 90 ++ .../mini-os-intree/include/xen/arch-x86/hvm/save.h | 630 ++++++++ .../mini-os-intree/include/xen/arch-x86/xen-mca.h | 440 ++++++ .../include/xen/arch-x86/xen-x86_32.h | 171 +++ .../include/xen/arch-x86/xen-x86_64.h | 202 +++ extras/mini-os-intree/include/xen/arch-x86/xen.h | 303 ++++ extras/mini-os-intree/include/xen/arch-x86_32.h | 27 + extras/mini-os-intree/include/xen/arch-x86_64.h | 43 + extras/mini-os-intree/include/xen/callback.h | 121 ++ extras/mini-os-intree/include/xen/dom0_ops.h | 120 ++ extras/mini-os-intree/include/xen/domctl.h | 1154 +++++++++++++++ extras/mini-os-intree/include/xen/elfnote.h | 271 ++++ extras/mini-os-intree/include/xen/event_channel.h | 385 +++++ extras/mini-os-intree/include/xen/features.h | 114 ++ extras/mini-os-intree/include/xen/gcov.h | 115 ++ extras/mini-os-intree/include/xen/grant_table.h | 682 +++++++++ extras/mini-os-intree/include/xen/hvm/e820.h | 34 + .../include/xen/hvm/hvm_info_table.h | 72 + extras/mini-os-intree/include/xen/hvm/hvm_op.h | 402 +++++ .../include/xen/hvm/hvm_xs_strings.h | 80 + extras/mini-os-intree/include/xen/hvm/ioreq.h | 129 ++ extras/mini-os-intree/include/xen/hvm/params.h | 199 +++ extras/mini-os-intree/include/xen/hvm/pvdrivers.h | 49 + extras/mini-os-intree/include/xen/hvm/save.h | 111 ++ extras/mini-os-intree/include/xen/io/blkif.h | 640 ++++++++ extras/mini-os-intree/include/xen/io/console.h | 51 + extras/mini-os-intree/include/xen/io/fbif.h | 176 +++ extras/mini-os-intree/include/xen/io/fsif.h | 192 +++ extras/mini-os-intree/include/xen/io/kbdif.h | 132 ++ extras/mini-os-intree/include/xen/io/libxenvchan.h | 97 ++ extras/mini-os-intree/include/xen/io/netif.h | 305 ++++ extras/mini-os-intree/include/xen/io/pciif.h | 125 ++ extras/mini-os-intree/include/xen/io/protocols.h | 40 + extras/mini-os-intree/include/xen/io/ring.h | 312 ++++ extras/mini-os-intree/include/xen/io/tpmif.h | 143 ++ extras/mini-os-intree/include/xen/io/usbif.h | 150 ++ extras/mini-os-intree/include/xen/io/vscsiif.h | 260 ++++ extras/mini-os-intree/include/xen/io/xenbus.h | 80 + extras/mini-os-intree/include/xen/io/xs_wire.h | 149 ++ extras/mini-os-intree/include/xen/kexec.h | 249 ++++ extras/mini-os-intree/include/xen/mem_event.h | 134 ++ extras/mini-os-intree/include/xen/memory.h | 587 ++++++++ extras/mini-os-intree/include/xen/nmi.h | 85 ++ extras/mini-os-intree/include/xen/physdev.h | 380 +++++ extras/mini-os-intree/include/xen/platform.h | 606 ++++++++ extras/mini-os-intree/include/xen/sched.h | 175 +++ extras/mini-os-intree/include/xen/sysctl.h | 719 +++++++++ extras/mini-os-intree/include/xen/tmem.h | 152 ++ extras/mini-os-intree/include/xen/trace.h | 331 +++++ extras/mini-os-intree/include/xen/vcpu.h | 240 +++ extras/mini-os-intree/include/xen/version.h | 96 ++ extras/mini-os-intree/include/xen/xen-compat.h | 44 + extras/mini-os-intree/include/xen/xen.h | 899 ++++++++++++ extras/mini-os-intree/include/xen/xencomm.h | 41 + extras/mini-os-intree/include/xen/xenoprof.h | 152 ++ extras/mini-os-intree/include/xen/xsm/flask_op.h | 201 +++ extras/mini-os-intree/include/xenbus.h | 120 ++ extras/mini-os-intree/include/xmalloc.h | 44 + extras/mini-os-intree/kernel.c | 198 +++ extras/mini-os-intree/lib/ctype.c | 29 + extras/mini-os-intree/lib/math.c | 426 ++++++ extras/mini-os-intree/lib/printf.c | 786 ++++++++++ extras/mini-os-intree/lib/stack_chk_fail.c | 8 + extras/mini-os-intree/lib/string.c | 228 +++ extras/mini-os-intree/lib/sys.c | 1550 ++++++++++++++++++++ extras/mini-os-intree/lib/xmalloc.c | 319 ++++ extras/mini-os-intree/lib/xs.c | 194 +++ extras/mini-os-intree/lock.c | 112 ++ extras/mini-os-intree/lwip-arch.c | 293 ++++ extras/mini-os-intree/lwip-net.c | 386 +++++ extras/mini-os-intree/main.c | 193 +++ extras/mini-os-intree/minios.mk | 76 + extras/mini-os-intree/mm.c | 441 ++++++ extras/mini-os-intree/netfront.c | 675 +++++++++ extras/mini-os-intree/pcifront.c | 616 ++++++++ extras/mini-os-intree/sched.c | 304 ++++ extras/mini-os-intree/test.c | 577 ++++++++ extras/mini-os-intree/tpm_tis.c | 1523 +++++++++++++++++++ extras/mini-os-intree/tpmback.c | 1136 ++++++++++++++ extras/mini-os-intree/tpmfront.c | 631 ++++++++ extras/mini-os-intree/xenbus/xenbus.c | 870 +++++++++++ extras/mini-os/COPYING | 36 - extras/mini-os/Config.mk | 99 -- extras/mini-os/Makefile | 224 --- extras/mini-os/README | 46 - extras/mini-os/app.lds | 11 - extras/mini-os/arch/arm/arm32.S | 294 ---- extras/mini-os/arch/arm/events.c | 31 - extras/mini-os/arch/arm/hypercalls32.S | 64 - extras/mini-os/arch/arm/minios-arm32.lds | 83 -- extras/mini-os/arch/arm/mm.c | 139 -- extras/mini-os/arch/arm/panic.c | 98 -- extras/mini-os/arch/arm/sched.c | 47 - extras/mini-os/arch/arm/setup.c | 119 -- extras/mini-os/arch/arm/time.c | 136 -- extras/mini-os/arch/x86/Makefile | 30 - extras/mini-os/arch/x86/arch.mk | 22 - extras/mini-os/arch/x86/events.c | 35 - extras/mini-os/arch/x86/ioremap.c | 75 - extras/mini-os/arch/x86/iorw.c | 35 - extras/mini-os/arch/x86/minios-x86_32.lds | 74 - extras/mini-os/arch/x86/minios-x86_64.lds | 74 - extras/mini-os/arch/x86/mm.c | 957 ------------ extras/mini-os/arch/x86/sched.c | 139 -- extras/mini-os/arch/x86/setup.c | 168 --- extras/mini-os/arch/x86/time.c | 238 --- extras/mini-os/arch/x86/traps.c | 333 ----- extras/mini-os/arch/x86/x86_32.S | 305 ---- extras/mini-os/arch/x86/x86_64.S | 383 ----- extras/mini-os/blkfront.c | 736 ---------- extras/mini-os/config/MiniOS.mk | 10 - extras/mini-os/config/StdGNU.mk | 47 - extras/mini-os/config/arm32.mk | 22 - extras/mini-os/config/arm64.mk | 19 - extras/mini-os/config/x86_32.mk | 20 - extras/mini-os/config/x86_64.mk | 33 - extras/mini-os/console/console.c | 164 -- extras/mini-os/console/console.h | 2 - extras/mini-os/console/xenbus.c | 195 --- extras/mini-os/console/xencons_ring.c | 195 --- extras/mini-os/daytime.c | 67 - extras/mini-os/domain_config | 19 - extras/mini-os/events.c | 269 ---- extras/mini-os/fbfront.c | 710 --------- extras/mini-os/gntmap.c | 250 ---- extras/mini-os/gnttab.c | 196 --- extras/mini-os/hypervisor.c | 132 -- extras/mini-os/include/arch/cc.h | 87 -- extras/mini-os/include/arch/perf.h | 15 - extras/mini-os/include/arch/sys_arch.h | 35 - extras/mini-os/include/arm/arch_endian.h | 7 - extras/mini-os/include/arm/arch_limits.h | 9 - extras/mini-os/include/arm/arch_mm.h | 38 - extras/mini-os/include/arm/arch_sched.h | 19 - extras/mini-os/include/arm/arch_spinlock.h | 36 - extras/mini-os/include/arm/arm32/arch_wordsize.h | 1 - extras/mini-os/include/arm/gic.h | 1 - extras/mini-os/include/arm/hypercall-arm.h | 98 -- extras/mini-os/include/arm/os.h | 216 --- extras/mini-os/include/arm/traps.h | 20 - extras/mini-os/include/blkfront.h | 54 - extras/mini-os/include/byteorder.h | 36 - extras/mini-os/include/byteswap.h | 39 - extras/mini-os/include/compiler.h | 10 - extras/mini-os/include/console.h | 89 -- extras/mini-os/include/ctype.h | 60 - extras/mini-os/include/endian.h | 19 - extras/mini-os/include/err.h | 31 - extras/mini-os/include/errno-base.h | 39 - extras/mini-os/include/errno.h | 122 -- extras/mini-os/include/events.h | 59 - extras/mini-os/include/fbfront.h | 46 - extras/mini-os/include/fcntl.h | 99 -- extras/mini-os/include/gntmap.h | 35 - extras/mini-os/include/gnttab.h | 17 - extras/mini-os/include/hypervisor.h | 48 - extras/mini-os/include/ioremap.h | 33 - extras/mini-os/include/iorw.h | 16 - extras/mini-os/include/kernel.h | 9 - extras/mini-os/include/lib-gpl.h | 59 - extras/mini-os/include/lib.h | 230 --- extras/mini-os/include/linux/types.h | 5 - extras/mini-os/include/lwipopts.h | 23 - extras/mini-os/include/minios-external/README | 24 - .../mini-os/include/minios-external/bsd-COPYRIGHT | 126 -- extras/mini-os/include/minios-external/bsd-queue.3 | 1044 ------------- .../minios-external/bsd-sys-queue-h-seddery | 72 - .../include/minios-external/bsd-sys-queue.h | 637 -------- extras/mini-os/include/mm.h | 82 - extras/mini-os/include/netfront.h | 24 - extras/mini-os/include/pcifront.h | 29 - extras/mini-os/include/posix/arpa/inet.h | 7 - extras/mini-os/include/posix/dirent.h | 24 - extras/mini-os/include/posix/err.h | 15 - extras/mini-os/include/posix/fcntl.h | 11 - extras/mini-os/include/posix/limits.h | 48 - extras/mini-os/include/posix/net/if.h | 85 -- extras/mini-os/include/posix/netdb.h | 9 - extras/mini-os/include/posix/netinet/in.h | 7 - extras/mini-os/include/posix/netinet/tcp.h | 6 - extras/mini-os/include/posix/poll.h | 1 - extras/mini-os/include/posix/pthread.h | 64 - extras/mini-os/include/posix/signal.h | 10 - extras/mini-os/include/posix/stdlib.h | 8 - extras/mini-os/include/posix/strings.h | 12 - extras/mini-os/include/posix/sys/ioctl.h | 16 - extras/mini-os/include/posix/sys/mman.h | 22 - extras/mini-os/include/posix/sys/poll.h | 79 - extras/mini-os/include/posix/sys/select.h | 7 - extras/mini-os/include/posix/sys/socket.h | 31 - extras/mini-os/include/posix/sys/stat.h | 7 - extras/mini-os/include/posix/syslog.h | 37 - extras/mini-os/include/posix/termios.h | 87 -- extras/mini-os/include/posix/time.h | 11 - extras/mini-os/include/posix/unistd.h | 16 - extras/mini-os/include/sched.h | 55 - extras/mini-os/include/semaphore.h | 110 -- extras/mini-os/include/spinlock.h | 55 - extras/mini-os/include/sys/lock.h | 52 - extras/mini-os/include/sys/time.h | 47 - extras/mini-os/include/time.h | 63 - extras/mini-os/include/tpm_tis.h | 61 - extras/mini-os/include/tpmback.h | 104 -- extras/mini-os/include/tpmfront.h | 97 -- extras/mini-os/include/types.h | 74 - extras/mini-os/include/wait.h | 105 -- extras/mini-os/include/waittypes.h | 32 - extras/mini-os/include/x86/arch_endian.h | 7 - extras/mini-os/include/x86/arch_limits.h | 20 - extras/mini-os/include/x86/arch_mm.h | 233 --- extras/mini-os/include/x86/arch_sched.h | 25 - extras/mini-os/include/x86/arch_spinlock.h | 94 -- extras/mini-os/include/x86/os.h | 572 -------- extras/mini-os/include/x86/traps.h | 78 - extras/mini-os/include/x86/x86_32/arch_wordsize.h | 1 - .../mini-os/include/x86/x86_32/hypercall-x86_32.h | 337 ----- extras/mini-os/include/x86/x86_64/arch_wordsize.h | 2 - .../mini-os/include/x86/x86_64/hypercall-x86_64.h | 344 ----- extras/mini-os/include/xen/COPYING | 38 - extras/mini-os/include/xen/arch-arm.h | 432 ------ extras/mini-os/include/xen/arch-arm/hvm/save.h | 39 - extras/mini-os/include/xen/arch-x86/cpuid.h | 90 -- extras/mini-os/include/xen/arch-x86/hvm/save.h | 630 -------- extras/mini-os/include/xen/arch-x86/xen-mca.h | 440 ------ extras/mini-os/include/xen/arch-x86/xen-x86_32.h | 171 --- extras/mini-os/include/xen/arch-x86/xen-x86_64.h | 202 --- extras/mini-os/include/xen/arch-x86/xen.h | 303 ---- extras/mini-os/include/xen/arch-x86_32.h | 27 - extras/mini-os/include/xen/arch-x86_64.h | 43 - extras/mini-os/include/xen/callback.h | 121 -- extras/mini-os/include/xen/dom0_ops.h | 120 -- extras/mini-os/include/xen/domctl.h | 1154 --------------- extras/mini-os/include/xen/elfnote.h | 271 ---- extras/mini-os/include/xen/event_channel.h | 385 ----- extras/mini-os/include/xen/features.h | 114 -- extras/mini-os/include/xen/gcov.h | 115 -- extras/mini-os/include/xen/grant_table.h | 682 --------- extras/mini-os/include/xen/hvm/e820.h | 34 - extras/mini-os/include/xen/hvm/hvm_info_table.h | 72 - extras/mini-os/include/xen/hvm/hvm_op.h | 402 ----- extras/mini-os/include/xen/hvm/hvm_xs_strings.h | 80 - extras/mini-os/include/xen/hvm/ioreq.h | 129 -- extras/mini-os/include/xen/hvm/params.h | 199 --- extras/mini-os/include/xen/hvm/pvdrivers.h | 49 - extras/mini-os/include/xen/hvm/save.h | 111 -- extras/mini-os/include/xen/io/blkif.h | 640 -------- extras/mini-os/include/xen/io/console.h | 51 - extras/mini-os/include/xen/io/fbif.h | 176 --- extras/mini-os/include/xen/io/fsif.h | 192 --- extras/mini-os/include/xen/io/kbdif.h | 132 -- extras/mini-os/include/xen/io/libxenvchan.h | 97 -- extras/mini-os/include/xen/io/netif.h | 305 ---- extras/mini-os/include/xen/io/pciif.h | 125 -- extras/mini-os/include/xen/io/protocols.h | 40 - extras/mini-os/include/xen/io/ring.h | 312 ---- extras/mini-os/include/xen/io/tpmif.h | 143 -- extras/mini-os/include/xen/io/usbif.h | 150 -- extras/mini-os/include/xen/io/vscsiif.h | 260 ---- extras/mini-os/include/xen/io/xenbus.h | 80 - extras/mini-os/include/xen/io/xs_wire.h | 149 -- extras/mini-os/include/xen/kexec.h | 249 ---- extras/mini-os/include/xen/mem_event.h | 134 -- extras/mini-os/include/xen/memory.h | 587 -------- extras/mini-os/include/xen/nmi.h | 85 -- extras/mini-os/include/xen/physdev.h | 380 ----- extras/mini-os/include/xen/platform.h | 606 -------- extras/mini-os/include/xen/sched.h | 175 --- extras/mini-os/include/xen/sysctl.h | 719 --------- extras/mini-os/include/xen/tmem.h | 152 -- extras/mini-os/include/xen/trace.h | 331 ----- extras/mini-os/include/xen/vcpu.h | 240 --- extras/mini-os/include/xen/version.h | 96 -- extras/mini-os/include/xen/xen-compat.h | 44 - extras/mini-os/include/xen/xen.h | 899 ------------ extras/mini-os/include/xen/xencomm.h | 41 - extras/mini-os/include/xen/xenoprof.h | 152 -- extras/mini-os/include/xen/xsm/flask_op.h | 201 --- extras/mini-os/include/xenbus.h | 120 -- extras/mini-os/include/xmalloc.h | 44 - extras/mini-os/kernel.c | 198 --- extras/mini-os/lib/ctype.c | 29 - extras/mini-os/lib/math.c | 426 ------ extras/mini-os/lib/printf.c | 786 ---------- extras/mini-os/lib/stack_chk_fail.c | 8 - extras/mini-os/lib/string.c | 228 --- extras/mini-os/lib/sys.c | 1550 -------------------- extras/mini-os/lib/xmalloc.c | 319 ---- extras/mini-os/lib/xs.c | 194 --- extras/mini-os/lock.c | 112 -- extras/mini-os/lwip-arch.c | 293 ---- extras/mini-os/lwip-net.c | 386 ----- extras/mini-os/main.c | 193 --- extras/mini-os/minios.mk | 76 - extras/mini-os/mm.c | 441 ------ extras/mini-os/netfront.c | 675 --------- extras/mini-os/pcifront.c | 616 -------- extras/mini-os/sched.c | 304 ---- extras/mini-os/test.c | 577 -------- extras/mini-os/tpm_tis.c | 1523 ------------------- extras/mini-os/tpmback.c | 1136 -------------- extras/mini-os/tpmfront.c | 631 -------- extras/mini-os/xenbus/xenbus.c | 870 ----------- stubdom/Makefile | 4 + tools/misc/mktarball | 4 +- 447 files changed, 40533 insertions(+), 40507 deletions(-) diff --git a/.gitignore b/.gitignore index cdbdca7..4979018 100644 --- a/.gitignore +++ b/.gitignore @@ -46,10 +46,8 @@ docs/man1/ docs/man5/ docs/pdf/ docs/txt/ -extras/mini-os/include/mini-os -extras/mini-os/include/x86/mini-os -extras/mini-os/include/list.h -extras/mini-os/mini-os* +extras/mini-os +extras/mini-os-remote install/* stubdom/autom4te.cache/ stubdom/binutils-* diff --git a/Config.mk b/Config.mk index d12ad91..109f1f1 100644 --- a/Config.mk +++ b/Config.mk @@ -245,14 +245,20 @@ OVMF_UPSTREAM_URL =3F=3D http://xenbits.xen.org/git-http/ovmf.git QEMU_UPSTREAM_URL =3F=3D http://xenbits.xen.org/git-http/qemu-upstream-unstable.git QEMU_TRADITIONAL_URL =3F=3D http://xenbits.xen.org/git-http/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL =3F=3D http://xenbits.xen.org/git-http/seabios.git +MINIOS_UPSTREAM_URL =3F=3D http://xenbits.xen.org/git-http/mini-os.git else OVMF_UPSTREAM_URL =3F=3D git://xenbits.xen.org/ovmf.git QEMU_UPSTREAM_URL =3F=3D git://xenbits.xen.org/qemu-upstream-unstable.git QEMU_TRADITIONAL_URL =3F=3D git://xenbits.xen.org/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL =3F=3D git://xenbits.xen.org/seabios.git +MINIOS_UPSTREAM_URL =3F=3D git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION =3F=3D 447d264115c476142f884af0be287622cd244423 QEMU_UPSTREAM_REVISION =3F=3D master +MINIOS_UPSTREAM_REVISION =3F=3D 55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d +# Thu Jan 29 19:10:04 2015 +0000 +# Mini-OS: standalone build + SEABIOS_UPSTREAM_REVISION =3F=3D rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. diff --git a/Makefile b/Makefile index ad6f917..e8a75ff 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,22 @@ TARGS_DISTCLEAN=3D$(patsubst %, distclean-%, $(SUBSYSTEMS)) export XEN_ROOT=3D$(CURDIR) include Config.mk +.PHONY: mini-os-dir +mini-os-dir: + GIT=3D$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh \ + $(MINIOS_UPSTREAM_URL) \ + $(MINIOS_UPSTREAM_REVISION) \ + $(XEN_ROOT)/extras/mini-os + +.PHONY: mini-os-dir-force-update +mini-os-dir-force-update: mini-os-dir + set -ex; \ + if [ "$(MINIOS_UPSTREAM_REVISION)" ]; then \ + cd extras/mini-os-remote; \ + $(GIT) fetch origin; \ + $(GIT) reset --hard $(MINIOS_UPSTREAM_REVISION); \ + fi + SUBARCH :=3D $(subst x86_32,i386,$(XEN_TARGET_ARCH)) export XEN_TARGET_ARCH SUBARCH export DESTDIR @@ -37,7 +53,7 @@ build-tools: $(MAKE) -C tools build .PHONY: build-stubdom -build-stubdom: +build-stubdom: mini-os-dir $(MAKE) -C stubdom build ifeq (x86_64,$(XEN_TARGET_ARCH)) XEN_TARGET_ARCH=3Dx86_32 $(MAKE) -C stubdom pv-grub @@ -84,7 +100,7 @@ install-tools: $(MAKE) -C tools install .PHONY: install-stubdom -install-stubdom: install-tools +install-stubdom: install-tools mini-os-dir $(MAKE) -C stubdom install ifeq (x86_64,$(XEN_TARGET_ARCH)) XEN_TARGET_ARCH=3Dx86_32 $(MAKE) -C stubdom install-grub @@ -125,11 +141,11 @@ rpmball: dist bash ./tools/misc/mkrpm $(XEN_ROOT) $$($(MAKE) -C xen xenversion --no-print-directory) .PHONY: subtree-force-update -subtree-force-update: +subtree-force-update: mini-os-dir-force-update $(MAKE) -C tools subtree-force-update .PHONY: subtree-force-update-all -subtree-force-update-all: +subtree-force-update-all: mini-os-dir-force-update $(MAKE) -C tools subtree-force-update-all # Make a source tarball, including qemu sub-trees. diff --git a/extras/mini-os-intree/COPYING b/extras/mini-os-intree/COPYING new file mode 100644 index 0000000..1d9df6c --- /dev/null +++ b/extras/mini-os-intree/COPYING @@ -0,0 +1,36 @@ +Certain files in this directory are licensed by the GNU +General Public License version 2 (GPLv2). By default these +files are not built and linked into MiniOs. Enabling them +will cause the whole work to become covered by the GPLv2. + +The current set of GPLv2 features are: +CONFIG_TPMFRONT +CONFIG_TPMBACK +CONFIG_TPM_TIS + +Do not use these if you do not want your MiniOS build to become +GPL licensed! + +Copyright (c) 2009 Citrix Systems, Inc. All rights reserved. + +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 AUTHOR 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 AUTHOR 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. + diff --git a/extras/mini-os-intree/Config.mk b/extras/mini-os-intree/Config.mk new file mode 100644 index 0000000..e5d8ade --- /dev/null +++ b/extras/mini-os-intree/Config.mk @@ -0,0 +1,99 @@ +# +# Compare $(1) and $(2) and replace $(2) with $(1) if they differ +# +# Typically $(1) is a newly generated file and $(2) is the target file +# being regenerated. This prevents changing the timestamp of $(2) only +# due to being auto regenereated with the same contents. +define move-if-changed + if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi +endef + +# cc-option: Check if compiler supports first option, else fall back to second. +# +# This is complicated by the fact that unrecognised -Wno-* options: +# (a) are ignored unless the compilation emits a warning; and +# (b) even then produce a warning rather than an error +# To handle this we do a test compile, passing the option-under-test, on a code +# fragment that will always produce a warning (integer assigned to pointer). +# We then grep for the option-under-test in the compiler's output, the presence +# of which would indicate an "unrecognized command-line option" warning/error. +# +# Usage: cflags-y +=3D $(call cc-option,$(CC),-march=3Dwinchip-c6,-march=3Di586) +cc-option =3D $(shell if test -z "`echo 'void*p=3D1;' | \ + $(1) $(2) -S -o /dev/null -x c - 2>&1 | grep -- $(2) -`"; \ + then echo "$(2)"; else echo "$(3)"; fi ;) + +# Compatibility with Xen's stubdom build environment. If we are building +# stubdom, some XEN_ variables are set, set MINIOS_ variables accordingly. +# +ifneq ($(XEN_ROOT),) +MINI-OS_ROOT=3D$(XEN_ROOT)/extras/mini-os +else +MINI-OS_ROOT=3D$(TOPLEVEL_DIR) +endif +export MINI-OS_ROOT + +ifneq ($(XEN_TARGET_ARCH),) +MINIOS_TARGET_ARCH =3D $(XEN_TARGET_ARCH) +else +MINIOS_COMPILE_ARCH =3F=3D $(shell uname -m | sed -e s/i.86/x86_32/ \ + -e s/i86pc/x86_32/ -e s/amd64/x86_64/ \ + -e s/armv7.*/arm32/ -e s/armv8.*/arm64/ \ + -e s/aarch64/arm64/) + +MINIOS_TARGET_ARCH =3F=3D $(MINIOS_COMPILE_ARCH) +endif + +libc =3D $(stubdom) + +XEN_INTERFACE_VERSION :=3D 0x00030205 +export XEN_INTERFACE_VERSION + +# Try to find out the architecture family TARGET_ARCH_FAM. +# First check whether x86_... is contained (for x86_32, x86_32y, x86_64). +# If not x86 then use $(MINIOS_TARGET_ARCH) +ifeq ($(findstring x86_,$(MINIOS_TARGET_ARCH)),x86_) +TARGET_ARCH_FAM =3D x86 +else +TARGET_ARCH_FAM =3D $(MINIOS_TARGET_ARCH) +endif + +# The architecture family directory below mini-os. +TARGET_ARCH_DIR :=3D arch/$(TARGET_ARCH_FAM) + +# Export these variables for possible use in architecture dependent makefiles. +export TARGET_ARCH_DIR +export TARGET_ARCH_FAM + +# This is used for architecture specific links. +# This can be overwritten from arch specific rules. +ARCH_LINKS =3D + +# The path pointing to the architecture specific header files. +ARCH_INC :=3D $(TARGET_ARCH_FAM) + +# For possible special header directories. +# This can be overwritten from arch specific rules. +EXTRA_INC =3D $(ARCH_INC) + +# Include the architecture family's special makerules. +# This must be before include minios.mk! +include $(MINI-OS_ROOT)/$(TARGET_ARCH_DIR)/arch.mk + +extra_incl :=3D $(foreach dir,$(EXTRA_INC),-isystem $(MINI-OS_ROOT)/include/$(dir)) + +DEF_CPPFLAGS +=3D -isystem $(MINI-OS_ROOT)/include +DEF_CPPFLAGS +=3D -D__MINIOS__ + +ifeq ($(libc),y) +DEF_CPPFLAGS +=3D -DHAVE_LIBC +DEF_CPPFLAGS +=3D -isystem $(MINI-OS_ROOT)/include/posix +DEF_CPPFLAGS +=3D -isystem $(XEN_ROOT)/tools/xenstore/include +endif + +ifneq ($(LWIPDIR),) +lwip=3Dy +DEF_CPPFLAGS +=3D -DHAVE_LWIP +DEF_CPPFLAGS +=3D -isystem $(LWIPDIR)/src/include +DEF_CPPFLAGS +=3D -isystem $(LWIPDIR)/src/include/ipv4 +endif diff --git a/extras/mini-os-intree/Makefile b/extras/mini-os-intree/Makefile new file mode 100644 index 0000000..f16520e --- /dev/null +++ b/extras/mini-os-intree/Makefile @@ -0,0 +1,224 @@ +# Common Makefile for mini-os. +# +# Every architecture directory below mini-os/arch has to have a +# Makefile and a arch.mk. +# + +OBJ_DIR=3D$(CURDIR) +TOPLEVEL_DIR=3D$(CURDIR) + +ifeq ($(MINIOS_CONFIG),) +include Config.mk +else +EXTRA_DEPS +=3D $(MINIOS_CONFIG) +include $(MINIOS_CONFIG) +endif + +include $(MINI-OS_ROOT)/config/MiniOS.mk + +# Configuration defaults +CONFIG_START_NETWORK =3F=3D y +CONFIG_SPARSE_BSS =3F=3D y +CONFIG_QEMU_XS_ARGS =3F=3D n +CONFIG_TEST =3F=3D n +CONFIG_PCIFRONT =3F=3D n +CONFIG_BLKFRONT =3F=3D y +CONFIG_TPMFRONT =3F=3D n +CONFIG_TPM_TIS =3F=3D n +CONFIG_TPMBACK =3F=3D n +CONFIG_NETFRONT =3F=3D y +CONFIG_FBFRONT =3F=3D y +CONFIG_KBDFRONT =3F=3D y +CONFIG_CONSFRONT =3F=3D y +CONFIG_XENBUS =3F=3D y +CONFIG_XC =3F=3Dy +CONFIG_LWIP =3F=3D $(lwip) + +# Export config items as compiler directives +flags-$(CONFIG_START_NETWORK) +=3D -DCONFIG_START_NETWORK +flags-$(CONFIG_SPARSE_BSS) +=3D -DCONFIG_SPARSE_BSS +flags-$(CONFIG_QEMU_XS_ARGS) +=3D -DCONFIG_QEMU_XS_ARGS +flags-$(CONFIG_PCIFRONT) +=3D -DCONFIG_PCIFRONT +flags-$(CONFIG_BLKFRONT) +=3D -DCONFIG_BLKFRONT +flags-$(CONFIG_TPMFRONT) +=3D -DCONFIG_TPMFRONT +flags-$(CONFIG_TPM_TIS) +=3D -DCONFIG_TPM_TIS +flags-$(CONFIG_TPMBACK) +=3D -DCONFIG_TPMBACK +flags-$(CONFIG_NETFRONT) +=3D -DCONFIG_NETFRONT +flags-$(CONFIG_KBDFRONT) +=3D -DCONFIG_KBDFRONT +flags-$(CONFIG_FBFRONT) +=3D -DCONFIG_FBFRONT +flags-$(CONFIG_CONSFRONT) +=3D -DCONFIG_CONSFRONT +flags-$(CONFIG_XENBUS) +=3D -DCONFIG_XENBUS + +DEF_CFLAGS +=3D $(flags-y) + +# Symlinks and headers that must be created before building the C files +GENERATED_HEADERS :=3D include/list.h $(ARCH_LINKS) include/mini-os include/$(TARGET_ARCH_FAM)/mini-os + +EXTRA_DEPS +=3D $(GENERATED_HEADERS) + +# Include common mini-os makerules. +include minios.mk + +# Set tester flags +# CFLAGS +=3D -DBLKTEST_WRITE + +# Define some default flags for linking. +LDLIBS :=3D +APP_LDLIBS :=3D +LDARCHLIB :=3D -L$(OBJ_DIR)/$(TARGET_ARCH_DIR) -l$(ARCH_LIB_NAME) +LDFLAGS_FINAL :=3D -T $(TARGET_ARCH_DIR)/minios-$(MINIOS_TARGET_ARCH).lds + +# Prefix for global API names. All other symbols are localised before +# linking with EXTRA_OBJS. +GLOBAL_PREFIX :=3D xenos_ +EXTRA_OBJS =3D + +TARGET :=3D mini-os + +# Subdirectories common to mini-os +SUBDIRS :=3D lib xenbus console + +src-$(CONFIG_BLKFRONT) +=3D blkfront.c +src-$(CONFIG_TPMFRONT) +=3D tpmfront.c +src-$(CONFIG_TPM_TIS) +=3D tpm_tis.c +src-$(CONFIG_TPMBACK) +=3D tpmback.c +src-y +=3D daytime.c +src-y +=3D events.c +src-$(CONFIG_FBFRONT) +=3D fbfront.c +src-y +=3D gntmap.c +src-y +=3D gnttab.c +src-y +=3D hypervisor.c +src-y +=3D kernel.c +src-y +=3D lock.c +src-y +=3D main.c +src-y +=3D mm.c +src-$(CONFIG_NETFRONT) +=3D netfront.c +src-$(CONFIG_PCIFRONT) +=3D pcifront.c +src-y +=3D sched.c +src-$(CONFIG_TEST) +=3D test.c + +src-y +=3D lib/ctype.c +src-y +=3D lib/math.c +src-y +=3D lib/printf.c +src-y +=3D lib/stack_chk_fail.c +src-y +=3D lib/string.c +src-y +=3D lib/sys.c +src-y +=3D lib/xmalloc.c +src-$(CONFIG_XENBUS) +=3D lib/xs.c + +src-$(CONFIG_XENBUS) +=3D xenbus/xenbus.c + +src-y +=3D console/console.c +src-y +=3D console/xencons_ring.c +src-$(CONFIG_CONSFRONT) +=3D console/xenbus.c + +# The common mini-os objects to build. +APP_OBJS :=3D +OBJS :=3D $(patsubst %.c,$(OBJ_DIR)/%.o,$(src-y)) + +.PHONY: default +default: $(OBJ_DIR)/$(TARGET) + +# Create special architecture specific links. The function arch_links +# has to be defined in arch.mk (see include above). +ifneq ($(ARCH_LINKS),) +$(ARCH_LINKS): + $(arch_links) +endif + +include/list.h: include/minios-external/bsd-sys-queue-h-seddery include/minios-external/bsd-sys-queue.h + perl $^ --prefix=3Dminios >$@.new + $(call move-if-changed,$@.new,$@) + +# Used by stubdom's Makefile +.PHONY: links +links: $(GENERATED_HEADERS) + +include/mini-os: + ln -sf . $@ + +include/$(TARGET_ARCH_FAM)/mini-os: + ln -sf . $@ + +.PHONY: arch_lib +arch_lib: + $(MAKE) --directory=3D$(TARGET_ARCH_DIR) OBJ_DIR=3D$(OBJ_DIR)/$(TARGET_ARCH_DIR) || exit 1; + +ifeq ($(CONFIG_LWIP),y) +# lwIP library +LWC :=3D $(shell find $(LWIPDIR)/src -type f -name '*.c') +LWC :=3D $(filter-out %6.c %ip6_addr.c %ethernetif.c, $(LWC)) +LWO :=3D $(patsubst %.c,%.o,$(LWC)) +LWO +=3D $(OBJ_DIR)/lwip-arch.o +ifeq ($(CONFIG_NETFRONT),y) +LWO +=3D $(OBJ_DIR)/lwip-net.o +endif + +$(OBJ_DIR)/lwip.a: $(LWO) + $(RM) $@ + $(AR) cqs $@ $^ + +OBJS +=3D $(OBJ_DIR)/lwip.a +endif + +OBJS :=3D $(filter-out $(OBJ_DIR)/lwip%.o $(LWO), $(OBJS)) + +ifeq ($(libc),y) +ifeq ($(CONFIG_XC),y) +APP_LDLIBS +=3D -L$(XEN_ROOT)/stubdom/libxc-$(XEN_TARGET_ARCH) -whole-archive -lxenguest -lxenctrl -no-whole-archive +endif +APP_LDLIBS +=3D -lpci +APP_LDLIBS +=3D -lz +APP_LDLIBS +=3D -lm +LDLIBS +=3D -lc +endif + +ifneq ($(APP_OBJS)-$(lwip),-y) +OBJS :=3D $(filter-out $(OBJ_DIR)/daytime.o, $(OBJS)) +endif + +$(OBJ_DIR)/$(TARGET)_app.o: $(APP_OBJS) app.lds + $(LD) -r -d $(LDFLAGS) -\( $^ -\) $(APP_LDLIBS) --undefined main -o $@ + +ifneq ($(APP_OBJS),) +APP_O=3D$(OBJ_DIR)/$(TARGET)_app.o +endif + +$(OBJ_DIR)/$(TARGET): $(OBJS) $(APP_O) arch_lib + $(LD) -r $(LDFLAGS) $(HEAD_OBJ) $(APP_O) $(OBJS) $(LDARCHLIB) $(LDLIBS) -o $@.o + $(OBJCOPY) -w -G $(GLOBAL_PREFIX)* -G _start $@.o $@.o + $(LD) $(LDFLAGS) $(LDFLAGS_FINAL) $@.o $(EXTRA_OBJS) -o $@ + gzip -f -9 -c $@ >$@.gz + +.PHONY: clean arch_clean + +arch_clean: + $(MAKE) --directory=3D$(TARGET_ARCH_DIR) OBJ_DIR=3D$(OBJ_DIR)/$(TARGET_ARCH_DIR) clean || exit 1; + +clean: arch_clean + for dir in $(addprefix $(OBJ_DIR)/,$(SUBDIRS)); do \ + rm -f $$dir/*.o; \ + done + rm -f include/list.h + rm -f $(OBJ_DIR)/*.o *~ $(OBJ_DIR)/core $(OBJ_DIR)/$(TARGET).elf $(OBJ_DIR)/$(TARGET).raw $(OBJ_DIR)/$(TARGET) $(OBJ_DIR)/$(TARGET).gz + find . $(OBJ_DIR) -type l | xargs rm -f + $(RM) $(OBJ_DIR)/lwip.a $(LWO) + rm -f tags TAGS + + +define all_sources + ( find . -follow -name SCCS -prune -o -name '*.[chS]' -print ) +endef + +.PHONY: cscope +cscope: + $(all_sources) > cscope.files + cscope -k -b -q + +.PHONY: tags +tags: + $(all_sources) | xargs ctags + +.PHONY: TAGS +TAGS: + $(all_sources) | xargs etags diff --git a/extras/mini-os-intree/README b/extras/mini-os-intree/README new file mode 100644 index 0000000..7960314 --- /dev/null +++ b/extras/mini-os-intree/README @@ -0,0 +1,46 @@ + Minimal OS + ---------- + +This shows some of the stuff that any guest OS will have to set up. + +This includes: + + * installing a virtual exception table + * handling virtual exceptions + * handling asynchronous events + * enabling/disabling async events + * parsing start_info struct at start-of-day + * registering virtual interrupt handlers (for timer interrupts) + * a simple page and memory allocator + * minimal libc support + * minimal Copy-on-Write support + * network, block, framebuffer support + * transparent access to FileSystem exports (see tools/fs-back) + +- to build it just type make. + +- to build it with TCP/IP support, download LWIP 1.3.2 source code and type + + make LWIPDIR=3D/path/to/lwip/source + +- to build it with much better libc support, see the stubdom/ directory + +- to start it do the following in domain0 + # xl create -c domain_config + +This starts the kernel and prints out a bunch of stuff and then once every +second the system time. + +If you have setup a disk in the config file (e.g. +disk =3D [ 'file:/tmp/foo,hda,r' ] ), it will loop reading it. If that disk is +writable (e.g. disk =3D [ 'file:/tmp/foo,hda,w' ] ), it will write data patterns +and re-read them. + +If you have setup a network in the config file (e.g. vif =3D [''] ), it will +print incoming packets. + +If you have setup a VFB in the config file (e.g. vfb =3D ['type=3Dsdl'] ), it will +show a mouse with which you can draw color squares. + +If you have compiled it with TCP/IP support, it will run a daytime server on +TCP port 13. diff --git a/extras/mini-os-intree/app.lds b/extras/mini-os-intree/app.lds new file mode 100644 index 0000000..4a48cc8 --- /dev/null +++ b/extras/mini-os-intree/app.lds @@ -0,0 +1,11 @@ +SECTIONS +{ + .app.bss : { + __app_bss_start =3D . ; + *(.bss .bss.*) + *(COMMON) + *(.lbss .lbss.*) + *(LARGE_COMMON) + __app_bss_end =3D . ; + } +} diff --git a/extras/mini-os-intree/arch/arm/arm32.S b/extras/mini-os-intree/arch/arm/arm32.S new file mode 100644 index 0000000..a08a170 --- /dev/null +++ b/extras/mini-os-intree/arch/arm/arm32.S @@ -0,0 +1,294 @@ +@ Offset of the kernel within the RAM. This is a Linux/zImage convention which we +@ rely on for now. +#define ZIMAGE_KERNEL_OFFSET 0x8000 + +.section .text + +.globl _start +_start: + @ zImage header +.rept 8 + mov r0, r0 +.endr + b reset + .word 0x016f2818 @ Magic numbers to help the loader + .word 0 @ zImage start address (0 =3D relocatable) + .word _edata - _start @ zImage end address (excludes bss section) + @ end of zImage header + +@ Called at boot time. Sets up MMU, exception vectors and stack, and then calls C arch_init() function. +@ =3D> r2 -> DTB +@ <=3D never returns +@ Note: this boot code needs to be within the first (1MB - ZIMAGE_KERNEL_OFFSET) of _start. +reset: + @ Problem: the C code wants to be at a known address (_start), but Xen might + @ load us anywhere. We initialise the MMU (mapping virtual to physical @ addresses) + @ so everything ends up where the code expects it to be. + @ + @ We calculate the offet between where the linker thought _start would be and where + @ it actually is and initialise the page tables to have that offset for every page. + @ + @ When we turn on the MMU, we're still executing at the old address. We don't want + @ the code to disappear from under us. So we have to do the mapping in stages: + @ + @ 1. set up a mapping to our current page from both its current and desired addresses + @ 2. enable the MMU + @ 3. jump to the new address + @ 4. remap all the other pages with the calculated offset + + adr r1, _start @ r1 =3D physical address of _start + ldr r3, =3D_start @ r3 =3D (desired) virtual address of _start + sub r9, r1, r3 @ r9 =3D (physical - virtual) offset + + ldr r7, =3D_page_dir @ r7 =3D (desired) virtual addr of translation table + add r1, r7, r9 @ r1 =3D physical addr of translation table + + @ Tell the system where our page table is located. + @ This is the 16 KB top-level translation table, in which + @ each word maps one 1MB virtual section to a physical section. + @ Note: We leave TTBCR as 0, meaning that only TTBR0 is used and + @ we use the short-descriptor format (32-bit physical addresses). + orr r0, r1, #0b0001011 @ Sharable, Inner/Outer Write-Back Write-Allocate Cacheable + mcr p15, 0, r0, c2, c0, 0 @ set TTBR0 + + @ Set access permission for domains. + @ Domains are deprecated, but we have to configure them anyway. + @ We mark every page as being domain 0 and set domain 0 to "client mode" + @ (client mode =3D use access flags in page table). + mov r0, #1 @ 1 =3D client + mcr p15, 0, r0, c3, c0, 0 @ DACR + + @ Template (flags) for a 1 MB page-table entry. + @ TEX[2:0] C B =3D 001 1 1 (outer and inner write-back, write-allocate) + ldr r8, =3D(0x2 + /* Section entry */ \ + 0xc + /* C B */ \ + (3 << 10) + /* Read/write */ \ + (1 << 12) + /* TEX */ \ + (1 << 16) + /* Sharable */ \ + (1<<19)) /* Non-secure */ + @ r8 =3D template page table entry + + @ Add an entry for the current physical section, at the old and new + @ addresses. It's OK if they're the same. + mov r0, pc, lsr#20 + mov r0, r0, lsl#20 @ r0 =3D physical address of this code's section start + orr r3, r0, r8 @ r3 =3D table entry for this section + ldr r4, =3D_start @ r4 =3D desired virtual address of this section + str r3, [r1, r4, lsr#18] @ map desired virtual section to this code + str r3, [r1, r0, lsr#18] @ map current section to this code too + + @ Invalidate TLB + dsb @ Caching is off, but must still prevent reordering + mcr p15, 0, r1, c8, c7, 0 @ TLBIALL + + @ Enable MMU / SCTLR + mrc p15, 0, r1, c1, c0, 0 @ SCTLR + orr r1, r1, #3 << 11 @ enable icache, branch prediction + orr r1, r1, #4 + 1 @ enable dcache, MMU + mcr p15, 0, r1, c1, c0, 0 @ SCTLR + isb + + ldr r1, =3Dstage2 @ Virtual address of stage2 + bx r1 + +@ Called once the MMU is enabled. The boot code and the page table are mapped, +@ but nothing else is yet. +@ +@ =3D> r2 -> dtb (physical) +@ r7 =3D virtual address of page table +@ r8 =3D section entry template (flags) +@ r9 =3D desired physical - virtual offset +@ pc -> somewhere in newly-mapped virtual code section +stage2: + @ Invalidate TLB + mcr p15, 0, r1, c8, c7, 0 @ TLBIALL + isb + + @ The new mapping has now taken effect: + @ r7 -> page_dir + + @ Fill in the whole top-level translation table (at page_dir). + @ Populate the whole pagedir with 1MB section descriptors. + + mov r1, r7 @ r1 -> first section entry + add r3, r1, #4*4*1024 @ limit (4 GB address space, 4 byte entries) + orr r0, r8, r9 @ r0 =3D entry mapping section zero to start of physical RAM +1: + str r0, [r1],#4 @ write the section entry + add r0, r0, #1 << 20 @ next physical page (wraps) + cmp r1, r3 + bne 1b + + @ Invalidate TLB + dsb + mcr p15, 0, r1, c8, c7, 0 @ TLBIALL + isb + + @ Set VBAR -> exception_vector_table + @ SCTLR.V =3D 0 + adr r0, exception_vector_table + mcr p15, 0, r0, c12, c0, 0 + + @ Enable hardware floating point: + @ 1. Access to CP10 and CP11 must be enabled in the Coprocessor Access + @ Control Register (CP15.CACR): + mrc p15, 0, r1, c1, c0, 2 @ CACR + orr r1, r1, #(3 << 20) + (3 << 22) @ full access for CP10 & CP11 + mcr p15, 0, r1, c1, c0, 2 + @ 2. The EN bit in the FPEXC register must be set: + vmrs r0, FPEXC + orr r0, r0, #1<<30 @ EN (enable) + vmsr FPEXC, r0 + + @ Initialise 16 KB stack + ldr sp, =3D_boot_stack_end + + sub r0, r2, r9 @ r0 -> device tree (virtual address) + mov r1, r9 @ r1 =3D physical_address_offset + + b arch_init + +.pushsection .bss +@ Note: calling arch_init zeroes out this region. +.align 12 +.globl shared_info_page +shared_info_page: + .fill (1024), 4, 0x0 + +.align 3 +.globl irqstack +.globl irqstack_end +irqstack: + .fill (1024), 4, 0x0 +irqstack_end: + +fault_dump: + .fill 18, 4, 0x0 @ On fault, we save the registers + CPSR + handler address + +.popsection + +fault: + cpsid aif @ Disable interrupts + + ldr r13, =3Dfault_dump + stmia r13, {r0-r12} @ Dump the non-banked registers directly (well, unless from FIQ mode) + str r14, [r13, #15 << 2] @ Our r14 is the faulting r15 + mov r0, r13 + + @ Save the caller's CPSR (our SPSR) too. + mrs r1, SPSR + str r1, [r13, #16 << 2] + + @ Switch to the mode we came from to get r13 and r14. + @ If coming from user mode, use System mode instead so we're still + @ privileged. + and r1, r1, #0x1f @ r1 =3D SPSR mode + cmp r1, #0x10 @ If from User mode + moveq r1, #0x1f @ Then use System mode instead + + mrs r3, CPSR @ r3 =3D our CPSR + bic r2, r3, #0x1f + orr r2, r2, r1 + msr CPSR, r2 @ Change to mode r1 + + @ Save old mode's r13, r14 + str r13, [r0, #13 << 2] + str r14, [r0, #14 << 2] + + msr CPSR, r3 @ Back to fault mode + + ldr r1, [r0, #17 << 2] + sub r1, r1, #12 @ Fix to point at start of handler + str r1, [r0, #17 << 2] + + @ Call C code to format the register dump. + @ Clobbers the stack, but we're not going to return anyway. + ldr sp, =3D_boot_stack_end + bl dump_registers + b do_exit + +@ We want to store a unique value to identify this handler, without corrupting +@ any of the registers. So, we store r15 (which will point just after the branch). +@ Later, we subtract 12 so the user gets pointed at the start of the exception +@ handler. +#define FAULT(name) \ +.globl fault_##name; \ +fault_##name: \ + ldr r13, =3Dfault_dump; \ + str r15, [r13, #17 << 2]; \ + b fault + +FAULT(reset) +FAULT(undefined_instruction) +FAULT(svc) +FAULT(prefetch_call) +FAULT(prefetch_abort) +FAULT(data_abort) + +@ exception base address +.align 5 +.globl exception_vector_table +@ Note: remember to call CLREX if returning from an exception: +@ "The architecture enables the local monitor to treat any exclusive store as +@ matching a previous LDREX address. For this reason, use of the CLREX +@ instruction to clear an existing tag is required on context switches." +@ -- ARM Cortex-A Series Programmer=E2=80=99s Guide (Version: 4.0) +exception_vector_table: + b fault_reset + b fault_undefined_instruction + b fault_svc + b fault_prefetch_call + b fault_prefetch_abort + b fault_data_abort + b irq_handler @ IRQ + .word 0xe7f000f0 @ abort on FIQ + +@ Call fault_undefined_instruction in "Undefined mode" +bug: + .word 0xe7f000f0 @ und/udf - a "Permanently Undefined" instruction + +irq_handler: + ldr sp, =3Dirqstack_end + push {r0 - r12, r14} + + ldr r0, IRQ_handler + cmp r0, #0 + beq bug + blx r0 @ call handler + + @ Return from IRQ + pop {r0 - r12, r14} + clrex + subs pc, lr, #4 + +.globl IRQ_handler +IRQ_handler: + .long 0x0 + + +.globl __arch_switch_threads +@ =3D> r0 =3D &prev->sp +@ r1 =3D &next->sp +@ <=3D returns to next thread's saved return address +__arch_switch_threads: + push {r4-r11} @ Store callee-saved registers to old thread's stack + stmia r0, {sp, lr} @ Store current sp and ip to prev's struct thread + + ldmia r1, {sp, lr} @ Load new sp, ip from next's struct thread + pop {r4-r11} @ Load callee-saved registers from new thread's stack + + bx lr + +@ This is called if you try to divide by zero. For now, we make a supervisor call, +@ which will make us halt. +.globl raise +raise: + svc 0 + +.globl arm_start_thread +arm_start_thread: + pop {r0, r1} + @ r0 =3D user data + @ r1 -> thread's main function + ldr lr, =3Dexit_thread + bx r1 diff --git a/extras/mini-os-intree/arch/arm/events.c b/extras/mini-os-intree/arch/arm/events.c new file mode 100644 index 0000000..441010d --- /dev/null +++ b/extras/mini-os-intree/arch/arm/events.c @@ -0,0 +1,31 @@ +#include +#include +#include +#include + +static void virq_debug(evtchn_port_t port, struct pt_regs *regs, void *params) +{ + printk("Received a virq_debug event\n"); +} + +evtchn_port_t debug_port =3D -1; +void arch_init_events(void) +{ + debug_port =3D bind_virq(VIRQ_DEBUG, (evtchn_handler_t)virq_debug, 0); + if(debug_port =3D=3D -1) + BUG(); + unmask_evtchn(debug_port); +} + +void arch_unbind_ports(void) +{ + if(debug_port !=3D -1) + { + mask_evtchn(debug_port); + unbind_evtchn(debug_port); + } +} + +void arch_fini_events(void) +{ +} diff --git a/extras/mini-os-intree/arch/arm/hypercalls32.S b/extras/mini-os-intree/arch/arm/hypercalls32.S new file mode 100644 index 0000000..af8e175 --- /dev/null +++ b/extras/mini-os-intree/arch/arm/hypercalls32.S @@ -0,0 +1,64 @@ +/****************************************************************************** + * hypercall.S + * + * Xen hypercall wrappers + * + * Stefano Stabellini , Citrix, 2012 + * + * 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; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include + +#define __HVC(imm16) .long ((0xE1400070 | (((imm16) & 0xFFF0) << 4) | ((imm16) & 0x000F)) & 0xFFFFFFFF) + +#define XEN_IMM 0xEA1 + +#define HYPERCALL_SIMPLE(hypercall) \ +.globl HYPERVISOR_##hypercall; \ +.align 4,0x90; \ +HYPERVISOR_##hypercall: \ + mov r12, #__HYPERVISOR_##hypercall; \ + __HVC(XEN_IMM); \ + mov pc, lr; + +#define _hypercall0 HYPERCALL_SIMPLE +#define _hypercall1 HYPERCALL_SIMPLE +#define _hypercall2 HYPERCALL_SIMPLE +#define _hypercall3 HYPERCALL_SIMPLE +#define _hypercall4 HYPERCALL_SIMPLE + +_hypercall2(sched_op); +_hypercall2(memory_op); +_hypercall2(event_channel_op); +_hypercall2(xen_version); +_hypercall3(console_io); +_hypercall1(physdev_op); +_hypercall3(grant_table_op); +_hypercall3(vcpu_op); +_hypercall1(sysctl); +_hypercall1(domctl); +_hypercall2(hvm_op); +_hypercall1(xsm_op); diff --git a/extras/mini-os-intree/arch/arm/minios-arm32.lds b/extras/mini-os-intree/arch/arm/minios-arm32.lds new file mode 100755 index 0000000..9627162 --- /dev/null +++ b/extras/mini-os-intree/arch/arm/minios-arm32.lds @@ -0,0 +1,83 @@ +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + /* Note: we currently assume that Xen will load the kernel image + * at start-of-RAM + 0x8000. We use this initial 32 KB for the stack + * and translation tables. + */ + _boot_stack =3D 0x400000; /* 16 KB boot stack */ + _boot_stack_end =3D 0x404000; + _page_dir =3D 0x404000; /* 16 KB translation table */ + . =3D 0x408000; + _text =3D .; /* Text and read-only data */ + .text : { + *(.text) + *(.gnu.warning) + } =3D 0x9090 + + _etext =3D .; /* End of text section */ + + .rodata : { *(.rodata) *(.rodata.*) } + . =3D ALIGN(4096); + _erodata =3D .; + + /* newlib initialization functions */ + . =3D ALIGN(32 / 8); + PROVIDE (__preinit_array_start =3D .); + .preinit_array : { *(.preinit_array) } + PROVIDE (__preinit_array_end =3D .); + PROVIDE (__init_array_start =3D .); + .init_array : { *(.init_array) } + PROVIDE (__init_array_end =3D .); + PROVIDE (__fini_array_start =3D .); + .fini_array : { *(.fini_array) } + PROVIDE (__fini_array_end =3D .); + + .ctors : { + __CTOR_LIST__ =3D .; + *(.ctors) + CONSTRUCTORS + LONG(0) + __CTOR_END__ =3D .; + } + + .dtors : { + __DTOR_LIST__ =3D .; + *(.dtors) + LONG(0) + __DTOR_END__ =3D .; + } + + .data : { /* Data */ + *(.data) + } + + /* Note: linker will insert any extra sections here, just before .bss */ + + .bss : { + _edata =3D .; /* End of data included in image */ + /* Nothing after here is included in the zImage's size */ + + __bss_start =3D .; + *(.bss) + *(.app.bss) + } + _end =3D . ; + + /* Sections to be discarded */ + /DISCARD/ : { + *(.text.exit) + *(.data.exit) + *(.exitcall.exit) + } + + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } +} diff --git a/extras/mini-os-intree/arch/arm/mm.c b/extras/mini-os-intree/arch/arm/mm.c new file mode 100644 index 0000000..efecc51 --- /dev/null +++ b/extras/mini-os-intree/arch/arm/mm.c @@ -0,0 +1,139 @@ +#include +#include +#include +#include +#include +#include + +uint32_t physical_address_offset; + +unsigned long allocate_ondemand(unsigned long n, unsigned long alignment) +{ + // FIXME + BUG(); +} + +void arch_init_mm(unsigned long *start_pfn_p, unsigned long *max_pfn_p) +{ + int memory; + int prop_len =3D 0; + const uint64_t *regs; + + printk(" _text: %p(VA)\n", &_text); + printk(" _etext: %p(VA)\n", &_etext); + printk(" _erodata: %p(VA)\n", &_erodata); + printk(" _edata: %p(VA)\n", &_edata); + printk(" stack start: %p(VA)\n", _boot_stack); + printk(" _end: %p(VA)\n", &_end); + + if (fdt_num_mem_rsv(device_tree) !=3D 0) + printk("WARNING: reserved memory not supported!\n"); + + memory =3D fdt_node_offset_by_prop_value(device_tree, -1, "device_type", "memory", sizeof("memory")); + if (memory < 0) { + printk("No memory found in FDT!\n"); + BUG(); + } + + /* Xen will always provide us at least one bank of memory. + * Mini-OS will use the first bank for the time-being. */ + regs =3D fdt_getprop(device_tree, memory, "reg", &prop_len); + + /* The property must contain at least the start address + * and size, each of which is 8-bytes. */ + if (regs =3D=3D NULL || prop_len < 16) { + printk("Bad 'reg' property: %p %d\n", regs, prop_len); + BUG(); + } + + unsigned int end =3D (unsigned int) &_end; + paddr_t mem_base =3D fdt64_to_cpu(regs[0]); + uint64_t mem_size =3D fdt64_to_cpu(regs[1]); + printk("Found memory at 0x%llx (len 0x%llx)\n", + (unsigned long long) mem_base, (unsigned long long) mem_size); + + BUG_ON(to_virt(mem_base) > (void *) &_text); /* Our image isn't in our RAM! */ + *start_pfn_p =3D PFN_UP(to_phys(end)); + uint64_t heap_len =3D mem_size - (PFN_PHYS(*start_pfn_p) - mem_base); + *max_pfn_p =3D *start_pfn_p + PFN_DOWN(heap_len); + + printk("Using pages %lu to %lu as free space for heap.\n", *start_pfn_p, *max_pfn_p); + + /* The device tree is probably in memory that we're about to hand over to the page + * allocator, so move it to the end and reserve that space. + */ + uint32_t fdt_size =3D fdt_totalsize(device_tree); + void *new_device_tree =3D to_virt(((*max_pfn_p << PAGE_SHIFT) - fdt_size) & PAGE_MASK); + if (new_device_tree !=3D device_tree) { + memmove(new_device_tree, device_tree, fdt_size); + } + device_tree =3D new_device_tree; + *max_pfn_p =3D to_phys(new_device_tree) >> PAGE_SHIFT; +} + +void arch_init_p2m(unsigned long max_pfn) +{ +} + +void arch_init_demand_mapping_area(unsigned long cur_pfn) +{ +} + +/* Get Xen's suggested physical page assignments for the grant table. */ +static paddr_t get_gnttab_base(void) +{ + int hypervisor; + int len =3D 0; + const uint64_t *regs; + paddr_t gnttab_base; + + hypervisor =3D fdt_node_offset_by_compatible(device_tree, -1, "xen,xen"); + BUG_ON(hypervisor < 0); + + regs =3D fdt_getprop(device_tree, hypervisor, "reg", &len); + /* The property contains the address and size, 8-bytes each. */ + if (regs =3D=3D NULL || len < 16) { + printk("Bad 'reg' property: %p %d\n", regs, len); + BUG(); + } + + gnttab_base =3D fdt64_to_cpu(regs[0]); + + printk("FDT suggests grant table base %llx\n", (unsigned long long) gnttab_base); + + return gnttab_base; +} + +grant_entry_t *arch_init_gnttab(int nr_grant_frames) +{ + struct xen_add_to_physmap xatp; + struct gnttab_setup_table setup; + xen_pfn_t frames[nr_grant_frames]; + paddr_t gnttab_table; + int i, rc; + + gnttab_table =3D get_gnttab_base(); + + for (i =3D 0; i < nr_grant_frames; i++) + { + xatp.domid =3D DOMID_SELF; + xatp.size =3D 0; /* Seems to be unused */ + xatp.space =3D XENMAPSPACE_grant_table; + xatp.idx =3D i; + xatp.gpfn =3D (gnttab_table >> PAGE_SHIFT) + i; + rc =3D HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp); + BUG_ON(rc !=3D 0); + } + + setup.dom =3D DOMID_SELF; + setup.nr_frames =3D nr_grant_frames; + set_xen_guest_handle(setup.frame_list, frames); + HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1); + if (setup.status !=3D 0) + { + printk("GNTTABOP_setup_table failed; status =3D %d\n", setup.status); + BUG(); + } + + return to_virt(gnttab_table); +} diff --git a/extras/mini-os-intree/arch/arm/panic.c b/extras/mini-os-intree/arch/arm/panic.c new file mode 100644 index 0000000..0ac49ad --- /dev/null +++ b/extras/mini-os-intree/arch/arm/panic.c @@ -0,0 +1,98 @@ +/****************************************************************************** + * panic.c + * + * Displays a register dump and stack trace for debugging. + * + * Copyright (c) 2014, Thomas Leonard + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include + +extern int irqstack[]; +extern int irqstack_end[]; + +typedef void handler(void); + +extern handler fault_reset; +extern handler fault_undefined_instruction; +extern handler fault_svc; +extern handler fault_prefetch_call; +extern handler fault_prefetch_abort; +extern handler fault_data_abort; + +void dump_registers(int *saved_registers) { + static int in_dump =3D 0; + int *sp, *stack_top, *x; + char *fault_name; + void *fault_handler; + int i; + + if (in_dump) + { + printk("Crash while in dump_registers! Not generating a second report.\n"); + return; + } + + in_dump =3D 1; + + fault_handler =3D (handler *) saved_registers[17]; + if (fault_handler =3D=3D fault_reset) + fault_name =3D "reset"; + else if (fault_handler =3D=3D fault_undefined_instruction) + fault_name =3D "undefined_instruction"; + else if (fault_handler =3D=3D fault_svc) + fault_name =3D "svc"; + else if (fault_handler =3D=3D fault_prefetch_call) + fault_name =3D "prefetch_call"; + else if (fault_handler =3D=3D fault_prefetch_abort) + fault_name =3D "prefetch_abort"; + else if (fault_handler =3D=3D fault_data_abort) + fault_name =3D "data_abort"; + else + fault_name =3D "unknown fault type!"; + + printk("Fault handler at %p called (%s)\n", fault_handler, fault_name); + + for (i =3D 0; i < 16; i++) { + printk("r%d =3D %x\n", i, saved_registers[i]); + } + printk("CPSR =3D %x\n", saved_registers[16]); + + printk("Stack dump (innermost last)\n"); + sp =3D (int *) saved_registers[13]; + + if (sp >=3D _boot_stack && sp <=3D _boot_stack_end) + stack_top =3D _boot_stack_end; /* The boot stack */ + else if (sp >=3D irqstack && sp <=3D irqstack_end) + stack_top =3D irqstack_end; /* The IRQ stack */ + else + stack_top =3D (int *) ((((unsigned long) sp) | (__STACK_SIZE-1)) + 1); /* A normal thread stack */ + + for (x =3D stack_top - 1; x >=3D sp; x--) + { + printk(" [%8p] %8x\n", x, *x); + } + printk("End of stack\n"); + + in_dump =3D 0; +} diff --git a/extras/mini-os-intree/arch/arm/sched.c b/extras/mini-os-intree/arch/arm/sched.c new file mode 100644 index 0000000..8091566 --- /dev/null +++ b/extras/mini-os-intree/arch/arm/sched.c @@ -0,0 +1,47 @@ +#include +#include +#include + +void arm_start_thread(void); + +/* The AAPCS requires the callee (e.g. __arch_switch_threads) to preserve r4-r11. */ +#define CALLEE_SAVED_REGISTERS 8 + +/* Architecture specific setup of thread creation */ +struct thread* arch_create_thread(char *name, void (*function)(void *), + void *data) +{ + struct thread *thread; + + thread =3D xmalloc(struct thread); + /* We can't use lazy allocation here since the trap handler runs on the stack */ + thread->stack =3D (char *)alloc_pages(STACK_SIZE_PAGE_ORDER); + thread->name =3D name; + printk("Thread \"%s\": pointer: 0x%p, stack: 0x%p\n", name, thread, + thread->stack); + + /* Save pointer to the thread on the stack, used by current macro */ + *((unsigned long *)thread->stack) =3D (unsigned long)thread; + + /* Push the details to pass to arm_start_thread onto the stack. */ + int *sp =3D (int *) (thread->stack + STACK_SIZE); + *(--sp) =3D (int) function; + *(--sp) =3D (int) data; + + /* We leave room for the 8 callee-saved registers which we will + * try to restore on thread switch, even though they're not needed + * for the initial switch. */ + thread->sp =3D (unsigned long) sp - 4 * CALLEE_SAVED_REGISTERS; + + thread->ip =3D (unsigned long) arm_start_thread; + + return thread; +} + +void run_idle_thread(void) +{ + __asm__ __volatile__ ("mov sp, %0; bx %1":: + "r"(idle_thread->sp + 4 * CALLEE_SAVED_REGISTERS), + "r"(idle_thread->ip)); + /* Never arrive here! */ +} diff --git a/extras/mini-os-intree/arch/arm/setup.c b/extras/mini-os-intree/arch/arm/setup.c new file mode 100644 index 0000000..06afe46 --- /dev/null +++ b/extras/mini-os-intree/arch/arm/setup.c @@ -0,0 +1,119 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * This structure contains start-of-day info, such as pagetable base pointer, + * address of the shared_info structure, and things like that. + * On x86, the hypervisor passes it to us. On ARM, we fill it in ourselves. + */ +union start_info_union start_info_union; + +/* + * Shared page for communicating with the hypervisor. + * Events flags go here, for example. + */ +shared_info_t *HYPERVISOR_shared_info; + +extern char shared_info_page[PAGE_SIZE]; + +void *device_tree; + +static int hvm_get_parameter(int idx, uint64_t *value) +{ + struct xen_hvm_param xhv; + int ret; + + xhv.domid =3D DOMID_SELF; + xhv.index =3D idx; + ret =3D HYPERVISOR_hvm_op(HVMOP_get_param, &xhv); + if (ret < 0) { + BUG(); + } + *value =3D xhv.value; + return ret; +} + +static void get_console(void) +{ + uint64_t v =3D -1; + + hvm_get_parameter(HVM_PARAM_CONSOLE_EVTCHN, &v); + start_info.console.domU.evtchn =3D v; + + hvm_get_parameter(HVM_PARAM_CONSOLE_PFN, &v); + start_info.console.domU.mfn =3D v; + + printk("Console is on port %d\n", start_info.console.domU.evtchn); + printk("Console ring is at mfn %lx\n", (unsigned long) start_info.console.domU.mfn); +} + +void get_xenbus(void) +{ + uint64_t value; + + if (hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &value)) + BUG(); + + start_info.store_evtchn =3D (int)value; + + if(hvm_get_parameter(HVM_PARAM_STORE_PFN, &value)) + BUG(); + start_info.store_mfn =3D (unsigned long)value; +} + +/* + * INITIAL C ENTRY POINT. + */ +void arch_init(void *dtb_pointer, uint32_t physical_offset) +{ + struct xen_add_to_physmap xatp; + int r; + + memset(&__bss_start, 0, &_end - &__bss_start); + + physical_address_offset =3D physical_offset; + + xprintk("Virtual -> physical offset =3D %x\n", physical_address_offset); + + xprintk("Checking DTB at %p...\n", dtb_pointer); + + if ((r =3D fdt_check_header(dtb_pointer))) { + xprintk("Invalid DTB from Xen: %s\n", fdt_strerror(r)); + BUG(); + } + device_tree =3D dtb_pointer; + + /* Map shared_info page */ + xatp.domid =3D DOMID_SELF; + xatp.idx =3D 0; + xatp.space =3D XENMAPSPACE_shared_info; + xatp.gpfn =3D virt_to_pfn(shared_info_page); + if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp) !=3D 0) + BUG(); + HYPERVISOR_shared_info =3D (struct shared_info *)shared_info_page; + + /* Fill in start_info */ + get_console(); + get_xenbus(); + + gic_init(); + + start_kernel(); +} + +void +arch_fini(void) +{ +} + +void +arch_do_exit(void) +{ +} diff --git a/extras/mini-os-intree/arch/arm/time.c b/extras/mini-os-intree/arch/arm/time.c new file mode 100644 index 0000000..a088981 --- /dev/null +++ b/extras/mini-os-intree/arch/arm/time.c @@ -0,0 +1,136 @@ +#include +#include +#include +#include +#include +#include +#include + +//#define VTIMER_DEBUG +#ifdef VTIMER_DEBUG +#define DEBUG(_f, _a...) \ + printk("MINI_OS(file=3Dvtimer.c, line=3D%d) " _f , __LINE__, ## _a) +#else +#define DEBUG(_f, _a...) ((void)0) +#endif + +/************************************************************************ + * Time functions + *************************************************************************/ + +static uint64_t cntvct_at_init; +static uint32_t counter_freq; + +/* Compute with 96 bit intermediate result: (a*b)/c */ +uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c) +{ + union { + uint64_t ll; + struct { + uint32_t low, high; + } l; + } u, res; + uint64_t rl, rh; + + u.ll =3D a; + rl =3D (uint64_t)u.l.low * (uint64_t)b; + rh =3D (uint64_t)u.l.high * (uint64_t)b; + rh +=3D (rl >> 32); + res.l.high =3D rh / c; + res.l.low =3D (((rh % c) << 32) + (rl & 0xffffffff)) / c; + return res.ll; +} + +static inline s_time_t ticks_to_ns(uint64_t ticks) +{ + return muldiv64(ticks, SECONDS(1), counter_freq); +} + +static inline uint64_t ns_to_ticks(s_time_t ns) +{ + return muldiv64(ns, counter_freq, SECONDS(1)); +} + +/* Wall-clock time is not currently available on ARM, so this is always zero for now: + * http://wiki.xenproject.org/wiki/Xen_ARM_TODO#Expose_Wallclock_time_to_guests + */ +static struct timespec shadow_ts; + +static inline uint64_t read_virtual_count(void) +{ + uint32_t c_lo, c_hi; + __asm__ __volatile__("mrrc p15, 1, %0, %1, c14":"=3Dr"(c_lo), "=3Dr"(c_hi)); + return (((uint64_t) c_hi) << 32) + c_lo; +} + +/* monotonic_clock(): returns # of nanoseconds passed since time_init() + * Note: This function is required to return accurate + * time even in the absence of multiple timer ticks. + */ +uint64_t monotonic_clock(void) +{ + return ticks_to_ns(read_virtual_count() - cntvct_at_init); +} + +int gettimeofday(struct timeval *tv, void *tz) +{ + uint64_t nsec =3D monotonic_clock(); + nsec +=3D shadow_ts.tv_nsec; + + tv->tv_sec =3D shadow_ts.tv_sec; + tv->tv_sec +=3D NSEC_TO_SEC(nsec); + tv->tv_usec =3D NSEC_TO_USEC(nsec % 1000000000UL); + + return 0; +} + +/* Set the timer and mask. */ +void write_timer_ctl(uint32_t value) { + __asm__ __volatile__( + "mcr p15, 0, %0, c14, c3, 1\n" + "isb"::"r"(value)); +} + +void set_vtimer_compare(uint64_t value) { + DEBUG("New CompareValue : %llx\n", value); + + __asm__ __volatile__("mcrr p15, 3, %0, %H0, c14" + ::"r"(value)); + + /* Enable timer and unmask the output signal */ + write_timer_ctl(1); +} + +void unset_vtimer_compare(void) { + /* Disable timer and mask the output signal */ + write_timer_ctl(2); +} + +void block_domain(s_time_t until) +{ + uint64_t until_count =3D ns_to_ticks(until) + cntvct_at_init; + ASSERT(irqs_disabled()); + if (read_virtual_count() < until_count) + { + set_vtimer_compare(until_count); + __asm__ __volatile__("wfi"); + unset_vtimer_compare(); + + /* Give the IRQ handler a chance to handle whatever woke us up. */ + local_irq_enable(); + local_irq_disable(); + } +} + +void init_time(void) +{ + printk("Initialising timer interface\n"); + + __asm__ __volatile__("mrc p15, 0, %0, c14, c0, 0":"=3Dr"(counter_freq)); + cntvct_at_init =3D read_virtual_count(); + printk("Virtual Count register is %llx, freq =3D %d Hz\n", cntvct_at_init, counter_freq); +} + +void fini_time(void) +{ +} diff --git a/extras/mini-os-intree/arch/x86/Makefile b/extras/mini-os-intree/arch/x86/Makefile new file mode 100644 index 0000000..9f04a93 --- /dev/null +++ b/extras/mini-os-intree/arch/x86/Makefile @@ -0,0 +1,30 @@ +# +# x86 architecture specific makefiles. +# It's is used for x86_32, x86_32y and x86_64 +# + +TOPLEVEL_DIR =3D $(CURDIR)/../.. +include ../../Config.mk + +# include arch.mk has to be before mini-os.mk! + +include arch.mk +include ../../minios.mk + +# Sources here are all *.c *.S without $(MINIOS_TARGET_ARCH).S +# This is handled in $(HEAD_ARCH_OBJ) +ARCH_SRCS :=3D $(wildcard *.c) + +# The objects built from the sources. +ARCH_OBJS :=3D $(patsubst %.c,$(OBJ_DIR)/%.o,$(ARCH_SRCS)) + +all: $(OBJ_DIR)/$(ARCH_LIB) + +# $(HEAD_ARCH_OBJ) is only build here, needed on linking +# in ../../Makefile. +$(OBJ_DIR)/$(ARCH_LIB): $(ARCH_OBJS) $(OBJ_DIR)/$(HEAD_ARCH_OBJ) + $(AR) rv $(OBJ_DIR)/$(ARCH_LIB) $(ARCH_OBJS) + +clean: + rm -f $(OBJ_DIR)/$(ARCH_LIB) $(ARCH_OBJS) $(OBJ_DIR)/$(HEAD_ARCH_OBJ) + diff --git a/extras/mini-os-intree/arch/x86/arch.mk b/extras/mini-os-intree/arch/x86/arch.mk new file mode 100644 index 0000000..81e8118 --- /dev/null +++ b/extras/mini-os-intree/arch/x86/arch.mk @@ -0,0 +1,22 @@ +# +# Architecture special makerules for x86 family +# (including x86_32, x86_32y and x86_64). +# + +ifeq ($(MINIOS_TARGET_ARCH),x86_32) +ARCH_CFLAGS :=3D -m32 -march=3Di686 +ARCH_LDFLAGS :=3D -m elf_i386 +ARCH_ASFLAGS :=3D -m32 +EXTRA_INC +=3D $(TARGET_ARCH_FAM)/$(MINIOS_TARGET_ARCH) +EXTRA_SRC +=3D arch/$(EXTRA_INC) +endif + +ifeq ($(MINIOS_TARGET_ARCH),x86_64) +ARCH_CFLAGS :=3D -m64 -mno-red-zone -fno-reorder-blocks +ARCH_CFLAGS +=3D -fno-asynchronous-unwind-tables +ARCH_ASFLAGS :=3D -m64 +ARCH_LDFLAGS :=3D -m elf_x86_64 +EXTRA_INC +=3D $(TARGET_ARCH_FAM)/$(MINIOS_TARGET_ARCH) +EXTRA_SRC +=3D arch/$(EXTRA_INC) +endif + diff --git a/extras/mini-os-intree/arch/x86/events.c b/extras/mini-os-intree/arch/x86/events.c new file mode 100644 index 0000000..5198cf3 --- /dev/null +++ b/extras/mini-os-intree/arch/x86/events.c @@ -0,0 +1,35 @@ +#include +#include +#include + +#if defined(__x86_64__) +char irqstack[2 * STACK_SIZE]; + +static struct pda +{ + int irqcount; /* offset 0 (used in x86_64.S) */ + char *irqstackptr; /* 8 */ +} cpu0_pda; +#endif + +void arch_init_events(void) +{ +#if defined(__x86_64__) + asm volatile("movl %0,%%fs ; movl %0,%%gs" :: "r" (0)); + wrmsrl(0xc0000101, &cpu0_pda); /* 0xc0000101 is MSR_GS_BASE */ + cpu0_pda.irqcount =3D -1; + cpu0_pda.irqstackptr =3D (void*) (((unsigned long)irqstack + 2 * STACK_SIZE) + & ~(STACK_SIZE - 1)); +#endif +} + +void arch_unbind_ports(void) +{ +} + +void arch_fini_events(void) +{ +#if defined(__x86_64__) + wrmsrl(0xc0000101, NULL); /* 0xc0000101 is MSR_GS_BASE */ +#endif +} diff --git a/extras/mini-os-intree/arch/x86/ioremap.c b/extras/mini-os-intree/arch/x86/ioremap.c new file mode 100644 index 0000000..4384b1c --- /dev/null +++ b/extras/mini-os-intree/arch/x86/ioremap.c @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2009, Netronome Systems, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + + +#include +#include +#include +#include +#include + +/* Map a physical address range into virtual address space with provided + * flags. Return a virtual address range it is mapped to. */ +static void *__do_ioremap(unsigned long phys_addr, unsigned long size, + unsigned long prot) +{ + unsigned long va; + unsigned long mfns, mfn; + unsigned long num_pages, offset; + + /* allow non page aligned addresses but for mapping we need to align them */ + offset =3D (phys_addr & ~PAGE_MASK); + num_pages =3D (offset + size + PAGE_SIZE - 1) / PAGE_SIZE; + phys_addr &=3D PAGE_MASK; + mfns =3D mfn =3D phys_addr >> PAGE_SHIFT; + + va =3D (unsigned long)map_frames_ex(&mfns, num_pages, 0, 1, 1, + DOMID_IO, NULL, prot); + return (void *)(va + offset); +} + +void *ioremap(unsigned long phys_addr, unsigned long size) +{ + return __do_ioremap(phys_addr, size, IO_PROT); +} + +void *ioremap_nocache(unsigned long phys_addr, unsigned long size) +{ + return __do_ioremap(phys_addr, size, IO_PROT_NOCACHE); +} + +/* Un-map the io-remapped region. Currently no list of existing mappings is + * maintained, so the caller has to supply the size */ +void iounmap(void *virt_addr, unsigned long size) +{ + unsigned long num_pages; + unsigned long va =3D (unsigned long)virt_addr; + + /* work out number of frames to unmap */ + num_pages =3D ((va & ~PAGE_MASK) + size + PAGE_SIZE - 1) / PAGE_SIZE; + + unmap_frames(va & PAGE_MASK, num_pages); +} + + + +/* -*- Mode:C; c-basic-offset:4; tab-width:4 indent-tabs-mode:nil -*- */ diff --git a/extras/mini-os-intree/arch/x86/iorw.c b/extras/mini-os-intree/arch/x86/iorw.c new file mode 100644 index 0000000..3080769 --- /dev/null +++ b/extras/mini-os-intree/arch/x86/iorw.c @@ -0,0 +1,35 @@ +#include + +void iowrite8(volatile void* addr, uint8_t val) +{ + *((volatile uint8_t*)addr) =3D val; +} +void iowrite16(volatile void* addr, uint16_t val) +{ + *((volatile uint16_t*)addr) =3D val; +} +void iowrite32(volatile void* addr, uint32_t val) +{ + *((volatile uint32_t*)addr) =3D val; +} +void iowrite64(volatile void* addr, uint64_t val) +{ + *((volatile uint64_t*)addr) =3D val; +} + +uint8_t ioread8(volatile void* addr) +{ + return *((volatile uint8_t*) addr); +} +uint16_t ioread16(volatile void* addr) +{ + return *((volatile uint16_t*) addr); +} +uint32_t ioread32(volatile void* addr) +{ + return *((volatile uint32_t*) addr); +} +uint64_t ioread64(volatile void* addr) +{ + return *((volatile uint64_t*) addr); +} diff --git a/extras/mini-os-intree/arch/x86/minios-x86_32.lds b/extras/mini-os-intree/arch/x86/minios-x86_32.lds new file mode 100644 index 0000000..f5cabb6 --- /dev/null +++ b/extras/mini-os-intree/arch/x86/minios-x86_32.lds @@ -0,0 +1,74 @@ +OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") +OUTPUT_ARCH(i386) +ENTRY(_start) +SECTIONS +{ + . =3D 0x0; + _text =3D .; /* Text and read-only data */ + .text : { + *(.text) + *(.gnu.warning) + } =3D 0x9090 + + _etext =3D .; /* End of text section */ + + .rodata : { *(.rodata) *(.rodata.*) } + . =3D ALIGN(4096); + _erodata =3D .; + + /* newlib initialization functions */ + . =3D ALIGN(32 / 8); + PROVIDE (__preinit_array_start =3D .); + .preinit_array : { *(.preinit_array) } + PROVIDE (__preinit_array_end =3D .); + PROVIDE (__init_array_start =3D .); + .init_array : { *(.init_array) } + PROVIDE (__init_array_end =3D .); + PROVIDE (__fini_array_start =3D .); + .fini_array : { *(.fini_array) } + PROVIDE (__fini_array_end =3D .); + + .ctors : { + __CTOR_LIST__ =3D .; + *(.ctors) + CONSTRUCTORS + LONG(0) + __CTOR_END__ =3D .; + } + + .dtors : { + __DTOR_LIST__ =3D .; + *(.dtors) + LONG(0) + __DTOR_END__ =3D .; + } + + .data : { /* Data */ + *(.data) + } + + _edata =3D .; /* End of data section */ + + __bss_start =3D .; /* BSS */ + .bss : { + *(.bss) + *(.app.bss) + } + _end =3D . ; + + /* Sections to be discarded */ + /DISCARD/ : { + *(.text.exit) + *(.data.exit) + *(.exitcall.exit) + } + + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } +} diff --git a/extras/mini-os-intree/arch/x86/minios-x86_64.lds b/extras/mini-os-intree/arch/x86/minios-x86_64.lds new file mode 100644 index 0000000..3da0a9f --- /dev/null +++ b/extras/mini-os-intree/arch/x86/minios-x86_64.lds @@ -0,0 +1,74 @@ +OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") +OUTPUT_ARCH(i386:x86-64) +ENTRY(_start) +SECTIONS +{ + . =3D 0x0; + _text =3D .; /* Text and read-only data */ + .text : { + *(.text) + *(.gnu.warning) + } =3D 0x9090 + + _etext =3D .; /* End of text section */ + + .rodata : { *(.rodata) *(.rodata.*) } + . =3D ALIGN(4096); + _erodata =3D .; + + /* newlib initialization functions */ + . =3D ALIGN(64 / 8); + PROVIDE (__preinit_array_start =3D .); + .preinit_array : { *(.preinit_array) } + PROVIDE (__preinit_array_end =3D .); + PROVIDE (__init_array_start =3D .); + .init_array : { *(.init_array) } + PROVIDE (__init_array_end =3D .); + PROVIDE (__fini_array_start =3D .); + .fini_array : { *(.fini_array) } + PROVIDE (__fini_array_end =3D .); + + .ctors : { + __CTOR_LIST__ =3D .; + *(.ctors) + CONSTRUCTORS + QUAD(0) + __CTOR_END__ =3D .; + } + + .dtors : { + __DTOR_LIST__ =3D .; + *(.dtors) + QUAD(0) + __DTOR_END__ =3D .; + } + + .data : { /* Data */ + *(.data) + } + + _edata =3D .; /* End of data section */ + + __bss_start =3D .; /* BSS */ + .bss : { + *(.bss) + *(.app.bss) + } + _end =3D . ; + + /* Sections to be discarded */ + /DISCARD/ : { + *(.text.exit) + *(.data.exit) + *(.exitcall.exit) + } + + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } +} diff --git a/extras/mini-os-intree/arch/x86/mm.c b/extras/mini-os-intree/arch/x86/mm.c new file mode 100644 index 0000000..9c6d1b8 --- /dev/null +++ b/extras/mini-os-intree/arch/x86/mm.c @@ -0,0 +1,957 @@ +/* + **************************************************************************** + * (C) 2003 - Rolf Neugebauer - Intel Research Cambridge + * (C) 2005 - Grzegorz Milos - Intel Research Cambridge + **************************************************************************** + * + * File: mm.c + * Author: Rolf Neugebauer (neugebar@dcs.gla.ac.uk) + * Changes: Grzegorz Milos + * + * Date: Aug 2003, chages Aug 2005 + * + * Environment: Xen Minimal OS + * Description: memory management related functions + * contains buddy page allocator from Xen. + * + **************************************************************************** + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include +#include +#include +#include +#include + +#ifdef MM_DEBUG +#define DEBUG(_f, _a...) \ + printk("MINI_OS(file=3Dmm.c, line=3D%d) " _f "\n", __LINE__, ## _a) +#else +#define DEBUG(_f, _a...) ((void)0) +#endif + +unsigned long *phys_to_machine_mapping; +unsigned long mfn_zero; +extern char stack[]; +extern void page_walk(unsigned long va); + +/* + * Make pt_pfn a new 'level' page table frame and hook it into the page + * table at offset in previous level MFN (pref_l_mfn). pt_pfn is a guest + * PFN. + */ +static void new_pt_frame(unsigned long *pt_pfn, unsigned long prev_l_mfn, + unsigned long offset, unsigned long level) +{ + pgentry_t *tab =3D (pgentry_t *)start_info.pt_base; + unsigned long pt_page =3D (unsigned long)pfn_to_virt(*pt_pfn); + pgentry_t prot_e, prot_t; + mmu_update_t mmu_updates[1]; + int rc; + + prot_e =3D prot_t =3D 0; + DEBUG("Allocating new L%d pt frame for pfn=3D%lx, " + "prev_l_mfn=3D%lx, offset=3D%lx", + level, *pt_pfn, prev_l_mfn, offset); + + /* We need to clear the page, otherwise we might fail to map it + as a page table page */ + memset((void*) pt_page, 0, PAGE_SIZE); + + switch ( level ) + { + case L1_FRAME: + prot_e =3D L1_PROT; + prot_t =3D L2_PROT; + break; + case L2_FRAME: + prot_e =3D L2_PROT; + prot_t =3D L3_PROT; + break; +#if defined(__x86_64__) + case L3_FRAME: + prot_e =3D L3_PROT; + prot_t =3D L4_PROT; + break; +#endif + default: + printk("new_pt_frame() called with invalid level number %d\n", level); + do_exit(); + break; + } + + /* Make PFN a page table page */ +#if defined(__x86_64__) + tab =3D pte_to_virt(tab[l4_table_offset(pt_page)]); +#endif + tab =3D pte_to_virt(tab[l3_table_offset(pt_page)]); + + mmu_updates[0].ptr =3D (tab[l2_table_offset(pt_page)] & PAGE_MASK) + + sizeof(pgentry_t) * l1_table_offset(pt_page); + mmu_updates[0].val =3D (pgentry_t)pfn_to_mfn(*pt_pfn) << PAGE_SHIFT | + (prot_e & ~_PAGE_RW); + + if ( (rc =3D HYPERVISOR_mmu_update(mmu_updates, 1, NULL, DOMID_SELF)) < 0 ) + { + printk("ERROR: PTE for new page table page could not be updated\n"); + printk(" mmu_update failed with rc=3D%d\n", rc); + do_exit(); + } + + /* Hook the new page table page into the hierarchy */ + mmu_updates[0].ptr =3D + ((pgentry_t)prev_l_mfn << PAGE_SHIFT) + sizeof(pgentry_t) * offset; + mmu_updates[0].val =3D (pgentry_t)pfn_to_mfn(*pt_pfn) << PAGE_SHIFT | prot_t; + + if ( (rc =3D HYPERVISOR_mmu_update(mmu_updates, 1, NULL, DOMID_SELF)) < 0 ) + { + printk("ERROR: mmu_update failed with rc=3D%d\n", rc); + do_exit(); + } + + *pt_pfn +=3D 1; +} + +/* + * Checks if a pagetable frame is needed at 'level' to map a given + * address. Note, this function is specific to the initial page table + * building. + */ +static int need_pt_frame(unsigned long va, int level) +{ + unsigned long hyp_virt_start =3D HYPERVISOR_VIRT_START; +#if defined(__x86_64__) + unsigned long hyp_virt_end =3D HYPERVISOR_VIRT_END; +#else + unsigned long hyp_virt_end =3D 0xffffffff; +#endif + + /* In general frames will _not_ be needed if they were already + allocated to map the hypervisor into our VA space */ +#if defined(__x86_64__) + if ( level =3D=3D L3_FRAME ) + { + if ( l4_table_offset(va) >=3D + l4_table_offset(hyp_virt_start) && + l4_table_offset(va) <=3D + l4_table_offset(hyp_virt_end)) + return 0; + return 1; + } + else +#endif + + if ( level =3D=3D L2_FRAME ) + { +#if defined(__x86_64__) + if ( l4_table_offset(va) >=3D + l4_table_offset(hyp_virt_start) && + l4_table_offset(va) <=3D + l4_table_offset(hyp_virt_end)) +#endif + if ( l3_table_offset(va) >=3D + l3_table_offset(hyp_virt_start) && + l3_table_offset(va) <=3D + l3_table_offset(hyp_virt_end)) + return 0; + + return 1; + } + else + /* Always need l1 frames */ + if ( level =3D=3D L1_FRAME ) + return 1; + + printk("ERROR: Unknown frame level %d, hypervisor %llx,%llx\n", + level, hyp_virt_start, hyp_virt_end); + return -1; +} + +/* + * Build the initial pagetable. + */ +static void build_pagetable(unsigned long *start_pfn, unsigned long *max_pfn) +{ + unsigned long start_address, end_address; + unsigned long pfn_to_map, pt_pfn =3D *start_pfn; + static mmu_update_t mmu_updates[L1_PAGETABLE_ENTRIES + 1]; + pgentry_t *tab =3D (pgentry_t *)start_info.pt_base, page; + unsigned long pt_mfn =3D pfn_to_mfn(virt_to_pfn(start_info.pt_base)); + unsigned long offset; + int count =3D 0; + int rc; + + pfn_to_map =3D + (start_info.nr_pt_frames - NOT_L1_FRAMES) * L1_PAGETABLE_ENTRIES; + + if ( *max_pfn >=3D virt_to_pfn(HYPERVISOR_VIRT_START) ) + { + printk("WARNING: Mini-OS trying to use Xen virtual space. " + "Truncating memory from %dMB to ", + ((unsigned long)pfn_to_virt(*max_pfn) - + (unsigned long)&_text)>>20); + *max_pfn =3D virt_to_pfn(HYPERVISOR_VIRT_START - PAGE_SIZE); + printk("%dMB\n", + ((unsigned long)pfn_to_virt(*max_pfn) - + (unsigned long)&_text)>>20); + } + + start_address =3D (unsigned long)pfn_to_virt(pfn_to_map); + end_address =3D (unsigned long)pfn_to_virt(*max_pfn); + + /* We worked out the virtual memory range to map, now mapping loop */ + printk("Mapping memory range 0x%lx - 0x%lx\n", start_address, end_address); + + while ( start_address < end_address ) + { + tab =3D (pgentry_t *)start_info.pt_base; + pt_mfn =3D pfn_to_mfn(virt_to_pfn(start_info.pt_base)); + +#if defined(__x86_64__) + offset =3D l4_table_offset(start_address); + /* Need new L3 pt frame */ + if ( !(start_address & L3_MASK) ) + if ( need_pt_frame(start_address, L3_FRAME) ) + new_pt_frame(&pt_pfn, pt_mfn, offset, L3_FRAME); + + page =3D tab[offset]; + pt_mfn =3D pte_to_mfn(page); + tab =3D to_virt(mfn_to_pfn(pt_mfn) << PAGE_SHIFT); +#endif + offset =3D l3_table_offset(start_address); + /* Need new L2 pt frame */ + if ( !(start_address & L2_MASK) ) + if ( need_pt_frame(start_address, L2_FRAME) ) + new_pt_frame(&pt_pfn, pt_mfn, offset, L2_FRAME); + + page =3D tab[offset]; + pt_mfn =3D pte_to_mfn(page); + tab =3D to_virt(mfn_to_pfn(pt_mfn) << PAGE_SHIFT); + offset =3D l2_table_offset(start_address); + /* Need new L1 pt frame */ + if ( !(start_address & L1_MASK) ) + if ( need_pt_frame(start_address, L1_FRAME) ) + new_pt_frame(&pt_pfn, pt_mfn, offset, L1_FRAME); + + page =3D tab[offset]; + pt_mfn =3D pte_to_mfn(page); + offset =3D l1_table_offset(start_address); + + mmu_updates[count].ptr =3D + ((pgentry_t)pt_mfn << PAGE_SHIFT) + sizeof(pgentry_t) * offset; + mmu_updates[count].val =3D + (pgentry_t)pfn_to_mfn(pfn_to_map++) << PAGE_SHIFT | L1_PROT; + count++; + if ( count =3D=3D L1_PAGETABLE_ENTRIES || pfn_to_map =3D=3D *max_pfn ) + { + rc =3D HYPERVISOR_mmu_update(mmu_updates, count, NULL, DOMID_SELF); + if ( rc < 0 ) + { + printk("ERROR: build_pagetable(): PTE could not be updated\n"); + printk(" mmu_update failed with rc=3D%d\n", rc); + do_exit(); + } + count =3D 0; + } + start_address +=3D PAGE_SIZE; + } + + *start_pfn =3D pt_pfn; +} + +/* + * Mark portion of the address space read only. + */ +extern struct shared_info shared_info; +static void set_readonly(void *text, void *etext) +{ + unsigned long start_address =3D + ((unsigned long) text + PAGE_SIZE - 1) & PAGE_MASK; + unsigned long end_address =3D (unsigned long) etext; + static mmu_update_t mmu_updates[L1_PAGETABLE_ENTRIES + 1]; + pgentry_t *tab =3D (pgentry_t *)start_info.pt_base, page; + unsigned long mfn =3D pfn_to_mfn(virt_to_pfn(start_info.pt_base)); + unsigned long offset; + int count =3D 0; + int rc; + + printk("setting %p-%p readonly\n", text, etext); + + while ( start_address + PAGE_SIZE <=3D end_address ) + { + tab =3D (pgentry_t *)start_info.pt_base; + mfn =3D pfn_to_mfn(virt_to_pfn(start_info.pt_base)); + +#if defined(__x86_64__) + offset =3D l4_table_offset(start_address); + page =3D tab[offset]; + mfn =3D pte_to_mfn(page); + tab =3D to_virt(mfn_to_pfn(mfn) << PAGE_SHIFT); +#endif + offset =3D l3_table_offset(start_address); + page =3D tab[offset]; + mfn =3D pte_to_mfn(page); + tab =3D to_virt(mfn_to_pfn(mfn) << PAGE_SHIFT); + offset =3D l2_table_offset(start_address); + page =3D tab[offset]; + mfn =3D pte_to_mfn(page); + tab =3D to_virt(mfn_to_pfn(mfn) << PAGE_SHIFT); + + offset =3D l1_table_offset(start_address); + + if ( start_address !=3D (unsigned long)&shared_info ) + { + mmu_updates[count].ptr =3D + ((pgentry_t)mfn << PAGE_SHIFT) + sizeof(pgentry_t) * offset; + mmu_updates[count].val =3D tab[offset] & ~_PAGE_RW; + count++; + } + else + printk("skipped %p\n", start_address); + + start_address +=3D PAGE_SIZE; + + if ( count =3D=3D L1_PAGETABLE_ENTRIES || + start_address + PAGE_SIZE > end_address ) + { + rc =3D HYPERVISOR_mmu_update(mmu_updates, count, NULL, DOMID_SELF); + if ( rc < 0 ) + { + printk("ERROR: set_readonly(): PTE could not be updated\n"); + do_exit(); + } + count =3D 0; + } + } + + { + mmuext_op_t op =3D { + .cmd =3D MMUEXT_TLB_FLUSH_ALL, + }; + int count; + HYPERVISOR_mmuext_op(&op, 1, &count, DOMID_SELF); + } +} + +/* + * A useful mem testing function. Write the address to every address in the + * range provided and read back the value. If verbose, print page walk to + * some VA + * + * If we get MEM_TEST_MAX_ERRORS we might as well stop + */ +#define MEM_TEST_MAX_ERRORS 10 +int mem_test(unsigned long *start_va, unsigned long *end_va, int verbose) +{ + unsigned long mask =3D 0x10000; + unsigned long *pointer; + int error_count =3D 0; + + /* write values and print page walks */ + if ( verbose && (((unsigned long)start_va) & 0xfffff) ) + { + printk("MemTest Start: 0x%lx\n", start_va); + page_walk((unsigned long)start_va); + } + for ( pointer =3D start_va; pointer < end_va; pointer++ ) + { + if ( verbose && !(((unsigned long)pointer) & 0xfffff) ) + { + printk("Writing to %lx\n", pointer); + page_walk((unsigned long)pointer); + } + *pointer =3D (unsigned long)pointer & ~mask; + } + if ( verbose && (((unsigned long)end_va) & 0xfffff) ) + { + printk("MemTest End: %lx\n", end_va-1); + page_walk((unsigned long)end_va-1); + } + + /* verify values */ + for ( pointer =3D start_va; pointer < end_va; pointer++ ) + { + if ( ((unsigned long)pointer & ~mask) !=3D *pointer ) + { + printk("Read error at 0x%lx. Read: 0x%lx, should read 0x%lx\n", + (unsigned long)pointer, *pointer, + ((unsigned long)pointer & ~mask)); + error_count++; + if ( error_count >=3D MEM_TEST_MAX_ERRORS ) + { + printk("mem_test: too many errors\n"); + return -1; + } + } + } + return 0; +} + + +/* + * get the PTE for virtual address va if it exists. Otherwise NULL. + */ +static pgentry_t *get_pgt(unsigned long va) +{ + unsigned long mfn; + pgentry_t *tab; + unsigned offset; + + tab =3D (pgentry_t *)start_info.pt_base; + mfn =3D virt_to_mfn(start_info.pt_base); + +#if defined(__x86_64__) + offset =3D l4_table_offset(va); + if ( !(tab[offset] & _PAGE_PRESENT) ) + return NULL; + mfn =3D pte_to_mfn(tab[offset]); + tab =3D mfn_to_virt(mfn); +#endif + offset =3D l3_table_offset(va); + if ( !(tab[offset] & _PAGE_PRESENT) ) + return NULL; + mfn =3D pte_to_mfn(tab[offset]); + tab =3D mfn_to_virt(mfn); + offset =3D l2_table_offset(va); + if ( !(tab[offset] & _PAGE_PRESENT) ) + return NULL; + mfn =3D pte_to_mfn(tab[offset]); + tab =3D mfn_to_virt(mfn); + offset =3D l1_table_offset(va); + return &tab[offset]; +} + + +/* + * return a valid PTE for a given virtual address. If PTE does not exist, + * allocate page-table pages. + */ +pgentry_t *need_pgt(unsigned long va) +{ + unsigned long pt_mfn; + pgentry_t *tab; + unsigned long pt_pfn; + unsigned offset; + + tab =3D (pgentry_t *)start_info.pt_base; + pt_mfn =3D virt_to_mfn(start_info.pt_base); + +#if defined(__x86_64__) + offset =3D l4_table_offset(va); + if ( !(tab[offset] & _PAGE_PRESENT) ) + { + pt_pfn =3D virt_to_pfn(alloc_page()); + new_pt_frame(&pt_pfn, pt_mfn, offset, L3_FRAME); + } + ASSERT(tab[offset] & _PAGE_PRESENT); + pt_mfn =3D pte_to_mfn(tab[offset]); + tab =3D mfn_to_virt(pt_mfn); +#endif + offset =3D l3_table_offset(va); + if ( !(tab[offset] & _PAGE_PRESENT) ) + { + pt_pfn =3D virt_to_pfn(alloc_page()); + new_pt_frame(&pt_pfn, pt_mfn, offset, L2_FRAME); + } + ASSERT(tab[offset] & _PAGE_PRESENT); + pt_mfn =3D pte_to_mfn(tab[offset]); + tab =3D mfn_to_virt(pt_mfn); + offset =3D l2_table_offset(va); + if ( !(tab[offset] & _PAGE_PRESENT) ) + { + pt_pfn =3D virt_to_pfn(alloc_page()); + new_pt_frame(&pt_pfn, pt_mfn, offset, L1_FRAME); + } + ASSERT(tab[offset] & _PAGE_PRESENT); + pt_mfn =3D pte_to_mfn(tab[offset]); + tab =3D mfn_to_virt(pt_mfn); + + offset =3D l1_table_offset(va); + return &tab[offset]; +} + +/* + * Reserve an area of virtual address space for mappings and Heap + */ +static unsigned long demand_map_area_start; +#ifdef __x86_64__ +#define DEMAND_MAP_PAGES ((128ULL << 30) / PAGE_SIZE) +#else +#define DEMAND_MAP_PAGES ((2ULL << 30) / PAGE_SIZE) +#endif + +#ifndef HAVE_LIBC +#define HEAP_PAGES 0 +#else +unsigned long heap, brk, heap_mapped, heap_end; +#ifdef __x86_64__ +#define HEAP_PAGES ((128ULL << 30) / PAGE_SIZE) +#else +#define HEAP_PAGES ((1ULL << 30) / PAGE_SIZE) +#endif +#endif --===============3270912304271382760== 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 --===============3270912304271382760==-- From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:16:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:16: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 1YTqFH-000272-9t; Fri, 06 Mar 2015 11:16:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFF-00026n-HP for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:42 +0000 Content-Length: 107656 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 2F/91-03164-89C89F45; Fri, 06 Mar 2015 11:16:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1425640593!13690854!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19152 invoked from network); 6 Mar 2015 11:16: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; 6 Mar 2015 11:16:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqF7-0006Bj-Lb for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqF7-0001ha-H0 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:33 +0000 Date: Fri, 06 Mar 2015 11:16:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build system: stubdom targets now depends on mini-os target X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============3270912304271382760==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3270912304271382760== Content-Length: 110197 Content-Transfer-Encoding: quoted-printable commit 42ddf48a29d2109e6b33fddd6dafd75e0747fd09 Author: Wei Liu AuthorDate: Fri Jan 30 15:58:38 2015 +0000 Commit: Wei Liu CommitDate: Fri Feb 27 16:04:50 2015 +0000 build system: stubdom targets now depends on mini-os target Provide mini-os url and revision in Config.mk Make stubdom targets depend on mini-os-dir target. Make subtree-force-update{,-all} depend on mini-os-dir-force-update. Also make mktarball script generate mini-os archive. Original mini-os directory is renamed to mini-os-intree to help reduce patch length. That directory will be deleted in a separate patch. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- Changes in v3: 1. Put mini-os targets in main Makefile. 2. Stubdom clean and distclean don't depend on mini-os-dir. Changes in v2: 1. Use hash in Config.mk. --- .gitignore | 6 +- Config.mk | 6 + Makefile | 24 +- extras/mini-os-intree/COPYING | 36 + extras/mini-os-intree/Config.mk | 99 ++ extras/mini-os-intree/Makefile | 224 +++ extras/mini-os-intree/README | 46 + extras/mini-os-intree/app.lds | 11 + extras/mini-os-intree/arch/arm/arm32.S | 294 ++++ extras/mini-os-intree/arch/arm/events.c | 31 + extras/mini-os-intree/arch/arm/hypercalls32.S | 64 + extras/mini-os-intree/arch/arm/minios-arm32.lds | 83 ++ extras/mini-os-intree/arch/arm/mm.c | 139 ++ extras/mini-os-intree/arch/arm/panic.c | 98 ++ extras/mini-os-intree/arch/arm/sched.c | 47 + extras/mini-os-intree/arch/arm/setup.c | 119 ++ extras/mini-os-intree/arch/arm/time.c | 136 ++ extras/mini-os-intree/arch/x86/Makefile | 30 + extras/mini-os-intree/arch/x86/arch.mk | 22 + extras/mini-os-intree/arch/x86/events.c | 35 + extras/mini-os-intree/arch/x86/ioremap.c | 75 + extras/mini-os-intree/arch/x86/iorw.c | 35 + extras/mini-os-intree/arch/x86/minios-x86_32.lds | 74 + extras/mini-os-intree/arch/x86/minios-x86_64.lds | 74 + extras/mini-os-intree/arch/x86/mm.c | 957 ++++++++++++ extras/mini-os-intree/arch/x86/sched.c | 139 ++ extras/mini-os-intree/arch/x86/setup.c | 168 +++ extras/mini-os-intree/arch/x86/time.c | 238 +++ extras/mini-os-intree/arch/x86/traps.c | 333 +++++ extras/mini-os-intree/arch/x86/x86_32.S | 305 ++++ extras/mini-os-intree/arch/x86/x86_64.S | 383 +++++ extras/mini-os-intree/blkfront.c | 736 ++++++++++ extras/mini-os-intree/config/MiniOS.mk | 10 + extras/mini-os-intree/config/StdGNU.mk | 47 + extras/mini-os-intree/config/arm32.mk | 22 + extras/mini-os-intree/config/arm64.mk | 19 + extras/mini-os-intree/config/x86_32.mk | 20 + extras/mini-os-intree/config/x86_64.mk | 33 + extras/mini-os-intree/console/console.c | 164 ++ extras/mini-os-intree/console/console.h | 2 + extras/mini-os-intree/console/xenbus.c | 195 +++ extras/mini-os-intree/console/xencons_ring.c | 195 +++ extras/mini-os-intree/daytime.c | 67 + extras/mini-os-intree/domain_config | 19 + extras/mini-os-intree/events.c | 269 ++++ extras/mini-os-intree/fbfront.c | 710 +++++++++ extras/mini-os-intree/gntmap.c | 250 ++++ extras/mini-os-intree/gnttab.c | 196 +++ extras/mini-os-intree/hypervisor.c | 132 ++ extras/mini-os-intree/include/arch/cc.h | 87 ++ extras/mini-os-intree/include/arch/perf.h | 15 + extras/mini-os-intree/include/arch/sys_arch.h | 35 + extras/mini-os-intree/include/arm/arch_endian.h | 7 + extras/mini-os-intree/include/arm/arch_limits.h | 9 + extras/mini-os-intree/include/arm/arch_mm.h | 38 + extras/mini-os-intree/include/arm/arch_sched.h | 19 + extras/mini-os-intree/include/arm/arch_spinlock.h | 36 + .../include/arm/arm32/arch_wordsize.h | 1 + extras/mini-os-intree/include/arm/gic.h | 1 + extras/mini-os-intree/include/arm/hypercall-arm.h | 98 ++ extras/mini-os-intree/include/arm/os.h | 216 +++ extras/mini-os-intree/include/arm/traps.h | 20 + extras/mini-os-intree/include/blkfront.h | 54 + extras/mini-os-intree/include/byteorder.h | 36 + extras/mini-os-intree/include/byteswap.h | 39 + extras/mini-os-intree/include/compiler.h | 10 + extras/mini-os-intree/include/console.h | 89 ++ extras/mini-os-intree/include/ctype.h | 60 + extras/mini-os-intree/include/endian.h | 19 + extras/mini-os-intree/include/err.h | 31 + extras/mini-os-intree/include/errno-base.h | 39 + extras/mini-os-intree/include/errno.h | 122 ++ extras/mini-os-intree/include/events.h | 59 + extras/mini-os-intree/include/fbfront.h | 46 + extras/mini-os-intree/include/fcntl.h | 99 ++ extras/mini-os-intree/include/gntmap.h | 35 + extras/mini-os-intree/include/gnttab.h | 17 + extras/mini-os-intree/include/hypervisor.h | 48 + extras/mini-os-intree/include/ioremap.h | 33 + extras/mini-os-intree/include/iorw.h | 16 + extras/mini-os-intree/include/kernel.h | 9 + extras/mini-os-intree/include/lib-gpl.h | 59 + extras/mini-os-intree/include/lib.h | 230 +++ extras/mini-os-intree/include/linux/types.h | 5 + extras/mini-os-intree/include/lwipopts.h | 23 + .../mini-os-intree/include/minios-external/README | 24 + .../include/minios-external/bsd-COPYRIGHT | 126 ++ .../include/minios-external/bsd-queue.3 | 1044 +++++++++++++ .../minios-external/bsd-sys-queue-h-seddery | 72 + .../include/minios-external/bsd-sys-queue.h | 637 ++++++++ extras/mini-os-intree/include/mm.h | 82 + extras/mini-os-intree/include/netfront.h | 24 + extras/mini-os-intree/include/pcifront.h | 29 + extras/mini-os-intree/include/posix/arpa/inet.h | 7 + extras/mini-os-intree/include/posix/dirent.h | 24 + extras/mini-os-intree/include/posix/err.h | 15 + extras/mini-os-intree/include/posix/fcntl.h | 11 + extras/mini-os-intree/include/posix/limits.h | 48 + extras/mini-os-intree/include/posix/net/if.h | 85 ++ extras/mini-os-intree/include/posix/netdb.h | 9 + extras/mini-os-intree/include/posix/netinet/in.h | 7 + extras/mini-os-intree/include/posix/netinet/tcp.h | 6 + extras/mini-os-intree/include/posix/poll.h | 1 + extras/mini-os-intree/include/posix/pthread.h | 64 + extras/mini-os-intree/include/posix/signal.h | 10 + extras/mini-os-intree/include/posix/stdlib.h | 8 + extras/mini-os-intree/include/posix/strings.h | 12 + extras/mini-os-intree/include/posix/sys/ioctl.h | 16 + extras/mini-os-intree/include/posix/sys/mman.h | 22 + extras/mini-os-intree/include/posix/sys/poll.h | 79 + extras/mini-os-intree/include/posix/sys/select.h | 7 + extras/mini-os-intree/include/posix/sys/socket.h | 31 + extras/mini-os-intree/include/posix/sys/stat.h | 7 + extras/mini-os-intree/include/posix/syslog.h | 37 + extras/mini-os-intree/include/posix/termios.h | 87 ++ extras/mini-os-intree/include/posix/time.h | 11 + extras/mini-os-intree/include/posix/unistd.h | 16 + extras/mini-os-intree/include/sched.h | 55 + extras/mini-os-intree/include/semaphore.h | 110 ++ extras/mini-os-intree/include/spinlock.h | 55 + extras/mini-os-intree/include/sys/lock.h | 52 + extras/mini-os-intree/include/sys/time.h | 47 + extras/mini-os-intree/include/time.h | 63 + extras/mini-os-intree/include/tpm_tis.h | 61 + extras/mini-os-intree/include/tpmback.h | 104 ++ extras/mini-os-intree/include/tpmfront.h | 97 ++ extras/mini-os-intree/include/types.h | 74 + extras/mini-os-intree/include/wait.h | 105 ++ extras/mini-os-intree/include/waittypes.h | 32 + extras/mini-os-intree/include/x86/arch_endian.h | 7 + extras/mini-os-intree/include/x86/arch_limits.h | 20 + extras/mini-os-intree/include/x86/arch_mm.h | 233 +++ extras/mini-os-intree/include/x86/arch_sched.h | 25 + extras/mini-os-intree/include/x86/arch_spinlock.h | 94 ++ extras/mini-os-intree/include/x86/os.h | 572 ++++++++ extras/mini-os-intree/include/x86/traps.h | 78 + .../include/x86/x86_32/arch_wordsize.h | 1 + .../include/x86/x86_32/hypercall-x86_32.h | 337 +++++ .../include/x86/x86_64/arch_wordsize.h | 2 + .../include/x86/x86_64/hypercall-x86_64.h | 344 +++++ extras/mini-os-intree/include/xen/COPYING | 38 + extras/mini-os-intree/include/xen/arch-arm.h | 432 ++++++ .../mini-os-intree/include/xen/arch-arm/hvm/save.h | 39 + extras/mini-os-intree/include/xen/arch-x86/cpuid.h | 90 ++ .../mini-os-intree/include/xen/arch-x86/hvm/save.h | 630 ++++++++ .../mini-os-intree/include/xen/arch-x86/xen-mca.h | 440 ++++++ .../include/xen/arch-x86/xen-x86_32.h | 171 +++ .../include/xen/arch-x86/xen-x86_64.h | 202 +++ extras/mini-os-intree/include/xen/arch-x86/xen.h | 303 ++++ extras/mini-os-intree/include/xen/arch-x86_32.h | 27 + extras/mini-os-intree/include/xen/arch-x86_64.h | 43 + extras/mini-os-intree/include/xen/callback.h | 121 ++ extras/mini-os-intree/include/xen/dom0_ops.h | 120 ++ extras/mini-os-intree/include/xen/domctl.h | 1154 +++++++++++++++ extras/mini-os-intree/include/xen/elfnote.h | 271 ++++ extras/mini-os-intree/include/xen/event_channel.h | 385 +++++ extras/mini-os-intree/include/xen/features.h | 114 ++ extras/mini-os-intree/include/xen/gcov.h | 115 ++ extras/mini-os-intree/include/xen/grant_table.h | 682 +++++++++ extras/mini-os-intree/include/xen/hvm/e820.h | 34 + .../include/xen/hvm/hvm_info_table.h | 72 + extras/mini-os-intree/include/xen/hvm/hvm_op.h | 402 +++++ .../include/xen/hvm/hvm_xs_strings.h | 80 + extras/mini-os-intree/include/xen/hvm/ioreq.h | 129 ++ extras/mini-os-intree/include/xen/hvm/params.h | 199 +++ extras/mini-os-intree/include/xen/hvm/pvdrivers.h | 49 + extras/mini-os-intree/include/xen/hvm/save.h | 111 ++ extras/mini-os-intree/include/xen/io/blkif.h | 640 ++++++++ extras/mini-os-intree/include/xen/io/console.h | 51 + extras/mini-os-intree/include/xen/io/fbif.h | 176 +++ extras/mini-os-intree/include/xen/io/fsif.h | 192 +++ extras/mini-os-intree/include/xen/io/kbdif.h | 132 ++ extras/mini-os-intree/include/xen/io/libxenvchan.h | 97 ++ extras/mini-os-intree/include/xen/io/netif.h | 305 ++++ extras/mini-os-intree/include/xen/io/pciif.h | 125 ++ extras/mini-os-intree/include/xen/io/protocols.h | 40 + extras/mini-os-intree/include/xen/io/ring.h | 312 ++++ extras/mini-os-intree/include/xen/io/tpmif.h | 143 ++ extras/mini-os-intree/include/xen/io/usbif.h | 150 ++ extras/mini-os-intree/include/xen/io/vscsiif.h | 260 ++++ extras/mini-os-intree/include/xen/io/xenbus.h | 80 + extras/mini-os-intree/include/xen/io/xs_wire.h | 149 ++ extras/mini-os-intree/include/xen/kexec.h | 249 ++++ extras/mini-os-intree/include/xen/mem_event.h | 134 ++ extras/mini-os-intree/include/xen/memory.h | 587 ++++++++ extras/mini-os-intree/include/xen/nmi.h | 85 ++ extras/mini-os-intree/include/xen/physdev.h | 380 +++++ extras/mini-os-intree/include/xen/platform.h | 606 ++++++++ extras/mini-os-intree/include/xen/sched.h | 175 +++ extras/mini-os-intree/include/xen/sysctl.h | 719 +++++++++ extras/mini-os-intree/include/xen/tmem.h | 152 ++ extras/mini-os-intree/include/xen/trace.h | 331 +++++ extras/mini-os-intree/include/xen/vcpu.h | 240 +++ extras/mini-os-intree/include/xen/version.h | 96 ++ extras/mini-os-intree/include/xen/xen-compat.h | 44 + extras/mini-os-intree/include/xen/xen.h | 899 ++++++++++++ extras/mini-os-intree/include/xen/xencomm.h | 41 + extras/mini-os-intree/include/xen/xenoprof.h | 152 ++ extras/mini-os-intree/include/xen/xsm/flask_op.h | 201 +++ extras/mini-os-intree/include/xenbus.h | 120 ++ extras/mini-os-intree/include/xmalloc.h | 44 + extras/mini-os-intree/kernel.c | 198 +++ extras/mini-os-intree/lib/ctype.c | 29 + extras/mini-os-intree/lib/math.c | 426 ++++++ extras/mini-os-intree/lib/printf.c | 786 ++++++++++ extras/mini-os-intree/lib/stack_chk_fail.c | 8 + extras/mini-os-intree/lib/string.c | 228 +++ extras/mini-os-intree/lib/sys.c | 1550 ++++++++++++++++++++ extras/mini-os-intree/lib/xmalloc.c | 319 ++++ extras/mini-os-intree/lib/xs.c | 194 +++ extras/mini-os-intree/lock.c | 112 ++ extras/mini-os-intree/lwip-arch.c | 293 ++++ extras/mini-os-intree/lwip-net.c | 386 +++++ extras/mini-os-intree/main.c | 193 +++ extras/mini-os-intree/minios.mk | 76 + extras/mini-os-intree/mm.c | 441 ++++++ extras/mini-os-intree/netfront.c | 675 +++++++++ extras/mini-os-intree/pcifront.c | 616 ++++++++ extras/mini-os-intree/sched.c | 304 ++++ extras/mini-os-intree/test.c | 577 ++++++++ extras/mini-os-intree/tpm_tis.c | 1523 +++++++++++++++++++ extras/mini-os-intree/tpmback.c | 1136 ++++++++++++++ extras/mini-os-intree/tpmfront.c | 631 ++++++++ extras/mini-os-intree/xenbus/xenbus.c | 870 +++++++++++ extras/mini-os/COPYING | 36 - extras/mini-os/Config.mk | 99 -- extras/mini-os/Makefile | 224 --- extras/mini-os/README | 46 - extras/mini-os/app.lds | 11 - extras/mini-os/arch/arm/arm32.S | 294 ---- extras/mini-os/arch/arm/events.c | 31 - extras/mini-os/arch/arm/hypercalls32.S | 64 - extras/mini-os/arch/arm/minios-arm32.lds | 83 -- extras/mini-os/arch/arm/mm.c | 139 -- extras/mini-os/arch/arm/panic.c | 98 -- extras/mini-os/arch/arm/sched.c | 47 - extras/mini-os/arch/arm/setup.c | 119 -- extras/mini-os/arch/arm/time.c | 136 -- extras/mini-os/arch/x86/Makefile | 30 - extras/mini-os/arch/x86/arch.mk | 22 - extras/mini-os/arch/x86/events.c | 35 - extras/mini-os/arch/x86/ioremap.c | 75 - extras/mini-os/arch/x86/iorw.c | 35 - extras/mini-os/arch/x86/minios-x86_32.lds | 74 - extras/mini-os/arch/x86/minios-x86_64.lds | 74 - extras/mini-os/arch/x86/mm.c | 957 ------------ extras/mini-os/arch/x86/sched.c | 139 -- extras/mini-os/arch/x86/setup.c | 168 --- extras/mini-os/arch/x86/time.c | 238 --- extras/mini-os/arch/x86/traps.c | 333 ----- extras/mini-os/arch/x86/x86_32.S | 305 ---- extras/mini-os/arch/x86/x86_64.S | 383 ----- extras/mini-os/blkfront.c | 736 ---------- extras/mini-os/config/MiniOS.mk | 10 - extras/mini-os/config/StdGNU.mk | 47 - extras/mini-os/config/arm32.mk | 22 - extras/mini-os/config/arm64.mk | 19 - extras/mini-os/config/x86_32.mk | 20 - extras/mini-os/config/x86_64.mk | 33 - extras/mini-os/console/console.c | 164 -- extras/mini-os/console/console.h | 2 - extras/mini-os/console/xenbus.c | 195 --- extras/mini-os/console/xencons_ring.c | 195 --- extras/mini-os/daytime.c | 67 - extras/mini-os/domain_config | 19 - extras/mini-os/events.c | 269 ---- extras/mini-os/fbfront.c | 710 --------- extras/mini-os/gntmap.c | 250 ---- extras/mini-os/gnttab.c | 196 --- extras/mini-os/hypervisor.c | 132 -- extras/mini-os/include/arch/cc.h | 87 -- extras/mini-os/include/arch/perf.h | 15 - extras/mini-os/include/arch/sys_arch.h | 35 - extras/mini-os/include/arm/arch_endian.h | 7 - extras/mini-os/include/arm/arch_limits.h | 9 - extras/mini-os/include/arm/arch_mm.h | 38 - extras/mini-os/include/arm/arch_sched.h | 19 - extras/mini-os/include/arm/arch_spinlock.h | 36 - extras/mini-os/include/arm/arm32/arch_wordsize.h | 1 - extras/mini-os/include/arm/gic.h | 1 - extras/mini-os/include/arm/hypercall-arm.h | 98 -- extras/mini-os/include/arm/os.h | 216 --- extras/mini-os/include/arm/traps.h | 20 - extras/mini-os/include/blkfront.h | 54 - extras/mini-os/include/byteorder.h | 36 - extras/mini-os/include/byteswap.h | 39 - extras/mini-os/include/compiler.h | 10 - extras/mini-os/include/console.h | 89 -- extras/mini-os/include/ctype.h | 60 - extras/mini-os/include/endian.h | 19 - extras/mini-os/include/err.h | 31 - extras/mini-os/include/errno-base.h | 39 - extras/mini-os/include/errno.h | 122 -- extras/mini-os/include/events.h | 59 - extras/mini-os/include/fbfront.h | 46 - extras/mini-os/include/fcntl.h | 99 -- extras/mini-os/include/gntmap.h | 35 - extras/mini-os/include/gnttab.h | 17 - extras/mini-os/include/hypervisor.h | 48 - extras/mini-os/include/ioremap.h | 33 - extras/mini-os/include/iorw.h | 16 - extras/mini-os/include/kernel.h | 9 - extras/mini-os/include/lib-gpl.h | 59 - extras/mini-os/include/lib.h | 230 --- extras/mini-os/include/linux/types.h | 5 - extras/mini-os/include/lwipopts.h | 23 - extras/mini-os/include/minios-external/README | 24 - .../mini-os/include/minios-external/bsd-COPYRIGHT | 126 -- extras/mini-os/include/minios-external/bsd-queue.3 | 1044 ------------- .../minios-external/bsd-sys-queue-h-seddery | 72 - .../include/minios-external/bsd-sys-queue.h | 637 -------- extras/mini-os/include/mm.h | 82 - extras/mini-os/include/netfront.h | 24 - extras/mini-os/include/pcifront.h | 29 - extras/mini-os/include/posix/arpa/inet.h | 7 - extras/mini-os/include/posix/dirent.h | 24 - extras/mini-os/include/posix/err.h | 15 - extras/mini-os/include/posix/fcntl.h | 11 - extras/mini-os/include/posix/limits.h | 48 - extras/mini-os/include/posix/net/if.h | 85 -- extras/mini-os/include/posix/netdb.h | 9 - extras/mini-os/include/posix/netinet/in.h | 7 - extras/mini-os/include/posix/netinet/tcp.h | 6 - extras/mini-os/include/posix/poll.h | 1 - extras/mini-os/include/posix/pthread.h | 64 - extras/mini-os/include/posix/signal.h | 10 - extras/mini-os/include/posix/stdlib.h | 8 - extras/mini-os/include/posix/strings.h | 12 - extras/mini-os/include/posix/sys/ioctl.h | 16 - extras/mini-os/include/posix/sys/mman.h | 22 - extras/mini-os/include/posix/sys/poll.h | 79 - extras/mini-os/include/posix/sys/select.h | 7 - extras/mini-os/include/posix/sys/socket.h | 31 - extras/mini-os/include/posix/sys/stat.h | 7 - extras/mini-os/include/posix/syslog.h | 37 - extras/mini-os/include/posix/termios.h | 87 -- extras/mini-os/include/posix/time.h | 11 - extras/mini-os/include/posix/unistd.h | 16 - extras/mini-os/include/sched.h | 55 - extras/mini-os/include/semaphore.h | 110 -- extras/mini-os/include/spinlock.h | 55 - extras/mini-os/include/sys/lock.h | 52 - extras/mini-os/include/sys/time.h | 47 - extras/mini-os/include/time.h | 63 - extras/mini-os/include/tpm_tis.h | 61 - extras/mini-os/include/tpmback.h | 104 -- extras/mini-os/include/tpmfront.h | 97 -- extras/mini-os/include/types.h | 74 - extras/mini-os/include/wait.h | 105 -- extras/mini-os/include/waittypes.h | 32 - extras/mini-os/include/x86/arch_endian.h | 7 - extras/mini-os/include/x86/arch_limits.h | 20 - extras/mini-os/include/x86/arch_mm.h | 233 --- extras/mini-os/include/x86/arch_sched.h | 25 - extras/mini-os/include/x86/arch_spinlock.h | 94 -- extras/mini-os/include/x86/os.h | 572 -------- extras/mini-os/include/x86/traps.h | 78 - extras/mini-os/include/x86/x86_32/arch_wordsize.h | 1 - .../mini-os/include/x86/x86_32/hypercall-x86_32.h | 337 ----- extras/mini-os/include/x86/x86_64/arch_wordsize.h | 2 - .../mini-os/include/x86/x86_64/hypercall-x86_64.h | 344 ----- extras/mini-os/include/xen/COPYING | 38 - extras/mini-os/include/xen/arch-arm.h | 432 ------ extras/mini-os/include/xen/arch-arm/hvm/save.h | 39 - extras/mini-os/include/xen/arch-x86/cpuid.h | 90 -- extras/mini-os/include/xen/arch-x86/hvm/save.h | 630 -------- extras/mini-os/include/xen/arch-x86/xen-mca.h | 440 ------ extras/mini-os/include/xen/arch-x86/xen-x86_32.h | 171 --- extras/mini-os/include/xen/arch-x86/xen-x86_64.h | 202 --- extras/mini-os/include/xen/arch-x86/xen.h | 303 ---- extras/mini-os/include/xen/arch-x86_32.h | 27 - extras/mini-os/include/xen/arch-x86_64.h | 43 - extras/mini-os/include/xen/callback.h | 121 -- extras/mini-os/include/xen/dom0_ops.h | 120 -- extras/mini-os/include/xen/domctl.h | 1154 --------------- extras/mini-os/include/xen/elfnote.h | 271 ---- extras/mini-os/include/xen/event_channel.h | 385 ----- extras/mini-os/include/xen/features.h | 114 -- extras/mini-os/include/xen/gcov.h | 115 -- extras/mini-os/include/xen/grant_table.h | 682 --------- extras/mini-os/include/xen/hvm/e820.h | 34 - extras/mini-os/include/xen/hvm/hvm_info_table.h | 72 - extras/mini-os/include/xen/hvm/hvm_op.h | 402 ----- extras/mini-os/include/xen/hvm/hvm_xs_strings.h | 80 - extras/mini-os/include/xen/hvm/ioreq.h | 129 -- extras/mini-os/include/xen/hvm/params.h | 199 --- extras/mini-os/include/xen/hvm/pvdrivers.h | 49 - extras/mini-os/include/xen/hvm/save.h | 111 -- extras/mini-os/include/xen/io/blkif.h | 640 -------- extras/mini-os/include/xen/io/console.h | 51 - extras/mini-os/include/xen/io/fbif.h | 176 --- extras/mini-os/include/xen/io/fsif.h | 192 --- extras/mini-os/include/xen/io/kbdif.h | 132 -- extras/mini-os/include/xen/io/libxenvchan.h | 97 -- extras/mini-os/include/xen/io/netif.h | 305 ---- extras/mini-os/include/xen/io/pciif.h | 125 -- extras/mini-os/include/xen/io/protocols.h | 40 - extras/mini-os/include/xen/io/ring.h | 312 ---- extras/mini-os/include/xen/io/tpmif.h | 143 -- extras/mini-os/include/xen/io/usbif.h | 150 -- extras/mini-os/include/xen/io/vscsiif.h | 260 ---- extras/mini-os/include/xen/io/xenbus.h | 80 - extras/mini-os/include/xen/io/xs_wire.h | 149 -- extras/mini-os/include/xen/kexec.h | 249 ---- extras/mini-os/include/xen/mem_event.h | 134 -- extras/mini-os/include/xen/memory.h | 587 -------- extras/mini-os/include/xen/nmi.h | 85 -- extras/mini-os/include/xen/physdev.h | 380 ----- extras/mini-os/include/xen/platform.h | 606 -------- extras/mini-os/include/xen/sched.h | 175 --- extras/mini-os/include/xen/sysctl.h | 719 --------- extras/mini-os/include/xen/tmem.h | 152 -- extras/mini-os/include/xen/trace.h | 331 ----- extras/mini-os/include/xen/vcpu.h | 240 --- extras/mini-os/include/xen/version.h | 96 -- extras/mini-os/include/xen/xen-compat.h | 44 - extras/mini-os/include/xen/xen.h | 899 ------------ extras/mini-os/include/xen/xencomm.h | 41 - extras/mini-os/include/xen/xenoprof.h | 152 -- extras/mini-os/include/xen/xsm/flask_op.h | 201 --- extras/mini-os/include/xenbus.h | 120 -- extras/mini-os/include/xmalloc.h | 44 - extras/mini-os/kernel.c | 198 --- extras/mini-os/lib/ctype.c | 29 - extras/mini-os/lib/math.c | 426 ------ extras/mini-os/lib/printf.c | 786 ---------- extras/mini-os/lib/stack_chk_fail.c | 8 - extras/mini-os/lib/string.c | 228 --- extras/mini-os/lib/sys.c | 1550 -------------------- extras/mini-os/lib/xmalloc.c | 319 ---- extras/mini-os/lib/xs.c | 194 --- extras/mini-os/lock.c | 112 -- extras/mini-os/lwip-arch.c | 293 ---- extras/mini-os/lwip-net.c | 386 ----- extras/mini-os/main.c | 193 --- extras/mini-os/minios.mk | 76 - extras/mini-os/mm.c | 441 ------ extras/mini-os/netfront.c | 675 --------- extras/mini-os/pcifront.c | 616 -------- extras/mini-os/sched.c | 304 ---- extras/mini-os/test.c | 577 -------- extras/mini-os/tpm_tis.c | 1523 ------------------- extras/mini-os/tpmback.c | 1136 -------------- extras/mini-os/tpmfront.c | 631 -------- extras/mini-os/xenbus/xenbus.c | 870 ----------- stubdom/Makefile | 4 + tools/misc/mktarball | 4 +- 447 files changed, 40533 insertions(+), 40507 deletions(-) diff --git a/.gitignore b/.gitignore index cdbdca7..4979018 100644 --- a/.gitignore +++ b/.gitignore @@ -46,10 +46,8 @@ docs/man1/ docs/man5/ docs/pdf/ docs/txt/ -extras/mini-os/include/mini-os -extras/mini-os/include/x86/mini-os -extras/mini-os/include/list.h -extras/mini-os/mini-os* +extras/mini-os +extras/mini-os-remote install/* stubdom/autom4te.cache/ stubdom/binutils-* diff --git a/Config.mk b/Config.mk index d12ad91..109f1f1 100644 --- a/Config.mk +++ b/Config.mk @@ -245,14 +245,20 @@ OVMF_UPSTREAM_URL =3F=3D http://xenbits.xen.org/git-http/ovmf.git QEMU_UPSTREAM_URL =3F=3D http://xenbits.xen.org/git-http/qemu-upstream-unstable.git QEMU_TRADITIONAL_URL =3F=3D http://xenbits.xen.org/git-http/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL =3F=3D http://xenbits.xen.org/git-http/seabios.git +MINIOS_UPSTREAM_URL =3F=3D http://xenbits.xen.org/git-http/mini-os.git else OVMF_UPSTREAM_URL =3F=3D git://xenbits.xen.org/ovmf.git QEMU_UPSTREAM_URL =3F=3D git://xenbits.xen.org/qemu-upstream-unstable.git QEMU_TRADITIONAL_URL =3F=3D git://xenbits.xen.org/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL =3F=3D git://xenbits.xen.org/seabios.git +MINIOS_UPSTREAM_URL =3F=3D git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION =3F=3D 447d264115c476142f884af0be287622cd244423 QEMU_UPSTREAM_REVISION =3F=3D master +MINIOS_UPSTREAM_REVISION =3F=3D 55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d +# Thu Jan 29 19:10:04 2015 +0000 +# Mini-OS: standalone build + SEABIOS_UPSTREAM_REVISION =3F=3D rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. diff --git a/Makefile b/Makefile index ad6f917..e8a75ff 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,22 @@ TARGS_DISTCLEAN=3D$(patsubst %, distclean-%, $(SUBSYSTEMS)) export XEN_ROOT=3D$(CURDIR) include Config.mk +.PHONY: mini-os-dir +mini-os-dir: + GIT=3D$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh \ + $(MINIOS_UPSTREAM_URL) \ + $(MINIOS_UPSTREAM_REVISION) \ + $(XEN_ROOT)/extras/mini-os + +.PHONY: mini-os-dir-force-update +mini-os-dir-force-update: mini-os-dir + set -ex; \ + if [ "$(MINIOS_UPSTREAM_REVISION)" ]; then \ + cd extras/mini-os-remote; \ + $(GIT) fetch origin; \ + $(GIT) reset --hard $(MINIOS_UPSTREAM_REVISION); \ + fi + SUBARCH :=3D $(subst x86_32,i386,$(XEN_TARGET_ARCH)) export XEN_TARGET_ARCH SUBARCH export DESTDIR @@ -37,7 +53,7 @@ build-tools: $(MAKE) -C tools build .PHONY: build-stubdom -build-stubdom: +build-stubdom: mini-os-dir $(MAKE) -C stubdom build ifeq (x86_64,$(XEN_TARGET_ARCH)) XEN_TARGET_ARCH=3Dx86_32 $(MAKE) -C stubdom pv-grub @@ -84,7 +100,7 @@ install-tools: $(MAKE) -C tools install .PHONY: install-stubdom -install-stubdom: install-tools +install-stubdom: install-tools mini-os-dir $(MAKE) -C stubdom install ifeq (x86_64,$(XEN_TARGET_ARCH)) XEN_TARGET_ARCH=3Dx86_32 $(MAKE) -C stubdom install-grub @@ -125,11 +141,11 @@ rpmball: dist bash ./tools/misc/mkrpm $(XEN_ROOT) $$($(MAKE) -C xen xenversion --no-print-directory) .PHONY: subtree-force-update -subtree-force-update: +subtree-force-update: mini-os-dir-force-update $(MAKE) -C tools subtree-force-update .PHONY: subtree-force-update-all -subtree-force-update-all: +subtree-force-update-all: mini-os-dir-force-update $(MAKE) -C tools subtree-force-update-all # Make a source tarball, including qemu sub-trees. diff --git a/extras/mini-os-intree/COPYING b/extras/mini-os-intree/COPYING new file mode 100644 index 0000000..1d9df6c --- /dev/null +++ b/extras/mini-os-intree/COPYING @@ -0,0 +1,36 @@ +Certain files in this directory are licensed by the GNU +General Public License version 2 (GPLv2). By default these +files are not built and linked into MiniOs. Enabling them +will cause the whole work to become covered by the GPLv2. + +The current set of GPLv2 features are: +CONFIG_TPMFRONT +CONFIG_TPMBACK +CONFIG_TPM_TIS + +Do not use these if you do not want your MiniOS build to become +GPL licensed! + +Copyright (c) 2009 Citrix Systems, Inc. All rights reserved. + +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 AUTHOR 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 AUTHOR 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. + diff --git a/extras/mini-os-intree/Config.mk b/extras/mini-os-intree/Config.mk new file mode 100644 index 0000000..e5d8ade --- /dev/null +++ b/extras/mini-os-intree/Config.mk @@ -0,0 +1,99 @@ +# +# Compare $(1) and $(2) and replace $(2) with $(1) if they differ +# +# Typically $(1) is a newly generated file and $(2) is the target file +# being regenerated. This prevents changing the timestamp of $(2) only +# due to being auto regenereated with the same contents. +define move-if-changed + if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi +endef + +# cc-option: Check if compiler supports first option, else fall back to second. +# +# This is complicated by the fact that unrecognised -Wno-* options: +# (a) are ignored unless the compilation emits a warning; and +# (b) even then produce a warning rather than an error +# To handle this we do a test compile, passing the option-under-test, on a code +# fragment that will always produce a warning (integer assigned to pointer). +# We then grep for the option-under-test in the compiler's output, the presence +# of which would indicate an "unrecognized command-line option" warning/error. +# +# Usage: cflags-y +=3D $(call cc-option,$(CC),-march=3Dwinchip-c6,-march=3Di586) +cc-option =3D $(shell if test -z "`echo 'void*p=3D1;' | \ + $(1) $(2) -S -o /dev/null -x c - 2>&1 | grep -- $(2) -`"; \ + then echo "$(2)"; else echo "$(3)"; fi ;) + +# Compatibility with Xen's stubdom build environment. If we are building +# stubdom, some XEN_ variables are set, set MINIOS_ variables accordingly. +# +ifneq ($(XEN_ROOT),) +MINI-OS_ROOT=3D$(XEN_ROOT)/extras/mini-os +else +MINI-OS_ROOT=3D$(TOPLEVEL_DIR) +endif +export MINI-OS_ROOT + +ifneq ($(XEN_TARGET_ARCH),) +MINIOS_TARGET_ARCH =3D $(XEN_TARGET_ARCH) +else +MINIOS_COMPILE_ARCH =3F=3D $(shell uname -m | sed -e s/i.86/x86_32/ \ + -e s/i86pc/x86_32/ -e s/amd64/x86_64/ \ + -e s/armv7.*/arm32/ -e s/armv8.*/arm64/ \ + -e s/aarch64/arm64/) + +MINIOS_TARGET_ARCH =3F=3D $(MINIOS_COMPILE_ARCH) +endif + +libc =3D $(stubdom) + +XEN_INTERFACE_VERSION :=3D 0x00030205 +export XEN_INTERFACE_VERSION + +# Try to find out the architecture family TARGET_ARCH_FAM. +# First check whether x86_... is contained (for x86_32, x86_32y, x86_64). +# If not x86 then use $(MINIOS_TARGET_ARCH) +ifeq ($(findstring x86_,$(MINIOS_TARGET_ARCH)),x86_) +TARGET_ARCH_FAM =3D x86 +else +TARGET_ARCH_FAM =3D $(MINIOS_TARGET_ARCH) +endif + +# The architecture family directory below mini-os. +TARGET_ARCH_DIR :=3D arch/$(TARGET_ARCH_FAM) + +# Export these variables for possible use in architecture dependent makefiles. +export TARGET_ARCH_DIR +export TARGET_ARCH_FAM + +# This is used for architecture specific links. +# This can be overwritten from arch specific rules. +ARCH_LINKS =3D + +# The path pointing to the architecture specific header files. +ARCH_INC :=3D $(TARGET_ARCH_FAM) + +# For possible special header directories. +# This can be overwritten from arch specific rules. +EXTRA_INC =3D $(ARCH_INC) + +# Include the architecture family's special makerules. +# This must be before include minios.mk! +include $(MINI-OS_ROOT)/$(TARGET_ARCH_DIR)/arch.mk + +extra_incl :=3D $(foreach dir,$(EXTRA_INC),-isystem $(MINI-OS_ROOT)/include/$(dir)) + +DEF_CPPFLAGS +=3D -isystem $(MINI-OS_ROOT)/include +DEF_CPPFLAGS +=3D -D__MINIOS__ + +ifeq ($(libc),y) +DEF_CPPFLAGS +=3D -DHAVE_LIBC +DEF_CPPFLAGS +=3D -isystem $(MINI-OS_ROOT)/include/posix +DEF_CPPFLAGS +=3D -isystem $(XEN_ROOT)/tools/xenstore/include +endif + +ifneq ($(LWIPDIR),) +lwip=3Dy +DEF_CPPFLAGS +=3D -DHAVE_LWIP +DEF_CPPFLAGS +=3D -isystem $(LWIPDIR)/src/include +DEF_CPPFLAGS +=3D -isystem $(LWIPDIR)/src/include/ipv4 +endif diff --git a/extras/mini-os-intree/Makefile b/extras/mini-os-intree/Makefile new file mode 100644 index 0000000..f16520e --- /dev/null +++ b/extras/mini-os-intree/Makefile @@ -0,0 +1,224 @@ +# Common Makefile for mini-os. +# +# Every architecture directory below mini-os/arch has to have a +# Makefile and a arch.mk. +# + +OBJ_DIR=3D$(CURDIR) +TOPLEVEL_DIR=3D$(CURDIR) + +ifeq ($(MINIOS_CONFIG),) +include Config.mk +else +EXTRA_DEPS +=3D $(MINIOS_CONFIG) +include $(MINIOS_CONFIG) +endif + +include $(MINI-OS_ROOT)/config/MiniOS.mk + +# Configuration defaults +CONFIG_START_NETWORK =3F=3D y +CONFIG_SPARSE_BSS =3F=3D y +CONFIG_QEMU_XS_ARGS =3F=3D n +CONFIG_TEST =3F=3D n +CONFIG_PCIFRONT =3F=3D n +CONFIG_BLKFRONT =3F=3D y +CONFIG_TPMFRONT =3F=3D n +CONFIG_TPM_TIS =3F=3D n +CONFIG_TPMBACK =3F=3D n +CONFIG_NETFRONT =3F=3D y +CONFIG_FBFRONT =3F=3D y +CONFIG_KBDFRONT =3F=3D y +CONFIG_CONSFRONT =3F=3D y +CONFIG_XENBUS =3F=3D y +CONFIG_XC =3F=3Dy +CONFIG_LWIP =3F=3D $(lwip) + +# Export config items as compiler directives +flags-$(CONFIG_START_NETWORK) +=3D -DCONFIG_START_NETWORK +flags-$(CONFIG_SPARSE_BSS) +=3D -DCONFIG_SPARSE_BSS +flags-$(CONFIG_QEMU_XS_ARGS) +=3D -DCONFIG_QEMU_XS_ARGS +flags-$(CONFIG_PCIFRONT) +=3D -DCONFIG_PCIFRONT +flags-$(CONFIG_BLKFRONT) +=3D -DCONFIG_BLKFRONT +flags-$(CONFIG_TPMFRONT) +=3D -DCONFIG_TPMFRONT +flags-$(CONFIG_TPM_TIS) +=3D -DCONFIG_TPM_TIS +flags-$(CONFIG_TPMBACK) +=3D -DCONFIG_TPMBACK +flags-$(CONFIG_NETFRONT) +=3D -DCONFIG_NETFRONT +flags-$(CONFIG_KBDFRONT) +=3D -DCONFIG_KBDFRONT +flags-$(CONFIG_FBFRONT) +=3D -DCONFIG_FBFRONT +flags-$(CONFIG_CONSFRONT) +=3D -DCONFIG_CONSFRONT +flags-$(CONFIG_XENBUS) +=3D -DCONFIG_XENBUS + +DEF_CFLAGS +=3D $(flags-y) + +# Symlinks and headers that must be created before building the C files +GENERATED_HEADERS :=3D include/list.h $(ARCH_LINKS) include/mini-os include/$(TARGET_ARCH_FAM)/mini-os + +EXTRA_DEPS +=3D $(GENERATED_HEADERS) + +# Include common mini-os makerules. +include minios.mk + +# Set tester flags +# CFLAGS +=3D -DBLKTEST_WRITE + +# Define some default flags for linking. +LDLIBS :=3D +APP_LDLIBS :=3D +LDARCHLIB :=3D -L$(OBJ_DIR)/$(TARGET_ARCH_DIR) -l$(ARCH_LIB_NAME) +LDFLAGS_FINAL :=3D -T $(TARGET_ARCH_DIR)/minios-$(MINIOS_TARGET_ARCH).lds + +# Prefix for global API names. All other symbols are localised before +# linking with EXTRA_OBJS. +GLOBAL_PREFIX :=3D xenos_ +EXTRA_OBJS =3D + +TARGET :=3D mini-os + +# Subdirectories common to mini-os +SUBDIRS :=3D lib xenbus console + +src-$(CONFIG_BLKFRONT) +=3D blkfront.c +src-$(CONFIG_TPMFRONT) +=3D tpmfront.c +src-$(CONFIG_TPM_TIS) +=3D tpm_tis.c +src-$(CONFIG_TPMBACK) +=3D tpmback.c +src-y +=3D daytime.c +src-y +=3D events.c +src-$(CONFIG_FBFRONT) +=3D fbfront.c +src-y +=3D gntmap.c +src-y +=3D gnttab.c +src-y +=3D hypervisor.c +src-y +=3D kernel.c +src-y +=3D lock.c +src-y +=3D main.c +src-y +=3D mm.c +src-$(CONFIG_NETFRONT) +=3D netfront.c +src-$(CONFIG_PCIFRONT) +=3D pcifront.c +src-y +=3D sched.c +src-$(CONFIG_TEST) +=3D test.c + +src-y +=3D lib/ctype.c +src-y +=3D lib/math.c +src-y +=3D lib/printf.c +src-y +=3D lib/stack_chk_fail.c +src-y +=3D lib/string.c +src-y +=3D lib/sys.c +src-y +=3D lib/xmalloc.c +src-$(CONFIG_XENBUS) +=3D lib/xs.c + +src-$(CONFIG_XENBUS) +=3D xenbus/xenbus.c + +src-y +=3D console/console.c +src-y +=3D console/xencons_ring.c +src-$(CONFIG_CONSFRONT) +=3D console/xenbus.c + +# The common mini-os objects to build. +APP_OBJS :=3D +OBJS :=3D $(patsubst %.c,$(OBJ_DIR)/%.o,$(src-y)) + +.PHONY: default +default: $(OBJ_DIR)/$(TARGET) + +# Create special architecture specific links. The function arch_links +# has to be defined in arch.mk (see include above). +ifneq ($(ARCH_LINKS),) +$(ARCH_LINKS): + $(arch_links) +endif + +include/list.h: include/minios-external/bsd-sys-queue-h-seddery include/minios-external/bsd-sys-queue.h + perl $^ --prefix=3Dminios >$@.new + $(call move-if-changed,$@.new,$@) + +# Used by stubdom's Makefile +.PHONY: links +links: $(GENERATED_HEADERS) + +include/mini-os: + ln -sf . $@ + +include/$(TARGET_ARCH_FAM)/mini-os: + ln -sf . $@ + +.PHONY: arch_lib +arch_lib: + $(MAKE) --directory=3D$(TARGET_ARCH_DIR) OBJ_DIR=3D$(OBJ_DIR)/$(TARGET_ARCH_DIR) || exit 1; + +ifeq ($(CONFIG_LWIP),y) +# lwIP library +LWC :=3D $(shell find $(LWIPDIR)/src -type f -name '*.c') +LWC :=3D $(filter-out %6.c %ip6_addr.c %ethernetif.c, $(LWC)) +LWO :=3D $(patsubst %.c,%.o,$(LWC)) +LWO +=3D $(OBJ_DIR)/lwip-arch.o +ifeq ($(CONFIG_NETFRONT),y) +LWO +=3D $(OBJ_DIR)/lwip-net.o +endif + +$(OBJ_DIR)/lwip.a: $(LWO) + $(RM) $@ + $(AR) cqs $@ $^ + +OBJS +=3D $(OBJ_DIR)/lwip.a +endif + +OBJS :=3D $(filter-out $(OBJ_DIR)/lwip%.o $(LWO), $(OBJS)) + +ifeq ($(libc),y) +ifeq ($(CONFIG_XC),y) +APP_LDLIBS +=3D -L$(XEN_ROOT)/stubdom/libxc-$(XEN_TARGET_ARCH) -whole-archive -lxenguest -lxenctrl -no-whole-archive +endif +APP_LDLIBS +=3D -lpci +APP_LDLIBS +=3D -lz +APP_LDLIBS +=3D -lm +LDLIBS +=3D -lc +endif + +ifneq ($(APP_OBJS)-$(lwip),-y) +OBJS :=3D $(filter-out $(OBJ_DIR)/daytime.o, $(OBJS)) +endif + +$(OBJ_DIR)/$(TARGET)_app.o: $(APP_OBJS) app.lds + $(LD) -r -d $(LDFLAGS) -\( $^ -\) $(APP_LDLIBS) --undefined main -o $@ + +ifneq ($(APP_OBJS),) +APP_O=3D$(OBJ_DIR)/$(TARGET)_app.o +endif + +$(OBJ_DIR)/$(TARGET): $(OBJS) $(APP_O) arch_lib + $(LD) -r $(LDFLAGS) $(HEAD_OBJ) $(APP_O) $(OBJS) $(LDARCHLIB) $(LDLIBS) -o $@.o + $(OBJCOPY) -w -G $(GLOBAL_PREFIX)* -G _start $@.o $@.o + $(LD) $(LDFLAGS) $(LDFLAGS_FINAL) $@.o $(EXTRA_OBJS) -o $@ + gzip -f -9 -c $@ >$@.gz + +.PHONY: clean arch_clean + +arch_clean: + $(MAKE) --directory=3D$(TARGET_ARCH_DIR) OBJ_DIR=3D$(OBJ_DIR)/$(TARGET_ARCH_DIR) clean || exit 1; + +clean: arch_clean + for dir in $(addprefix $(OBJ_DIR)/,$(SUBDIRS)); do \ + rm -f $$dir/*.o; \ + done + rm -f include/list.h + rm -f $(OBJ_DIR)/*.o *~ $(OBJ_DIR)/core $(OBJ_DIR)/$(TARGET).elf $(OBJ_DIR)/$(TARGET).raw $(OBJ_DIR)/$(TARGET) $(OBJ_DIR)/$(TARGET).gz + find . $(OBJ_DIR) -type l | xargs rm -f + $(RM) $(OBJ_DIR)/lwip.a $(LWO) + rm -f tags TAGS + + +define all_sources + ( find . -follow -name SCCS -prune -o -name '*.[chS]' -print ) +endef + +.PHONY: cscope +cscope: + $(all_sources) > cscope.files + cscope -k -b -q + +.PHONY: tags +tags: + $(all_sources) | xargs ctags + +.PHONY: TAGS +TAGS: + $(all_sources) | xargs etags diff --git a/extras/mini-os-intree/README b/extras/mini-os-intree/README new file mode 100644 index 0000000..7960314 --- /dev/null +++ b/extras/mini-os-intree/README @@ -0,0 +1,46 @@ + Minimal OS + ---------- + +This shows some of the stuff that any guest OS will have to set up. + +This includes: + + * installing a virtual exception table + * handling virtual exceptions + * handling asynchronous events + * enabling/disabling async events + * parsing start_info struct at start-of-day + * registering virtual interrupt handlers (for timer interrupts) + * a simple page and memory allocator + * minimal libc support + * minimal Copy-on-Write support + * network, block, framebuffer support + * transparent access to FileSystem exports (see tools/fs-back) + +- to build it just type make. + +- to build it with TCP/IP support, download LWIP 1.3.2 source code and type + + make LWIPDIR=3D/path/to/lwip/source + +- to build it with much better libc support, see the stubdom/ directory + +- to start it do the following in domain0 + # xl create -c domain_config + +This starts the kernel and prints out a bunch of stuff and then once every +second the system time. + +If you have setup a disk in the config file (e.g. +disk =3D [ 'file:/tmp/foo,hda,r' ] ), it will loop reading it. If that disk is +writable (e.g. disk =3D [ 'file:/tmp/foo,hda,w' ] ), it will write data patterns +and re-read them. + +If you have setup a network in the config file (e.g. vif =3D [''] ), it will +print incoming packets. + +If you have setup a VFB in the config file (e.g. vfb =3D ['type=3Dsdl'] ), it will +show a mouse with which you can draw color squares. + +If you have compiled it with TCP/IP support, it will run a daytime server on +TCP port 13. diff --git a/extras/mini-os-intree/app.lds b/extras/mini-os-intree/app.lds new file mode 100644 index 0000000..4a48cc8 --- /dev/null +++ b/extras/mini-os-intree/app.lds @@ -0,0 +1,11 @@ +SECTIONS +{ + .app.bss : { + __app_bss_start =3D . ; + *(.bss .bss.*) + *(COMMON) + *(.lbss .lbss.*) + *(LARGE_COMMON) + __app_bss_end =3D . ; + } +} diff --git a/extras/mini-os-intree/arch/arm/arm32.S b/extras/mini-os-intree/arch/arm/arm32.S new file mode 100644 index 0000000..a08a170 --- /dev/null +++ b/extras/mini-os-intree/arch/arm/arm32.S @@ -0,0 +1,294 @@ +@ Offset of the kernel within the RAM. This is a Linux/zImage convention which we +@ rely on for now. +#define ZIMAGE_KERNEL_OFFSET 0x8000 + +.section .text + +.globl _start +_start: + @ zImage header +.rept 8 + mov r0, r0 +.endr + b reset + .word 0x016f2818 @ Magic numbers to help the loader + .word 0 @ zImage start address (0 =3D relocatable) + .word _edata - _start @ zImage end address (excludes bss section) + @ end of zImage header + +@ Called at boot time. Sets up MMU, exception vectors and stack, and then calls C arch_init() function. +@ =3D> r2 -> DTB +@ <=3D never returns +@ Note: this boot code needs to be within the first (1MB - ZIMAGE_KERNEL_OFFSET) of _start. +reset: + @ Problem: the C code wants to be at a known address (_start), but Xen might + @ load us anywhere. We initialise the MMU (mapping virtual to physical @ addresses) + @ so everything ends up where the code expects it to be. + @ + @ We calculate the offet between where the linker thought _start would be and where + @ it actually is and initialise the page tables to have that offset for every page. + @ + @ When we turn on the MMU, we're still executing at the old address. We don't want + @ the code to disappear from under us. So we have to do the mapping in stages: + @ + @ 1. set up a mapping to our current page from both its current and desired addresses + @ 2. enable the MMU + @ 3. jump to the new address + @ 4. remap all the other pages with the calculated offset + + adr r1, _start @ r1 =3D physical address of _start + ldr r3, =3D_start @ r3 =3D (desired) virtual address of _start + sub r9, r1, r3 @ r9 =3D (physical - virtual) offset + + ldr r7, =3D_page_dir @ r7 =3D (desired) virtual addr of translation table + add r1, r7, r9 @ r1 =3D physical addr of translation table + + @ Tell the system where our page table is located. + @ This is the 16 KB top-level translation table, in which + @ each word maps one 1MB virtual section to a physical section. + @ Note: We leave TTBCR as 0, meaning that only TTBR0 is used and + @ we use the short-descriptor format (32-bit physical addresses). + orr r0, r1, #0b0001011 @ Sharable, Inner/Outer Write-Back Write-Allocate Cacheable + mcr p15, 0, r0, c2, c0, 0 @ set TTBR0 + + @ Set access permission for domains. + @ Domains are deprecated, but we have to configure them anyway. + @ We mark every page as being domain 0 and set domain 0 to "client mode" + @ (client mode =3D use access flags in page table). + mov r0, #1 @ 1 =3D client + mcr p15, 0, r0, c3, c0, 0 @ DACR + + @ Template (flags) for a 1 MB page-table entry. + @ TEX[2:0] C B =3D 001 1 1 (outer and inner write-back, write-allocate) + ldr r8, =3D(0x2 + /* Section entry */ \ + 0xc + /* C B */ \ + (3 << 10) + /* Read/write */ \ + (1 << 12) + /* TEX */ \ + (1 << 16) + /* Sharable */ \ + (1<<19)) /* Non-secure */ + @ r8 =3D template page table entry + + @ Add an entry for the current physical section, at the old and new + @ addresses. It's OK if they're the same. + mov r0, pc, lsr#20 + mov r0, r0, lsl#20 @ r0 =3D physical address of this code's section start + orr r3, r0, r8 @ r3 =3D table entry for this section + ldr r4, =3D_start @ r4 =3D desired virtual address of this section + str r3, [r1, r4, lsr#18] @ map desired virtual section to this code + str r3, [r1, r0, lsr#18] @ map current section to this code too + + @ Invalidate TLB + dsb @ Caching is off, but must still prevent reordering + mcr p15, 0, r1, c8, c7, 0 @ TLBIALL + + @ Enable MMU / SCTLR + mrc p15, 0, r1, c1, c0, 0 @ SCTLR + orr r1, r1, #3 << 11 @ enable icache, branch prediction + orr r1, r1, #4 + 1 @ enable dcache, MMU + mcr p15, 0, r1, c1, c0, 0 @ SCTLR + isb + + ldr r1, =3Dstage2 @ Virtual address of stage2 + bx r1 + +@ Called once the MMU is enabled. The boot code and the page table are mapped, +@ but nothing else is yet. +@ +@ =3D> r2 -> dtb (physical) +@ r7 =3D virtual address of page table +@ r8 =3D section entry template (flags) +@ r9 =3D desired physical - virtual offset +@ pc -> somewhere in newly-mapped virtual code section +stage2: + @ Invalidate TLB + mcr p15, 0, r1, c8, c7, 0 @ TLBIALL + isb + + @ The new mapping has now taken effect: + @ r7 -> page_dir + + @ Fill in the whole top-level translation table (at page_dir). + @ Populate the whole pagedir with 1MB section descriptors. + + mov r1, r7 @ r1 -> first section entry + add r3, r1, #4*4*1024 @ limit (4 GB address space, 4 byte entries) + orr r0, r8, r9 @ r0 =3D entry mapping section zero to start of physical RAM +1: + str r0, [r1],#4 @ write the section entry + add r0, r0, #1 << 20 @ next physical page (wraps) + cmp r1, r3 + bne 1b + + @ Invalidate TLB + dsb + mcr p15, 0, r1, c8, c7, 0 @ TLBIALL + isb + + @ Set VBAR -> exception_vector_table + @ SCTLR.V =3D 0 + adr r0, exception_vector_table + mcr p15, 0, r0, c12, c0, 0 + + @ Enable hardware floating point: + @ 1. Access to CP10 and CP11 must be enabled in the Coprocessor Access + @ Control Register (CP15.CACR): + mrc p15, 0, r1, c1, c0, 2 @ CACR + orr r1, r1, #(3 << 20) + (3 << 22) @ full access for CP10 & CP11 + mcr p15, 0, r1, c1, c0, 2 + @ 2. The EN bit in the FPEXC register must be set: + vmrs r0, FPEXC + orr r0, r0, #1<<30 @ EN (enable) + vmsr FPEXC, r0 + + @ Initialise 16 KB stack + ldr sp, =3D_boot_stack_end + + sub r0, r2, r9 @ r0 -> device tree (virtual address) + mov r1, r9 @ r1 =3D physical_address_offset + + b arch_init + +.pushsection .bss +@ Note: calling arch_init zeroes out this region. +.align 12 +.globl shared_info_page +shared_info_page: + .fill (1024), 4, 0x0 + +.align 3 +.globl irqstack +.globl irqstack_end +irqstack: + .fill (1024), 4, 0x0 +irqstack_end: + +fault_dump: + .fill 18, 4, 0x0 @ On fault, we save the registers + CPSR + handler address + +.popsection + +fault: + cpsid aif @ Disable interrupts + + ldr r13, =3Dfault_dump + stmia r13, {r0-r12} @ Dump the non-banked registers directly (well, unless from FIQ mode) + str r14, [r13, #15 << 2] @ Our r14 is the faulting r15 + mov r0, r13 + + @ Save the caller's CPSR (our SPSR) too. + mrs r1, SPSR + str r1, [r13, #16 << 2] + + @ Switch to the mode we came from to get r13 and r14. + @ If coming from user mode, use System mode instead so we're still + @ privileged. + and r1, r1, #0x1f @ r1 =3D SPSR mode + cmp r1, #0x10 @ If from User mode + moveq r1, #0x1f @ Then use System mode instead + + mrs r3, CPSR @ r3 =3D our CPSR + bic r2, r3, #0x1f + orr r2, r2, r1 + msr CPSR, r2 @ Change to mode r1 + + @ Save old mode's r13, r14 + str r13, [r0, #13 << 2] + str r14, [r0, #14 << 2] + + msr CPSR, r3 @ Back to fault mode + + ldr r1, [r0, #17 << 2] + sub r1, r1, #12 @ Fix to point at start of handler + str r1, [r0, #17 << 2] + + @ Call C code to format the register dump. + @ Clobbers the stack, but we're not going to return anyway. + ldr sp, =3D_boot_stack_end + bl dump_registers + b do_exit + +@ We want to store a unique value to identify this handler, without corrupting +@ any of the registers. So, we store r15 (which will point just after the branch). +@ Later, we subtract 12 so the user gets pointed at the start of the exception +@ handler. +#define FAULT(name) \ +.globl fault_##name; \ +fault_##name: \ + ldr r13, =3Dfault_dump; \ + str r15, [r13, #17 << 2]; \ + b fault + +FAULT(reset) +FAULT(undefined_instruction) +FAULT(svc) +FAULT(prefetch_call) +FAULT(prefetch_abort) +FAULT(data_abort) + +@ exception base address +.align 5 +.globl exception_vector_table +@ Note: remember to call CLREX if returning from an exception: +@ "The architecture enables the local monitor to treat any exclusive store as +@ matching a previous LDREX address. For this reason, use of the CLREX +@ instruction to clear an existing tag is required on context switches." +@ -- ARM Cortex-A Series Programmer=E2=80=99s Guide (Version: 4.0) +exception_vector_table: + b fault_reset + b fault_undefined_instruction + b fault_svc + b fault_prefetch_call + b fault_prefetch_abort + b fault_data_abort + b irq_handler @ IRQ + .word 0xe7f000f0 @ abort on FIQ + +@ Call fault_undefined_instruction in "Undefined mode" +bug: + .word 0xe7f000f0 @ und/udf - a "Permanently Undefined" instruction + +irq_handler: + ldr sp, =3Dirqstack_end + push {r0 - r12, r14} + + ldr r0, IRQ_handler + cmp r0, #0 + beq bug + blx r0 @ call handler + + @ Return from IRQ + pop {r0 - r12, r14} + clrex + subs pc, lr, #4 + +.globl IRQ_handler +IRQ_handler: + .long 0x0 + + +.globl __arch_switch_threads +@ =3D> r0 =3D &prev->sp +@ r1 =3D &next->sp +@ <=3D returns to next thread's saved return address +__arch_switch_threads: + push {r4-r11} @ Store callee-saved registers to old thread's stack + stmia r0, {sp, lr} @ Store current sp and ip to prev's struct thread + + ldmia r1, {sp, lr} @ Load new sp, ip from next's struct thread + pop {r4-r11} @ Load callee-saved registers from new thread's stack + + bx lr + +@ This is called if you try to divide by zero. For now, we make a supervisor call, +@ which will make us halt. +.globl raise +raise: + svc 0 + +.globl arm_start_thread +arm_start_thread: + pop {r0, r1} + @ r0 =3D user data + @ r1 -> thread's main function + ldr lr, =3Dexit_thread + bx r1 diff --git a/extras/mini-os-intree/arch/arm/events.c b/extras/mini-os-intree/arch/arm/events.c new file mode 100644 index 0000000..441010d --- /dev/null +++ b/extras/mini-os-intree/arch/arm/events.c @@ -0,0 +1,31 @@ +#include +#include +#include +#include + +static void virq_debug(evtchn_port_t port, struct pt_regs *regs, void *params) +{ + printk("Received a virq_debug event\n"); +} + +evtchn_port_t debug_port =3D -1; +void arch_init_events(void) +{ + debug_port =3D bind_virq(VIRQ_DEBUG, (evtchn_handler_t)virq_debug, 0); + if(debug_port =3D=3D -1) + BUG(); + unmask_evtchn(debug_port); +} + +void arch_unbind_ports(void) +{ + if(debug_port !=3D -1) + { + mask_evtchn(debug_port); + unbind_evtchn(debug_port); + } +} + +void arch_fini_events(void) +{ +} diff --git a/extras/mini-os-intree/arch/arm/hypercalls32.S b/extras/mini-os-intree/arch/arm/hypercalls32.S new file mode 100644 index 0000000..af8e175 --- /dev/null +++ b/extras/mini-os-intree/arch/arm/hypercalls32.S @@ -0,0 +1,64 @@ +/****************************************************************************** + * hypercall.S + * + * Xen hypercall wrappers + * + * Stefano Stabellini , Citrix, 2012 + * + * 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; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include + +#define __HVC(imm16) .long ((0xE1400070 | (((imm16) & 0xFFF0) << 4) | ((imm16) & 0x000F)) & 0xFFFFFFFF) + +#define XEN_IMM 0xEA1 + +#define HYPERCALL_SIMPLE(hypercall) \ +.globl HYPERVISOR_##hypercall; \ +.align 4,0x90; \ +HYPERVISOR_##hypercall: \ + mov r12, #__HYPERVISOR_##hypercall; \ + __HVC(XEN_IMM); \ + mov pc, lr; + +#define _hypercall0 HYPERCALL_SIMPLE +#define _hypercall1 HYPERCALL_SIMPLE +#define _hypercall2 HYPERCALL_SIMPLE +#define _hypercall3 HYPERCALL_SIMPLE +#define _hypercall4 HYPERCALL_SIMPLE + +_hypercall2(sched_op); +_hypercall2(memory_op); +_hypercall2(event_channel_op); +_hypercall2(xen_version); +_hypercall3(console_io); +_hypercall1(physdev_op); +_hypercall3(grant_table_op); +_hypercall3(vcpu_op); +_hypercall1(sysctl); +_hypercall1(domctl); +_hypercall2(hvm_op); +_hypercall1(xsm_op); diff --git a/extras/mini-os-intree/arch/arm/minios-arm32.lds b/extras/mini-os-intree/arch/arm/minios-arm32.lds new file mode 100755 index 0000000..9627162 --- /dev/null +++ b/extras/mini-os-intree/arch/arm/minios-arm32.lds @@ -0,0 +1,83 @@ +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + /* Note: we currently assume that Xen will load the kernel image + * at start-of-RAM + 0x8000. We use this initial 32 KB for the stack + * and translation tables. + */ + _boot_stack =3D 0x400000; /* 16 KB boot stack */ + _boot_stack_end =3D 0x404000; + _page_dir =3D 0x404000; /* 16 KB translation table */ + . =3D 0x408000; + _text =3D .; /* Text and read-only data */ + .text : { + *(.text) + *(.gnu.warning) + } =3D 0x9090 + + _etext =3D .; /* End of text section */ + + .rodata : { *(.rodata) *(.rodata.*) } + . =3D ALIGN(4096); + _erodata =3D .; + + /* newlib initialization functions */ + . =3D ALIGN(32 / 8); + PROVIDE (__preinit_array_start =3D .); + .preinit_array : { *(.preinit_array) } + PROVIDE (__preinit_array_end =3D .); + PROVIDE (__init_array_start =3D .); + .init_array : { *(.init_array) } + PROVIDE (__init_array_end =3D .); + PROVIDE (__fini_array_start =3D .); + .fini_array : { *(.fini_array) } + PROVIDE (__fini_array_end =3D .); + + .ctors : { + __CTOR_LIST__ =3D .; + *(.ctors) + CONSTRUCTORS + LONG(0) + __CTOR_END__ =3D .; + } + + .dtors : { + __DTOR_LIST__ =3D .; + *(.dtors) + LONG(0) + __DTOR_END__ =3D .; + } + + .data : { /* Data */ + *(.data) + } + + /* Note: linker will insert any extra sections here, just before .bss */ + + .bss : { + _edata =3D .; /* End of data included in image */ + /* Nothing after here is included in the zImage's size */ + + __bss_start =3D .; + *(.bss) + *(.app.bss) + } + _end =3D . ; + + /* Sections to be discarded */ + /DISCARD/ : { + *(.text.exit) + *(.data.exit) + *(.exitcall.exit) + } + + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } +} diff --git a/extras/mini-os-intree/arch/arm/mm.c b/extras/mini-os-intree/arch/arm/mm.c new file mode 100644 index 0000000..efecc51 --- /dev/null +++ b/extras/mini-os-intree/arch/arm/mm.c @@ -0,0 +1,139 @@ +#include +#include +#include +#include +#include +#include + +uint32_t physical_address_offset; + +unsigned long allocate_ondemand(unsigned long n, unsigned long alignment) +{ + // FIXME + BUG(); +} + +void arch_init_mm(unsigned long *start_pfn_p, unsigned long *max_pfn_p) +{ + int memory; + int prop_len =3D 0; + const uint64_t *regs; + + printk(" _text: %p(VA)\n", &_text); + printk(" _etext: %p(VA)\n", &_etext); + printk(" _erodata: %p(VA)\n", &_erodata); + printk(" _edata: %p(VA)\n", &_edata); + printk(" stack start: %p(VA)\n", _boot_stack); + printk(" _end: %p(VA)\n", &_end); + + if (fdt_num_mem_rsv(device_tree) !=3D 0) + printk("WARNING: reserved memory not supported!\n"); + + memory =3D fdt_node_offset_by_prop_value(device_tree, -1, "device_type", "memory", sizeof("memory")); + if (memory < 0) { + printk("No memory found in FDT!\n"); + BUG(); + } + + /* Xen will always provide us at least one bank of memory. + * Mini-OS will use the first bank for the time-being. */ + regs =3D fdt_getprop(device_tree, memory, "reg", &prop_len); + + /* The property must contain at least the start address + * and size, each of which is 8-bytes. */ + if (regs =3D=3D NULL || prop_len < 16) { + printk("Bad 'reg' property: %p %d\n", regs, prop_len); + BUG(); + } + + unsigned int end =3D (unsigned int) &_end; + paddr_t mem_base =3D fdt64_to_cpu(regs[0]); + uint64_t mem_size =3D fdt64_to_cpu(regs[1]); + printk("Found memory at 0x%llx (len 0x%llx)\n", + (unsigned long long) mem_base, (unsigned long long) mem_size); + + BUG_ON(to_virt(mem_base) > (void *) &_text); /* Our image isn't in our RAM! */ + *start_pfn_p =3D PFN_UP(to_phys(end)); + uint64_t heap_len =3D mem_size - (PFN_PHYS(*start_pfn_p) - mem_base); + *max_pfn_p =3D *start_pfn_p + PFN_DOWN(heap_len); + + printk("Using pages %lu to %lu as free space for heap.\n", *start_pfn_p, *max_pfn_p); + + /* The device tree is probably in memory that we're about to hand over to the page + * allocator, so move it to the end and reserve that space. + */ + uint32_t fdt_size =3D fdt_totalsize(device_tree); + void *new_device_tree =3D to_virt(((*max_pfn_p << PAGE_SHIFT) - fdt_size) & PAGE_MASK); + if (new_device_tree !=3D device_tree) { + memmove(new_device_tree, device_tree, fdt_size); + } + device_tree =3D new_device_tree; + *max_pfn_p =3D to_phys(new_device_tree) >> PAGE_SHIFT; +} + +void arch_init_p2m(unsigned long max_pfn) +{ +} + +void arch_init_demand_mapping_area(unsigned long cur_pfn) +{ +} + +/* Get Xen's suggested physical page assignments for the grant table. */ +static paddr_t get_gnttab_base(void) +{ + int hypervisor; + int len =3D 0; + const uint64_t *regs; + paddr_t gnttab_base; + + hypervisor =3D fdt_node_offset_by_compatible(device_tree, -1, "xen,xen"); + BUG_ON(hypervisor < 0); + + regs =3D fdt_getprop(device_tree, hypervisor, "reg", &len); + /* The property contains the address and size, 8-bytes each. */ + if (regs =3D=3D NULL || len < 16) { + printk("Bad 'reg' property: %p %d\n", regs, len); + BUG(); + } + + gnttab_base =3D fdt64_to_cpu(regs[0]); + + printk("FDT suggests grant table base %llx\n", (unsigned long long) gnttab_base); + + return gnttab_base; +} + +grant_entry_t *arch_init_gnttab(int nr_grant_frames) +{ + struct xen_add_to_physmap xatp; + struct gnttab_setup_table setup; + xen_pfn_t frames[nr_grant_frames]; + paddr_t gnttab_table; + int i, rc; + + gnttab_table =3D get_gnttab_base(); + + for (i =3D 0; i < nr_grant_frames; i++) + { + xatp.domid =3D DOMID_SELF; + xatp.size =3D 0; /* Seems to be unused */ + xatp.space =3D XENMAPSPACE_grant_table; + xatp.idx =3D i; + xatp.gpfn =3D (gnttab_table >> PAGE_SHIFT) + i; + rc =3D HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp); + BUG_ON(rc !=3D 0); + } + + setup.dom =3D DOMID_SELF; + setup.nr_frames =3D nr_grant_frames; + set_xen_guest_handle(setup.frame_list, frames); + HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1); + if (setup.status !=3D 0) + { + printk("GNTTABOP_setup_table failed; status =3D %d\n", setup.status); + BUG(); + } + + return to_virt(gnttab_table); +} diff --git a/extras/mini-os-intree/arch/arm/panic.c b/extras/mini-os-intree/arch/arm/panic.c new file mode 100644 index 0000000..0ac49ad --- /dev/null +++ b/extras/mini-os-intree/arch/arm/panic.c @@ -0,0 +1,98 @@ +/****************************************************************************** + * panic.c + * + * Displays a register dump and stack trace for debugging. + * + * Copyright (c) 2014, Thomas Leonard + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include + +extern int irqstack[]; +extern int irqstack_end[]; + +typedef void handler(void); + +extern handler fault_reset; +extern handler fault_undefined_instruction; +extern handler fault_svc; +extern handler fault_prefetch_call; +extern handler fault_prefetch_abort; +extern handler fault_data_abort; + +void dump_registers(int *saved_registers) { + static int in_dump =3D 0; + int *sp, *stack_top, *x; + char *fault_name; + void *fault_handler; + int i; + + if (in_dump) + { + printk("Crash while in dump_registers! Not generating a second report.\n"); + return; + } + + in_dump =3D 1; + + fault_handler =3D (handler *) saved_registers[17]; + if (fault_handler =3D=3D fault_reset) + fault_name =3D "reset"; + else if (fault_handler =3D=3D fault_undefined_instruction) + fault_name =3D "undefined_instruction"; + else if (fault_handler =3D=3D fault_svc) + fault_name =3D "svc"; + else if (fault_handler =3D=3D fault_prefetch_call) + fault_name =3D "prefetch_call"; + else if (fault_handler =3D=3D fault_prefetch_abort) + fault_name =3D "prefetch_abort"; + else if (fault_handler =3D=3D fault_data_abort) + fault_name =3D "data_abort"; + else + fault_name =3D "unknown fault type!"; + + printk("Fault handler at %p called (%s)\n", fault_handler, fault_name); + + for (i =3D 0; i < 16; i++) { + printk("r%d =3D %x\n", i, saved_registers[i]); + } + printk("CPSR =3D %x\n", saved_registers[16]); + + printk("Stack dump (innermost last)\n"); + sp =3D (int *) saved_registers[13]; + + if (sp >=3D _boot_stack && sp <=3D _boot_stack_end) + stack_top =3D _boot_stack_end; /* The boot stack */ + else if (sp >=3D irqstack && sp <=3D irqstack_end) + stack_top =3D irqstack_end; /* The IRQ stack */ + else + stack_top =3D (int *) ((((unsigned long) sp) | (__STACK_SIZE-1)) + 1); /* A normal thread stack */ + + for (x =3D stack_top - 1; x >=3D sp; x--) + { + printk(" [%8p] %8x\n", x, *x); + } + printk("End of stack\n"); + + in_dump =3D 0; +} diff --git a/extras/mini-os-intree/arch/arm/sched.c b/extras/mini-os-intree/arch/arm/sched.c new file mode 100644 index 0000000..8091566 --- /dev/null +++ b/extras/mini-os-intree/arch/arm/sched.c @@ -0,0 +1,47 @@ +#include +#include +#include + +void arm_start_thread(void); + +/* The AAPCS requires the callee (e.g. __arch_switch_threads) to preserve r4-r11. */ +#define CALLEE_SAVED_REGISTERS 8 + +/* Architecture specific setup of thread creation */ +struct thread* arch_create_thread(char *name, void (*function)(void *), + void *data) +{ + struct thread *thread; + + thread =3D xmalloc(struct thread); + /* We can't use lazy allocation here since the trap handler runs on the stack */ + thread->stack =3D (char *)alloc_pages(STACK_SIZE_PAGE_ORDER); + thread->name =3D name; + printk("Thread \"%s\": pointer: 0x%p, stack: 0x%p\n", name, thread, + thread->stack); + + /* Save pointer to the thread on the stack, used by current macro */ + *((unsigned long *)thread->stack) =3D (unsigned long)thread; + + /* Push the details to pass to arm_start_thread onto the stack. */ + int *sp =3D (int *) (thread->stack + STACK_SIZE); + *(--sp) =3D (int) function; + *(--sp) =3D (int) data; + + /* We leave room for the 8 callee-saved registers which we will + * try to restore on thread switch, even though they're not needed + * for the initial switch. */ + thread->sp =3D (unsigned long) sp - 4 * CALLEE_SAVED_REGISTERS; + + thread->ip =3D (unsigned long) arm_start_thread; + + return thread; +} + +void run_idle_thread(void) +{ + __asm__ __volatile__ ("mov sp, %0; bx %1":: + "r"(idle_thread->sp + 4 * CALLEE_SAVED_REGISTERS), + "r"(idle_thread->ip)); + /* Never arrive here! */ +} diff --git a/extras/mini-os-intree/arch/arm/setup.c b/extras/mini-os-intree/arch/arm/setup.c new file mode 100644 index 0000000..06afe46 --- /dev/null +++ b/extras/mini-os-intree/arch/arm/setup.c @@ -0,0 +1,119 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * This structure contains start-of-day info, such as pagetable base pointer, + * address of the shared_info structure, and things like that. + * On x86, the hypervisor passes it to us. On ARM, we fill it in ourselves. + */ +union start_info_union start_info_union; + +/* + * Shared page for communicating with the hypervisor. + * Events flags go here, for example. + */ +shared_info_t *HYPERVISOR_shared_info; + +extern char shared_info_page[PAGE_SIZE]; + +void *device_tree; + +static int hvm_get_parameter(int idx, uint64_t *value) +{ + struct xen_hvm_param xhv; + int ret; + + xhv.domid =3D DOMID_SELF; + xhv.index =3D idx; + ret =3D HYPERVISOR_hvm_op(HVMOP_get_param, &xhv); + if (ret < 0) { + BUG(); + } + *value =3D xhv.value; + return ret; +} + +static void get_console(void) +{ + uint64_t v =3D -1; + + hvm_get_parameter(HVM_PARAM_CONSOLE_EVTCHN, &v); + start_info.console.domU.evtchn =3D v; + + hvm_get_parameter(HVM_PARAM_CONSOLE_PFN, &v); + start_info.console.domU.mfn =3D v; + + printk("Console is on port %d\n", start_info.console.domU.evtchn); + printk("Console ring is at mfn %lx\n", (unsigned long) start_info.console.domU.mfn); +} + +void get_xenbus(void) +{ + uint64_t value; + + if (hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &value)) + BUG(); + + start_info.store_evtchn =3D (int)value; + + if(hvm_get_parameter(HVM_PARAM_STORE_PFN, &value)) + BUG(); + start_info.store_mfn =3D (unsigned long)value; +} + +/* + * INITIAL C ENTRY POINT. + */ +void arch_init(void *dtb_pointer, uint32_t physical_offset) +{ + struct xen_add_to_physmap xatp; + int r; + + memset(&__bss_start, 0, &_end - &__bss_start); + + physical_address_offset =3D physical_offset; + + xprintk("Virtual -> physical offset =3D %x\n", physical_address_offset); + + xprintk("Checking DTB at %p...\n", dtb_pointer); + + if ((r =3D fdt_check_header(dtb_pointer))) { + xprintk("Invalid DTB from Xen: %s\n", fdt_strerror(r)); + BUG(); + } + device_tree =3D dtb_pointer; + + /* Map shared_info page */ + xatp.domid =3D DOMID_SELF; + xatp.idx =3D 0; + xatp.space =3D XENMAPSPACE_shared_info; + xatp.gpfn =3D virt_to_pfn(shared_info_page); + if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp) !=3D 0) + BUG(); + HYPERVISOR_shared_info =3D (struct shared_info *)shared_info_page; + + /* Fill in start_info */ + get_console(); + get_xenbus(); + + gic_init(); + + start_kernel(); +} + +void +arch_fini(void) +{ +} + +void +arch_do_exit(void) +{ +} diff --git a/extras/mini-os-intree/arch/arm/time.c b/extras/mini-os-intree/arch/arm/time.c new file mode 100644 index 0000000..a088981 --- /dev/null +++ b/extras/mini-os-intree/arch/arm/time.c @@ -0,0 +1,136 @@ +#include +#include +#include +#include +#include +#include +#include + +//#define VTIMER_DEBUG +#ifdef VTIMER_DEBUG +#define DEBUG(_f, _a...) \ + printk("MINI_OS(file=3Dvtimer.c, line=3D%d) " _f , __LINE__, ## _a) +#else +#define DEBUG(_f, _a...) ((void)0) +#endif + +/************************************************************************ + * Time functions + *************************************************************************/ + +static uint64_t cntvct_at_init; +static uint32_t counter_freq; + +/* Compute with 96 bit intermediate result: (a*b)/c */ +uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c) +{ + union { + uint64_t ll; + struct { + uint32_t low, high; + } l; + } u, res; + uint64_t rl, rh; + + u.ll =3D a; + rl =3D (uint64_t)u.l.low * (uint64_t)b; + rh =3D (uint64_t)u.l.high * (uint64_t)b; + rh +=3D (rl >> 32); + res.l.high =3D rh / c; + res.l.low =3D (((rh % c) << 32) + (rl & 0xffffffff)) / c; + return res.ll; +} + +static inline s_time_t ticks_to_ns(uint64_t ticks) +{ + return muldiv64(ticks, SECONDS(1), counter_freq); +} + +static inline uint64_t ns_to_ticks(s_time_t ns) +{ + return muldiv64(ns, counter_freq, SECONDS(1)); +} + +/* Wall-clock time is not currently available on ARM, so this is always zero for now: + * http://wiki.xenproject.org/wiki/Xen_ARM_TODO#Expose_Wallclock_time_to_guests + */ +static struct timespec shadow_ts; + +static inline uint64_t read_virtual_count(void) +{ + uint32_t c_lo, c_hi; + __asm__ __volatile__("mrrc p15, 1, %0, %1, c14":"=3Dr"(c_lo), "=3Dr"(c_hi)); + return (((uint64_t) c_hi) << 32) + c_lo; +} + +/* monotonic_clock(): returns # of nanoseconds passed since time_init() + * Note: This function is required to return accurate + * time even in the absence of multiple timer ticks. + */ +uint64_t monotonic_clock(void) +{ + return ticks_to_ns(read_virtual_count() - cntvct_at_init); +} + +int gettimeofday(struct timeval *tv, void *tz) +{ + uint64_t nsec =3D monotonic_clock(); + nsec +=3D shadow_ts.tv_nsec; + + tv->tv_sec =3D shadow_ts.tv_sec; + tv->tv_sec +=3D NSEC_TO_SEC(nsec); + tv->tv_usec =3D NSEC_TO_USEC(nsec % 1000000000UL); + + return 0; +} + +/* Set the timer and mask. */ +void write_timer_ctl(uint32_t value) { + __asm__ __volatile__( + "mcr p15, 0, %0, c14, c3, 1\n" + "isb"::"r"(value)); +} + +void set_vtimer_compare(uint64_t value) { + DEBUG("New CompareValue : %llx\n", value); + + __asm__ __volatile__("mcrr p15, 3, %0, %H0, c14" + ::"r"(value)); + + /* Enable timer and unmask the output signal */ + write_timer_ctl(1); +} + +void unset_vtimer_compare(void) { + /* Disable timer and mask the output signal */ + write_timer_ctl(2); +} + +void block_domain(s_time_t until) +{ + uint64_t until_count =3D ns_to_ticks(until) + cntvct_at_init; + ASSERT(irqs_disabled()); + if (read_virtual_count() < until_count) + { + set_vtimer_compare(until_count); + __asm__ __volatile__("wfi"); + unset_vtimer_compare(); + + /* Give the IRQ handler a chance to handle whatever woke us up. */ + local_irq_enable(); + local_irq_disable(); + } +} + +void init_time(void) +{ + printk("Initialising timer interface\n"); + + __asm__ __volatile__("mrc p15, 0, %0, c14, c0, 0":"=3Dr"(counter_freq)); + cntvct_at_init =3D read_virtual_count(); + printk("Virtual Count register is %llx, freq =3D %d Hz\n", cntvct_at_init, counter_freq); +} + +void fini_time(void) +{ +} diff --git a/extras/mini-os-intree/arch/x86/Makefile b/extras/mini-os-intree/arch/x86/Makefile new file mode 100644 index 0000000..9f04a93 --- /dev/null +++ b/extras/mini-os-intree/arch/x86/Makefile @@ -0,0 +1,30 @@ +# +# x86 architecture specific makefiles. +# It's is used for x86_32, x86_32y and x86_64 +# + +TOPLEVEL_DIR =3D $(CURDIR)/../.. +include ../../Config.mk + +# include arch.mk has to be before mini-os.mk! + +include arch.mk +include ../../minios.mk + +# Sources here are all *.c *.S without $(MINIOS_TARGET_ARCH).S +# This is handled in $(HEAD_ARCH_OBJ) +ARCH_SRCS :=3D $(wildcard *.c) + +# The objects built from the sources. +ARCH_OBJS :=3D $(patsubst %.c,$(OBJ_DIR)/%.o,$(ARCH_SRCS)) + +all: $(OBJ_DIR)/$(ARCH_LIB) + +# $(HEAD_ARCH_OBJ) is only build here, needed on linking +# in ../../Makefile. +$(OBJ_DIR)/$(ARCH_LIB): $(ARCH_OBJS) $(OBJ_DIR)/$(HEAD_ARCH_OBJ) + $(AR) rv $(OBJ_DIR)/$(ARCH_LIB) $(ARCH_OBJS) + +clean: + rm -f $(OBJ_DIR)/$(ARCH_LIB) $(ARCH_OBJS) $(OBJ_DIR)/$(HEAD_ARCH_OBJ) + diff --git a/extras/mini-os-intree/arch/x86/arch.mk b/extras/mini-os-intree/arch/x86/arch.mk new file mode 100644 index 0000000..81e8118 --- /dev/null +++ b/extras/mini-os-intree/arch/x86/arch.mk @@ -0,0 +1,22 @@ +# +# Architecture special makerules for x86 family +# (including x86_32, x86_32y and x86_64). +# + +ifeq ($(MINIOS_TARGET_ARCH),x86_32) +ARCH_CFLAGS :=3D -m32 -march=3Di686 +ARCH_LDFLAGS :=3D -m elf_i386 +ARCH_ASFLAGS :=3D -m32 +EXTRA_INC +=3D $(TARGET_ARCH_FAM)/$(MINIOS_TARGET_ARCH) +EXTRA_SRC +=3D arch/$(EXTRA_INC) +endif + +ifeq ($(MINIOS_TARGET_ARCH),x86_64) +ARCH_CFLAGS :=3D -m64 -mno-red-zone -fno-reorder-blocks +ARCH_CFLAGS +=3D -fno-asynchronous-unwind-tables +ARCH_ASFLAGS :=3D -m64 +ARCH_LDFLAGS :=3D -m elf_x86_64 +EXTRA_INC +=3D $(TARGET_ARCH_FAM)/$(MINIOS_TARGET_ARCH) +EXTRA_SRC +=3D arch/$(EXTRA_INC) +endif + diff --git a/extras/mini-os-intree/arch/x86/events.c b/extras/mini-os-intree/arch/x86/events.c new file mode 100644 index 0000000..5198cf3 --- /dev/null +++ b/extras/mini-os-intree/arch/x86/events.c @@ -0,0 +1,35 @@ +#include +#include +#include + +#if defined(__x86_64__) +char irqstack[2 * STACK_SIZE]; + +static struct pda +{ + int irqcount; /* offset 0 (used in x86_64.S) */ + char *irqstackptr; /* 8 */ +} cpu0_pda; +#endif + +void arch_init_events(void) +{ +#if defined(__x86_64__) + asm volatile("movl %0,%%fs ; movl %0,%%gs" :: "r" (0)); + wrmsrl(0xc0000101, &cpu0_pda); /* 0xc0000101 is MSR_GS_BASE */ + cpu0_pda.irqcount =3D -1; + cpu0_pda.irqstackptr =3D (void*) (((unsigned long)irqstack + 2 * STACK_SIZE) + & ~(STACK_SIZE - 1)); +#endif +} + +void arch_unbind_ports(void) +{ +} + +void arch_fini_events(void) +{ +#if defined(__x86_64__) + wrmsrl(0xc0000101, NULL); /* 0xc0000101 is MSR_GS_BASE */ +#endif +} diff --git a/extras/mini-os-intree/arch/x86/ioremap.c b/extras/mini-os-intree/arch/x86/ioremap.c new file mode 100644 index 0000000..4384b1c --- /dev/null +++ b/extras/mini-os-intree/arch/x86/ioremap.c @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2009, Netronome Systems, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + + +#include +#include +#include +#include +#include + +/* Map a physical address range into virtual address space with provided + * flags. Return a virtual address range it is mapped to. */ +static void *__do_ioremap(unsigned long phys_addr, unsigned long size, + unsigned long prot) +{ + unsigned long va; + unsigned long mfns, mfn; + unsigned long num_pages, offset; + + /* allow non page aligned addresses but for mapping we need to align them */ + offset =3D (phys_addr & ~PAGE_MASK); + num_pages =3D (offset + size + PAGE_SIZE - 1) / PAGE_SIZE; + phys_addr &=3D PAGE_MASK; + mfns =3D mfn =3D phys_addr >> PAGE_SHIFT; + + va =3D (unsigned long)map_frames_ex(&mfns, num_pages, 0, 1, 1, + DOMID_IO, NULL, prot); + return (void *)(va + offset); +} + +void *ioremap(unsigned long phys_addr, unsigned long size) +{ + return __do_ioremap(phys_addr, size, IO_PROT); +} + +void *ioremap_nocache(unsigned long phys_addr, unsigned long size) +{ + return __do_ioremap(phys_addr, size, IO_PROT_NOCACHE); +} + +/* Un-map the io-remapped region. Currently no list of existing mappings is + * maintained, so the caller has to supply the size */ +void iounmap(void *virt_addr, unsigned long size) +{ + unsigned long num_pages; + unsigned long va =3D (unsigned long)virt_addr; + + /* work out number of frames to unmap */ + num_pages =3D ((va & ~PAGE_MASK) + size + PAGE_SIZE - 1) / PAGE_SIZE; + + unmap_frames(va & PAGE_MASK, num_pages); +} + + + +/* -*- Mode:C; c-basic-offset:4; tab-width:4 indent-tabs-mode:nil -*- */ diff --git a/extras/mini-os-intree/arch/x86/iorw.c b/extras/mini-os-intree/arch/x86/iorw.c new file mode 100644 index 0000000..3080769 --- /dev/null +++ b/extras/mini-os-intree/arch/x86/iorw.c @@ -0,0 +1,35 @@ +#include + +void iowrite8(volatile void* addr, uint8_t val) +{ + *((volatile uint8_t*)addr) =3D val; +} +void iowrite16(volatile void* addr, uint16_t val) +{ + *((volatile uint16_t*)addr) =3D val; +} +void iowrite32(volatile void* addr, uint32_t val) +{ + *((volatile uint32_t*)addr) =3D val; +} +void iowrite64(volatile void* addr, uint64_t val) +{ + *((volatile uint64_t*)addr) =3D val; +} + +uint8_t ioread8(volatile void* addr) +{ + return *((volatile uint8_t*) addr); +} +uint16_t ioread16(volatile void* addr) +{ + return *((volatile uint16_t*) addr); +} +uint32_t ioread32(volatile void* addr) +{ + return *((volatile uint32_t*) addr); +} +uint64_t ioread64(volatile void* addr) +{ + return *((volatile uint64_t*) addr); +} diff --git a/extras/mini-os-intree/arch/x86/minios-x86_32.lds b/extras/mini-os-intree/arch/x86/minios-x86_32.lds new file mode 100644 index 0000000..f5cabb6 --- /dev/null +++ b/extras/mini-os-intree/arch/x86/minios-x86_32.lds @@ -0,0 +1,74 @@ +OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") +OUTPUT_ARCH(i386) +ENTRY(_start) +SECTIONS +{ + . =3D 0x0; + _text =3D .; /* Text and read-only data */ + .text : { + *(.text) + *(.gnu.warning) + } =3D 0x9090 + + _etext =3D .; /* End of text section */ + + .rodata : { *(.rodata) *(.rodata.*) } + . =3D ALIGN(4096); + _erodata =3D .; + + /* newlib initialization functions */ + . =3D ALIGN(32 / 8); + PROVIDE (__preinit_array_start =3D .); + .preinit_array : { *(.preinit_array) } + PROVIDE (__preinit_array_end =3D .); + PROVIDE (__init_array_start =3D .); + .init_array : { *(.init_array) } + PROVIDE (__init_array_end =3D .); + PROVIDE (__fini_array_start =3D .); + .fini_array : { *(.fini_array) } + PROVIDE (__fini_array_end =3D .); + + .ctors : { + __CTOR_LIST__ =3D .; + *(.ctors) + CONSTRUCTORS + LONG(0) + __CTOR_END__ =3D .; + } + + .dtors : { + __DTOR_LIST__ =3D .; + *(.dtors) + LONG(0) + __DTOR_END__ =3D .; + } + + .data : { /* Data */ + *(.data) + } + + _edata =3D .; /* End of data section */ + + __bss_start =3D .; /* BSS */ + .bss : { + *(.bss) + *(.app.bss) + } + _end =3D . ; + + /* Sections to be discarded */ + /DISCARD/ : { + *(.text.exit) + *(.data.exit) + *(.exitcall.exit) + } + + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } +} diff --git a/extras/mini-os-intree/arch/x86/minios-x86_64.lds b/extras/mini-os-intree/arch/x86/minios-x86_64.lds new file mode 100644 index 0000000..3da0a9f --- /dev/null +++ b/extras/mini-os-intree/arch/x86/minios-x86_64.lds @@ -0,0 +1,74 @@ +OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") +OUTPUT_ARCH(i386:x86-64) +ENTRY(_start) +SECTIONS +{ + . =3D 0x0; + _text =3D .; /* Text and read-only data */ + .text : { + *(.text) + *(.gnu.warning) + } =3D 0x9090 + + _etext =3D .; /* End of text section */ + + .rodata : { *(.rodata) *(.rodata.*) } + . =3D ALIGN(4096); + _erodata =3D .; + + /* newlib initialization functions */ + . =3D ALIGN(64 / 8); + PROVIDE (__preinit_array_start =3D .); + .preinit_array : { *(.preinit_array) } + PROVIDE (__preinit_array_end =3D .); + PROVIDE (__init_array_start =3D .); + .init_array : { *(.init_array) } + PROVIDE (__init_array_end =3D .); + PROVIDE (__fini_array_start =3D .); + .fini_array : { *(.fini_array) } + PROVIDE (__fini_array_end =3D .); + + .ctors : { + __CTOR_LIST__ =3D .; + *(.ctors) + CONSTRUCTORS + QUAD(0) + __CTOR_END__ =3D .; + } + + .dtors : { + __DTOR_LIST__ =3D .; + *(.dtors) + QUAD(0) + __DTOR_END__ =3D .; + } + + .data : { /* Data */ + *(.data) + } + + _edata =3D .; /* End of data section */ + + __bss_start =3D .; /* BSS */ + .bss : { + *(.bss) + *(.app.bss) + } + _end =3D . ; + + /* Sections to be discarded */ + /DISCARD/ : { + *(.text.exit) + *(.data.exit) + *(.exitcall.exit) + } + + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } +} diff --git a/extras/mini-os-intree/arch/x86/mm.c b/extras/mini-os-intree/arch/x86/mm.c new file mode 100644 index 0000000..9c6d1b8 --- /dev/null +++ b/extras/mini-os-intree/arch/x86/mm.c @@ -0,0 +1,957 @@ +/* + **************************************************************************** + * (C) 2003 - Rolf Neugebauer - Intel Research Cambridge + * (C) 2005 - Grzegorz Milos - Intel Research Cambridge + **************************************************************************** + * + * File: mm.c + * Author: Rolf Neugebauer (neugebar@dcs.gla.ac.uk) + * Changes: Grzegorz Milos + * + * Date: Aug 2003, chages Aug 2005 + * + * Environment: Xen Minimal OS + * Description: memory management related functions + * contains buddy page allocator from Xen. + * + **************************************************************************** + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include +#include +#include +#include +#include + +#ifdef MM_DEBUG +#define DEBUG(_f, _a...) \ + printk("MINI_OS(file=3Dmm.c, line=3D%d) " _f "\n", __LINE__, ## _a) +#else +#define DEBUG(_f, _a...) ((void)0) +#endif + +unsigned long *phys_to_machine_mapping; +unsigned long mfn_zero; +extern char stack[]; +extern void page_walk(unsigned long va); + +/* + * Make pt_pfn a new 'level' page table frame and hook it into the page + * table at offset in previous level MFN (pref_l_mfn). pt_pfn is a guest + * PFN. + */ +static void new_pt_frame(unsigned long *pt_pfn, unsigned long prev_l_mfn, + unsigned long offset, unsigned long level) +{ + pgentry_t *tab =3D (pgentry_t *)start_info.pt_base; + unsigned long pt_page =3D (unsigned long)pfn_to_virt(*pt_pfn); + pgentry_t prot_e, prot_t; + mmu_update_t mmu_updates[1]; + int rc; + + prot_e =3D prot_t =3D 0; + DEBUG("Allocating new L%d pt frame for pfn=3D%lx, " + "prev_l_mfn=3D%lx, offset=3D%lx", + level, *pt_pfn, prev_l_mfn, offset); + + /* We need to clear the page, otherwise we might fail to map it + as a page table page */ + memset((void*) pt_page, 0, PAGE_SIZE); + + switch ( level ) + { + case L1_FRAME: + prot_e =3D L1_PROT; + prot_t =3D L2_PROT; + break; + case L2_FRAME: + prot_e =3D L2_PROT; + prot_t =3D L3_PROT; + break; +#if defined(__x86_64__) + case L3_FRAME: + prot_e =3D L3_PROT; + prot_t =3D L4_PROT; + break; +#endif + default: + printk("new_pt_frame() called with invalid level number %d\n", level); + do_exit(); + break; + } + + /* Make PFN a page table page */ +#if defined(__x86_64__) + tab =3D pte_to_virt(tab[l4_table_offset(pt_page)]); +#endif + tab =3D pte_to_virt(tab[l3_table_offset(pt_page)]); + + mmu_updates[0].ptr =3D (tab[l2_table_offset(pt_page)] & PAGE_MASK) + + sizeof(pgentry_t) * l1_table_offset(pt_page); + mmu_updates[0].val =3D (pgentry_t)pfn_to_mfn(*pt_pfn) << PAGE_SHIFT | + (prot_e & ~_PAGE_RW); + + if ( (rc =3D HYPERVISOR_mmu_update(mmu_updates, 1, NULL, DOMID_SELF)) < 0 ) + { + printk("ERROR: PTE for new page table page could not be updated\n"); + printk(" mmu_update failed with rc=3D%d\n", rc); + do_exit(); + } + + /* Hook the new page table page into the hierarchy */ + mmu_updates[0].ptr =3D + ((pgentry_t)prev_l_mfn << PAGE_SHIFT) + sizeof(pgentry_t) * offset; + mmu_updates[0].val =3D (pgentry_t)pfn_to_mfn(*pt_pfn) << PAGE_SHIFT | prot_t; + + if ( (rc =3D HYPERVISOR_mmu_update(mmu_updates, 1, NULL, DOMID_SELF)) < 0 ) + { + printk("ERROR: mmu_update failed with rc=3D%d\n", rc); + do_exit(); + } + + *pt_pfn +=3D 1; +} + +/* + * Checks if a pagetable frame is needed at 'level' to map a given + * address. Note, this function is specific to the initial page table + * building. + */ +static int need_pt_frame(unsigned long va, int level) +{ + unsigned long hyp_virt_start =3D HYPERVISOR_VIRT_START; +#if defined(__x86_64__) + unsigned long hyp_virt_end =3D HYPERVISOR_VIRT_END; +#else + unsigned long hyp_virt_end =3D 0xffffffff; +#endif + + /* In general frames will _not_ be needed if they were already + allocated to map the hypervisor into our VA space */ +#if defined(__x86_64__) + if ( level =3D=3D L3_FRAME ) + { + if ( l4_table_offset(va) >=3D + l4_table_offset(hyp_virt_start) && + l4_table_offset(va) <=3D + l4_table_offset(hyp_virt_end)) + return 0; + return 1; + } + else +#endif + + if ( level =3D=3D L2_FRAME ) + { +#if defined(__x86_64__) + if ( l4_table_offset(va) >=3D + l4_table_offset(hyp_virt_start) && + l4_table_offset(va) <=3D + l4_table_offset(hyp_virt_end)) +#endif + if ( l3_table_offset(va) >=3D + l3_table_offset(hyp_virt_start) && + l3_table_offset(va) <=3D + l3_table_offset(hyp_virt_end)) + return 0; + + return 1; + } + else + /* Always need l1 frames */ + if ( level =3D=3D L1_FRAME ) + return 1; + + printk("ERROR: Unknown frame level %d, hypervisor %llx,%llx\n", + level, hyp_virt_start, hyp_virt_end); + return -1; +} + +/* + * Build the initial pagetable. + */ +static void build_pagetable(unsigned long *start_pfn, unsigned long *max_pfn) +{ + unsigned long start_address, end_address; + unsigned long pfn_to_map, pt_pfn =3D *start_pfn; + static mmu_update_t mmu_updates[L1_PAGETABLE_ENTRIES + 1]; + pgentry_t *tab =3D (pgentry_t *)start_info.pt_base, page; + unsigned long pt_mfn =3D pfn_to_mfn(virt_to_pfn(start_info.pt_base)); + unsigned long offset; + int count =3D 0; + int rc; + + pfn_to_map =3D + (start_info.nr_pt_frames - NOT_L1_FRAMES) * L1_PAGETABLE_ENTRIES; + + if ( *max_pfn >=3D virt_to_pfn(HYPERVISOR_VIRT_START) ) + { + printk("WARNING: Mini-OS trying to use Xen virtual space. " + "Truncating memory from %dMB to ", + ((unsigned long)pfn_to_virt(*max_pfn) - + (unsigned long)&_text)>>20); + *max_pfn =3D virt_to_pfn(HYPERVISOR_VIRT_START - PAGE_SIZE); + printk("%dMB\n", + ((unsigned long)pfn_to_virt(*max_pfn) - + (unsigned long)&_text)>>20); + } + + start_address =3D (unsigned long)pfn_to_virt(pfn_to_map); + end_address =3D (unsigned long)pfn_to_virt(*max_pfn); + + /* We worked out the virtual memory range to map, now mapping loop */ + printk("Mapping memory range 0x%lx - 0x%lx\n", start_address, end_address); + + while ( start_address < end_address ) + { + tab =3D (pgentry_t *)start_info.pt_base; + pt_mfn =3D pfn_to_mfn(virt_to_pfn(start_info.pt_base)); + +#if defined(__x86_64__) + offset =3D l4_table_offset(start_address); + /* Need new L3 pt frame */ + if ( !(start_address & L3_MASK) ) + if ( need_pt_frame(start_address, L3_FRAME) ) + new_pt_frame(&pt_pfn, pt_mfn, offset, L3_FRAME); + + page =3D tab[offset]; + pt_mfn =3D pte_to_mfn(page); + tab =3D to_virt(mfn_to_pfn(pt_mfn) << PAGE_SHIFT); +#endif + offset =3D l3_table_offset(start_address); + /* Need new L2 pt frame */ + if ( !(start_address & L2_MASK) ) + if ( need_pt_frame(start_address, L2_FRAME) ) + new_pt_frame(&pt_pfn, pt_mfn, offset, L2_FRAME); + + page =3D tab[offset]; + pt_mfn =3D pte_to_mfn(page); + tab =3D to_virt(mfn_to_pfn(pt_mfn) << PAGE_SHIFT); + offset =3D l2_table_offset(start_address); + /* Need new L1 pt frame */ + if ( !(start_address & L1_MASK) ) + if ( need_pt_frame(start_address, L1_FRAME) ) + new_pt_frame(&pt_pfn, pt_mfn, offset, L1_FRAME); + + page =3D tab[offset]; + pt_mfn =3D pte_to_mfn(page); + offset =3D l1_table_offset(start_address); + + mmu_updates[count].ptr =3D + ((pgentry_t)pt_mfn << PAGE_SHIFT) + sizeof(pgentry_t) * offset; + mmu_updates[count].val =3D + (pgentry_t)pfn_to_mfn(pfn_to_map++) << PAGE_SHIFT | L1_PROT; + count++; + if ( count =3D=3D L1_PAGETABLE_ENTRIES || pfn_to_map =3D=3D *max_pfn ) + { + rc =3D HYPERVISOR_mmu_update(mmu_updates, count, NULL, DOMID_SELF); + if ( rc < 0 ) + { + printk("ERROR: build_pagetable(): PTE could not be updated\n"); + printk(" mmu_update failed with rc=3D%d\n", rc); + do_exit(); + } + count =3D 0; + } + start_address +=3D PAGE_SIZE; + } + + *start_pfn =3D pt_pfn; +} + +/* + * Mark portion of the address space read only. + */ +extern struct shared_info shared_info; +static void set_readonly(void *text, void *etext) +{ + unsigned long start_address =3D + ((unsigned long) text + PAGE_SIZE - 1) & PAGE_MASK; + unsigned long end_address =3D (unsigned long) etext; + static mmu_update_t mmu_updates[L1_PAGETABLE_ENTRIES + 1]; + pgentry_t *tab =3D (pgentry_t *)start_info.pt_base, page; + unsigned long mfn =3D pfn_to_mfn(virt_to_pfn(start_info.pt_base)); + unsigned long offset; + int count =3D 0; + int rc; + + printk("setting %p-%p readonly\n", text, etext); + + while ( start_address + PAGE_SIZE <=3D end_address ) + { + tab =3D (pgentry_t *)start_info.pt_base; + mfn =3D pfn_to_mfn(virt_to_pfn(start_info.pt_base)); + +#if defined(__x86_64__) + offset =3D l4_table_offset(start_address); + page =3D tab[offset]; + mfn =3D pte_to_mfn(page); + tab =3D to_virt(mfn_to_pfn(mfn) << PAGE_SHIFT); +#endif + offset =3D l3_table_offset(start_address); + page =3D tab[offset]; + mfn =3D pte_to_mfn(page); + tab =3D to_virt(mfn_to_pfn(mfn) << PAGE_SHIFT); + offset =3D l2_table_offset(start_address); + page =3D tab[offset]; + mfn =3D pte_to_mfn(page); + tab =3D to_virt(mfn_to_pfn(mfn) << PAGE_SHIFT); + + offset =3D l1_table_offset(start_address); + + if ( start_address !=3D (unsigned long)&shared_info ) + { + mmu_updates[count].ptr =3D + ((pgentry_t)mfn << PAGE_SHIFT) + sizeof(pgentry_t) * offset; + mmu_updates[count].val =3D tab[offset] & ~_PAGE_RW; + count++; + } + else + printk("skipped %p\n", start_address); + + start_address +=3D PAGE_SIZE; + + if ( count =3D=3D L1_PAGETABLE_ENTRIES || + start_address + PAGE_SIZE > end_address ) + { + rc =3D HYPERVISOR_mmu_update(mmu_updates, count, NULL, DOMID_SELF); + if ( rc < 0 ) + { + printk("ERROR: set_readonly(): PTE could not be updated\n"); + do_exit(); + } + count =3D 0; + } + } + + { + mmuext_op_t op =3D { + .cmd =3D MMUEXT_TLB_FLUSH_ALL, + }; + int count; + HYPERVISOR_mmuext_op(&op, 1, &count, DOMID_SELF); + } +} + +/* + * A useful mem testing function. Write the address to every address in the + * range provided and read back the value. If verbose, print page walk to + * some VA + * + * If we get MEM_TEST_MAX_ERRORS we might as well stop + */ +#define MEM_TEST_MAX_ERRORS 10 +int mem_test(unsigned long *start_va, unsigned long *end_va, int verbose) +{ + unsigned long mask =3D 0x10000; + unsigned long *pointer; + int error_count =3D 0; + + /* write values and print page walks */ + if ( verbose && (((unsigned long)start_va) & 0xfffff) ) + { + printk("MemTest Start: 0x%lx\n", start_va); + page_walk((unsigned long)start_va); + } + for ( pointer =3D start_va; pointer < end_va; pointer++ ) + { + if ( verbose && !(((unsigned long)pointer) & 0xfffff) ) + { + printk("Writing to %lx\n", pointer); + page_walk((unsigned long)pointer); + } + *pointer =3D (unsigned long)pointer & ~mask; + } + if ( verbose && (((unsigned long)end_va) & 0xfffff) ) + { + printk("MemTest End: %lx\n", end_va-1); + page_walk((unsigned long)end_va-1); + } + + /* verify values */ + for ( pointer =3D start_va; pointer < end_va; pointer++ ) + { + if ( ((unsigned long)pointer & ~mask) !=3D *pointer ) + { + printk("Read error at 0x%lx. Read: 0x%lx, should read 0x%lx\n", + (unsigned long)pointer, *pointer, + ((unsigned long)pointer & ~mask)); + error_count++; + if ( error_count >=3D MEM_TEST_MAX_ERRORS ) + { + printk("mem_test: too many errors\n"); + return -1; + } + } + } + return 0; +} + + +/* + * get the PTE for virtual address va if it exists. Otherwise NULL. + */ +static pgentry_t *get_pgt(unsigned long va) +{ + unsigned long mfn; + pgentry_t *tab; + unsigned offset; + + tab =3D (pgentry_t *)start_info.pt_base; + mfn =3D virt_to_mfn(start_info.pt_base); + +#if defined(__x86_64__) + offset =3D l4_table_offset(va); + if ( !(tab[offset] & _PAGE_PRESENT) ) + return NULL; + mfn =3D pte_to_mfn(tab[offset]); + tab =3D mfn_to_virt(mfn); +#endif + offset =3D l3_table_offset(va); + if ( !(tab[offset] & _PAGE_PRESENT) ) + return NULL; + mfn =3D pte_to_mfn(tab[offset]); + tab =3D mfn_to_virt(mfn); + offset =3D l2_table_offset(va); + if ( !(tab[offset] & _PAGE_PRESENT) ) + return NULL; + mfn =3D pte_to_mfn(tab[offset]); + tab =3D mfn_to_virt(mfn); + offset =3D l1_table_offset(va); + return &tab[offset]; +} + + +/* + * return a valid PTE for a given virtual address. If PTE does not exist, + * allocate page-table pages. + */ +pgentry_t *need_pgt(unsigned long va) +{ + unsigned long pt_mfn; + pgentry_t *tab; + unsigned long pt_pfn; + unsigned offset; + + tab =3D (pgentry_t *)start_info.pt_base; + pt_mfn =3D virt_to_mfn(start_info.pt_base); + +#if defined(__x86_64__) + offset =3D l4_table_offset(va); + if ( !(tab[offset] & _PAGE_PRESENT) ) + { + pt_pfn =3D virt_to_pfn(alloc_page()); + new_pt_frame(&pt_pfn, pt_mfn, offset, L3_FRAME); + } + ASSERT(tab[offset] & _PAGE_PRESENT); + pt_mfn =3D pte_to_mfn(tab[offset]); + tab =3D mfn_to_virt(pt_mfn); +#endif + offset =3D l3_table_offset(va); + if ( !(tab[offset] & _PAGE_PRESENT) ) + { + pt_pfn =3D virt_to_pfn(alloc_page()); + new_pt_frame(&pt_pfn, pt_mfn, offset, L2_FRAME); + } + ASSERT(tab[offset] & _PAGE_PRESENT); + pt_mfn =3D pte_to_mfn(tab[offset]); + tab =3D mfn_to_virt(pt_mfn); + offset =3D l2_table_offset(va); + if ( !(tab[offset] & _PAGE_PRESENT) ) + { + pt_pfn =3D virt_to_pfn(alloc_page()); + new_pt_frame(&pt_pfn, pt_mfn, offset, L1_FRAME); + } + ASSERT(tab[offset] & _PAGE_PRESENT); + pt_mfn =3D pte_to_mfn(tab[offset]); + tab =3D mfn_to_virt(pt_mfn); + + offset =3D l1_table_offset(va); + return &tab[offset]; +} + +/* + * Reserve an area of virtual address space for mappings and Heap + */ +static unsigned long demand_map_area_start; +#ifdef __x86_64__ +#define DEMAND_MAP_PAGES ((128ULL << 30) / PAGE_SIZE) +#else +#define DEMAND_MAP_PAGES ((2ULL << 30) / PAGE_SIZE) +#endif + +#ifndef HAVE_LIBC +#define HEAP_PAGES 0 +#else +unsigned long heap, brk, heap_mapped, heap_end; +#ifdef __x86_64__ +#define HEAP_PAGES ((128ULL << 30) / PAGE_SIZE) +#else +#define HEAP_PAGES ((1ULL << 30) / PAGE_SIZE) +#endif +#endif --===============3270912304271382760== 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 --===============3270912304271382760==-- From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:16:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:16: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 1YTqFS-00029G-I3; Fri, 06 Mar 2015 11:16:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFQ-00028w-JY for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:53 +0000 Content-Length: 99881 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id A9/02-03164-3AC89F45; Fri, 06 Mar 2015 11:16:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425640604!13636700!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19925 invoked from network); 6 Mar 2015 11:16:45 -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; 6 Mar 2015 11:16:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFI-0006Bn-1Y for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqFH-0001i4-Rs for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:43 +0000 Date: Fri, 06 Mar 2015 11:16:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Remove in-tree mini-os directory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============4576138641625528538==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4576138641625528538== Content-Length: 102422 Content-Transfer-Encoding: quoted-printable commit 7280bb923ad9853f541207f8e1aa1b4f1c513c91 Author: Wei Liu AuthorDate: Fri Jan 30 16:03:18 2015 +0000 Commit: Wei Liu CommitDate: Fri Feb 27 16:04:54 2015 +0000 Remove in-tree mini-os directory Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- extras/mini-os-intree/COPYING | 36 - extras/mini-os-intree/Config.mk | 99 -- extras/mini-os-intree/Makefile | 224 --- extras/mini-os-intree/README | 46 - extras/mini-os-intree/app.lds | 11 - extras/mini-os-intree/arch/arm/arm32.S | 294 ---- extras/mini-os-intree/arch/arm/events.c | 31 - extras/mini-os-intree/arch/arm/hypercalls32.S | 64 - extras/mini-os-intree/arch/arm/minios-arm32.lds | 83 -- extras/mini-os-intree/arch/arm/mm.c | 139 -- extras/mini-os-intree/arch/arm/panic.c | 98 -- extras/mini-os-intree/arch/arm/sched.c | 47 - extras/mini-os-intree/arch/arm/setup.c | 119 -- extras/mini-os-intree/arch/arm/time.c | 136 -- extras/mini-os-intree/arch/x86/Makefile | 30 - extras/mini-os-intree/arch/x86/arch.mk | 22 - extras/mini-os-intree/arch/x86/events.c | 35 - extras/mini-os-intree/arch/x86/ioremap.c | 75 - extras/mini-os-intree/arch/x86/iorw.c | 35 - extras/mini-os-intree/arch/x86/minios-x86_32.lds | 74 - extras/mini-os-intree/arch/x86/minios-x86_64.lds | 74 - extras/mini-os-intree/arch/x86/mm.c | 957 ------------ extras/mini-os-intree/arch/x86/sched.c | 139 -- extras/mini-os-intree/arch/x86/setup.c | 168 --- extras/mini-os-intree/arch/x86/time.c | 238 --- extras/mini-os-intree/arch/x86/traps.c | 333 ----- extras/mini-os-intree/arch/x86/x86_32.S | 305 ---- extras/mini-os-intree/arch/x86/x86_64.S | 383 ----- extras/mini-os-intree/blkfront.c | 736 ---------- extras/mini-os-intree/config/MiniOS.mk | 10 - extras/mini-os-intree/config/StdGNU.mk | 47 - extras/mini-os-intree/config/arm32.mk | 22 - extras/mini-os-intree/config/arm64.mk | 19 - extras/mini-os-intree/config/x86_32.mk | 20 - extras/mini-os-intree/config/x86_64.mk | 33 - extras/mini-os-intree/console/console.c | 164 -- extras/mini-os-intree/console/console.h | 2 - extras/mini-os-intree/console/xenbus.c | 195 --- extras/mini-os-intree/console/xencons_ring.c | 195 --- extras/mini-os-intree/daytime.c | 67 - extras/mini-os-intree/domain_config | 19 - extras/mini-os-intree/events.c | 269 ---- extras/mini-os-intree/fbfront.c | 710 --------- extras/mini-os-intree/gntmap.c | 250 ---- extras/mini-os-intree/gnttab.c | 196 --- extras/mini-os-intree/hypervisor.c | 132 -- extras/mini-os-intree/include/arch/cc.h | 87 -- extras/mini-os-intree/include/arch/perf.h | 15 - extras/mini-os-intree/include/arch/sys_arch.h | 35 - extras/mini-os-intree/include/arm/arch_endian.h | 7 - extras/mini-os-intree/include/arm/arch_limits.h | 9 - extras/mini-os-intree/include/arm/arch_mm.h | 38 - extras/mini-os-intree/include/arm/arch_sched.h | 19 - extras/mini-os-intree/include/arm/arch_spinlock.h | 36 - .../include/arm/arm32/arch_wordsize.h | 1 - extras/mini-os-intree/include/arm/gic.h | 1 - extras/mini-os-intree/include/arm/hypercall-arm.h | 98 -- extras/mini-os-intree/include/arm/os.h | 216 --- extras/mini-os-intree/include/arm/traps.h | 20 - extras/mini-os-intree/include/blkfront.h | 54 - extras/mini-os-intree/include/byteorder.h | 36 - extras/mini-os-intree/include/byteswap.h | 39 - extras/mini-os-intree/include/compiler.h | 10 - extras/mini-os-intree/include/console.h | 89 -- extras/mini-os-intree/include/ctype.h | 60 - extras/mini-os-intree/include/endian.h | 19 - extras/mini-os-intree/include/err.h | 31 - extras/mini-os-intree/include/errno-base.h | 39 - extras/mini-os-intree/include/errno.h | 122 -- extras/mini-os-intree/include/events.h | 59 - extras/mini-os-intree/include/fbfront.h | 46 - extras/mini-os-intree/include/fcntl.h | 99 -- extras/mini-os-intree/include/gntmap.h | 35 - extras/mini-os-intree/include/gnttab.h | 17 - extras/mini-os-intree/include/hypervisor.h | 48 - extras/mini-os-intree/include/ioremap.h | 33 - extras/mini-os-intree/include/iorw.h | 16 - extras/mini-os-intree/include/kernel.h | 9 - extras/mini-os-intree/include/lib-gpl.h | 59 - extras/mini-os-intree/include/lib.h | 230 --- extras/mini-os-intree/include/linux/types.h | 5 - extras/mini-os-intree/include/lwipopts.h | 23 - .../mini-os-intree/include/minios-external/README | 24 - .../include/minios-external/bsd-COPYRIGHT | 126 -- .../include/minios-external/bsd-queue.3 | 1044 ------------- .../minios-external/bsd-sys-queue-h-seddery | 72 - .../include/minios-external/bsd-sys-queue.h | 637 -------- extras/mini-os-intree/include/mm.h | 82 - extras/mini-os-intree/include/netfront.h | 24 - extras/mini-os-intree/include/pcifront.h | 29 - extras/mini-os-intree/include/posix/arpa/inet.h | 7 - extras/mini-os-intree/include/posix/dirent.h | 24 - extras/mini-os-intree/include/posix/err.h | 15 - extras/mini-os-intree/include/posix/fcntl.h | 11 - extras/mini-os-intree/include/posix/limits.h | 48 - extras/mini-os-intree/include/posix/net/if.h | 85 -- extras/mini-os-intree/include/posix/netdb.h | 9 - extras/mini-os-intree/include/posix/netinet/in.h | 7 - extras/mini-os-intree/include/posix/netinet/tcp.h | 6 - extras/mini-os-intree/include/posix/poll.h | 1 - extras/mini-os-intree/include/posix/pthread.h | 64 - extras/mini-os-intree/include/posix/signal.h | 10 - extras/mini-os-intree/include/posix/stdlib.h | 8 - extras/mini-os-intree/include/posix/strings.h | 12 - extras/mini-os-intree/include/posix/sys/ioctl.h | 16 - extras/mini-os-intree/include/posix/sys/mman.h | 22 - extras/mini-os-intree/include/posix/sys/poll.h | 79 - extras/mini-os-intree/include/posix/sys/select.h | 7 - extras/mini-os-intree/include/posix/sys/socket.h | 31 - extras/mini-os-intree/include/posix/sys/stat.h | 7 - extras/mini-os-intree/include/posix/syslog.h | 37 - extras/mini-os-intree/include/posix/termios.h | 87 -- extras/mini-os-intree/include/posix/time.h | 11 - extras/mini-os-intree/include/posix/unistd.h | 16 - extras/mini-os-intree/include/sched.h | 55 - extras/mini-os-intree/include/semaphore.h | 110 -- extras/mini-os-intree/include/spinlock.h | 55 - extras/mini-os-intree/include/sys/lock.h | 52 - extras/mini-os-intree/include/sys/time.h | 47 - extras/mini-os-intree/include/time.h | 63 - extras/mini-os-intree/include/tpm_tis.h | 61 - extras/mini-os-intree/include/tpmback.h | 104 -- extras/mini-os-intree/include/tpmfront.h | 97 -- extras/mini-os-intree/include/types.h | 74 - extras/mini-os-intree/include/wait.h | 105 -- extras/mini-os-intree/include/waittypes.h | 32 - extras/mini-os-intree/include/x86/arch_endian.h | 7 - extras/mini-os-intree/include/x86/arch_limits.h | 20 - extras/mini-os-intree/include/x86/arch_mm.h | 233 --- extras/mini-os-intree/include/x86/arch_sched.h | 25 - extras/mini-os-intree/include/x86/arch_spinlock.h | 94 -- extras/mini-os-intree/include/x86/os.h | 572 -------- extras/mini-os-intree/include/x86/traps.h | 78 - .../include/x86/x86_32/arch_wordsize.h | 1 - .../include/x86/x86_32/hypercall-x86_32.h | 337 ----- .../include/x86/x86_64/arch_wordsize.h | 2 - .../include/x86/x86_64/hypercall-x86_64.h | 344 ----- extras/mini-os-intree/include/xen/COPYING | 38 - extras/mini-os-intree/include/xen/arch-arm.h | 432 ------ .../mini-os-intree/include/xen/arch-arm/hvm/save.h | 39 - extras/mini-os-intree/include/xen/arch-x86/cpuid.h | 90 -- .../mini-os-intree/include/xen/arch-x86/hvm/save.h | 630 -------- .../mini-os-intree/include/xen/arch-x86/xen-mca.h | 440 ------ .../include/xen/arch-x86/xen-x86_32.h | 171 --- .../include/xen/arch-x86/xen-x86_64.h | 202 --- extras/mini-os-intree/include/xen/arch-x86/xen.h | 303 ---- extras/mini-os-intree/include/xen/arch-x86_32.h | 27 - extras/mini-os-intree/include/xen/arch-x86_64.h | 43 - extras/mini-os-intree/include/xen/callback.h | 121 -- extras/mini-os-intree/include/xen/dom0_ops.h | 120 -- extras/mini-os-intree/include/xen/domctl.h | 1154 --------------- extras/mini-os-intree/include/xen/elfnote.h | 271 ---- extras/mini-os-intree/include/xen/event_channel.h | 385 ----- extras/mini-os-intree/include/xen/features.h | 114 -- extras/mini-os-intree/include/xen/gcov.h | 115 -- extras/mini-os-intree/include/xen/grant_table.h | 682 --------- extras/mini-os-intree/include/xen/hvm/e820.h | 34 - .../include/xen/hvm/hvm_info_table.h | 72 - extras/mini-os-intree/include/xen/hvm/hvm_op.h | 402 ----- .../include/xen/hvm/hvm_xs_strings.h | 80 - extras/mini-os-intree/include/xen/hvm/ioreq.h | 129 -- extras/mini-os-intree/include/xen/hvm/params.h | 199 --- extras/mini-os-intree/include/xen/hvm/pvdrivers.h | 49 - extras/mini-os-intree/include/xen/hvm/save.h | 111 -- extras/mini-os-intree/include/xen/io/blkif.h | 640 -------- extras/mini-os-intree/include/xen/io/console.h | 51 - extras/mini-os-intree/include/xen/io/fbif.h | 176 --- extras/mini-os-intree/include/xen/io/fsif.h | 192 --- extras/mini-os-intree/include/xen/io/kbdif.h | 132 -- extras/mini-os-intree/include/xen/io/libxenvchan.h | 97 -- extras/mini-os-intree/include/xen/io/netif.h | 305 ---- extras/mini-os-intree/include/xen/io/pciif.h | 125 -- extras/mini-os-intree/include/xen/io/protocols.h | 40 - extras/mini-os-intree/include/xen/io/ring.h | 312 ---- extras/mini-os-intree/include/xen/io/tpmif.h | 143 -- extras/mini-os-intree/include/xen/io/usbif.h | 150 -- extras/mini-os-intree/include/xen/io/vscsiif.h | 260 ---- extras/mini-os-intree/include/xen/io/xenbus.h | 80 - extras/mini-os-intree/include/xen/io/xs_wire.h | 149 -- extras/mini-os-intree/include/xen/kexec.h | 249 ---- extras/mini-os-intree/include/xen/mem_event.h | 134 -- extras/mini-os-intree/include/xen/memory.h | 587 -------- extras/mini-os-intree/include/xen/nmi.h | 85 -- extras/mini-os-intree/include/xen/physdev.h | 380 ----- extras/mini-os-intree/include/xen/platform.h | 606 -------- extras/mini-os-intree/include/xen/sched.h | 175 --- extras/mini-os-intree/include/xen/sysctl.h | 719 --------- extras/mini-os-intree/include/xen/tmem.h | 152 -- extras/mini-os-intree/include/xen/trace.h | 331 ----- extras/mini-os-intree/include/xen/vcpu.h | 240 --- extras/mini-os-intree/include/xen/version.h | 96 -- extras/mini-os-intree/include/xen/xen-compat.h | 44 - extras/mini-os-intree/include/xen/xen.h | 899 ------------ extras/mini-os-intree/include/xen/xencomm.h | 41 - extras/mini-os-intree/include/xen/xenoprof.h | 152 -- extras/mini-os-intree/include/xen/xsm/flask_op.h | 201 --- extras/mini-os-intree/include/xenbus.h | 120 -- extras/mini-os-intree/include/xmalloc.h | 44 - extras/mini-os-intree/kernel.c | 198 --- extras/mini-os-intree/lib/ctype.c | 29 - extras/mini-os-intree/lib/math.c | 426 ------ extras/mini-os-intree/lib/printf.c | 786 ---------- extras/mini-os-intree/lib/stack_chk_fail.c | 8 - extras/mini-os-intree/lib/string.c | 228 --- extras/mini-os-intree/lib/sys.c | 1550 -------------------- extras/mini-os-intree/lib/xmalloc.c | 319 ---- extras/mini-os-intree/lib/xs.c | 194 --- extras/mini-os-intree/lock.c | 112 -- extras/mini-os-intree/lwip-arch.c | 293 ---- extras/mini-os-intree/lwip-net.c | 386 ----- extras/mini-os-intree/main.c | 193 --- extras/mini-os-intree/minios.mk | 76 - extras/mini-os-intree/mm.c | 441 ------ extras/mini-os-intree/netfront.c | 675 --------- extras/mini-os-intree/pcifront.c | 616 -------- extras/mini-os-intree/sched.c | 304 ---- extras/mini-os-intree/test.c | 577 -------- extras/mini-os-intree/tpm_tis.c | 1523 ------------------- extras/mini-os-intree/tpmback.c | 1136 -------------- extras/mini-os-intree/tpmfront.c | 631 -------- extras/mini-os-intree/xenbus/xenbus.c | 870 ----------- 221 files changed, 0 insertions(+), 40498 deletions(-) diff --git a/extras/mini-os-intree/COPYING b/extras/mini-os-intree/COPYING deleted file mode 100644 index 1d9df6c..0000000 --- a/extras/mini-os-intree/COPYING +++ /dev/null @@ -1,36 +0,0 @@ -Certain files in this directory are licensed by the GNU -General Public License version 2 (GPLv2). By default these -files are not built and linked into MiniOs. Enabling them -will cause the whole work to become covered by the GPLv2. - -The current set of GPLv2 features are: -CONFIG_TPMFRONT -CONFIG_TPMBACK -CONFIG_TPM_TIS - -Do not use these if you do not want your MiniOS build to become -GPL licensed! - -Copyright (c) 2009 Citrix Systems, Inc. All rights reserved. - -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 AUTHOR 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 AUTHOR 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. - diff --git a/extras/mini-os-intree/Config.mk b/extras/mini-os-intree/Config.mk deleted file mode 100644 index e5d8ade..0000000 --- a/extras/mini-os-intree/Config.mk +++ /dev/null @@ -1,99 +0,0 @@ -# -# Compare $(1) and $(2) and replace $(2) with $(1) if they differ -# -# Typically $(1) is a newly generated file and $(2) is the target file -# being regenerated. This prevents changing the timestamp of $(2) only -# due to being auto regenereated with the same contents. -define move-if-changed - if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi -endef - -# cc-option: Check if compiler supports first option, else fall back to second. -# -# This is complicated by the fact that unrecognised -Wno-* options: -# (a) are ignored unless the compilation emits a warning; and -# (b) even then produce a warning rather than an error -# To handle this we do a test compile, passing the option-under-test, on a code -# fragment that will always produce a warning (integer assigned to pointer). -# We then grep for the option-under-test in the compiler's output, the presence -# of which would indicate an "unrecognized command-line option" warning/error. -# -# Usage: cflags-y +=3D $(call cc-option,$(CC),-march=3Dwinchip-c6,-march=3Di586) -cc-option =3D $(shell if test -z "`echo 'void*p=3D1;' | \ - $(1) $(2) -S -o /dev/null -x c - 2>&1 | grep -- $(2) -`"; \ - then echo "$(2)"; else echo "$(3)"; fi ;) - -# Compatibility with Xen's stubdom build environment. If we are building -# stubdom, some XEN_ variables are set, set MINIOS_ variables accordingly. -# -ifneq ($(XEN_ROOT),) -MINI-OS_ROOT=3D$(XEN_ROOT)/extras/mini-os -else -MINI-OS_ROOT=3D$(TOPLEVEL_DIR) -endif -export MINI-OS_ROOT - -ifneq ($(XEN_TARGET_ARCH),) -MINIOS_TARGET_ARCH =3D $(XEN_TARGET_ARCH) -else -MINIOS_COMPILE_ARCH =3F=3D $(shell uname -m | sed -e s/i.86/x86_32/ \ - -e s/i86pc/x86_32/ -e s/amd64/x86_64/ \ - -e s/armv7.*/arm32/ -e s/armv8.*/arm64/ \ - -e s/aarch64/arm64/) - -MINIOS_TARGET_ARCH =3F=3D $(MINIOS_COMPILE_ARCH) -endif - -libc =3D $(stubdom) - -XEN_INTERFACE_VERSION :=3D 0x00030205 -export XEN_INTERFACE_VERSION - -# Try to find out the architecture family TARGET_ARCH_FAM. -# First check whether x86_... is contained (for x86_32, x86_32y, x86_64). -# If not x86 then use $(MINIOS_TARGET_ARCH) -ifeq ($(findstring x86_,$(MINIOS_TARGET_ARCH)),x86_) -TARGET_ARCH_FAM =3D x86 -else -TARGET_ARCH_FAM =3D $(MINIOS_TARGET_ARCH) -endif - -# The architecture family directory below mini-os. -TARGET_ARCH_DIR :=3D arch/$(TARGET_ARCH_FAM) - -# Export these variables for possible use in architecture dependent makefiles. -export TARGET_ARCH_DIR -export TARGET_ARCH_FAM - -# This is used for architecture specific links. -# This can be overwritten from arch specific rules. -ARCH_LINKS =3D - -# The path pointing to the architecture specific header files. -ARCH_INC :=3D $(TARGET_ARCH_FAM) - -# For possible special header directories. -# This can be overwritten from arch specific rules. -EXTRA_INC =3D $(ARCH_INC) - -# Include the architecture family's special makerules. -# This must be before include minios.mk! -include $(MINI-OS_ROOT)/$(TARGET_ARCH_DIR)/arch.mk - -extra_incl :=3D $(foreach dir,$(EXTRA_INC),-isystem $(MINI-OS_ROOT)/include/$(dir)) - -DEF_CPPFLAGS +=3D -isystem $(MINI-OS_ROOT)/include -DEF_CPPFLAGS +=3D -D__MINIOS__ - -ifeq ($(libc),y) -DEF_CPPFLAGS +=3D -DHAVE_LIBC -DEF_CPPFLAGS +=3D -isystem $(MINI-OS_ROOT)/include/posix -DEF_CPPFLAGS +=3D -isystem $(XEN_ROOT)/tools/xenstore/include -endif - -ifneq ($(LWIPDIR),) -lwip=3Dy -DEF_CPPFLAGS +=3D -DHAVE_LWIP -DEF_CPPFLAGS +=3D -isystem $(LWIPDIR)/src/include -DEF_CPPFLAGS +=3D -isystem $(LWIPDIR)/src/include/ipv4 -endif diff --git a/extras/mini-os-intree/Makefile b/extras/mini-os-intree/Makefile deleted file mode 100644 index f16520e..0000000 --- a/extras/mini-os-intree/Makefile +++ /dev/null @@ -1,224 +0,0 @@ -# Common Makefile for mini-os. -# -# Every architecture directory below mini-os/arch has to have a -# Makefile and a arch.mk. -# - -OBJ_DIR=3D$(CURDIR) -TOPLEVEL_DIR=3D$(CURDIR) - -ifeq ($(MINIOS_CONFIG),) -include Config.mk -else -EXTRA_DEPS +=3D $(MINIOS_CONFIG) -include $(MINIOS_CONFIG) -endif - -include $(MINI-OS_ROOT)/config/MiniOS.mk - -# Configuration defaults -CONFIG_START_NETWORK =3F=3D y -CONFIG_SPARSE_BSS =3F=3D y -CONFIG_QEMU_XS_ARGS =3F=3D n -CONFIG_TEST =3F=3D n -CONFIG_PCIFRONT =3F=3D n -CONFIG_BLKFRONT =3F=3D y -CONFIG_TPMFRONT =3F=3D n -CONFIG_TPM_TIS =3F=3D n -CONFIG_TPMBACK =3F=3D n -CONFIG_NETFRONT =3F=3D y -CONFIG_FBFRONT =3F=3D y -CONFIG_KBDFRONT =3F=3D y -CONFIG_CONSFRONT =3F=3D y -CONFIG_XENBUS =3F=3D y -CONFIG_XC =3F=3Dy -CONFIG_LWIP =3F=3D $(lwip) - -# Export config items as compiler directives -flags-$(CONFIG_START_NETWORK) +=3D -DCONFIG_START_NETWORK -flags-$(CONFIG_SPARSE_BSS) +=3D -DCONFIG_SPARSE_BSS -flags-$(CONFIG_QEMU_XS_ARGS) +=3D -DCONFIG_QEMU_XS_ARGS -flags-$(CONFIG_PCIFRONT) +=3D -DCONFIG_PCIFRONT -flags-$(CONFIG_BLKFRONT) +=3D -DCONFIG_BLKFRONT -flags-$(CONFIG_TPMFRONT) +=3D -DCONFIG_TPMFRONT -flags-$(CONFIG_TPM_TIS) +=3D -DCONFIG_TPM_TIS -flags-$(CONFIG_TPMBACK) +=3D -DCONFIG_TPMBACK -flags-$(CONFIG_NETFRONT) +=3D -DCONFIG_NETFRONT -flags-$(CONFIG_KBDFRONT) +=3D -DCONFIG_KBDFRONT -flags-$(CONFIG_FBFRONT) +=3D -DCONFIG_FBFRONT -flags-$(CONFIG_CONSFRONT) +=3D -DCONFIG_CONSFRONT -flags-$(CONFIG_XENBUS) +=3D -DCONFIG_XENBUS - -DEF_CFLAGS +=3D $(flags-y) - -# Symlinks and headers that must be created before building the C files -GENERATED_HEADERS :=3D include/list.h $(ARCH_LINKS) include/mini-os include/$(TARGET_ARCH_FAM)/mini-os - -EXTRA_DEPS +=3D $(GENERATED_HEADERS) - -# Include common mini-os makerules. -include minios.mk - -# Set tester flags -# CFLAGS +=3D -DBLKTEST_WRITE - -# Define some default flags for linking. -LDLIBS :=3D -APP_LDLIBS :=3D -LDARCHLIB :=3D -L$(OBJ_DIR)/$(TARGET_ARCH_DIR) -l$(ARCH_LIB_NAME) -LDFLAGS_FINAL :=3D -T $(TARGET_ARCH_DIR)/minios-$(MINIOS_TARGET_ARCH).lds - -# Prefix for global API names. All other symbols are localised before -# linking with EXTRA_OBJS. -GLOBAL_PREFIX :=3D xenos_ -EXTRA_OBJS =3D - -TARGET :=3D mini-os - -# Subdirectories common to mini-os -SUBDIRS :=3D lib xenbus console - -src-$(CONFIG_BLKFRONT) +=3D blkfront.c -src-$(CONFIG_TPMFRONT) +=3D tpmfront.c -src-$(CONFIG_TPM_TIS) +=3D tpm_tis.c -src-$(CONFIG_TPMBACK) +=3D tpmback.c -src-y +=3D daytime.c -src-y +=3D events.c -src-$(CONFIG_FBFRONT) +=3D fbfront.c -src-y +=3D gntmap.c -src-y +=3D gnttab.c -src-y +=3D hypervisor.c -src-y +=3D kernel.c -src-y +=3D lock.c -src-y +=3D main.c -src-y +=3D mm.c -src-$(CONFIG_NETFRONT) +=3D netfront.c -src-$(CONFIG_PCIFRONT) +=3D pcifront.c -src-y +=3D sched.c -src-$(CONFIG_TEST) +=3D test.c - -src-y +=3D lib/ctype.c -src-y +=3D lib/math.c -src-y +=3D lib/printf.c -src-y +=3D lib/stack_chk_fail.c -src-y +=3D lib/string.c -src-y +=3D lib/sys.c -src-y +=3D lib/xmalloc.c -src-$(CONFIG_XENBUS) +=3D lib/xs.c - -src-$(CONFIG_XENBUS) +=3D xenbus/xenbus.c - -src-y +=3D console/console.c -src-y +=3D console/xencons_ring.c -src-$(CONFIG_CONSFRONT) +=3D console/xenbus.c - -# The common mini-os objects to build. -APP_OBJS :=3D -OBJS :=3D $(patsubst %.c,$(OBJ_DIR)/%.o,$(src-y)) - -.PHONY: default -default: $(OBJ_DIR)/$(TARGET) - -# Create special architecture specific links. The function arch_links -# has to be defined in arch.mk (see include above). -ifneq ($(ARCH_LINKS),) -$(ARCH_LINKS): - $(arch_links) -endif - -include/list.h: include/minios-external/bsd-sys-queue-h-seddery include/minios-external/bsd-sys-queue.h - perl $^ --prefix=3Dminios >$@.new - $(call move-if-changed,$@.new,$@) - -# Used by stubdom's Makefile -.PHONY: links -links: $(GENERATED_HEADERS) - -include/mini-os: - ln -sf . $@ - -include/$(TARGET_ARCH_FAM)/mini-os: - ln -sf . $@ - -.PHONY: arch_lib -arch_lib: - $(MAKE) --directory=3D$(TARGET_ARCH_DIR) OBJ_DIR=3D$(OBJ_DIR)/$(TARGET_ARCH_DIR) || exit 1; - -ifeq ($(CONFIG_LWIP),y) -# lwIP library -LWC :=3D $(shell find $(LWIPDIR)/src -type f -name '*.c') -LWC :=3D $(filter-out %6.c %ip6_addr.c %ethernetif.c, $(LWC)) -LWO :=3D $(patsubst %.c,%.o,$(LWC)) -LWO +=3D $(OBJ_DIR)/lwip-arch.o -ifeq ($(CONFIG_NETFRONT),y) -LWO +=3D $(OBJ_DIR)/lwip-net.o -endif - -$(OBJ_DIR)/lwip.a: $(LWO) - $(RM) $@ - $(AR) cqs $@ $^ - -OBJS +=3D $(OBJ_DIR)/lwip.a -endif - -OBJS :=3D $(filter-out $(OBJ_DIR)/lwip%.o $(LWO), $(OBJS)) - -ifeq ($(libc),y) -ifeq ($(CONFIG_XC),y) -APP_LDLIBS +=3D -L$(XEN_ROOT)/stubdom/libxc-$(XEN_TARGET_ARCH) -whole-archive -lxenguest -lxenctrl -no-whole-archive -endif -APP_LDLIBS +=3D -lpci -APP_LDLIBS +=3D -lz -APP_LDLIBS +=3D -lm -LDLIBS +=3D -lc -endif - -ifneq ($(APP_OBJS)-$(lwip),-y) -OBJS :=3D $(filter-out $(OBJ_DIR)/daytime.o, $(OBJS)) -endif - -$(OBJ_DIR)/$(TARGET)_app.o: $(APP_OBJS) app.lds - $(LD) -r -d $(LDFLAGS) -\( $^ -\) $(APP_LDLIBS) --undefined main -o $@ - -ifneq ($(APP_OBJS),) -APP_O=3D$(OBJ_DIR)/$(TARGET)_app.o -endif - -$(OBJ_DIR)/$(TARGET): $(OBJS) $(APP_O) arch_lib - $(LD) -r $(LDFLAGS) $(HEAD_OBJ) $(APP_O) $(OBJS) $(LDARCHLIB) $(LDLIBS) -o $@.o - $(OBJCOPY) -w -G $(GLOBAL_PREFIX)* -G _start $@.o $@.o - $(LD) $(LDFLAGS) $(LDFLAGS_FINAL) $@.o $(EXTRA_OBJS) -o $@ - gzip -f -9 -c $@ >$@.gz - -.PHONY: clean arch_clean - -arch_clean: - $(MAKE) --directory=3D$(TARGET_ARCH_DIR) OBJ_DIR=3D$(OBJ_DIR)/$(TARGET_ARCH_DIR) clean || exit 1; - -clean: arch_clean - for dir in $(addprefix $(OBJ_DIR)/,$(SUBDIRS)); do \ - rm -f $$dir/*.o; \ - done - rm -f include/list.h - rm -f $(OBJ_DIR)/*.o *~ $(OBJ_DIR)/core $(OBJ_DIR)/$(TARGET).elf $(OBJ_DIR)/$(TARGET).raw $(OBJ_DIR)/$(TARGET) $(OBJ_DIR)/$(TARGET).gz - find . $(OBJ_DIR) -type l | xargs rm -f - $(RM) $(OBJ_DIR)/lwip.a $(LWO) - rm -f tags TAGS - - -define all_sources - ( find . -follow -name SCCS -prune -o -name '*.[chS]' -print ) -endef - -.PHONY: cscope -cscope: - $(all_sources) > cscope.files - cscope -k -b -q - -.PHONY: tags -tags: - $(all_sources) | xargs ctags - -.PHONY: TAGS -TAGS: - $(all_sources) | xargs etags diff --git a/extras/mini-os-intree/README b/extras/mini-os-intree/README deleted file mode 100644 index 7960314..0000000 --- a/extras/mini-os-intree/README +++ /dev/null @@ -1,46 +0,0 @@ - Minimal OS - ---------- - -This shows some of the stuff that any guest OS will have to set up. - -This includes: - - * installing a virtual exception table - * handling virtual exceptions - * handling asynchronous events - * enabling/disabling async events - * parsing start_info struct at start-of-day - * registering virtual interrupt handlers (for timer interrupts) - * a simple page and memory allocator - * minimal libc support - * minimal Copy-on-Write support - * network, block, framebuffer support - * transparent access to FileSystem exports (see tools/fs-back) - -- to build it just type make. - -- to build it with TCP/IP support, download LWIP 1.3.2 source code and type - - make LWIPDIR=3D/path/to/lwip/source - -- to build it with much better libc support, see the stubdom/ directory - -- to start it do the following in domain0 - # xl create -c domain_config - -This starts the kernel and prints out a bunch of stuff and then once every -second the system time. - -If you have setup a disk in the config file (e.g. -disk =3D [ 'file:/tmp/foo,hda,r' ] ), it will loop reading it. If that disk is -writable (e.g. disk =3D [ 'file:/tmp/foo,hda,w' ] ), it will write data patterns -and re-read them. - -If you have setup a network in the config file (e.g. vif =3D [''] ), it will -print incoming packets. - -If you have setup a VFB in the config file (e.g. vfb =3D ['type=3Dsdl'] ), it will -show a mouse with which you can draw color squares. - -If you have compiled it with TCP/IP support, it will run a daytime server on -TCP port 13. diff --git a/extras/mini-os-intree/app.lds b/extras/mini-os-intree/app.lds deleted file mode 100644 index 4a48cc8..0000000 --- a/extras/mini-os-intree/app.lds +++ /dev/null @@ -1,11 +0,0 @@ -SECTIONS -{ - .app.bss : { - __app_bss_start =3D . ; - *(.bss .bss.*) - *(COMMON) - *(.lbss .lbss.*) - *(LARGE_COMMON) - __app_bss_end =3D . ; - } -} diff --git a/extras/mini-os-intree/arch/arm/arm32.S b/extras/mini-os-intree/arch/arm/arm32.S deleted file mode 100644 index a08a170..0000000 --- a/extras/mini-os-intree/arch/arm/arm32.S +++ /dev/null @@ -1,294 +0,0 @@ -@ Offset of the kernel within the RAM. This is a Linux/zImage convention which we -@ rely on for now. -#define ZIMAGE_KERNEL_OFFSET 0x8000 - -.section .text - -.globl _start -_start: - @ zImage header -.rept 8 - mov r0, r0 -.endr - b reset - .word 0x016f2818 @ Magic numbers to help the loader - .word 0 @ zImage start address (0 =3D relocatable) - .word _edata - _start @ zImage end address (excludes bss section) - @ end of zImage header - -@ Called at boot time. Sets up MMU, exception vectors and stack, and then calls C arch_init() function. -@ =3D> r2 -> DTB -@ <=3D never returns -@ Note: this boot code needs to be within the first (1MB - ZIMAGE_KERNEL_OFFSET) of _start. -reset: - @ Problem: the C code wants to be at a known address (_start), but Xen might - @ load us anywhere. We initialise the MMU (mapping virtual to physical @ addresses) - @ so everything ends up where the code expects it to be. - @ - @ We calculate the offet between where the linker thought _start would be and where - @ it actually is and initialise the page tables to have that offset for every page. - @ - @ When we turn on the MMU, we're still executing at the old address. We don't want - @ the code to disappear from under us. So we have to do the mapping in stages: - @ - @ 1. set up a mapping to our current page from both its current and desired addresses - @ 2. enable the MMU - @ 3. jump to the new address - @ 4. remap all the other pages with the calculated offset - - adr r1, _start @ r1 =3D physical address of _start - ldr r3, =3D_start @ r3 =3D (desired) virtual address of _start - sub r9, r1, r3 @ r9 =3D (physical - virtual) offset - - ldr r7, =3D_page_dir @ r7 =3D (desired) virtual addr of translation table - add r1, r7, r9 @ r1 =3D physical addr of translation table - - @ Tell the system where our page table is located. - @ This is the 16 KB top-level translation table, in which - @ each word maps one 1MB virtual section to a physical section. - @ Note: We leave TTBCR as 0, meaning that only TTBR0 is used and - @ we use the short-descriptor format (32-bit physical addresses). - orr r0, r1, #0b0001011 @ Sharable, Inner/Outer Write-Back Write-Allocate Cacheable - mcr p15, 0, r0, c2, c0, 0 @ set TTBR0 - - @ Set access permission for domains. - @ Domains are deprecated, but we have to configure them anyway. - @ We mark every page as being domain 0 and set domain 0 to "client mode" - @ (client mode =3D use access flags in page table). - mov r0, #1 @ 1 =3D client - mcr p15, 0, r0, c3, c0, 0 @ DACR - - @ Template (flags) for a 1 MB page-table entry. - @ TEX[2:0] C B =3D 001 1 1 (outer and inner write-back, write-allocate) - ldr r8, =3D(0x2 + /* Section entry */ \ - 0xc + /* C B */ \ - (3 << 10) + /* Read/write */ \ - (1 << 12) + /* TEX */ \ - (1 << 16) + /* Sharable */ \ - (1<<19)) /* Non-secure */ - @ r8 =3D template page table entry - - @ Add an entry for the current physical section, at the old and new - @ addresses. It's OK if they're the same. - mov r0, pc, lsr#20 - mov r0, r0, lsl#20 @ r0 =3D physical address of this code's section start - orr r3, r0, r8 @ r3 =3D table entry for this section - ldr r4, =3D_start @ r4 =3D desired virtual address of this section - str r3, [r1, r4, lsr#18] @ map desired virtual section to this code - str r3, [r1, r0, lsr#18] @ map current section to this code too - - @ Invalidate TLB - dsb @ Caching is off, but must still prevent reordering - mcr p15, 0, r1, c8, c7, 0 @ TLBIALL - - @ Enable MMU / SCTLR - mrc p15, 0, r1, c1, c0, 0 @ SCTLR - orr r1, r1, #3 << 11 @ enable icache, branch prediction - orr r1, r1, #4 + 1 @ enable dcache, MMU - mcr p15, 0, r1, c1, c0, 0 @ SCTLR - isb - - ldr r1, =3Dstage2 @ Virtual address of stage2 - bx r1 - -@ Called once the MMU is enabled. The boot code and the page table are mapped, -@ but nothing else is yet. -@ -@ =3D> r2 -> dtb (physical) -@ r7 =3D virtual address of page table -@ r8 =3D section entry template (flags) -@ r9 =3D desired physical - virtual offset -@ pc -> somewhere in newly-mapped virtual code section -stage2: - @ Invalidate TLB - mcr p15, 0, r1, c8, c7, 0 @ TLBIALL - isb - - @ The new mapping has now taken effect: - @ r7 -> page_dir - - @ Fill in the whole top-level translation table (at page_dir). - @ Populate the whole pagedir with 1MB section descriptors. - - mov r1, r7 @ r1 -> first section entry - add r3, r1, #4*4*1024 @ limit (4 GB address space, 4 byte entries) - orr r0, r8, r9 @ r0 =3D entry mapping section zero to start of physical RAM -1: - str r0, [r1],#4 @ write the section entry - add r0, r0, #1 << 20 @ next physical page (wraps) - cmp r1, r3 - bne 1b - - @ Invalidate TLB - dsb - mcr p15, 0, r1, c8, c7, 0 @ TLBIALL - isb - - @ Set VBAR -> exception_vector_table - @ SCTLR.V =3D 0 - adr r0, exception_vector_table - mcr p15, 0, r0, c12, c0, 0 - - @ Enable hardware floating point: - @ 1. Access to CP10 and CP11 must be enabled in the Coprocessor Access - @ Control Register (CP15.CACR): - mrc p15, 0, r1, c1, c0, 2 @ CACR - orr r1, r1, #(3 << 20) + (3 << 22) @ full access for CP10 & CP11 - mcr p15, 0, r1, c1, c0, 2 - @ 2. The EN bit in the FPEXC register must be set: - vmrs r0, FPEXC - orr r0, r0, #1<<30 @ EN (enable) - vmsr FPEXC, r0 - - @ Initialise 16 KB stack - ldr sp, =3D_boot_stack_end - - sub r0, r2, r9 @ r0 -> device tree (virtual address) - mov r1, r9 @ r1 =3D physical_address_offset - - b arch_init - -.pushsection .bss -@ Note: calling arch_init zeroes out this region. -.align 12 -.globl shared_info_page -shared_info_page: - .fill (1024), 4, 0x0 - -.align 3 -.globl irqstack -.globl irqstack_end -irqstack: - .fill (1024), 4, 0x0 -irqstack_end: - -fault_dump: - .fill 18, 4, 0x0 @ On fault, we save the registers + CPSR + handler address - -.popsection - -fault: - cpsid aif @ Disable interrupts - - ldr r13, =3Dfault_dump - stmia r13, {r0-r12} @ Dump the non-banked registers directly (well, unless from FIQ mode) - str r14, [r13, #15 << 2] @ Our r14 is the faulting r15 - mov r0, r13 - - @ Save the caller's CPSR (our SPSR) too. - mrs r1, SPSR - str r1, [r13, #16 << 2] - - @ Switch to the mode we came from to get r13 and r14. - @ If coming from user mode, use System mode instead so we're still - @ privileged. - and r1, r1, #0x1f @ r1 =3D SPSR mode - cmp r1, #0x10 @ If from User mode - moveq r1, #0x1f @ Then use System mode instead - - mrs r3, CPSR @ r3 =3D our CPSR - bic r2, r3, #0x1f - orr r2, r2, r1 - msr CPSR, r2 @ Change to mode r1 - - @ Save old mode's r13, r14 - str r13, [r0, #13 << 2] - str r14, [r0, #14 << 2] - - msr CPSR, r3 @ Back to fault mode - - ldr r1, [r0, #17 << 2] - sub r1, r1, #12 @ Fix to point at start of handler - str r1, [r0, #17 << 2] - - @ Call C code to format the register dump. - @ Clobbers the stack, but we're not going to return anyway. - ldr sp, =3D_boot_stack_end - bl dump_registers - b do_exit - -@ We want to store a unique value to identify this handler, without corrupting -@ any of the registers. So, we store r15 (which will point just after the branch). -@ Later, we subtract 12 so the user gets pointed at the start of the exception -@ handler. -#define FAULT(name) \ -.globl fault_##name; \ -fault_##name: \ - ldr r13, =3Dfault_dump; \ - str r15, [r13, #17 << 2]; \ - b fault - -FAULT(reset) -FAULT(undefined_instruction) -FAULT(svc) -FAULT(prefetch_call) -FAULT(prefetch_abort) -FAULT(data_abort) - -@ exception base address -.align 5 -.globl exception_vector_table -@ Note: remember to call CLREX if returning from an exception: -@ "The architecture enables the local monitor to treat any exclusive store as -@ matching a previous LDREX address. For this reason, use of the CLREX -@ instruction to clear an existing tag is required on context switches." -@ -- ARM Cortex-A Series Programmer=E2=80=99s Guide (Version: 4.0) -exception_vector_table: - b fault_reset - b fault_undefined_instruction - b fault_svc - b fault_prefetch_call - b fault_prefetch_abort - b fault_data_abort - b irq_handler @ IRQ - .word 0xe7f000f0 @ abort on FIQ - -@ Call fault_undefined_instruction in "Undefined mode" -bug: - .word 0xe7f000f0 @ und/udf - a "Permanently Undefined" instruction - -irq_handler: - ldr sp, =3Dirqstack_end - push {r0 - r12, r14} - - ldr r0, IRQ_handler - cmp r0, #0 - beq bug - blx r0 @ call handler - - @ Return from IRQ - pop {r0 - r12, r14} - clrex - subs pc, lr, #4 - -.globl IRQ_handler -IRQ_handler: - .long 0x0 - - -.globl __arch_switch_threads -@ =3D> r0 =3D &prev->sp -@ r1 =3D &next->sp -@ <=3D returns to next thread's saved return address -__arch_switch_threads: - push {r4-r11} @ Store callee-saved registers to old thread's stack - stmia r0, {sp, lr} @ Store current sp and ip to prev's struct thread - - ldmia r1, {sp, lr} @ Load new sp, ip from next's struct thread - pop {r4-r11} @ Load callee-saved registers from new thread's stack - - bx lr - -@ This is called if you try to divide by zero. For now, we make a supervisor call, -@ which will make us halt. -.globl raise -raise: - svc 0 - -.globl arm_start_thread -arm_start_thread: - pop {r0, r1} - @ r0 =3D user data - @ r1 -> thread's main function - ldr lr, =3Dexit_thread - bx r1 diff --git a/extras/mini-os-intree/arch/arm/events.c b/extras/mini-os-intree/arch/arm/events.c deleted file mode 100644 index 441010d..0000000 --- a/extras/mini-os-intree/arch/arm/events.c +++ /dev/null @@ -1,31 +0,0 @@ -#include -#include -#include -#include - -static void virq_debug(evtchn_port_t port, struct pt_regs *regs, void *params) -{ - printk("Received a virq_debug event\n"); -} - -evtchn_port_t debug_port =3D -1; -void arch_init_events(void) -{ - debug_port =3D bind_virq(VIRQ_DEBUG, (evtchn_handler_t)virq_debug, 0); - if(debug_port =3D=3D -1) - BUG(); - unmask_evtchn(debug_port); -} - -void arch_unbind_ports(void) -{ - if(debug_port !=3D -1) - { - mask_evtchn(debug_port); - unbind_evtchn(debug_port); - } -} - -void arch_fini_events(void) -{ -} diff --git a/extras/mini-os-intree/arch/arm/hypercalls32.S b/extras/mini-os-intree/arch/arm/hypercalls32.S deleted file mode 100644 index af8e175..0000000 --- a/extras/mini-os-intree/arch/arm/hypercalls32.S +++ /dev/null @@ -1,64 +0,0 @@ -/****************************************************************************** - * hypercall.S - * - * Xen hypercall wrappers - * - * Stefano Stabellini , Citrix, 2012 - * - * 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; or, when distributed - * separately from the Linux kernel or incorporated into other - * software packages, subject to the following license: - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this source file (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, modify, - * merge, publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - */ - -#include - -#define __HVC(imm16) .long ((0xE1400070 | (((imm16) & 0xFFF0) << 4) | ((imm16) & 0x000F)) & 0xFFFFFFFF) - -#define XEN_IMM 0xEA1 - -#define HYPERCALL_SIMPLE(hypercall) \ -.globl HYPERVISOR_##hypercall; \ -.align 4,0x90; \ -HYPERVISOR_##hypercall: \ - mov r12, #__HYPERVISOR_##hypercall; \ - __HVC(XEN_IMM); \ - mov pc, lr; - -#define _hypercall0 HYPERCALL_SIMPLE -#define _hypercall1 HYPERCALL_SIMPLE -#define _hypercall2 HYPERCALL_SIMPLE -#define _hypercall3 HYPERCALL_SIMPLE -#define _hypercall4 HYPERCALL_SIMPLE - -_hypercall2(sched_op); -_hypercall2(memory_op); -_hypercall2(event_channel_op); -_hypercall2(xen_version); -_hypercall3(console_io); -_hypercall1(physdev_op); -_hypercall3(grant_table_op); -_hypercall3(vcpu_op); -_hypercall1(sysctl); -_hypercall1(domctl); -_hypercall2(hvm_op); -_hypercall1(xsm_op); diff --git a/extras/mini-os-intree/arch/arm/minios-arm32.lds b/extras/mini-os-intree/arch/arm/minios-arm32.lds deleted file mode 100755 index 9627162..0000000 --- a/extras/mini-os-intree/arch/arm/minios-arm32.lds +++ /dev/null @@ -1,83 +0,0 @@ -OUTPUT_ARCH(arm) -ENTRY(_start) -SECTIONS -{ - /* Note: we currently assume that Xen will load the kernel image - * at start-of-RAM + 0x8000. We use this initial 32 KB for the stack - * and translation tables. - */ - _boot_stack =3D 0x400000; /* 16 KB boot stack */ - _boot_stack_end =3D 0x404000; - _page_dir =3D 0x404000; /* 16 KB translation table */ - . =3D 0x408000; - _text =3D .; /* Text and read-only data */ - .text : { - *(.text) - *(.gnu.warning) - } =3D 0x9090 - - _etext =3D .; /* End of text section */ - - .rodata : { *(.rodata) *(.rodata.*) } - . =3D ALIGN(4096); - _erodata =3D .; - - /* newlib initialization functions */ - . =3D ALIGN(32 / 8); - PROVIDE (__preinit_array_start =3D .); - .preinit_array : { *(.preinit_array) } - PROVIDE (__preinit_array_end =3D .); - PROVIDE (__init_array_start =3D .); - .init_array : { *(.init_array) } - PROVIDE (__init_array_end =3D .); - PROVIDE (__fini_array_start =3D .); - .fini_array : { *(.fini_array) } - PROVIDE (__fini_array_end =3D .); - - .ctors : { - __CTOR_LIST__ =3D .; - *(.ctors) - CONSTRUCTORS - LONG(0) - __CTOR_END__ =3D .; - } - - .dtors : { - __DTOR_LIST__ =3D .; - *(.dtors) - LONG(0) - __DTOR_END__ =3D .; - } - - .data : { /* Data */ - *(.data) - } - - /* Note: linker will insert any extra sections here, just before .bss */ - - .bss : { - _edata =3D .; /* End of data included in image */ - /* Nothing after here is included in the zImage's size */ - - __bss_start =3D .; - *(.bss) - *(.app.bss) - } - _end =3D . ; - - /* Sections to be discarded */ - /DISCARD/ : { - *(.text.exit) - *(.data.exit) - *(.exitcall.exit) - } - - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } -} diff --git a/extras/mini-os-intree/arch/arm/mm.c b/extras/mini-os-intree/arch/arm/mm.c deleted file mode 100644 index efecc51..0000000 --- a/extras/mini-os-intree/arch/arm/mm.c +++ /dev/null @@ -1,139 +0,0 @@ -#include -#include -#include -#include -#include -#include - -uint32_t physical_address_offset; - -unsigned long allocate_ondemand(unsigned long n, unsigned long alignment) -{ - // FIXME - BUG(); -} - -void arch_init_mm(unsigned long *start_pfn_p, unsigned long *max_pfn_p) -{ - int memory; - int prop_len =3D 0; - const uint64_t *regs; - - printk(" _text: %p(VA)\n", &_text); - printk(" _etext: %p(VA)\n", &_etext); - printk(" _erodata: %p(VA)\n", &_erodata); - printk(" _edata: %p(VA)\n", &_edata); - printk(" stack start: %p(VA)\n", _boot_stack); - printk(" _end: %p(VA)\n", &_end); - - if (fdt_num_mem_rsv(device_tree) !=3D 0) - printk("WARNING: reserved memory not supported!\n"); - - memory =3D fdt_node_offset_by_prop_value(device_tree, -1, "device_type", "memory", sizeof("memory")); - if (memory < 0) { - printk("No memory found in FDT!\n"); - BUG(); - } - - /* Xen will always provide us at least one bank of memory. - * Mini-OS will use the first bank for the time-being. */ - regs =3D fdt_getprop(device_tree, memory, "reg", &prop_len); - - /* The property must contain at least the start address - * and size, each of which is 8-bytes. */ - if (regs =3D=3D NULL || prop_len < 16) { - printk("Bad 'reg' property: %p %d\n", regs, prop_len); - BUG(); - } - - unsigned int end =3D (unsigned int) &_end; - paddr_t mem_base =3D fdt64_to_cpu(regs[0]); - uint64_t mem_size =3D fdt64_to_cpu(regs[1]); - printk("Found memory at 0x%llx (len 0x%llx)\n", - (unsigned long long) mem_base, (unsigned long long) mem_size); - - BUG_ON(to_virt(mem_base) > (void *) &_text); /* Our image isn't in our RAM! */ - *start_pfn_p =3D PFN_UP(to_phys(end)); - uint64_t heap_len =3D mem_size - (PFN_PHYS(*start_pfn_p) - mem_base); - *max_pfn_p =3D *start_pfn_p + PFN_DOWN(heap_len); - - printk("Using pages %lu to %lu as free space for heap.\n", *start_pfn_p, *max_pfn_p); - - /* The device tree is probably in memory that we're about to hand over to the page - * allocator, so move it to the end and reserve that space. - */ - uint32_t fdt_size =3D fdt_totalsize(device_tree); - void *new_device_tree =3D to_virt(((*max_pfn_p << PAGE_SHIFT) - fdt_size) & PAGE_MASK); - if (new_device_tree !=3D device_tree) { - memmove(new_device_tree, device_tree, fdt_size); - } - device_tree =3D new_device_tree; - *max_pfn_p =3D to_phys(new_device_tree) >> PAGE_SHIFT; -} - -void arch_init_p2m(unsigned long max_pfn) -{ -} - -void arch_init_demand_mapping_area(unsigned long cur_pfn) -{ -} - -/* Get Xen's suggested physical page assignments for the grant table. */ -static paddr_t get_gnttab_base(void) -{ - int hypervisor; - int len =3D 0; - const uint64_t *regs; - paddr_t gnttab_base; - - hypervisor =3D fdt_node_offset_by_compatible(device_tree, -1, "xen,xen"); - BUG_ON(hypervisor < 0); - - regs =3D fdt_getprop(device_tree, hypervisor, "reg", &len); - /* The property contains the address and size, 8-bytes each. */ - if (regs =3D=3D NULL || len < 16) { - printk("Bad 'reg' property: %p %d\n", regs, len); - BUG(); - } - - gnttab_base =3D fdt64_to_cpu(regs[0]); - - printk("FDT suggests grant table base %llx\n", (unsigned long long) gnttab_base); - - return gnttab_base; -} - -grant_entry_t *arch_init_gnttab(int nr_grant_frames) -{ - struct xen_add_to_physmap xatp; - struct gnttab_setup_table setup; - xen_pfn_t frames[nr_grant_frames]; - paddr_t gnttab_table; - int i, rc; - - gnttab_table =3D get_gnttab_base(); - - for (i =3D 0; i < nr_grant_frames; i++) - { - xatp.domid =3D DOMID_SELF; - xatp.size =3D 0; /* Seems to be unused */ - xatp.space =3D XENMAPSPACE_grant_table; - xatp.idx =3D i; - xatp.gpfn =3D (gnttab_table >> PAGE_SHIFT) + i; - rc =3D HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp); - BUG_ON(rc !=3D 0); - } - - setup.dom =3D DOMID_SELF; - setup.nr_frames =3D nr_grant_frames; - set_xen_guest_handle(setup.frame_list, frames); - HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1); - if (setup.status !=3D 0) - { - printk("GNTTABOP_setup_table failed; status =3D %d\n", setup.status); - BUG(); - } - - return to_virt(gnttab_table); -} diff --git a/extras/mini-os-intree/arch/arm/panic.c b/extras/mini-os-intree/arch/arm/panic.c deleted file mode 100644 index 0ac49ad..0000000 --- a/extras/mini-os-intree/arch/arm/panic.c +++ /dev/null @@ -1,98 +0,0 @@ -/****************************************************************************** - * panic.c - * - * Displays a register dump and stack trace for debugging. - * - * Copyright (c) 2014, Thomas Leonard - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#include -#include -#include - -extern int irqstack[]; -extern int irqstack_end[]; - -typedef void handler(void); - -extern handler fault_reset; -extern handler fault_undefined_instruction; -extern handler fault_svc; -extern handler fault_prefetch_call; -extern handler fault_prefetch_abort; -extern handler fault_data_abort; - -void dump_registers(int *saved_registers) { - static int in_dump =3D 0; - int *sp, *stack_top, *x; - char *fault_name; - void *fault_handler; - int i; - - if (in_dump) - { - printk("Crash while in dump_registers! Not generating a second report.\n"); - return; - } - - in_dump =3D 1; - - fault_handler =3D (handler *) saved_registers[17]; - if (fault_handler =3D=3D fault_reset) - fault_name =3D "reset"; - else if (fault_handler =3D=3D fault_undefined_instruction) - fault_name =3D "undefined_instruction"; - else if (fault_handler =3D=3D fault_svc) - fault_name =3D "svc"; - else if (fault_handler =3D=3D fault_prefetch_call) - fault_name =3D "prefetch_call"; - else if (fault_handler =3D=3D fault_prefetch_abort) - fault_name =3D "prefetch_abort"; - else if (fault_handler =3D=3D fault_data_abort) - fault_name =3D "data_abort"; - else - fault_name =3D "unknown fault type!"; - - printk("Fault handler at %p called (%s)\n", fault_handler, fault_name); - - for (i =3D 0; i < 16; i++) { - printk("r%d =3D %x\n", i, saved_registers[i]); - } - printk("CPSR =3D %x\n", saved_registers[16]); - - printk("Stack dump (innermost last)\n"); - sp =3D (int *) saved_registers[13]; - - if (sp >=3D _boot_stack && sp <=3D _boot_stack_end) - stack_top =3D _boot_stack_end; /* The boot stack */ - else if (sp >=3D irqstack && sp <=3D irqstack_end) - stack_top =3D irqstack_end; /* The IRQ stack */ - else - stack_top =3D (int *) ((((unsigned long) sp) | (__STACK_SIZE-1)) + 1); /* A normal thread stack */ - - for (x =3D stack_top - 1; x >=3D sp; x--) - { - printk(" [%8p] %8x\n", x, *x); - } - printk("End of stack\n"); - - in_dump =3D 0; -} diff --git a/extras/mini-os-intree/arch/arm/sched.c b/extras/mini-os-intree/arch/arm/sched.c deleted file mode 100644 index 8091566..0000000 --- a/extras/mini-os-intree/arch/arm/sched.c +++ /dev/null @@ -1,47 +0,0 @@ -#include -#include -#include - -void arm_start_thread(void); - -/* The AAPCS requires the callee (e.g. __arch_switch_threads) to preserve r4-r11. */ -#define CALLEE_SAVED_REGISTERS 8 - -/* Architecture specific setup of thread creation */ -struct thread* arch_create_thread(char *name, void (*function)(void *), - void *data) -{ - struct thread *thread; - - thread =3D xmalloc(struct thread); - /* We can't use lazy allocation here since the trap handler runs on the stack */ - thread->stack =3D (char *)alloc_pages(STACK_SIZE_PAGE_ORDER); - thread->name =3D name; - printk("Thread \"%s\": pointer: 0x%p, stack: 0x%p\n", name, thread, - thread->stack); - - /* Save pointer to the thread on the stack, used by current macro */ - *((unsigned long *)thread->stack) =3D (unsigned long)thread; - - /* Push the details to pass to arm_start_thread onto the stack. */ - int *sp =3D (int *) (thread->stack + STACK_SIZE); - *(--sp) =3D (int) function; - *(--sp) =3D (int) data; - - /* We leave room for the 8 callee-saved registers which we will - * try to restore on thread switch, even though they're not needed - * for the initial switch. */ - thread->sp =3D (unsigned long) sp - 4 * CALLEE_SAVED_REGISTERS; - - thread->ip =3D (unsigned long) arm_start_thread; - - return thread; -} - -void run_idle_thread(void) -{ - __asm__ __volatile__ ("mov sp, %0; bx %1":: - "r"(idle_thread->sp + 4 * CALLEE_SAVED_REGISTERS), - "r"(idle_thread->ip)); - /* Never arrive here! */ -} diff --git a/extras/mini-os-intree/arch/arm/setup.c b/extras/mini-os-intree/arch/arm/setup.c deleted file mode 100644 index 06afe46..0000000 --- a/extras/mini-os-intree/arch/arm/setup.c +++ /dev/null @@ -1,119 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * This structure contains start-of-day info, such as pagetable base pointer, - * address of the shared_info structure, and things like that. - * On x86, the hypervisor passes it to us. On ARM, we fill it in ourselves. - */ -union start_info_union start_info_union; - -/* - * Shared page for communicating with the hypervisor. - * Events flags go here, for example. - */ -shared_info_t *HYPERVISOR_shared_info; - -extern char shared_info_page[PAGE_SIZE]; - -void *device_tree; - -static int hvm_get_parameter(int idx, uint64_t *value) -{ - struct xen_hvm_param xhv; - int ret; - - xhv.domid =3D DOMID_SELF; - xhv.index =3D idx; - ret =3D HYPERVISOR_hvm_op(HVMOP_get_param, &xhv); - if (ret < 0) { - BUG(); - } - *value =3D xhv.value; - return ret; -} - -static void get_console(void) -{ - uint64_t v =3D -1; - - hvm_get_parameter(HVM_PARAM_CONSOLE_EVTCHN, &v); - start_info.console.domU.evtchn =3D v; - - hvm_get_parameter(HVM_PARAM_CONSOLE_PFN, &v); - start_info.console.domU.mfn =3D v; - - printk("Console is on port %d\n", start_info.console.domU.evtchn); - printk("Console ring is at mfn %lx\n", (unsigned long) start_info.console.domU.mfn); -} - -void get_xenbus(void) -{ - uint64_t value; - - if (hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &value)) - BUG(); - - start_info.store_evtchn =3D (int)value; - - if(hvm_get_parameter(HVM_PARAM_STORE_PFN, &value)) - BUG(); - start_info.store_mfn =3D (unsigned long)value; -} - -/* - * INITIAL C ENTRY POINT. - */ -void arch_init(void *dtb_pointer, uint32_t physical_offset) -{ - struct xen_add_to_physmap xatp; - int r; - - memset(&__bss_start, 0, &_end - &__bss_start); - - physical_address_offset =3D physical_offset; - - xprintk("Virtual -> physical offset =3D %x\n", physical_address_offset); - - xprintk("Checking DTB at %p...\n", dtb_pointer); - - if ((r =3D fdt_check_header(dtb_pointer))) { - xprintk("Invalid DTB from Xen: %s\n", fdt_strerror(r)); - BUG(); - } - device_tree =3D dtb_pointer; - - /* Map shared_info page */ - xatp.domid =3D DOMID_SELF; - xatp.idx =3D 0; - xatp.space =3D XENMAPSPACE_shared_info; - xatp.gpfn =3D virt_to_pfn(shared_info_page); - if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp) !=3D 0) - BUG(); - HYPERVISOR_shared_info =3D (struct shared_info *)shared_info_page; - - /* Fill in start_info */ - get_console(); - get_xenbus(); - - gic_init(); - - start_kernel(); -} - -void -arch_fini(void) -{ -} - -void -arch_do_exit(void) -{ -} diff --git a/extras/mini-os-intree/arch/arm/time.c b/extras/mini-os-intree/arch/arm/time.c deleted file mode 100644 index a088981..0000000 --- a/extras/mini-os-intree/arch/arm/time.c +++ /dev/null @@ -1,136 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include - -//#define VTIMER_DEBUG -#ifdef VTIMER_DEBUG -#define DEBUG(_f, _a...) \ - printk("MINI_OS(file=3Dvtimer.c, line=3D%d) " _f , __LINE__, ## _a) -#else -#define DEBUG(_f, _a...) ((void)0) -#endif - -/************************************************************************ - * Time functions - *************************************************************************/ - -static uint64_t cntvct_at_init; -static uint32_t counter_freq; - -/* Compute with 96 bit intermediate result: (a*b)/c */ -uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c) -{ - union { - uint64_t ll; - struct { - uint32_t low, high; - } l; - } u, res; - uint64_t rl, rh; - - u.ll =3D a; - rl =3D (uint64_t)u.l.low * (uint64_t)b; - rh =3D (uint64_t)u.l.high * (uint64_t)b; - rh +=3D (rl >> 32); - res.l.high =3D rh / c; - res.l.low =3D (((rh % c) << 32) + (rl & 0xffffffff)) / c; - return res.ll; -} - -static inline s_time_t ticks_to_ns(uint64_t ticks) -{ - return muldiv64(ticks, SECONDS(1), counter_freq); -} - -static inline uint64_t ns_to_ticks(s_time_t ns) -{ - return muldiv64(ns, counter_freq, SECONDS(1)); -} - -/* Wall-clock time is not currently available on ARM, so this is always zero for now: - * http://wiki.xenproject.org/wiki/Xen_ARM_TODO#Expose_Wallclock_time_to_guests - */ -static struct timespec shadow_ts; - -static inline uint64_t read_virtual_count(void) -{ - uint32_t c_lo, c_hi; - __asm__ __volatile__("mrrc p15, 1, %0, %1, c14":"=3Dr"(c_lo), "=3Dr"(c_hi)); - return (((uint64_t) c_hi) << 32) + c_lo; -} - -/* monotonic_clock(): returns # of nanoseconds passed since time_init() - * Note: This function is required to return accurate - * time even in the absence of multiple timer ticks. - */ -uint64_t monotonic_clock(void) -{ - return ticks_to_ns(read_virtual_count() - cntvct_at_init); -} - -int gettimeofday(struct timeval *tv, void *tz) -{ - uint64_t nsec =3D monotonic_clock(); - nsec +=3D shadow_ts.tv_nsec; - - tv->tv_sec =3D shadow_ts.tv_sec; - tv->tv_sec +=3D NSEC_TO_SEC(nsec); - tv->tv_usec =3D NSEC_TO_USEC(nsec % 1000000000UL); - - return 0; -} - -/* Set the timer and mask. */ -void write_timer_ctl(uint32_t value) { - __asm__ __volatile__( - "mcr p15, 0, %0, c14, c3, 1\n" - "isb"::"r"(value)); -} - -void set_vtimer_compare(uint64_t value) { - DEBUG("New CompareValue : %llx\n", value); - - __asm__ __volatile__("mcrr p15, 3, %0, %H0, c14" - ::"r"(value)); - - /* Enable timer and unmask the output signal */ - write_timer_ctl(1); -} - -void unset_vtimer_compare(void) { - /* Disable timer and mask the output signal */ - write_timer_ctl(2); -} - -void block_domain(s_time_t until) -{ - uint64_t until_count =3D ns_to_ticks(until) + cntvct_at_init; - ASSERT(irqs_disabled()); - if (read_virtual_count() < until_count) - { - set_vtimer_compare(until_count); - __asm__ __volatile__("wfi"); - unset_vtimer_compare(); - - /* Give the IRQ handler a chance to handle whatever woke us up. */ - local_irq_enable(); - local_irq_disable(); - } -} - -void init_time(void) -{ - printk("Initialising timer interface\n"); - - __asm__ __volatile__("mrc p15, 0, %0, c14, c0, 0":"=3Dr"(counter_freq)); - cntvct_at_init =3D read_virtual_count(); - printk("Virtual Count register is %llx, freq =3D %d Hz\n", cntvct_at_init, counter_freq); -} - -void fini_time(void) -{ -} diff --git a/extras/mini-os-intree/arch/x86/Makefile b/extras/mini-os-intree/arch/x86/Makefile deleted file mode 100644 index 9f04a93..0000000 --- a/extras/mini-os-intree/arch/x86/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -# x86 architecture specific makefiles. -# It's is used for x86_32, x86_32y and x86_64 -# - -TOPLEVEL_DIR =3D $(CURDIR)/../.. -include ../../Config.mk - -# include arch.mk has to be before mini-os.mk! - -include arch.mk -include ../../minios.mk - -# Sources here are all *.c *.S without $(MINIOS_TARGET_ARCH).S -# This is handled in $(HEAD_ARCH_OBJ) -ARCH_SRCS :=3D $(wildcard *.c) - -# The objects built from the sources. -ARCH_OBJS :=3D $(patsubst %.c,$(OBJ_DIR)/%.o,$(ARCH_SRCS)) - -all: $(OBJ_DIR)/$(ARCH_LIB) - -# $(HEAD_ARCH_OBJ) is only build here, needed on linking -# in ../../Makefile. -$(OBJ_DIR)/$(ARCH_LIB): $(ARCH_OBJS) $(OBJ_DIR)/$(HEAD_ARCH_OBJ) - $(AR) rv $(OBJ_DIR)/$(ARCH_LIB) $(ARCH_OBJS) - -clean: - rm -f $(OBJ_DIR)/$(ARCH_LIB) $(ARCH_OBJS) $(OBJ_DIR)/$(HEAD_ARCH_OBJ) - diff --git a/extras/mini-os-intree/arch/x86/arch.mk b/extras/mini-os-intree/arch/x86/arch.mk deleted file mode 100644 index 81e8118..0000000 --- a/extras/mini-os-intree/arch/x86/arch.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -# Architecture special makerules for x86 family -# (including x86_32, x86_32y and x86_64). -# - -ifeq ($(MINIOS_TARGET_ARCH),x86_32) -ARCH_CFLAGS :=3D -m32 -march=3Di686 -ARCH_LDFLAGS :=3D -m elf_i386 -ARCH_ASFLAGS :=3D -m32 -EXTRA_INC +=3D $(TARGET_ARCH_FAM)/$(MINIOS_TARGET_ARCH) -EXTRA_SRC +=3D arch/$(EXTRA_INC) -endif - -ifeq ($(MINIOS_TARGET_ARCH),x86_64) -ARCH_CFLAGS :=3D -m64 -mno-red-zone -fno-reorder-blocks -ARCH_CFLAGS +=3D -fno-asynchronous-unwind-tables -ARCH_ASFLAGS :=3D -m64 -ARCH_LDFLAGS :=3D -m elf_x86_64 -EXTRA_INC +=3D $(TARGET_ARCH_FAM)/$(MINIOS_TARGET_ARCH) -EXTRA_SRC +=3D arch/$(EXTRA_INC) -endif - diff --git a/extras/mini-os-intree/arch/x86/events.c b/extras/mini-os-intree/arch/x86/events.c deleted file mode 100644 index 5198cf3..0000000 --- a/extras/mini-os-intree/arch/x86/events.c +++ /dev/null @@ -1,35 +0,0 @@ -#include -#include -#include - -#if defined(__x86_64__) -char irqstack[2 * STACK_SIZE]; - -static struct pda -{ - int irqcount; /* offset 0 (used in x86_64.S) */ - char *irqstackptr; /* 8 */ -} cpu0_pda; -#endif - -void arch_init_events(void) -{ -#if defined(__x86_64__) - asm volatile("movl %0,%%fs ; movl %0,%%gs" :: "r" (0)); - wrmsrl(0xc0000101, &cpu0_pda); /* 0xc0000101 is MSR_GS_BASE */ - cpu0_pda.irqcount =3D -1; - cpu0_pda.irqstackptr =3D (void*) (((unsigned long)irqstack + 2 * STACK_SIZE) - & ~(STACK_SIZE - 1)); -#endif -} - -void arch_unbind_ports(void) -{ -} - -void arch_fini_events(void) -{ -#if defined(__x86_64__) - wrmsrl(0xc0000101, NULL); /* 0xc0000101 is MSR_GS_BASE */ -#endif -} diff --git a/extras/mini-os-intree/arch/x86/ioremap.c b/extras/mini-os-intree/arch/x86/ioremap.c deleted file mode 100644 index 4384b1c..0000000 --- a/extras/mini-os-intree/arch/x86/ioremap.c +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) 2009, Netronome Systems, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - - -#include -#include -#include -#include -#include - -/* Map a physical address range into virtual address space with provided - * flags. Return a virtual address range it is mapped to. */ -static void *__do_ioremap(unsigned long phys_addr, unsigned long size, - unsigned long prot) -{ - unsigned long va; - unsigned long mfns, mfn; - unsigned long num_pages, offset; - - /* allow non page aligned addresses but for mapping we need to align them */ - offset =3D (phys_addr & ~PAGE_MASK); - num_pages =3D (offset + size + PAGE_SIZE - 1) / PAGE_SIZE; - phys_addr &=3D PAGE_MASK; - mfns =3D mfn =3D phys_addr >> PAGE_SHIFT; - - va =3D (unsigned long)map_frames_ex(&mfns, num_pages, 0, 1, 1, - DOMID_IO, NULL, prot); - return (void *)(va + offset); -} - -void *ioremap(unsigned long phys_addr, unsigned long size) -{ - return __do_ioremap(phys_addr, size, IO_PROT); -} - -void *ioremap_nocache(unsigned long phys_addr, unsigned long size) -{ - return __do_ioremap(phys_addr, size, IO_PROT_NOCACHE); -} - -/* Un-map the io-remapped region. Currently no list of existing mappings is - * maintained, so the caller has to supply the size */ -void iounmap(void *virt_addr, unsigned long size) -{ - unsigned long num_pages; - unsigned long va =3D (unsigned long)virt_addr; - - /* work out number of frames to unmap */ - num_pages =3D ((va & ~PAGE_MASK) + size + PAGE_SIZE - 1) / PAGE_SIZE; - - unmap_frames(va & PAGE_MASK, num_pages); -} - - - -/* -*- Mode:C; c-basic-offset:4; tab-width:4 indent-tabs-mode:nil -*- */ diff --git a/extras/mini-os-intree/arch/x86/iorw.c b/extras/mini-os-intree/arch/x86/iorw.c deleted file mode 100644 index 3080769..0000000 --- a/extras/mini-os-intree/arch/x86/iorw.c +++ /dev/null @@ -1,35 +0,0 @@ -#include - -void iowrite8(volatile void* addr, uint8_t val) -{ - *((volatile uint8_t*)addr) =3D val; -} -void iowrite16(volatile void* addr, uint16_t val) -{ - *((volatile uint16_t*)addr) =3D val; -} -void iowrite32(volatile void* addr, uint32_t val) -{ - *((volatile uint32_t*)addr) =3D val; -} -void iowrite64(volatile void* addr, uint64_t val) -{ - *((volatile uint64_t*)addr) =3D val; -} - -uint8_t ioread8(volatile void* addr) -{ - return *((volatile uint8_t*) addr); -} -uint16_t ioread16(volatile void* addr) -{ - return *((volatile uint16_t*) addr); -} -uint32_t ioread32(volatile void* addr) -{ - return *((volatile uint32_t*) addr); -} -uint64_t ioread64(volatile void* addr) -{ - return *((volatile uint64_t*) addr); -} diff --git a/extras/mini-os-intree/arch/x86/minios-x86_32.lds b/extras/mini-os-intree/arch/x86/minios-x86_32.lds deleted file mode 100644 index f5cabb6..0000000 --- a/extras/mini-os-intree/arch/x86/minios-x86_32.lds +++ /dev/null @@ -1,74 +0,0 @@ -OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") -OUTPUT_ARCH(i386) -ENTRY(_start) -SECTIONS -{ - . =3D 0x0; - _text =3D .; /* Text and read-only data */ - .text : { - *(.text) - *(.gnu.warning) - } =3D 0x9090 - - _etext =3D .; /* End of text section */ - - .rodata : { *(.rodata) *(.rodata.*) } - . =3D ALIGN(4096); - _erodata =3D .; - - /* newlib initialization functions */ - . =3D ALIGN(32 / 8); - PROVIDE (__preinit_array_start =3D .); - .preinit_array : { *(.preinit_array) } - PROVIDE (__preinit_array_end =3D .); - PROVIDE (__init_array_start =3D .); - .init_array : { *(.init_array) } - PROVIDE (__init_array_end =3D .); - PROVIDE (__fini_array_start =3D .); - .fini_array : { *(.fini_array) } - PROVIDE (__fini_array_end =3D .); - - .ctors : { - __CTOR_LIST__ =3D .; - *(.ctors) - CONSTRUCTORS - LONG(0) - __CTOR_END__ =3D .; - } - - .dtors : { - __DTOR_LIST__ =3D .; - *(.dtors) - LONG(0) - __DTOR_END__ =3D .; - } - - .data : { /* Data */ - *(.data) - } - - _edata =3D .; /* End of data section */ - - __bss_start =3D .; /* BSS */ - .bss : { - *(.bss) - *(.app.bss) - } - _end =3D . ; - - /* Sections to be discarded */ - /DISCARD/ : { - *(.text.exit) - *(.data.exit) - *(.exitcall.exit) - } - - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } -} diff --git a/extras/mini-os-intree/arch/x86/minios-x86_64.lds b/extras/mini-os-intree/arch/x86/minios-x86_64.lds deleted file mode 100644 index 3da0a9f..0000000 --- a/extras/mini-os-intree/arch/x86/minios-x86_64.lds +++ /dev/null @@ -1,74 +0,0 @@ -OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") -OUTPUT_ARCH(i386:x86-64) -ENTRY(_start) -SECTIONS -{ - . =3D 0x0; - _text =3D .; /* Text and read-only data */ - .text : { - *(.text) - *(.gnu.warning) - } =3D 0x9090 - - _etext =3D .; /* End of text section */ - - .rodata : { *(.rodata) *(.rodata.*) } - . =3D ALIGN(4096); - _erodata =3D .; - - /* newlib initialization functions */ - . =3D ALIGN(64 / 8); - PROVIDE (__preinit_array_start =3D .); - .preinit_array : { *(.preinit_array) } - PROVIDE (__preinit_array_end =3D .); - PROVIDE (__init_array_start =3D .); - .init_array : { *(.init_array) } - PROVIDE (__init_array_end =3D .); - PROVIDE (__fini_array_start =3D .); - .fini_array : { *(.fini_array) } - PROVIDE (__fini_array_end =3D .); - - .ctors : { - __CTOR_LIST__ =3D .; - *(.ctors) - CONSTRUCTORS - QUAD(0) - __CTOR_END__ =3D .; - } - - .dtors : { - __DTOR_LIST__ =3D .; - *(.dtors) - QUAD(0) - __DTOR_END__ =3D .; - } - - .data : { /* Data */ - *(.data) - } - - _edata =3D .; /* End of data section */ - - __bss_start =3D .; /* BSS */ - .bss : { - *(.bss) - *(.app.bss) - } - _end =3D . ; - - /* Sections to be discarded */ - /DISCARD/ : { - *(.text.exit) - *(.data.exit) - *(.exitcall.exit) - } - - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } -} diff --git a/extras/mini-os-intree/arch/x86/mm.c b/extras/mini-os-intree/arch/x86/mm.c deleted file mode 100644 index 9c6d1b8..0000000 --- a/extras/mini-os-intree/arch/x86/mm.c +++ /dev/null @@ -1,957 +0,0 @@ -/* - **************************************************************************** - * (C) 2003 - Rolf Neugebauer - Intel Research Cambridge - * (C) 2005 - Grzegorz Milos - Intel Research Cambridge - **************************************************************************** - * - * File: mm.c - * Author: Rolf Neugebauer (neugebar@dcs.gla.ac.uk) - * Changes: Grzegorz Milos - * - * Date: Aug 2003, chages Aug 2005 - * - * Environment: Xen Minimal OS - * Description: memory management related functions - * contains buddy page allocator from Xen. - * - **************************************************************************** - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#include -#include -#include -#include -#include -#include -#include - -#ifdef MM_DEBUG -#define DEBUG(_f, _a...) \ - printk("MINI_OS(file=3Dmm.c, line=3D%d) " _f "\n", __LINE__, ## _a) -#else -#define DEBUG(_f, _a...) ((void)0) -#endif - -unsigned long *phys_to_machine_mapping; -unsigned long mfn_zero; -extern char stack[]; -extern void page_walk(unsigned long va); - -/* - * Make pt_pfn a new 'level' page table frame and hook it into the page - * table at offset in previous level MFN (pref_l_mfn). pt_pfn is a guest - * PFN. - */ -static void new_pt_frame(unsigned long *pt_pfn, unsigned long prev_l_mfn, - unsigned long offset, unsigned long level) -{ - pgentry_t *tab =3D (pgentry_t *)start_info.pt_base; - unsigned long pt_page =3D (unsigned long)pfn_to_virt(*pt_pfn); - pgentry_t prot_e, prot_t; - mmu_update_t mmu_updates[1]; - int rc; - - prot_e =3D prot_t =3D 0; - DEBUG("Allocating new L%d pt frame for pfn=3D%lx, " - "prev_l_mfn=3D%lx, offset=3D%lx", - level, *pt_pfn, prev_l_mfn, offset); - - /* We need to clear the page, otherwise we might fail to map it - as a page table page */ - memset((void*) pt_page, 0, PAGE_SIZE); - - switch ( level ) - { - case L1_FRAME: - prot_e =3D L1_PROT; - prot_t =3D L2_PROT; - break; - case L2_FRAME: - prot_e =3D L2_PROT; - prot_t =3D L3_PROT; - break; -#if defined(__x86_64__) - case L3_FRAME: - prot_e =3D L3_PROT; - prot_t =3D L4_PROT; - break; -#endif - default: - printk("new_pt_frame() called with invalid level number %d\n", level); - do_exit(); - break; - } - - /* Make PFN a page table page */ -#if defined(__x86_64__) - tab =3D pte_to_virt(tab[l4_table_offset(pt_page)]); -#endif - tab =3D pte_to_virt(tab[l3_table_offset(pt_page)]); - - mmu_updates[0].ptr =3D (tab[l2_table_offset(pt_page)] & PAGE_MASK) + - sizeof(pgentry_t) * l1_table_offset(pt_page); - mmu_updates[0].val =3D (pgentry_t)pfn_to_mfn(*pt_pfn) << PAGE_SHIFT | - (prot_e & ~_PAGE_RW); - - if ( (rc =3D HYPERVISOR_mmu_update(mmu_updates, 1, NULL, DOMID_SELF)) < 0 ) - { - printk("ERROR: PTE for new page table page could not be updated\n"); - printk(" mmu_update failed with rc=3D%d\n", rc); - do_exit(); - } - - /* Hook the new page table page into the hierarchy */ - mmu_updates[0].ptr =3D - ((pgentry_t)prev_l_mfn << PAGE_SHIFT) + sizeof(pgentry_t) * offset; - mmu_updates[0].val =3D (pgentry_t)pfn_to_mfn(*pt_pfn) << PAGE_SHIFT | prot_t; - - if ( (rc =3D HYPERVISOR_mmu_update(mmu_updates, 1, NULL, DOMID_SELF)) < 0 ) - { - printk("ERROR: mmu_update failed with rc=3D%d\n", rc); - do_exit(); - } - - *pt_pfn +=3D 1; -} - -/* - * Checks if a pagetable frame is needed at 'level' to map a given - * address. Note, this function is specific to the initial page table - * building. - */ -static int need_pt_frame(unsigned long va, int level) -{ - unsigned long hyp_virt_start =3D HYPERVISOR_VIRT_START; -#if defined(__x86_64__) - unsigned long hyp_virt_end =3D HYPERVISOR_VIRT_END; -#else - unsigned long hyp_virt_end =3D 0xffffffff; -#endif - - /* In general frames will _not_ be needed if they were already - allocated to map the hypervisor into our VA space */ -#if defined(__x86_64__) - if ( level =3D=3D L3_FRAME ) - { - if ( l4_table_offset(va) >=3D - l4_table_offset(hyp_virt_start) && - l4_table_offset(va) <=3D - l4_table_offset(hyp_virt_end)) - return 0; - return 1; - } - else -#endif - - if ( level =3D=3D L2_FRAME ) - { -#if defined(__x86_64__) - if ( l4_table_offset(va) >=3D - l4_table_offset(hyp_virt_start) && - l4_table_offset(va) <=3D - l4_table_offset(hyp_virt_end)) -#endif - if ( l3_table_offset(va) >=3D - l3_table_offset(hyp_virt_start) && - l3_table_offset(va) <=3D - l3_table_offset(hyp_virt_end)) - return 0; - - return 1; - } - else - /* Always need l1 frames */ - if ( level =3D=3D L1_FRAME ) - return 1; - - printk("ERROR: Unknown frame level %d, hypervisor %llx,%llx\n", - level, hyp_virt_start, hyp_virt_end); - return -1; -} - -/* - * Build the initial pagetable. - */ -static void build_pagetable(unsigned long *start_pfn, unsigned long *max_pfn) -{ - unsigned long start_address, end_address; - unsigned long pfn_to_map, pt_pfn =3D *start_pfn; - static mmu_update_t mmu_updates[L1_PAGETABLE_ENTRIES + 1]; - pgentry_t *tab =3D (pgentry_t *)start_info.pt_base, page; - unsigned long pt_mfn =3D pfn_to_mfn(virt_to_pfn(start_info.pt_base)); - unsigned long offset; - int count =3D 0; - int rc; - - pfn_to_map =3D - (start_info.nr_pt_frames - NOT_L1_FRAMES) * L1_PAGETABLE_ENTRIES; - - if ( *max_pfn >=3D virt_to_pfn(HYPERVISOR_VIRT_START) ) - { - printk("WARNING: Mini-OS trying to use Xen virtual space. " - "Truncating memory from %dMB to ", - ((unsigned long)pfn_to_virt(*max_pfn) - - (unsigned long)&_text)>>20); - *max_pfn =3D virt_to_pfn(HYPERVISOR_VIRT_START - PAGE_SIZE); - printk("%dMB\n", - ((unsigned long)pfn_to_virt(*max_pfn) - - (unsigned long)&_text)>>20); - } - - start_address =3D (unsigned long)pfn_to_virt(pfn_to_map); - end_address =3D (unsigned long)pfn_to_virt(*max_pfn); - - /* We worked out the virtual memory range to map, now mapping loop */ - printk("Mapping memory range 0x%lx - 0x%lx\n", start_address, end_address); - - while ( start_address < end_address ) - { - tab =3D (pgentry_t *)start_info.pt_base; - pt_mfn =3D pfn_to_mfn(virt_to_pfn(start_info.pt_base)); - -#if defined(__x86_64__) - offset =3D l4_table_offset(start_address); - /* Need new L3 pt frame */ - if ( !(start_address & L3_MASK) ) - if ( need_pt_frame(start_address, L3_FRAME) ) - new_pt_frame(&pt_pfn, pt_mfn, offset, L3_FRAME); - - page =3D tab[offset]; - pt_mfn =3D pte_to_mfn(page); - tab =3D to_virt(mfn_to_pfn(pt_mfn) << PAGE_SHIFT); -#endif - offset =3D l3_table_offset(start_address); - /* Need new L2 pt frame */ - if ( !(start_address & L2_MASK) ) - if ( need_pt_frame(start_address, L2_FRAME) ) - new_pt_frame(&pt_pfn, pt_mfn, offset, L2_FRAME); - - page =3D tab[offset]; - pt_mfn =3D pte_to_mfn(page); - tab =3D to_virt(mfn_to_pfn(pt_mfn) << PAGE_SHIFT); - offset =3D l2_table_offset(start_address); - /* Need new L1 pt frame */ - if ( !(start_address & L1_MASK) ) - if ( need_pt_frame(start_address, L1_FRAME) ) - new_pt_frame(&pt_pfn, pt_mfn, offset, L1_FRAME); - - page =3D tab[offset]; - pt_mfn =3D pte_to_mfn(page); - offset =3D l1_table_offset(start_address); - - mmu_updates[count].ptr =3D - ((pgentry_t)pt_mfn << PAGE_SHIFT) + sizeof(pgentry_t) * offset; - mmu_updates[count].val =3D - (pgentry_t)pfn_to_mfn(pfn_to_map++) << PAGE_SHIFT | L1_PROT; - count++; - if ( count =3D=3D L1_PAGETABLE_ENTRIES || pfn_to_map =3D=3D *max_pfn ) - { - rc =3D HYPERVISOR_mmu_update(mmu_updates, count, NULL, DOMID_SELF); - if ( rc < 0 ) - { - printk("ERROR: build_pagetable(): PTE could not be updated\n"); - printk(" mmu_update failed with rc=3D%d\n", rc); - do_exit(); - } - count =3D 0; - } - start_address +=3D PAGE_SIZE; - } - - *start_pfn =3D pt_pfn; -} - -/* - * Mark portion of the address space read only. - */ -extern struct shared_info shared_info; -static void set_readonly(void *text, void *etext) -{ - unsigned long start_address =3D - ((unsigned long) text + PAGE_SIZE - 1) & PAGE_MASK; - unsigned long end_address =3D (unsigned long) etext; - static mmu_update_t mmu_updates[L1_PAGETABLE_ENTRIES + 1]; - pgentry_t *tab =3D (pgentry_t *)start_info.pt_base, page; - unsigned long mfn =3D pfn_to_mfn(virt_to_pfn(start_info.pt_base)); - unsigned long offset; - int count =3D 0; - int rc; - - printk("setting %p-%p readonly\n", text, etext); - - while ( start_address + PAGE_SIZE <=3D end_address ) - { - tab =3D (pgentry_t *)start_info.pt_base; - mfn =3D pfn_to_mfn(virt_to_pfn(start_info.pt_base)); - -#if defined(__x86_64__) - offset =3D l4_table_offset(start_address); - page =3D tab[offset]; - mfn =3D pte_to_mfn(page); - tab =3D to_virt(mfn_to_pfn(mfn) << PAGE_SHIFT); -#endif - offset =3D l3_table_offset(start_address); - page =3D tab[offset]; - mfn =3D pte_to_mfn(page); - tab =3D to_virt(mfn_to_pfn(mfn) << PAGE_SHIFT); - offset =3D l2_table_offset(start_address); - page =3D tab[offset]; - mfn =3D pte_to_mfn(page); - tab =3D to_virt(mfn_to_pfn(mfn) << PAGE_SHIFT); - - offset =3D l1_table_offset(start_address); - - if ( start_address !=3D (unsigned long)&shared_info ) - { - mmu_updates[count].ptr =3D - ((pgentry_t)mfn << PAGE_SHIFT) + sizeof(pgentry_t) * offset; - mmu_updates[count].val =3D tab[offset] & ~_PAGE_RW; - count++; - } - else - printk("skipped %p\n", start_address); - - start_address +=3D PAGE_SIZE; - - if ( count =3D=3D L1_PAGETABLE_ENTRIES || - start_address + PAGE_SIZE > end_address ) - { - rc =3D HYPERVISOR_mmu_update(mmu_updates, count, NULL, DOMID_SELF); - if ( rc < 0 ) - { - printk("ERROR: set_readonly(): PTE could not be updated\n"); - do_exit(); - } - count =3D 0; - } - } - - { - mmuext_op_t op =3D { - .cmd =3D MMUEXT_TLB_FLUSH_ALL, - }; - int count; - HYPERVISOR_mmuext_op(&op, 1, &count, DOMID_SELF); - } -} - -/* - * A useful mem testing function. Write the address to every address in the - * range provided and read back the value. If verbose, print page walk to - * some VA - * - * If we get MEM_TEST_MAX_ERRORS we might as well stop - */ -#define MEM_TEST_MAX_ERRORS 10 -int mem_test(unsigned long *start_va, unsigned long *end_va, int verbose) -{ - unsigned long mask =3D 0x10000; - unsigned long *pointer; - int error_count =3D 0; - - /* write values and print page walks */ - if ( verbose && (((unsigned long)start_va) & 0xfffff) ) - { - printk("MemTest Start: 0x%lx\n", start_va); - page_walk((unsigned long)start_va); - } - for ( pointer =3D start_va; pointer < end_va; pointer++ ) - { - if ( verbose && !(((unsigned long)pointer) & 0xfffff) ) - { - printk("Writing to %lx\n", pointer); - page_walk((unsigned long)pointer); - } - *pointer =3D (unsigned long)pointer & ~mask; - } - if ( verbose && (((unsigned long)end_va) & 0xfffff) ) - { - printk("MemTest End: %lx\n", end_va-1); - page_walk((unsigned long)end_va-1); - } - - /* verify values */ - for ( pointer =3D start_va; pointer < end_va; pointer++ ) - { - if ( ((unsigned long)pointer & ~mask) !=3D *pointer ) - { - printk("Read error at 0x%lx. Read: 0x%lx, should read 0x%lx\n", - (unsigned long)pointer, *pointer, - ((unsigned long)pointer & ~mask)); - error_count++; - if ( error_count >=3D MEM_TEST_MAX_ERRORS ) - { - printk("mem_test: too many errors\n"); - return -1; - } - } - } - return 0; -} - - -/* - * get the PTE for virtual address va if it exists. Otherwise NULL. - */ -static pgentry_t *get_pgt(unsigned long va) -{ - unsigned long mfn; - pgentry_t *tab; - unsigned offset; - - tab =3D (pgentry_t *)start_info.pt_base; - mfn =3D virt_to_mfn(start_info.pt_base); - -#if defined(__x86_64__) - offset =3D l4_table_offset(va); - if ( !(tab[offset] & _PAGE_PRESENT) ) - return NULL; - mfn =3D pte_to_mfn(tab[offset]); - tab =3D mfn_to_virt(mfn); -#endif - offset =3D l3_table_offset(va); - if ( !(tab[offset] & _PAGE_PRESENT) ) - return NULL; - mfn =3D pte_to_mfn(tab[offset]); - tab =3D mfn_to_virt(mfn); - offset =3D l2_table_offset(va); - if ( !(tab[offset] & _PAGE_PRESENT) ) - return NULL; - mfn =3D pte_to_mfn(tab[offset]); - tab =3D mfn_to_virt(mfn); - offset =3D l1_table_offset(va); - return &tab[offset]; -} - - -/* - * return a valid PTE for a given virtual address. If PTE does not exist, - * allocate page-table pages. - */ -pgentry_t *need_pgt(unsigned long va) -{ - unsigned long pt_mfn; - pgentry_t *tab; - unsigned long pt_pfn; - unsigned offset; - - tab =3D (pgentry_t *)start_info.pt_base; - pt_mfn =3D virt_to_mfn(start_info.pt_base); - -#if defined(__x86_64__) - offset =3D l4_table_offset(va); - if ( !(tab[offset] & _PAGE_PRESENT) ) - { - pt_pfn =3D virt_to_pfn(alloc_page()); - new_pt_frame(&pt_pfn, pt_mfn, offset, L3_FRAME); - } - ASSERT(tab[offset] & _PAGE_PRESENT); - pt_mfn =3D pte_to_mfn(tab[offset]); - tab =3D mfn_to_virt(pt_mfn); -#endif - offset =3D l3_table_offset(va); - if ( !(tab[offset] & _PAGE_PRESENT) ) - { - pt_pfn =3D virt_to_pfn(alloc_page()); - new_pt_frame(&pt_pfn, pt_mfn, offset, L2_FRAME); - } - ASSERT(tab[offset] & _PAGE_PRESENT); - pt_mfn =3D pte_to_mfn(tab[offset]); - tab =3D mfn_to_virt(pt_mfn); - offset =3D l2_table_offset(va); - if ( !(tab[offset] & _PAGE_PRESENT) ) - { - pt_pfn =3D virt_to_pfn(alloc_page()); - new_pt_frame(&pt_pfn, pt_mfn, offset, L1_FRAME); - } - ASSERT(tab[offset] & _PAGE_PRESENT); - pt_mfn =3D pte_to_mfn(tab[offset]); - tab =3D mfn_to_virt(pt_mfn); - - offset =3D l1_table_offset(va); - return &tab[offset]; -} - -/* - * Reserve an area of virtual address space for mappings and Heap - */ -static unsigned long demand_map_area_start; -#ifdef __x86_64__ -#define DEMAND_MAP_PAGES ((128ULL << 30) / PAGE_SIZE) -#else -#define DEMAND_MAP_PAGES ((2ULL << 30) / PAGE_SIZE) -#endif - -#ifndef HAVE_LIBC -#define HEAP_PAGES 0 -#else -unsigned long heap, brk, heap_mapped, heap_end; -#ifdef __x86_64__ -#define HEAP_PAGES ((128ULL << 30) / PAGE_SIZE) -#else -#define HEAP_PAGES ((1ULL << 30) / PAGE_SIZE) -#endif -#endif - -void arch_init_demand_mapping_area(unsigned long cur_pfn) -{ - cur_pfn++; - - demand_map_area_start =3D (unsigned long) pfn_to_virt(cur_pfn); - cur_pfn +=3D DEMAND_MAP_PAGES; - printk("Demand map pfns at %lx-%lx.\n", - demand_map_area_start, pfn_to_virt(cur_pfn)); - -#ifdef HAVE_LIBC - cur_pfn++; - heap_mapped =3D brk =3D heap =3D (unsigned long) pfn_to_virt(cur_pfn); - cur_pfn +=3D HEAP_PAGES; - heap_end =3D (unsigned long) pfn_to_virt(cur_pfn); - printk("Heap resides at %lx-%lx.\n", brk, heap_end); -#endif -} - -unsigned long allocate_ondemand(unsigned long n, unsigned long alignment) -{ - unsigned long x; - unsigned long y =3D 0; - - /* Find a properly aligned run of n contiguous frames */ - for ( x =3D 0; - x <=3D DEMAND_MAP_PAGES - n; - x =3D (x + y + 1 + alignment - 1) & ~(alignment - 1) ) - { - unsigned long addr =3D demand_map_area_start + x * PAGE_SIZE; - pgentry_t *pgt =3D get_pgt(addr); - for ( y =3D 0; y < n; y++, addr +=3D PAGE_SIZE ) - { - if ( !(addr & L1_MASK) ) - pgt =3D get_pgt(addr); - if ( pgt ) - { - if ( *pgt & _PAGE_PRESENT ) - break; - pgt++; - } - } - if ( y =3D=3D n ) - break; - } - if ( y !=3D n ) - { - printk("Failed to find %ld frames!\n", n); - return 0; - } - return demand_map_area_start + x * PAGE_SIZE; -} - -/* - * Map an array of MFNs contiguously into virtual address space starting at - * va. map f[i*stride]+i*increment for i in 0..n-1. - */ -#define MAP_BATCH ((STACK_SIZE / 2) / sizeof(mmu_update_t)) -void do_map_frames(unsigned long va, - const unsigned long *mfns, unsigned long n, - unsigned long stride, unsigned long incr, - domid_t id, int *err, unsigned long prot) -{ - pgentry_t *pgt =3D NULL; - unsigned long done =3D 0; - unsigned long i; - int rc; - - if ( !mfns ) - { - printk("do_map_frames: no mfns supplied\n"); - return; - } - DEBUG("va=3D%p n=3D0x%lx, mfns[0]=3D0x%lx stride=3D0x%lx incr=3D0x%lx prot=3D0x%lx\n", - va, n, mfns[0], stride, incr, prot); - - if ( err ) - memset(err, 0x00, n * sizeof(int)); - while ( done < n ) - { - unsigned long todo; - - if ( err ) - todo =3D 1; - else - todo =3D n - done; - - if ( todo > MAP_BATCH ) - todo =3D MAP_BATCH; - - { - mmu_update_t mmu_updates[todo]; - - for ( i =3D 0; i < todo; i++, va +=3D PAGE_SIZE, pgt++) - { - if ( !pgt || !(va & L1_MASK) ) - pgt =3D need_pgt(va); - - mmu_updates[i].ptr =3D virt_to_mach(pgt) | MMU_NORMAL_PT_UPDATE; - mmu_updates[i].val =3D ((pgentry_t)(mfns[(done + i) * stride] + - (done + i) * incr) - << PAGE_SHIFT) | prot; - } - - rc =3D HYPERVISOR_mmu_update(mmu_updates, todo, NULL, id); - if ( rc < 0 ) - { - if (err) - err[done * stride] =3D rc; - else { - printk("Map %ld (%lx, ...) at %p failed: %d.\n", - todo, mfns[done * stride] + done * incr, va, rc); - do_exit(); - } - } - } - done +=3D todo; - } -} - -/* - * Map an array of MFNs contiguous into virtual address space. Virtual - * addresses are allocated from the on demand area. - */ -void *map_frames_ex(const unsigned long *mfns, unsigned long n, - unsigned long stride, unsigned long incr, - unsigned long alignment, - domid_t id, int *err, unsigned long prot) -{ - unsigned long va =3D allocate_ondemand(n, alignment); - - if ( !va ) - return NULL; - - do_map_frames(va, mfns, n, stride, incr, id, err, prot); - - return (void *)va; -} - -/* - * Unmap nun_frames frames mapped at virtual address va. - */ -#define UNMAP_BATCH ((STACK_SIZE / 2) / sizeof(multicall_entry_t)) -int unmap_frames(unsigned long va, unsigned long num_frames) -{ - int n =3D UNMAP_BATCH; - multicall_entry_t call[n]; - int ret; - int i; - - ASSERT(!((unsigned long)va & ~PAGE_MASK)); - - DEBUG("va=3D%p, num=3D0x%lx\n", va, num_frames); - - while ( num_frames ) { - if ( n > num_frames ) - n =3D num_frames; - - for ( i =3D 0; i < n; i++ ) - { - int arg =3D 0; - /* simply update the PTE for the VA and invalidate TLB */ - call[i].op =3D __HYPERVISOR_update_va_mapping; - call[i].args[arg++] =3D va; - call[i].args[arg++] =3D 0; -#ifdef __i386__ - call[i].args[arg++] =3D 0; -#endif - call[i].args[arg++] =3D UVMF_INVLPG; - - va +=3D PAGE_SIZE; - } - - ret =3D HYPERVISOR_multicall(call, n); - if ( ret ) - { - printk("update_va_mapping hypercall failed with rc=3D%d.\n", ret); - return -ret; - } - - for ( i =3D 0; i < n; i++ ) - { - if ( call[i].result ) - { - printk("update_va_mapping failed for with rc=3D%d.\n", ret); - return -(call[i].result); - } - } - num_frames -=3D n; - } - return 0; -} - -/* - * Allocate pages which are contiguous in machine memory. - * Returns a VA to where they are mapped or 0 on failure. - * - * addr_bits indicates if the region has restrictions on where it is - * located. Typical values are 32 (if for example PCI devices can't access - * 64bit memory) or 0 for no restrictions. - * - * Allocated pages can be freed using the page allocators free_pages() - * function. - * - * based on Linux function xen_create_contiguous_region() - */ -#define MAX_CONTIG_ORDER 9 /* 2MB */ -unsigned long alloc_contig_pages(int order, unsigned int addr_bits) -{ - unsigned long in_va, va; - unsigned long in_frames[1UL << order], out_frames, mfn; - multicall_entry_t call[1UL << order]; - unsigned int i, num_pages =3D 1UL << order; - int ret, exch_success; - - /* pass in num_pages 'extends' of size 1 and - * request 1 extend of size 'order */ - struct xen_memory_exchange exchange =3D { - .in =3D { - .nr_extents =3D num_pages, - .extent_order =3D 0, - .domid =3D DOMID_SELF - }, - .out =3D { - .nr_extents =3D 1, - .extent_order =3D order, - .address_bits =3D addr_bits, - .domid =3D DOMID_SELF - }, - .nr_exchanged =3D 0 - }; - - if ( order > MAX_CONTIG_ORDER ) - { - printk("alloc_contig_pages: order too large 0x%x > 0x%x\n", - order, MAX_CONTIG_ORDER); - return 0; - } - - /* Allocate some potentially discontiguous pages */ - in_va =3D alloc_pages(order); - if ( !in_va ) - { - printk("alloc_contig_pages: could not get enough pages (order=3D0x%x\n", - order); - return 0; - } - - /* set up arguments for exchange hyper call */ - set_xen_guest_handle(exchange.in.extent_start, in_frames); - set_xen_guest_handle(exchange.out.extent_start, &out_frames); - - /* unmap current frames, keep a list of MFNs */ - for ( i =3D 0; i < num_pages; i++ ) - { - int arg =3D 0; - - va =3D in_va + (PAGE_SIZE * i); - in_frames[i] =3D virt_to_mfn(va); - - /* update P2M mapping */ - phys_to_machine_mapping[virt_to_pfn(va)] =3D INVALID_P2M_ENTRY; - - /* build multi call */ - call[i].op =3D __HYPERVISOR_update_va_mapping; - call[i].args[arg++] =3D va; - call[i].args[arg++] =3D 0; -#ifdef __i386__ - call[i].args[arg++] =3D 0; -#endif - call[i].args[arg++] =3D UVMF_INVLPG; - } - - ret =3D HYPERVISOR_multicall(call, i); - if ( ret ) - { - printk("Odd, update_va_mapping hypercall failed with rc=3D%d.\n", ret); - return 0; - } - - /* try getting a contig range of MFNs */ - out_frames =3D virt_to_pfn(in_va); /* PFNs to populate */ - ret =3D HYPERVISOR_memory_op(XENMEM_exchange, &exchange); - if ( ret ) { - printk("mem exchanged order=3D0x%x failed with rc=3D%d, nr_exchanged=3D%d\n", - order, ret, exchange.nr_exchanged); - /* we still need to return the allocated pages above to the pool - * ie. map them back into the 1:1 mapping etc. so we continue but - * in the end return the pages to the page allocator and return 0. */ - exch_success =3D 0; - } - else - exch_success =3D 1; - - /* map frames into 1:1 and update p2m */ - for ( i =3D 0; i < num_pages; i++ ) - { - int arg =3D 0; - pte_t pte; - - va =3D in_va + (PAGE_SIZE * i); - mfn =3D i < exchange.nr_exchanged =3F (out_frames + i) : in_frames[i]; - pte =3D __pte(mfn << PAGE_SHIFT | L1_PROT); - - /* update P2M mapping */ - phys_to_machine_mapping[virt_to_pfn(va)] =3D mfn; - - /* build multi call */ - call[i].op =3D __HYPERVISOR_update_va_mapping; - call[i].args[arg++] =3D va; -#ifdef __x86_64__ - call[i].args[arg++] =3D (pgentry_t)pte.pte; -#else - call[i].args[arg++] =3D pte.pte_low; - call[i].args[arg++] =3D pte.pte_high; -#endif - call[i].args[arg++] =3D UVMF_INVLPG; - } - ret =3D HYPERVISOR_multicall(call, i); - if ( ret ) - { - printk("update_va_mapping hypercall no. 2 failed with rc=3D%d.\n", ret); - return 0; - } - - if ( !exch_success ) - { - /* since the exchanged failed we just free the pages as well */ - free_pages((void *) in_va, order); - return 0; - } - - return in_va; -} - -/* - * Clear some of the bootstrap memory - */ -static void clear_bootstrap(void) -{ - pte_t nullpte =3D { }; - int rc; - - /* Use first page as the CoW zero page */ --===============4576138641625528538== 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 --===============4576138641625528538==-- From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:16:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:16: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 1YTqFS-00029G-I3; Fri, 06 Mar 2015 11:16:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFQ-00028w-JY for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:53 +0000 Content-Length: 99881 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id A9/02-03164-3AC89F45; Fri, 06 Mar 2015 11:16:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425640604!13636700!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19925 invoked from network); 6 Mar 2015 11:16:45 -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; 6 Mar 2015 11:16:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFI-0006Bn-1Y for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqFH-0001i4-Rs for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:43 +0000 Date: Fri, 06 Mar 2015 11:16:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Remove in-tree mini-os directory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============4576138641625528538==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4576138641625528538== Content-Length: 102422 Content-Transfer-Encoding: quoted-printable commit 7280bb923ad9853f541207f8e1aa1b4f1c513c91 Author: Wei Liu AuthorDate: Fri Jan 30 16:03:18 2015 +0000 Commit: Wei Liu CommitDate: Fri Feb 27 16:04:54 2015 +0000 Remove in-tree mini-os directory Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- extras/mini-os-intree/COPYING | 36 - extras/mini-os-intree/Config.mk | 99 -- extras/mini-os-intree/Makefile | 224 --- extras/mini-os-intree/README | 46 - extras/mini-os-intree/app.lds | 11 - extras/mini-os-intree/arch/arm/arm32.S | 294 ---- extras/mini-os-intree/arch/arm/events.c | 31 - extras/mini-os-intree/arch/arm/hypercalls32.S | 64 - extras/mini-os-intree/arch/arm/minios-arm32.lds | 83 -- extras/mini-os-intree/arch/arm/mm.c | 139 -- extras/mini-os-intree/arch/arm/panic.c | 98 -- extras/mini-os-intree/arch/arm/sched.c | 47 - extras/mini-os-intree/arch/arm/setup.c | 119 -- extras/mini-os-intree/arch/arm/time.c | 136 -- extras/mini-os-intree/arch/x86/Makefile | 30 - extras/mini-os-intree/arch/x86/arch.mk | 22 - extras/mini-os-intree/arch/x86/events.c | 35 - extras/mini-os-intree/arch/x86/ioremap.c | 75 - extras/mini-os-intree/arch/x86/iorw.c | 35 - extras/mini-os-intree/arch/x86/minios-x86_32.lds | 74 - extras/mini-os-intree/arch/x86/minios-x86_64.lds | 74 - extras/mini-os-intree/arch/x86/mm.c | 957 ------------ extras/mini-os-intree/arch/x86/sched.c | 139 -- extras/mini-os-intree/arch/x86/setup.c | 168 --- extras/mini-os-intree/arch/x86/time.c | 238 --- extras/mini-os-intree/arch/x86/traps.c | 333 ----- extras/mini-os-intree/arch/x86/x86_32.S | 305 ---- extras/mini-os-intree/arch/x86/x86_64.S | 383 ----- extras/mini-os-intree/blkfront.c | 736 ---------- extras/mini-os-intree/config/MiniOS.mk | 10 - extras/mini-os-intree/config/StdGNU.mk | 47 - extras/mini-os-intree/config/arm32.mk | 22 - extras/mini-os-intree/config/arm64.mk | 19 - extras/mini-os-intree/config/x86_32.mk | 20 - extras/mini-os-intree/config/x86_64.mk | 33 - extras/mini-os-intree/console/console.c | 164 -- extras/mini-os-intree/console/console.h | 2 - extras/mini-os-intree/console/xenbus.c | 195 --- extras/mini-os-intree/console/xencons_ring.c | 195 --- extras/mini-os-intree/daytime.c | 67 - extras/mini-os-intree/domain_config | 19 - extras/mini-os-intree/events.c | 269 ---- extras/mini-os-intree/fbfront.c | 710 --------- extras/mini-os-intree/gntmap.c | 250 ---- extras/mini-os-intree/gnttab.c | 196 --- extras/mini-os-intree/hypervisor.c | 132 -- extras/mini-os-intree/include/arch/cc.h | 87 -- extras/mini-os-intree/include/arch/perf.h | 15 - extras/mini-os-intree/include/arch/sys_arch.h | 35 - extras/mini-os-intree/include/arm/arch_endian.h | 7 - extras/mini-os-intree/include/arm/arch_limits.h | 9 - extras/mini-os-intree/include/arm/arch_mm.h | 38 - extras/mini-os-intree/include/arm/arch_sched.h | 19 - extras/mini-os-intree/include/arm/arch_spinlock.h | 36 - .../include/arm/arm32/arch_wordsize.h | 1 - extras/mini-os-intree/include/arm/gic.h | 1 - extras/mini-os-intree/include/arm/hypercall-arm.h | 98 -- extras/mini-os-intree/include/arm/os.h | 216 --- extras/mini-os-intree/include/arm/traps.h | 20 - extras/mini-os-intree/include/blkfront.h | 54 - extras/mini-os-intree/include/byteorder.h | 36 - extras/mini-os-intree/include/byteswap.h | 39 - extras/mini-os-intree/include/compiler.h | 10 - extras/mini-os-intree/include/console.h | 89 -- extras/mini-os-intree/include/ctype.h | 60 - extras/mini-os-intree/include/endian.h | 19 - extras/mini-os-intree/include/err.h | 31 - extras/mini-os-intree/include/errno-base.h | 39 - extras/mini-os-intree/include/errno.h | 122 -- extras/mini-os-intree/include/events.h | 59 - extras/mini-os-intree/include/fbfront.h | 46 - extras/mini-os-intree/include/fcntl.h | 99 -- extras/mini-os-intree/include/gntmap.h | 35 - extras/mini-os-intree/include/gnttab.h | 17 - extras/mini-os-intree/include/hypervisor.h | 48 - extras/mini-os-intree/include/ioremap.h | 33 - extras/mini-os-intree/include/iorw.h | 16 - extras/mini-os-intree/include/kernel.h | 9 - extras/mini-os-intree/include/lib-gpl.h | 59 - extras/mini-os-intree/include/lib.h | 230 --- extras/mini-os-intree/include/linux/types.h | 5 - extras/mini-os-intree/include/lwipopts.h | 23 - .../mini-os-intree/include/minios-external/README | 24 - .../include/minios-external/bsd-COPYRIGHT | 126 -- .../include/minios-external/bsd-queue.3 | 1044 ------------- .../minios-external/bsd-sys-queue-h-seddery | 72 - .../include/minios-external/bsd-sys-queue.h | 637 -------- extras/mini-os-intree/include/mm.h | 82 - extras/mini-os-intree/include/netfront.h | 24 - extras/mini-os-intree/include/pcifront.h | 29 - extras/mini-os-intree/include/posix/arpa/inet.h | 7 - extras/mini-os-intree/include/posix/dirent.h | 24 - extras/mini-os-intree/include/posix/err.h | 15 - extras/mini-os-intree/include/posix/fcntl.h | 11 - extras/mini-os-intree/include/posix/limits.h | 48 - extras/mini-os-intree/include/posix/net/if.h | 85 -- extras/mini-os-intree/include/posix/netdb.h | 9 - extras/mini-os-intree/include/posix/netinet/in.h | 7 - extras/mini-os-intree/include/posix/netinet/tcp.h | 6 - extras/mini-os-intree/include/posix/poll.h | 1 - extras/mini-os-intree/include/posix/pthread.h | 64 - extras/mini-os-intree/include/posix/signal.h | 10 - extras/mini-os-intree/include/posix/stdlib.h | 8 - extras/mini-os-intree/include/posix/strings.h | 12 - extras/mini-os-intree/include/posix/sys/ioctl.h | 16 - extras/mini-os-intree/include/posix/sys/mman.h | 22 - extras/mini-os-intree/include/posix/sys/poll.h | 79 - extras/mini-os-intree/include/posix/sys/select.h | 7 - extras/mini-os-intree/include/posix/sys/socket.h | 31 - extras/mini-os-intree/include/posix/sys/stat.h | 7 - extras/mini-os-intree/include/posix/syslog.h | 37 - extras/mini-os-intree/include/posix/termios.h | 87 -- extras/mini-os-intree/include/posix/time.h | 11 - extras/mini-os-intree/include/posix/unistd.h | 16 - extras/mini-os-intree/include/sched.h | 55 - extras/mini-os-intree/include/semaphore.h | 110 -- extras/mini-os-intree/include/spinlock.h | 55 - extras/mini-os-intree/include/sys/lock.h | 52 - extras/mini-os-intree/include/sys/time.h | 47 - extras/mini-os-intree/include/time.h | 63 - extras/mini-os-intree/include/tpm_tis.h | 61 - extras/mini-os-intree/include/tpmback.h | 104 -- extras/mini-os-intree/include/tpmfront.h | 97 -- extras/mini-os-intree/include/types.h | 74 - extras/mini-os-intree/include/wait.h | 105 -- extras/mini-os-intree/include/waittypes.h | 32 - extras/mini-os-intree/include/x86/arch_endian.h | 7 - extras/mini-os-intree/include/x86/arch_limits.h | 20 - extras/mini-os-intree/include/x86/arch_mm.h | 233 --- extras/mini-os-intree/include/x86/arch_sched.h | 25 - extras/mini-os-intree/include/x86/arch_spinlock.h | 94 -- extras/mini-os-intree/include/x86/os.h | 572 -------- extras/mini-os-intree/include/x86/traps.h | 78 - .../include/x86/x86_32/arch_wordsize.h | 1 - .../include/x86/x86_32/hypercall-x86_32.h | 337 ----- .../include/x86/x86_64/arch_wordsize.h | 2 - .../include/x86/x86_64/hypercall-x86_64.h | 344 ----- extras/mini-os-intree/include/xen/COPYING | 38 - extras/mini-os-intree/include/xen/arch-arm.h | 432 ------ .../mini-os-intree/include/xen/arch-arm/hvm/save.h | 39 - extras/mini-os-intree/include/xen/arch-x86/cpuid.h | 90 -- .../mini-os-intree/include/xen/arch-x86/hvm/save.h | 630 -------- .../mini-os-intree/include/xen/arch-x86/xen-mca.h | 440 ------ .../include/xen/arch-x86/xen-x86_32.h | 171 --- .../include/xen/arch-x86/xen-x86_64.h | 202 --- extras/mini-os-intree/include/xen/arch-x86/xen.h | 303 ---- extras/mini-os-intree/include/xen/arch-x86_32.h | 27 - extras/mini-os-intree/include/xen/arch-x86_64.h | 43 - extras/mini-os-intree/include/xen/callback.h | 121 -- extras/mini-os-intree/include/xen/dom0_ops.h | 120 -- extras/mini-os-intree/include/xen/domctl.h | 1154 --------------- extras/mini-os-intree/include/xen/elfnote.h | 271 ---- extras/mini-os-intree/include/xen/event_channel.h | 385 ----- extras/mini-os-intree/include/xen/features.h | 114 -- extras/mini-os-intree/include/xen/gcov.h | 115 -- extras/mini-os-intree/include/xen/grant_table.h | 682 --------- extras/mini-os-intree/include/xen/hvm/e820.h | 34 - .../include/xen/hvm/hvm_info_table.h | 72 - extras/mini-os-intree/include/xen/hvm/hvm_op.h | 402 ----- .../include/xen/hvm/hvm_xs_strings.h | 80 - extras/mini-os-intree/include/xen/hvm/ioreq.h | 129 -- extras/mini-os-intree/include/xen/hvm/params.h | 199 --- extras/mini-os-intree/include/xen/hvm/pvdrivers.h | 49 - extras/mini-os-intree/include/xen/hvm/save.h | 111 -- extras/mini-os-intree/include/xen/io/blkif.h | 640 -------- extras/mini-os-intree/include/xen/io/console.h | 51 - extras/mini-os-intree/include/xen/io/fbif.h | 176 --- extras/mini-os-intree/include/xen/io/fsif.h | 192 --- extras/mini-os-intree/include/xen/io/kbdif.h | 132 -- extras/mini-os-intree/include/xen/io/libxenvchan.h | 97 -- extras/mini-os-intree/include/xen/io/netif.h | 305 ---- extras/mini-os-intree/include/xen/io/pciif.h | 125 -- extras/mini-os-intree/include/xen/io/protocols.h | 40 - extras/mini-os-intree/include/xen/io/ring.h | 312 ---- extras/mini-os-intree/include/xen/io/tpmif.h | 143 -- extras/mini-os-intree/include/xen/io/usbif.h | 150 -- extras/mini-os-intree/include/xen/io/vscsiif.h | 260 ---- extras/mini-os-intree/include/xen/io/xenbus.h | 80 - extras/mini-os-intree/include/xen/io/xs_wire.h | 149 -- extras/mini-os-intree/include/xen/kexec.h | 249 ---- extras/mini-os-intree/include/xen/mem_event.h | 134 -- extras/mini-os-intree/include/xen/memory.h | 587 -------- extras/mini-os-intree/include/xen/nmi.h | 85 -- extras/mini-os-intree/include/xen/physdev.h | 380 ----- extras/mini-os-intree/include/xen/platform.h | 606 -------- extras/mini-os-intree/include/xen/sched.h | 175 --- extras/mini-os-intree/include/xen/sysctl.h | 719 --------- extras/mini-os-intree/include/xen/tmem.h | 152 -- extras/mini-os-intree/include/xen/trace.h | 331 ----- extras/mini-os-intree/include/xen/vcpu.h | 240 --- extras/mini-os-intree/include/xen/version.h | 96 -- extras/mini-os-intree/include/xen/xen-compat.h | 44 - extras/mini-os-intree/include/xen/xen.h | 899 ------------ extras/mini-os-intree/include/xen/xencomm.h | 41 - extras/mini-os-intree/include/xen/xenoprof.h | 152 -- extras/mini-os-intree/include/xen/xsm/flask_op.h | 201 --- extras/mini-os-intree/include/xenbus.h | 120 -- extras/mini-os-intree/include/xmalloc.h | 44 - extras/mini-os-intree/kernel.c | 198 --- extras/mini-os-intree/lib/ctype.c | 29 - extras/mini-os-intree/lib/math.c | 426 ------ extras/mini-os-intree/lib/printf.c | 786 ---------- extras/mini-os-intree/lib/stack_chk_fail.c | 8 - extras/mini-os-intree/lib/string.c | 228 --- extras/mini-os-intree/lib/sys.c | 1550 -------------------- extras/mini-os-intree/lib/xmalloc.c | 319 ---- extras/mini-os-intree/lib/xs.c | 194 --- extras/mini-os-intree/lock.c | 112 -- extras/mini-os-intree/lwip-arch.c | 293 ---- extras/mini-os-intree/lwip-net.c | 386 ----- extras/mini-os-intree/main.c | 193 --- extras/mini-os-intree/minios.mk | 76 - extras/mini-os-intree/mm.c | 441 ------ extras/mini-os-intree/netfront.c | 675 --------- extras/mini-os-intree/pcifront.c | 616 -------- extras/mini-os-intree/sched.c | 304 ---- extras/mini-os-intree/test.c | 577 -------- extras/mini-os-intree/tpm_tis.c | 1523 ------------------- extras/mini-os-intree/tpmback.c | 1136 -------------- extras/mini-os-intree/tpmfront.c | 631 -------- extras/mini-os-intree/xenbus/xenbus.c | 870 ----------- 221 files changed, 0 insertions(+), 40498 deletions(-) diff --git a/extras/mini-os-intree/COPYING b/extras/mini-os-intree/COPYING deleted file mode 100644 index 1d9df6c..0000000 --- a/extras/mini-os-intree/COPYING +++ /dev/null @@ -1,36 +0,0 @@ -Certain files in this directory are licensed by the GNU -General Public License version 2 (GPLv2). By default these -files are not built and linked into MiniOs. Enabling them -will cause the whole work to become covered by the GPLv2. - -The current set of GPLv2 features are: -CONFIG_TPMFRONT -CONFIG_TPMBACK -CONFIG_TPM_TIS - -Do not use these if you do not want your MiniOS build to become -GPL licensed! - -Copyright (c) 2009 Citrix Systems, Inc. All rights reserved. - -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 AUTHOR 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 AUTHOR 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. - diff --git a/extras/mini-os-intree/Config.mk b/extras/mini-os-intree/Config.mk deleted file mode 100644 index e5d8ade..0000000 --- a/extras/mini-os-intree/Config.mk +++ /dev/null @@ -1,99 +0,0 @@ -# -# Compare $(1) and $(2) and replace $(2) with $(1) if they differ -# -# Typically $(1) is a newly generated file and $(2) is the target file -# being regenerated. This prevents changing the timestamp of $(2) only -# due to being auto regenereated with the same contents. -define move-if-changed - if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi -endef - -# cc-option: Check if compiler supports first option, else fall back to second. -# -# This is complicated by the fact that unrecognised -Wno-* options: -# (a) are ignored unless the compilation emits a warning; and -# (b) even then produce a warning rather than an error -# To handle this we do a test compile, passing the option-under-test, on a code -# fragment that will always produce a warning (integer assigned to pointer). -# We then grep for the option-under-test in the compiler's output, the presence -# of which would indicate an "unrecognized command-line option" warning/error. -# -# Usage: cflags-y +=3D $(call cc-option,$(CC),-march=3Dwinchip-c6,-march=3Di586) -cc-option =3D $(shell if test -z "`echo 'void*p=3D1;' | \ - $(1) $(2) -S -o /dev/null -x c - 2>&1 | grep -- $(2) -`"; \ - then echo "$(2)"; else echo "$(3)"; fi ;) - -# Compatibility with Xen's stubdom build environment. If we are building -# stubdom, some XEN_ variables are set, set MINIOS_ variables accordingly. -# -ifneq ($(XEN_ROOT),) -MINI-OS_ROOT=3D$(XEN_ROOT)/extras/mini-os -else -MINI-OS_ROOT=3D$(TOPLEVEL_DIR) -endif -export MINI-OS_ROOT - -ifneq ($(XEN_TARGET_ARCH),) -MINIOS_TARGET_ARCH =3D $(XEN_TARGET_ARCH) -else -MINIOS_COMPILE_ARCH =3F=3D $(shell uname -m | sed -e s/i.86/x86_32/ \ - -e s/i86pc/x86_32/ -e s/amd64/x86_64/ \ - -e s/armv7.*/arm32/ -e s/armv8.*/arm64/ \ - -e s/aarch64/arm64/) - -MINIOS_TARGET_ARCH =3F=3D $(MINIOS_COMPILE_ARCH) -endif - -libc =3D $(stubdom) - -XEN_INTERFACE_VERSION :=3D 0x00030205 -export XEN_INTERFACE_VERSION - -# Try to find out the architecture family TARGET_ARCH_FAM. -# First check whether x86_... is contained (for x86_32, x86_32y, x86_64). -# If not x86 then use $(MINIOS_TARGET_ARCH) -ifeq ($(findstring x86_,$(MINIOS_TARGET_ARCH)),x86_) -TARGET_ARCH_FAM =3D x86 -else -TARGET_ARCH_FAM =3D $(MINIOS_TARGET_ARCH) -endif - -# The architecture family directory below mini-os. -TARGET_ARCH_DIR :=3D arch/$(TARGET_ARCH_FAM) - -# Export these variables for possible use in architecture dependent makefiles. -export TARGET_ARCH_DIR -export TARGET_ARCH_FAM - -# This is used for architecture specific links. -# This can be overwritten from arch specific rules. -ARCH_LINKS =3D - -# The path pointing to the architecture specific header files. -ARCH_INC :=3D $(TARGET_ARCH_FAM) - -# For possible special header directories. -# This can be overwritten from arch specific rules. -EXTRA_INC =3D $(ARCH_INC) - -# Include the architecture family's special makerules. -# This must be before include minios.mk! -include $(MINI-OS_ROOT)/$(TARGET_ARCH_DIR)/arch.mk - -extra_incl :=3D $(foreach dir,$(EXTRA_INC),-isystem $(MINI-OS_ROOT)/include/$(dir)) - -DEF_CPPFLAGS +=3D -isystem $(MINI-OS_ROOT)/include -DEF_CPPFLAGS +=3D -D__MINIOS__ - -ifeq ($(libc),y) -DEF_CPPFLAGS +=3D -DHAVE_LIBC -DEF_CPPFLAGS +=3D -isystem $(MINI-OS_ROOT)/include/posix -DEF_CPPFLAGS +=3D -isystem $(XEN_ROOT)/tools/xenstore/include -endif - -ifneq ($(LWIPDIR),) -lwip=3Dy -DEF_CPPFLAGS +=3D -DHAVE_LWIP -DEF_CPPFLAGS +=3D -isystem $(LWIPDIR)/src/include -DEF_CPPFLAGS +=3D -isystem $(LWIPDIR)/src/include/ipv4 -endif diff --git a/extras/mini-os-intree/Makefile b/extras/mini-os-intree/Makefile deleted file mode 100644 index f16520e..0000000 --- a/extras/mini-os-intree/Makefile +++ /dev/null @@ -1,224 +0,0 @@ -# Common Makefile for mini-os. -# -# Every architecture directory below mini-os/arch has to have a -# Makefile and a arch.mk. -# - -OBJ_DIR=3D$(CURDIR) -TOPLEVEL_DIR=3D$(CURDIR) - -ifeq ($(MINIOS_CONFIG),) -include Config.mk -else -EXTRA_DEPS +=3D $(MINIOS_CONFIG) -include $(MINIOS_CONFIG) -endif - -include $(MINI-OS_ROOT)/config/MiniOS.mk - -# Configuration defaults -CONFIG_START_NETWORK =3F=3D y -CONFIG_SPARSE_BSS =3F=3D y -CONFIG_QEMU_XS_ARGS =3F=3D n -CONFIG_TEST =3F=3D n -CONFIG_PCIFRONT =3F=3D n -CONFIG_BLKFRONT =3F=3D y -CONFIG_TPMFRONT =3F=3D n -CONFIG_TPM_TIS =3F=3D n -CONFIG_TPMBACK =3F=3D n -CONFIG_NETFRONT =3F=3D y -CONFIG_FBFRONT =3F=3D y -CONFIG_KBDFRONT =3F=3D y -CONFIG_CONSFRONT =3F=3D y -CONFIG_XENBUS =3F=3D y -CONFIG_XC =3F=3Dy -CONFIG_LWIP =3F=3D $(lwip) - -# Export config items as compiler directives -flags-$(CONFIG_START_NETWORK) +=3D -DCONFIG_START_NETWORK -flags-$(CONFIG_SPARSE_BSS) +=3D -DCONFIG_SPARSE_BSS -flags-$(CONFIG_QEMU_XS_ARGS) +=3D -DCONFIG_QEMU_XS_ARGS -flags-$(CONFIG_PCIFRONT) +=3D -DCONFIG_PCIFRONT -flags-$(CONFIG_BLKFRONT) +=3D -DCONFIG_BLKFRONT -flags-$(CONFIG_TPMFRONT) +=3D -DCONFIG_TPMFRONT -flags-$(CONFIG_TPM_TIS) +=3D -DCONFIG_TPM_TIS -flags-$(CONFIG_TPMBACK) +=3D -DCONFIG_TPMBACK -flags-$(CONFIG_NETFRONT) +=3D -DCONFIG_NETFRONT -flags-$(CONFIG_KBDFRONT) +=3D -DCONFIG_KBDFRONT -flags-$(CONFIG_FBFRONT) +=3D -DCONFIG_FBFRONT -flags-$(CONFIG_CONSFRONT) +=3D -DCONFIG_CONSFRONT -flags-$(CONFIG_XENBUS) +=3D -DCONFIG_XENBUS - -DEF_CFLAGS +=3D $(flags-y) - -# Symlinks and headers that must be created before building the C files -GENERATED_HEADERS :=3D include/list.h $(ARCH_LINKS) include/mini-os include/$(TARGET_ARCH_FAM)/mini-os - -EXTRA_DEPS +=3D $(GENERATED_HEADERS) - -# Include common mini-os makerules. -include minios.mk - -# Set tester flags -# CFLAGS +=3D -DBLKTEST_WRITE - -# Define some default flags for linking. -LDLIBS :=3D -APP_LDLIBS :=3D -LDARCHLIB :=3D -L$(OBJ_DIR)/$(TARGET_ARCH_DIR) -l$(ARCH_LIB_NAME) -LDFLAGS_FINAL :=3D -T $(TARGET_ARCH_DIR)/minios-$(MINIOS_TARGET_ARCH).lds - -# Prefix for global API names. All other symbols are localised before -# linking with EXTRA_OBJS. -GLOBAL_PREFIX :=3D xenos_ -EXTRA_OBJS =3D - -TARGET :=3D mini-os - -# Subdirectories common to mini-os -SUBDIRS :=3D lib xenbus console - -src-$(CONFIG_BLKFRONT) +=3D blkfront.c -src-$(CONFIG_TPMFRONT) +=3D tpmfront.c -src-$(CONFIG_TPM_TIS) +=3D tpm_tis.c -src-$(CONFIG_TPMBACK) +=3D tpmback.c -src-y +=3D daytime.c -src-y +=3D events.c -src-$(CONFIG_FBFRONT) +=3D fbfront.c -src-y +=3D gntmap.c -src-y +=3D gnttab.c -src-y +=3D hypervisor.c -src-y +=3D kernel.c -src-y +=3D lock.c -src-y +=3D main.c -src-y +=3D mm.c -src-$(CONFIG_NETFRONT) +=3D netfront.c -src-$(CONFIG_PCIFRONT) +=3D pcifront.c -src-y +=3D sched.c -src-$(CONFIG_TEST) +=3D test.c - -src-y +=3D lib/ctype.c -src-y +=3D lib/math.c -src-y +=3D lib/printf.c -src-y +=3D lib/stack_chk_fail.c -src-y +=3D lib/string.c -src-y +=3D lib/sys.c -src-y +=3D lib/xmalloc.c -src-$(CONFIG_XENBUS) +=3D lib/xs.c - -src-$(CONFIG_XENBUS) +=3D xenbus/xenbus.c - -src-y +=3D console/console.c -src-y +=3D console/xencons_ring.c -src-$(CONFIG_CONSFRONT) +=3D console/xenbus.c - -# The common mini-os objects to build. -APP_OBJS :=3D -OBJS :=3D $(patsubst %.c,$(OBJ_DIR)/%.o,$(src-y)) - -.PHONY: default -default: $(OBJ_DIR)/$(TARGET) - -# Create special architecture specific links. The function arch_links -# has to be defined in arch.mk (see include above). -ifneq ($(ARCH_LINKS),) -$(ARCH_LINKS): - $(arch_links) -endif - -include/list.h: include/minios-external/bsd-sys-queue-h-seddery include/minios-external/bsd-sys-queue.h - perl $^ --prefix=3Dminios >$@.new - $(call move-if-changed,$@.new,$@) - -# Used by stubdom's Makefile -.PHONY: links -links: $(GENERATED_HEADERS) - -include/mini-os: - ln -sf . $@ - -include/$(TARGET_ARCH_FAM)/mini-os: - ln -sf . $@ - -.PHONY: arch_lib -arch_lib: - $(MAKE) --directory=3D$(TARGET_ARCH_DIR) OBJ_DIR=3D$(OBJ_DIR)/$(TARGET_ARCH_DIR) || exit 1; - -ifeq ($(CONFIG_LWIP),y) -# lwIP library -LWC :=3D $(shell find $(LWIPDIR)/src -type f -name '*.c') -LWC :=3D $(filter-out %6.c %ip6_addr.c %ethernetif.c, $(LWC)) -LWO :=3D $(patsubst %.c,%.o,$(LWC)) -LWO +=3D $(OBJ_DIR)/lwip-arch.o -ifeq ($(CONFIG_NETFRONT),y) -LWO +=3D $(OBJ_DIR)/lwip-net.o -endif - -$(OBJ_DIR)/lwip.a: $(LWO) - $(RM) $@ - $(AR) cqs $@ $^ - -OBJS +=3D $(OBJ_DIR)/lwip.a -endif - -OBJS :=3D $(filter-out $(OBJ_DIR)/lwip%.o $(LWO), $(OBJS)) - -ifeq ($(libc),y) -ifeq ($(CONFIG_XC),y) -APP_LDLIBS +=3D -L$(XEN_ROOT)/stubdom/libxc-$(XEN_TARGET_ARCH) -whole-archive -lxenguest -lxenctrl -no-whole-archive -endif -APP_LDLIBS +=3D -lpci -APP_LDLIBS +=3D -lz -APP_LDLIBS +=3D -lm -LDLIBS +=3D -lc -endif - -ifneq ($(APP_OBJS)-$(lwip),-y) -OBJS :=3D $(filter-out $(OBJ_DIR)/daytime.o, $(OBJS)) -endif - -$(OBJ_DIR)/$(TARGET)_app.o: $(APP_OBJS) app.lds - $(LD) -r -d $(LDFLAGS) -\( $^ -\) $(APP_LDLIBS) --undefined main -o $@ - -ifneq ($(APP_OBJS),) -APP_O=3D$(OBJ_DIR)/$(TARGET)_app.o -endif - -$(OBJ_DIR)/$(TARGET): $(OBJS) $(APP_O) arch_lib - $(LD) -r $(LDFLAGS) $(HEAD_OBJ) $(APP_O) $(OBJS) $(LDARCHLIB) $(LDLIBS) -o $@.o - $(OBJCOPY) -w -G $(GLOBAL_PREFIX)* -G _start $@.o $@.o - $(LD) $(LDFLAGS) $(LDFLAGS_FINAL) $@.o $(EXTRA_OBJS) -o $@ - gzip -f -9 -c $@ >$@.gz - -.PHONY: clean arch_clean - -arch_clean: - $(MAKE) --directory=3D$(TARGET_ARCH_DIR) OBJ_DIR=3D$(OBJ_DIR)/$(TARGET_ARCH_DIR) clean || exit 1; - -clean: arch_clean - for dir in $(addprefix $(OBJ_DIR)/,$(SUBDIRS)); do \ - rm -f $$dir/*.o; \ - done - rm -f include/list.h - rm -f $(OBJ_DIR)/*.o *~ $(OBJ_DIR)/core $(OBJ_DIR)/$(TARGET).elf $(OBJ_DIR)/$(TARGET).raw $(OBJ_DIR)/$(TARGET) $(OBJ_DIR)/$(TARGET).gz - find . $(OBJ_DIR) -type l | xargs rm -f - $(RM) $(OBJ_DIR)/lwip.a $(LWO) - rm -f tags TAGS - - -define all_sources - ( find . -follow -name SCCS -prune -o -name '*.[chS]' -print ) -endef - -.PHONY: cscope -cscope: - $(all_sources) > cscope.files - cscope -k -b -q - -.PHONY: tags -tags: - $(all_sources) | xargs ctags - -.PHONY: TAGS -TAGS: - $(all_sources) | xargs etags diff --git a/extras/mini-os-intree/README b/extras/mini-os-intree/README deleted file mode 100644 index 7960314..0000000 --- a/extras/mini-os-intree/README +++ /dev/null @@ -1,46 +0,0 @@ - Minimal OS - ---------- - -This shows some of the stuff that any guest OS will have to set up. - -This includes: - - * installing a virtual exception table - * handling virtual exceptions - * handling asynchronous events - * enabling/disabling async events - * parsing start_info struct at start-of-day - * registering virtual interrupt handlers (for timer interrupts) - * a simple page and memory allocator - * minimal libc support - * minimal Copy-on-Write support - * network, block, framebuffer support - * transparent access to FileSystem exports (see tools/fs-back) - -- to build it just type make. - -- to build it with TCP/IP support, download LWIP 1.3.2 source code and type - - make LWIPDIR=3D/path/to/lwip/source - -- to build it with much better libc support, see the stubdom/ directory - -- to start it do the following in domain0 - # xl create -c domain_config - -This starts the kernel and prints out a bunch of stuff and then once every -second the system time. - -If you have setup a disk in the config file (e.g. -disk =3D [ 'file:/tmp/foo,hda,r' ] ), it will loop reading it. If that disk is -writable (e.g. disk =3D [ 'file:/tmp/foo,hda,w' ] ), it will write data patterns -and re-read them. - -If you have setup a network in the config file (e.g. vif =3D [''] ), it will -print incoming packets. - -If you have setup a VFB in the config file (e.g. vfb =3D ['type=3Dsdl'] ), it will -show a mouse with which you can draw color squares. - -If you have compiled it with TCP/IP support, it will run a daytime server on -TCP port 13. diff --git a/extras/mini-os-intree/app.lds b/extras/mini-os-intree/app.lds deleted file mode 100644 index 4a48cc8..0000000 --- a/extras/mini-os-intree/app.lds +++ /dev/null @@ -1,11 +0,0 @@ -SECTIONS -{ - .app.bss : { - __app_bss_start =3D . ; - *(.bss .bss.*) - *(COMMON) - *(.lbss .lbss.*) - *(LARGE_COMMON) - __app_bss_end =3D . ; - } -} diff --git a/extras/mini-os-intree/arch/arm/arm32.S b/extras/mini-os-intree/arch/arm/arm32.S deleted file mode 100644 index a08a170..0000000 --- a/extras/mini-os-intree/arch/arm/arm32.S +++ /dev/null @@ -1,294 +0,0 @@ -@ Offset of the kernel within the RAM. This is a Linux/zImage convention which we -@ rely on for now. -#define ZIMAGE_KERNEL_OFFSET 0x8000 - -.section .text - -.globl _start -_start: - @ zImage header -.rept 8 - mov r0, r0 -.endr - b reset - .word 0x016f2818 @ Magic numbers to help the loader - .word 0 @ zImage start address (0 =3D relocatable) - .word _edata - _start @ zImage end address (excludes bss section) - @ end of zImage header - -@ Called at boot time. Sets up MMU, exception vectors and stack, and then calls C arch_init() function. -@ =3D> r2 -> DTB -@ <=3D never returns -@ Note: this boot code needs to be within the first (1MB - ZIMAGE_KERNEL_OFFSET) of _start. -reset: - @ Problem: the C code wants to be at a known address (_start), but Xen might - @ load us anywhere. We initialise the MMU (mapping virtual to physical @ addresses) - @ so everything ends up where the code expects it to be. - @ - @ We calculate the offet between where the linker thought _start would be and where - @ it actually is and initialise the page tables to have that offset for every page. - @ - @ When we turn on the MMU, we're still executing at the old address. We don't want - @ the code to disappear from under us. So we have to do the mapping in stages: - @ - @ 1. set up a mapping to our current page from both its current and desired addresses - @ 2. enable the MMU - @ 3. jump to the new address - @ 4. remap all the other pages with the calculated offset - - adr r1, _start @ r1 =3D physical address of _start - ldr r3, =3D_start @ r3 =3D (desired) virtual address of _start - sub r9, r1, r3 @ r9 =3D (physical - virtual) offset - - ldr r7, =3D_page_dir @ r7 =3D (desired) virtual addr of translation table - add r1, r7, r9 @ r1 =3D physical addr of translation table - - @ Tell the system where our page table is located. - @ This is the 16 KB top-level translation table, in which - @ each word maps one 1MB virtual section to a physical section. - @ Note: We leave TTBCR as 0, meaning that only TTBR0 is used and - @ we use the short-descriptor format (32-bit physical addresses). - orr r0, r1, #0b0001011 @ Sharable, Inner/Outer Write-Back Write-Allocate Cacheable - mcr p15, 0, r0, c2, c0, 0 @ set TTBR0 - - @ Set access permission for domains. - @ Domains are deprecated, but we have to configure them anyway. - @ We mark every page as being domain 0 and set domain 0 to "client mode" - @ (client mode =3D use access flags in page table). - mov r0, #1 @ 1 =3D client - mcr p15, 0, r0, c3, c0, 0 @ DACR - - @ Template (flags) for a 1 MB page-table entry. - @ TEX[2:0] C B =3D 001 1 1 (outer and inner write-back, write-allocate) - ldr r8, =3D(0x2 + /* Section entry */ \ - 0xc + /* C B */ \ - (3 << 10) + /* Read/write */ \ - (1 << 12) + /* TEX */ \ - (1 << 16) + /* Sharable */ \ - (1<<19)) /* Non-secure */ - @ r8 =3D template page table entry - - @ Add an entry for the current physical section, at the old and new - @ addresses. It's OK if they're the same. - mov r0, pc, lsr#20 - mov r0, r0, lsl#20 @ r0 =3D physical address of this code's section start - orr r3, r0, r8 @ r3 =3D table entry for this section - ldr r4, =3D_start @ r4 =3D desired virtual address of this section - str r3, [r1, r4, lsr#18] @ map desired virtual section to this code - str r3, [r1, r0, lsr#18] @ map current section to this code too - - @ Invalidate TLB - dsb @ Caching is off, but must still prevent reordering - mcr p15, 0, r1, c8, c7, 0 @ TLBIALL - - @ Enable MMU / SCTLR - mrc p15, 0, r1, c1, c0, 0 @ SCTLR - orr r1, r1, #3 << 11 @ enable icache, branch prediction - orr r1, r1, #4 + 1 @ enable dcache, MMU - mcr p15, 0, r1, c1, c0, 0 @ SCTLR - isb - - ldr r1, =3Dstage2 @ Virtual address of stage2 - bx r1 - -@ Called once the MMU is enabled. The boot code and the page table are mapped, -@ but nothing else is yet. -@ -@ =3D> r2 -> dtb (physical) -@ r7 =3D virtual address of page table -@ r8 =3D section entry template (flags) -@ r9 =3D desired physical - virtual offset -@ pc -> somewhere in newly-mapped virtual code section -stage2: - @ Invalidate TLB - mcr p15, 0, r1, c8, c7, 0 @ TLBIALL - isb - - @ The new mapping has now taken effect: - @ r7 -> page_dir - - @ Fill in the whole top-level translation table (at page_dir). - @ Populate the whole pagedir with 1MB section descriptors. - - mov r1, r7 @ r1 -> first section entry - add r3, r1, #4*4*1024 @ limit (4 GB address space, 4 byte entries) - orr r0, r8, r9 @ r0 =3D entry mapping section zero to start of physical RAM -1: - str r0, [r1],#4 @ write the section entry - add r0, r0, #1 << 20 @ next physical page (wraps) - cmp r1, r3 - bne 1b - - @ Invalidate TLB - dsb - mcr p15, 0, r1, c8, c7, 0 @ TLBIALL - isb - - @ Set VBAR -> exception_vector_table - @ SCTLR.V =3D 0 - adr r0, exception_vector_table - mcr p15, 0, r0, c12, c0, 0 - - @ Enable hardware floating point: - @ 1. Access to CP10 and CP11 must be enabled in the Coprocessor Access - @ Control Register (CP15.CACR): - mrc p15, 0, r1, c1, c0, 2 @ CACR - orr r1, r1, #(3 << 20) + (3 << 22) @ full access for CP10 & CP11 - mcr p15, 0, r1, c1, c0, 2 - @ 2. The EN bit in the FPEXC register must be set: - vmrs r0, FPEXC - orr r0, r0, #1<<30 @ EN (enable) - vmsr FPEXC, r0 - - @ Initialise 16 KB stack - ldr sp, =3D_boot_stack_end - - sub r0, r2, r9 @ r0 -> device tree (virtual address) - mov r1, r9 @ r1 =3D physical_address_offset - - b arch_init - -.pushsection .bss -@ Note: calling arch_init zeroes out this region. -.align 12 -.globl shared_info_page -shared_info_page: - .fill (1024), 4, 0x0 - -.align 3 -.globl irqstack -.globl irqstack_end -irqstack: - .fill (1024), 4, 0x0 -irqstack_end: - -fault_dump: - .fill 18, 4, 0x0 @ On fault, we save the registers + CPSR + handler address - -.popsection - -fault: - cpsid aif @ Disable interrupts - - ldr r13, =3Dfault_dump - stmia r13, {r0-r12} @ Dump the non-banked registers directly (well, unless from FIQ mode) - str r14, [r13, #15 << 2] @ Our r14 is the faulting r15 - mov r0, r13 - - @ Save the caller's CPSR (our SPSR) too. - mrs r1, SPSR - str r1, [r13, #16 << 2] - - @ Switch to the mode we came from to get r13 and r14. - @ If coming from user mode, use System mode instead so we're still - @ privileged. - and r1, r1, #0x1f @ r1 =3D SPSR mode - cmp r1, #0x10 @ If from User mode - moveq r1, #0x1f @ Then use System mode instead - - mrs r3, CPSR @ r3 =3D our CPSR - bic r2, r3, #0x1f - orr r2, r2, r1 - msr CPSR, r2 @ Change to mode r1 - - @ Save old mode's r13, r14 - str r13, [r0, #13 << 2] - str r14, [r0, #14 << 2] - - msr CPSR, r3 @ Back to fault mode - - ldr r1, [r0, #17 << 2] - sub r1, r1, #12 @ Fix to point at start of handler - str r1, [r0, #17 << 2] - - @ Call C code to format the register dump. - @ Clobbers the stack, but we're not going to return anyway. - ldr sp, =3D_boot_stack_end - bl dump_registers - b do_exit - -@ We want to store a unique value to identify this handler, without corrupting -@ any of the registers. So, we store r15 (which will point just after the branch). -@ Later, we subtract 12 so the user gets pointed at the start of the exception -@ handler. -#define FAULT(name) \ -.globl fault_##name; \ -fault_##name: \ - ldr r13, =3Dfault_dump; \ - str r15, [r13, #17 << 2]; \ - b fault - -FAULT(reset) -FAULT(undefined_instruction) -FAULT(svc) -FAULT(prefetch_call) -FAULT(prefetch_abort) -FAULT(data_abort) - -@ exception base address -.align 5 -.globl exception_vector_table -@ Note: remember to call CLREX if returning from an exception: -@ "The architecture enables the local monitor to treat any exclusive store as -@ matching a previous LDREX address. For this reason, use of the CLREX -@ instruction to clear an existing tag is required on context switches." -@ -- ARM Cortex-A Series Programmer=E2=80=99s Guide (Version: 4.0) -exception_vector_table: - b fault_reset - b fault_undefined_instruction - b fault_svc - b fault_prefetch_call - b fault_prefetch_abort - b fault_data_abort - b irq_handler @ IRQ - .word 0xe7f000f0 @ abort on FIQ - -@ Call fault_undefined_instruction in "Undefined mode" -bug: - .word 0xe7f000f0 @ und/udf - a "Permanently Undefined" instruction - -irq_handler: - ldr sp, =3Dirqstack_end - push {r0 - r12, r14} - - ldr r0, IRQ_handler - cmp r0, #0 - beq bug - blx r0 @ call handler - - @ Return from IRQ - pop {r0 - r12, r14} - clrex - subs pc, lr, #4 - -.globl IRQ_handler -IRQ_handler: - .long 0x0 - - -.globl __arch_switch_threads -@ =3D> r0 =3D &prev->sp -@ r1 =3D &next->sp -@ <=3D returns to next thread's saved return address -__arch_switch_threads: - push {r4-r11} @ Store callee-saved registers to old thread's stack - stmia r0, {sp, lr} @ Store current sp and ip to prev's struct thread - - ldmia r1, {sp, lr} @ Load new sp, ip from next's struct thread - pop {r4-r11} @ Load callee-saved registers from new thread's stack - - bx lr - -@ This is called if you try to divide by zero. For now, we make a supervisor call, -@ which will make us halt. -.globl raise -raise: - svc 0 - -.globl arm_start_thread -arm_start_thread: - pop {r0, r1} - @ r0 =3D user data - @ r1 -> thread's main function - ldr lr, =3Dexit_thread - bx r1 diff --git a/extras/mini-os-intree/arch/arm/events.c b/extras/mini-os-intree/arch/arm/events.c deleted file mode 100644 index 441010d..0000000 --- a/extras/mini-os-intree/arch/arm/events.c +++ /dev/null @@ -1,31 +0,0 @@ -#include -#include -#include -#include - -static void virq_debug(evtchn_port_t port, struct pt_regs *regs, void *params) -{ - printk("Received a virq_debug event\n"); -} - -evtchn_port_t debug_port =3D -1; -void arch_init_events(void) -{ - debug_port =3D bind_virq(VIRQ_DEBUG, (evtchn_handler_t)virq_debug, 0); - if(debug_port =3D=3D -1) - BUG(); - unmask_evtchn(debug_port); -} - -void arch_unbind_ports(void) -{ - if(debug_port !=3D -1) - { - mask_evtchn(debug_port); - unbind_evtchn(debug_port); - } -} - -void arch_fini_events(void) -{ -} diff --git a/extras/mini-os-intree/arch/arm/hypercalls32.S b/extras/mini-os-intree/arch/arm/hypercalls32.S deleted file mode 100644 index af8e175..0000000 --- a/extras/mini-os-intree/arch/arm/hypercalls32.S +++ /dev/null @@ -1,64 +0,0 @@ -/****************************************************************************** - * hypercall.S - * - * Xen hypercall wrappers - * - * Stefano Stabellini , Citrix, 2012 - * - * 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; or, when distributed - * separately from the Linux kernel or incorporated into other - * software packages, subject to the following license: - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this source file (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, modify, - * merge, publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - */ - -#include - -#define __HVC(imm16) .long ((0xE1400070 | (((imm16) & 0xFFF0) << 4) | ((imm16) & 0x000F)) & 0xFFFFFFFF) - -#define XEN_IMM 0xEA1 - -#define HYPERCALL_SIMPLE(hypercall) \ -.globl HYPERVISOR_##hypercall; \ -.align 4,0x90; \ -HYPERVISOR_##hypercall: \ - mov r12, #__HYPERVISOR_##hypercall; \ - __HVC(XEN_IMM); \ - mov pc, lr; - -#define _hypercall0 HYPERCALL_SIMPLE -#define _hypercall1 HYPERCALL_SIMPLE -#define _hypercall2 HYPERCALL_SIMPLE -#define _hypercall3 HYPERCALL_SIMPLE -#define _hypercall4 HYPERCALL_SIMPLE - -_hypercall2(sched_op); -_hypercall2(memory_op); -_hypercall2(event_channel_op); -_hypercall2(xen_version); -_hypercall3(console_io); -_hypercall1(physdev_op); -_hypercall3(grant_table_op); -_hypercall3(vcpu_op); -_hypercall1(sysctl); -_hypercall1(domctl); -_hypercall2(hvm_op); -_hypercall1(xsm_op); diff --git a/extras/mini-os-intree/arch/arm/minios-arm32.lds b/extras/mini-os-intree/arch/arm/minios-arm32.lds deleted file mode 100755 index 9627162..0000000 --- a/extras/mini-os-intree/arch/arm/minios-arm32.lds +++ /dev/null @@ -1,83 +0,0 @@ -OUTPUT_ARCH(arm) -ENTRY(_start) -SECTIONS -{ - /* Note: we currently assume that Xen will load the kernel image - * at start-of-RAM + 0x8000. We use this initial 32 KB for the stack - * and translation tables. - */ - _boot_stack =3D 0x400000; /* 16 KB boot stack */ - _boot_stack_end =3D 0x404000; - _page_dir =3D 0x404000; /* 16 KB translation table */ - . =3D 0x408000; - _text =3D .; /* Text and read-only data */ - .text : { - *(.text) - *(.gnu.warning) - } =3D 0x9090 - - _etext =3D .; /* End of text section */ - - .rodata : { *(.rodata) *(.rodata.*) } - . =3D ALIGN(4096); - _erodata =3D .; - - /* newlib initialization functions */ - . =3D ALIGN(32 / 8); - PROVIDE (__preinit_array_start =3D .); - .preinit_array : { *(.preinit_array) } - PROVIDE (__preinit_array_end =3D .); - PROVIDE (__init_array_start =3D .); - .init_array : { *(.init_array) } - PROVIDE (__init_array_end =3D .); - PROVIDE (__fini_array_start =3D .); - .fini_array : { *(.fini_array) } - PROVIDE (__fini_array_end =3D .); - - .ctors : { - __CTOR_LIST__ =3D .; - *(.ctors) - CONSTRUCTORS - LONG(0) - __CTOR_END__ =3D .; - } - - .dtors : { - __DTOR_LIST__ =3D .; - *(.dtors) - LONG(0) - __DTOR_END__ =3D .; - } - - .data : { /* Data */ - *(.data) - } - - /* Note: linker will insert any extra sections here, just before .bss */ - - .bss : { - _edata =3D .; /* End of data included in image */ - /* Nothing after here is included in the zImage's size */ - - __bss_start =3D .; - *(.bss) - *(.app.bss) - } - _end =3D . ; - - /* Sections to be discarded */ - /DISCARD/ : { - *(.text.exit) - *(.data.exit) - *(.exitcall.exit) - } - - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } -} diff --git a/extras/mini-os-intree/arch/arm/mm.c b/extras/mini-os-intree/arch/arm/mm.c deleted file mode 100644 index efecc51..0000000 --- a/extras/mini-os-intree/arch/arm/mm.c +++ /dev/null @@ -1,139 +0,0 @@ -#include -#include -#include -#include -#include -#include - -uint32_t physical_address_offset; - -unsigned long allocate_ondemand(unsigned long n, unsigned long alignment) -{ - // FIXME - BUG(); -} - -void arch_init_mm(unsigned long *start_pfn_p, unsigned long *max_pfn_p) -{ - int memory; - int prop_len =3D 0; - const uint64_t *regs; - - printk(" _text: %p(VA)\n", &_text); - printk(" _etext: %p(VA)\n", &_etext); - printk(" _erodata: %p(VA)\n", &_erodata); - printk(" _edata: %p(VA)\n", &_edata); - printk(" stack start: %p(VA)\n", _boot_stack); - printk(" _end: %p(VA)\n", &_end); - - if (fdt_num_mem_rsv(device_tree) !=3D 0) - printk("WARNING: reserved memory not supported!\n"); - - memory =3D fdt_node_offset_by_prop_value(device_tree, -1, "device_type", "memory", sizeof("memory")); - if (memory < 0) { - printk("No memory found in FDT!\n"); - BUG(); - } - - /* Xen will always provide us at least one bank of memory. - * Mini-OS will use the first bank for the time-being. */ - regs =3D fdt_getprop(device_tree, memory, "reg", &prop_len); - - /* The property must contain at least the start address - * and size, each of which is 8-bytes. */ - if (regs =3D=3D NULL || prop_len < 16) { - printk("Bad 'reg' property: %p %d\n", regs, prop_len); - BUG(); - } - - unsigned int end =3D (unsigned int) &_end; - paddr_t mem_base =3D fdt64_to_cpu(regs[0]); - uint64_t mem_size =3D fdt64_to_cpu(regs[1]); - printk("Found memory at 0x%llx (len 0x%llx)\n", - (unsigned long long) mem_base, (unsigned long long) mem_size); - - BUG_ON(to_virt(mem_base) > (void *) &_text); /* Our image isn't in our RAM! */ - *start_pfn_p =3D PFN_UP(to_phys(end)); - uint64_t heap_len =3D mem_size - (PFN_PHYS(*start_pfn_p) - mem_base); - *max_pfn_p =3D *start_pfn_p + PFN_DOWN(heap_len); - - printk("Using pages %lu to %lu as free space for heap.\n", *start_pfn_p, *max_pfn_p); - - /* The device tree is probably in memory that we're about to hand over to the page - * allocator, so move it to the end and reserve that space. - */ - uint32_t fdt_size =3D fdt_totalsize(device_tree); - void *new_device_tree =3D to_virt(((*max_pfn_p << PAGE_SHIFT) - fdt_size) & PAGE_MASK); - if (new_device_tree !=3D device_tree) { - memmove(new_device_tree, device_tree, fdt_size); - } - device_tree =3D new_device_tree; - *max_pfn_p =3D to_phys(new_device_tree) >> PAGE_SHIFT; -} - -void arch_init_p2m(unsigned long max_pfn) -{ -} - -void arch_init_demand_mapping_area(unsigned long cur_pfn) -{ -} - -/* Get Xen's suggested physical page assignments for the grant table. */ -static paddr_t get_gnttab_base(void) -{ - int hypervisor; - int len =3D 0; - const uint64_t *regs; - paddr_t gnttab_base; - - hypervisor =3D fdt_node_offset_by_compatible(device_tree, -1, "xen,xen"); - BUG_ON(hypervisor < 0); - - regs =3D fdt_getprop(device_tree, hypervisor, "reg", &len); - /* The property contains the address and size, 8-bytes each. */ - if (regs =3D=3D NULL || len < 16) { - printk("Bad 'reg' property: %p %d\n", regs, len); - BUG(); - } - - gnttab_base =3D fdt64_to_cpu(regs[0]); - - printk("FDT suggests grant table base %llx\n", (unsigned long long) gnttab_base); - - return gnttab_base; -} - -grant_entry_t *arch_init_gnttab(int nr_grant_frames) -{ - struct xen_add_to_physmap xatp; - struct gnttab_setup_table setup; - xen_pfn_t frames[nr_grant_frames]; - paddr_t gnttab_table; - int i, rc; - - gnttab_table =3D get_gnttab_base(); - - for (i =3D 0; i < nr_grant_frames; i++) - { - xatp.domid =3D DOMID_SELF; - xatp.size =3D 0; /* Seems to be unused */ - xatp.space =3D XENMAPSPACE_grant_table; - xatp.idx =3D i; - xatp.gpfn =3D (gnttab_table >> PAGE_SHIFT) + i; - rc =3D HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp); - BUG_ON(rc !=3D 0); - } - - setup.dom =3D DOMID_SELF; - setup.nr_frames =3D nr_grant_frames; - set_xen_guest_handle(setup.frame_list, frames); - HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1); - if (setup.status !=3D 0) - { - printk("GNTTABOP_setup_table failed; status =3D %d\n", setup.status); - BUG(); - } - - return to_virt(gnttab_table); -} diff --git a/extras/mini-os-intree/arch/arm/panic.c b/extras/mini-os-intree/arch/arm/panic.c deleted file mode 100644 index 0ac49ad..0000000 --- a/extras/mini-os-intree/arch/arm/panic.c +++ /dev/null @@ -1,98 +0,0 @@ -/****************************************************************************** - * panic.c - * - * Displays a register dump and stack trace for debugging. - * - * Copyright (c) 2014, Thomas Leonard - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#include -#include -#include - -extern int irqstack[]; -extern int irqstack_end[]; - -typedef void handler(void); - -extern handler fault_reset; -extern handler fault_undefined_instruction; -extern handler fault_svc; -extern handler fault_prefetch_call; -extern handler fault_prefetch_abort; -extern handler fault_data_abort; - -void dump_registers(int *saved_registers) { - static int in_dump =3D 0; - int *sp, *stack_top, *x; - char *fault_name; - void *fault_handler; - int i; - - if (in_dump) - { - printk("Crash while in dump_registers! Not generating a second report.\n"); - return; - } - - in_dump =3D 1; - - fault_handler =3D (handler *) saved_registers[17]; - if (fault_handler =3D=3D fault_reset) - fault_name =3D "reset"; - else if (fault_handler =3D=3D fault_undefined_instruction) - fault_name =3D "undefined_instruction"; - else if (fault_handler =3D=3D fault_svc) - fault_name =3D "svc"; - else if (fault_handler =3D=3D fault_prefetch_call) - fault_name =3D "prefetch_call"; - else if (fault_handler =3D=3D fault_prefetch_abort) - fault_name =3D "prefetch_abort"; - else if (fault_handler =3D=3D fault_data_abort) - fault_name =3D "data_abort"; - else - fault_name =3D "unknown fault type!"; - - printk("Fault handler at %p called (%s)\n", fault_handler, fault_name); - - for (i =3D 0; i < 16; i++) { - printk("r%d =3D %x\n", i, saved_registers[i]); - } - printk("CPSR =3D %x\n", saved_registers[16]); - - printk("Stack dump (innermost last)\n"); - sp =3D (int *) saved_registers[13]; - - if (sp >=3D _boot_stack && sp <=3D _boot_stack_end) - stack_top =3D _boot_stack_end; /* The boot stack */ - else if (sp >=3D irqstack && sp <=3D irqstack_end) - stack_top =3D irqstack_end; /* The IRQ stack */ - else - stack_top =3D (int *) ((((unsigned long) sp) | (__STACK_SIZE-1)) + 1); /* A normal thread stack */ - - for (x =3D stack_top - 1; x >=3D sp; x--) - { - printk(" [%8p] %8x\n", x, *x); - } - printk("End of stack\n"); - - in_dump =3D 0; -} diff --git a/extras/mini-os-intree/arch/arm/sched.c b/extras/mini-os-intree/arch/arm/sched.c deleted file mode 100644 index 8091566..0000000 --- a/extras/mini-os-intree/arch/arm/sched.c +++ /dev/null @@ -1,47 +0,0 @@ -#include -#include -#include - -void arm_start_thread(void); - -/* The AAPCS requires the callee (e.g. __arch_switch_threads) to preserve r4-r11. */ -#define CALLEE_SAVED_REGISTERS 8 - -/* Architecture specific setup of thread creation */ -struct thread* arch_create_thread(char *name, void (*function)(void *), - void *data) -{ - struct thread *thread; - - thread =3D xmalloc(struct thread); - /* We can't use lazy allocation here since the trap handler runs on the stack */ - thread->stack =3D (char *)alloc_pages(STACK_SIZE_PAGE_ORDER); - thread->name =3D name; - printk("Thread \"%s\": pointer: 0x%p, stack: 0x%p\n", name, thread, - thread->stack); - - /* Save pointer to the thread on the stack, used by current macro */ - *((unsigned long *)thread->stack) =3D (unsigned long)thread; - - /* Push the details to pass to arm_start_thread onto the stack. */ - int *sp =3D (int *) (thread->stack + STACK_SIZE); - *(--sp) =3D (int) function; - *(--sp) =3D (int) data; - - /* We leave room for the 8 callee-saved registers which we will - * try to restore on thread switch, even though they're not needed - * for the initial switch. */ - thread->sp =3D (unsigned long) sp - 4 * CALLEE_SAVED_REGISTERS; - - thread->ip =3D (unsigned long) arm_start_thread; - - return thread; -} - -void run_idle_thread(void) -{ - __asm__ __volatile__ ("mov sp, %0; bx %1":: - "r"(idle_thread->sp + 4 * CALLEE_SAVED_REGISTERS), - "r"(idle_thread->ip)); - /* Never arrive here! */ -} diff --git a/extras/mini-os-intree/arch/arm/setup.c b/extras/mini-os-intree/arch/arm/setup.c deleted file mode 100644 index 06afe46..0000000 --- a/extras/mini-os-intree/arch/arm/setup.c +++ /dev/null @@ -1,119 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * This structure contains start-of-day info, such as pagetable base pointer, - * address of the shared_info structure, and things like that. - * On x86, the hypervisor passes it to us. On ARM, we fill it in ourselves. - */ -union start_info_union start_info_union; - -/* - * Shared page for communicating with the hypervisor. - * Events flags go here, for example. - */ -shared_info_t *HYPERVISOR_shared_info; - -extern char shared_info_page[PAGE_SIZE]; - -void *device_tree; - -static int hvm_get_parameter(int idx, uint64_t *value) -{ - struct xen_hvm_param xhv; - int ret; - - xhv.domid =3D DOMID_SELF; - xhv.index =3D idx; - ret =3D HYPERVISOR_hvm_op(HVMOP_get_param, &xhv); - if (ret < 0) { - BUG(); - } - *value =3D xhv.value; - return ret; -} - -static void get_console(void) -{ - uint64_t v =3D -1; - - hvm_get_parameter(HVM_PARAM_CONSOLE_EVTCHN, &v); - start_info.console.domU.evtchn =3D v; - - hvm_get_parameter(HVM_PARAM_CONSOLE_PFN, &v); - start_info.console.domU.mfn =3D v; - - printk("Console is on port %d\n", start_info.console.domU.evtchn); - printk("Console ring is at mfn %lx\n", (unsigned long) start_info.console.domU.mfn); -} - -void get_xenbus(void) -{ - uint64_t value; - - if (hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &value)) - BUG(); - - start_info.store_evtchn =3D (int)value; - - if(hvm_get_parameter(HVM_PARAM_STORE_PFN, &value)) - BUG(); - start_info.store_mfn =3D (unsigned long)value; -} - -/* - * INITIAL C ENTRY POINT. - */ -void arch_init(void *dtb_pointer, uint32_t physical_offset) -{ - struct xen_add_to_physmap xatp; - int r; - - memset(&__bss_start, 0, &_end - &__bss_start); - - physical_address_offset =3D physical_offset; - - xprintk("Virtual -> physical offset =3D %x\n", physical_address_offset); - - xprintk("Checking DTB at %p...\n", dtb_pointer); - - if ((r =3D fdt_check_header(dtb_pointer))) { - xprintk("Invalid DTB from Xen: %s\n", fdt_strerror(r)); - BUG(); - } - device_tree =3D dtb_pointer; - - /* Map shared_info page */ - xatp.domid =3D DOMID_SELF; - xatp.idx =3D 0; - xatp.space =3D XENMAPSPACE_shared_info; - xatp.gpfn =3D virt_to_pfn(shared_info_page); - if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp) !=3D 0) - BUG(); - HYPERVISOR_shared_info =3D (struct shared_info *)shared_info_page; - - /* Fill in start_info */ - get_console(); - get_xenbus(); - - gic_init(); - - start_kernel(); -} - -void -arch_fini(void) -{ -} - -void -arch_do_exit(void) -{ -} diff --git a/extras/mini-os-intree/arch/arm/time.c b/extras/mini-os-intree/arch/arm/time.c deleted file mode 100644 index a088981..0000000 --- a/extras/mini-os-intree/arch/arm/time.c +++ /dev/null @@ -1,136 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include - -//#define VTIMER_DEBUG -#ifdef VTIMER_DEBUG -#define DEBUG(_f, _a...) \ - printk("MINI_OS(file=3Dvtimer.c, line=3D%d) " _f , __LINE__, ## _a) -#else -#define DEBUG(_f, _a...) ((void)0) -#endif - -/************************************************************************ - * Time functions - *************************************************************************/ - -static uint64_t cntvct_at_init; -static uint32_t counter_freq; - -/* Compute with 96 bit intermediate result: (a*b)/c */ -uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c) -{ - union { - uint64_t ll; - struct { - uint32_t low, high; - } l; - } u, res; - uint64_t rl, rh; - - u.ll =3D a; - rl =3D (uint64_t)u.l.low * (uint64_t)b; - rh =3D (uint64_t)u.l.high * (uint64_t)b; - rh +=3D (rl >> 32); - res.l.high =3D rh / c; - res.l.low =3D (((rh % c) << 32) + (rl & 0xffffffff)) / c; - return res.ll; -} - -static inline s_time_t ticks_to_ns(uint64_t ticks) -{ - return muldiv64(ticks, SECONDS(1), counter_freq); -} - -static inline uint64_t ns_to_ticks(s_time_t ns) -{ - return muldiv64(ns, counter_freq, SECONDS(1)); -} - -/* Wall-clock time is not currently available on ARM, so this is always zero for now: - * http://wiki.xenproject.org/wiki/Xen_ARM_TODO#Expose_Wallclock_time_to_guests - */ -static struct timespec shadow_ts; - -static inline uint64_t read_virtual_count(void) -{ - uint32_t c_lo, c_hi; - __asm__ __volatile__("mrrc p15, 1, %0, %1, c14":"=3Dr"(c_lo), "=3Dr"(c_hi)); - return (((uint64_t) c_hi) << 32) + c_lo; -} - -/* monotonic_clock(): returns # of nanoseconds passed since time_init() - * Note: This function is required to return accurate - * time even in the absence of multiple timer ticks. - */ -uint64_t monotonic_clock(void) -{ - return ticks_to_ns(read_virtual_count() - cntvct_at_init); -} - -int gettimeofday(struct timeval *tv, void *tz) -{ - uint64_t nsec =3D monotonic_clock(); - nsec +=3D shadow_ts.tv_nsec; - - tv->tv_sec =3D shadow_ts.tv_sec; - tv->tv_sec +=3D NSEC_TO_SEC(nsec); - tv->tv_usec =3D NSEC_TO_USEC(nsec % 1000000000UL); - - return 0; -} - -/* Set the timer and mask. */ -void write_timer_ctl(uint32_t value) { - __asm__ __volatile__( - "mcr p15, 0, %0, c14, c3, 1\n" - "isb"::"r"(value)); -} - -void set_vtimer_compare(uint64_t value) { - DEBUG("New CompareValue : %llx\n", value); - - __asm__ __volatile__("mcrr p15, 3, %0, %H0, c14" - ::"r"(value)); - - /* Enable timer and unmask the output signal */ - write_timer_ctl(1); -} - -void unset_vtimer_compare(void) { - /* Disable timer and mask the output signal */ - write_timer_ctl(2); -} - -void block_domain(s_time_t until) -{ - uint64_t until_count =3D ns_to_ticks(until) + cntvct_at_init; - ASSERT(irqs_disabled()); - if (read_virtual_count() < until_count) - { - set_vtimer_compare(until_count); - __asm__ __volatile__("wfi"); - unset_vtimer_compare(); - - /* Give the IRQ handler a chance to handle whatever woke us up. */ - local_irq_enable(); - local_irq_disable(); - } -} - -void init_time(void) -{ - printk("Initialising timer interface\n"); - - __asm__ __volatile__("mrc p15, 0, %0, c14, c0, 0":"=3Dr"(counter_freq)); - cntvct_at_init =3D read_virtual_count(); - printk("Virtual Count register is %llx, freq =3D %d Hz\n", cntvct_at_init, counter_freq); -} - -void fini_time(void) -{ -} diff --git a/extras/mini-os-intree/arch/x86/Makefile b/extras/mini-os-intree/arch/x86/Makefile deleted file mode 100644 index 9f04a93..0000000 --- a/extras/mini-os-intree/arch/x86/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -# x86 architecture specific makefiles. -# It's is used for x86_32, x86_32y and x86_64 -# - -TOPLEVEL_DIR =3D $(CURDIR)/../.. -include ../../Config.mk - -# include arch.mk has to be before mini-os.mk! - -include arch.mk -include ../../minios.mk - -# Sources here are all *.c *.S without $(MINIOS_TARGET_ARCH).S -# This is handled in $(HEAD_ARCH_OBJ) -ARCH_SRCS :=3D $(wildcard *.c) - -# The objects built from the sources. -ARCH_OBJS :=3D $(patsubst %.c,$(OBJ_DIR)/%.o,$(ARCH_SRCS)) - -all: $(OBJ_DIR)/$(ARCH_LIB) - -# $(HEAD_ARCH_OBJ) is only build here, needed on linking -# in ../../Makefile. -$(OBJ_DIR)/$(ARCH_LIB): $(ARCH_OBJS) $(OBJ_DIR)/$(HEAD_ARCH_OBJ) - $(AR) rv $(OBJ_DIR)/$(ARCH_LIB) $(ARCH_OBJS) - -clean: - rm -f $(OBJ_DIR)/$(ARCH_LIB) $(ARCH_OBJS) $(OBJ_DIR)/$(HEAD_ARCH_OBJ) - diff --git a/extras/mini-os-intree/arch/x86/arch.mk b/extras/mini-os-intree/arch/x86/arch.mk deleted file mode 100644 index 81e8118..0000000 --- a/extras/mini-os-intree/arch/x86/arch.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -# Architecture special makerules for x86 family -# (including x86_32, x86_32y and x86_64). -# - -ifeq ($(MINIOS_TARGET_ARCH),x86_32) -ARCH_CFLAGS :=3D -m32 -march=3Di686 -ARCH_LDFLAGS :=3D -m elf_i386 -ARCH_ASFLAGS :=3D -m32 -EXTRA_INC +=3D $(TARGET_ARCH_FAM)/$(MINIOS_TARGET_ARCH) -EXTRA_SRC +=3D arch/$(EXTRA_INC) -endif - -ifeq ($(MINIOS_TARGET_ARCH),x86_64) -ARCH_CFLAGS :=3D -m64 -mno-red-zone -fno-reorder-blocks -ARCH_CFLAGS +=3D -fno-asynchronous-unwind-tables -ARCH_ASFLAGS :=3D -m64 -ARCH_LDFLAGS :=3D -m elf_x86_64 -EXTRA_INC +=3D $(TARGET_ARCH_FAM)/$(MINIOS_TARGET_ARCH) -EXTRA_SRC +=3D arch/$(EXTRA_INC) -endif - diff --git a/extras/mini-os-intree/arch/x86/events.c b/extras/mini-os-intree/arch/x86/events.c deleted file mode 100644 index 5198cf3..0000000 --- a/extras/mini-os-intree/arch/x86/events.c +++ /dev/null @@ -1,35 +0,0 @@ -#include -#include -#include - -#if defined(__x86_64__) -char irqstack[2 * STACK_SIZE]; - -static struct pda -{ - int irqcount; /* offset 0 (used in x86_64.S) */ - char *irqstackptr; /* 8 */ -} cpu0_pda; -#endif - -void arch_init_events(void) -{ -#if defined(__x86_64__) - asm volatile("movl %0,%%fs ; movl %0,%%gs" :: "r" (0)); - wrmsrl(0xc0000101, &cpu0_pda); /* 0xc0000101 is MSR_GS_BASE */ - cpu0_pda.irqcount =3D -1; - cpu0_pda.irqstackptr =3D (void*) (((unsigned long)irqstack + 2 * STACK_SIZE) - & ~(STACK_SIZE - 1)); -#endif -} - -void arch_unbind_ports(void) -{ -} - -void arch_fini_events(void) -{ -#if defined(__x86_64__) - wrmsrl(0xc0000101, NULL); /* 0xc0000101 is MSR_GS_BASE */ -#endif -} diff --git a/extras/mini-os-intree/arch/x86/ioremap.c b/extras/mini-os-intree/arch/x86/ioremap.c deleted file mode 100644 index 4384b1c..0000000 --- a/extras/mini-os-intree/arch/x86/ioremap.c +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) 2009, Netronome Systems, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - - -#include -#include -#include -#include -#include - -/* Map a physical address range into virtual address space with provided - * flags. Return a virtual address range it is mapped to. */ -static void *__do_ioremap(unsigned long phys_addr, unsigned long size, - unsigned long prot) -{ - unsigned long va; - unsigned long mfns, mfn; - unsigned long num_pages, offset; - - /* allow non page aligned addresses but for mapping we need to align them */ - offset =3D (phys_addr & ~PAGE_MASK); - num_pages =3D (offset + size + PAGE_SIZE - 1) / PAGE_SIZE; - phys_addr &=3D PAGE_MASK; - mfns =3D mfn =3D phys_addr >> PAGE_SHIFT; - - va =3D (unsigned long)map_frames_ex(&mfns, num_pages, 0, 1, 1, - DOMID_IO, NULL, prot); - return (void *)(va + offset); -} - -void *ioremap(unsigned long phys_addr, unsigned long size) -{ - return __do_ioremap(phys_addr, size, IO_PROT); -} - -void *ioremap_nocache(unsigned long phys_addr, unsigned long size) -{ - return __do_ioremap(phys_addr, size, IO_PROT_NOCACHE); -} - -/* Un-map the io-remapped region. Currently no list of existing mappings is - * maintained, so the caller has to supply the size */ -void iounmap(void *virt_addr, unsigned long size) -{ - unsigned long num_pages; - unsigned long va =3D (unsigned long)virt_addr; - - /* work out number of frames to unmap */ - num_pages =3D ((va & ~PAGE_MASK) + size + PAGE_SIZE - 1) / PAGE_SIZE; - - unmap_frames(va & PAGE_MASK, num_pages); -} - - - -/* -*- Mode:C; c-basic-offset:4; tab-width:4 indent-tabs-mode:nil -*- */ diff --git a/extras/mini-os-intree/arch/x86/iorw.c b/extras/mini-os-intree/arch/x86/iorw.c deleted file mode 100644 index 3080769..0000000 --- a/extras/mini-os-intree/arch/x86/iorw.c +++ /dev/null @@ -1,35 +0,0 @@ -#include - -void iowrite8(volatile void* addr, uint8_t val) -{ - *((volatile uint8_t*)addr) =3D val; -} -void iowrite16(volatile void* addr, uint16_t val) -{ - *((volatile uint16_t*)addr) =3D val; -} -void iowrite32(volatile void* addr, uint32_t val) -{ - *((volatile uint32_t*)addr) =3D val; -} -void iowrite64(volatile void* addr, uint64_t val) -{ - *((volatile uint64_t*)addr) =3D val; -} - -uint8_t ioread8(volatile void* addr) -{ - return *((volatile uint8_t*) addr); -} -uint16_t ioread16(volatile void* addr) -{ - return *((volatile uint16_t*) addr); -} -uint32_t ioread32(volatile void* addr) -{ - return *((volatile uint32_t*) addr); -} -uint64_t ioread64(volatile void* addr) -{ - return *((volatile uint64_t*) addr); -} diff --git a/extras/mini-os-intree/arch/x86/minios-x86_32.lds b/extras/mini-os-intree/arch/x86/minios-x86_32.lds deleted file mode 100644 index f5cabb6..0000000 --- a/extras/mini-os-intree/arch/x86/minios-x86_32.lds +++ /dev/null @@ -1,74 +0,0 @@ -OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") -OUTPUT_ARCH(i386) -ENTRY(_start) -SECTIONS -{ - . =3D 0x0; - _text =3D .; /* Text and read-only data */ - .text : { - *(.text) - *(.gnu.warning) - } =3D 0x9090 - - _etext =3D .; /* End of text section */ - - .rodata : { *(.rodata) *(.rodata.*) } - . =3D ALIGN(4096); - _erodata =3D .; - - /* newlib initialization functions */ - . =3D ALIGN(32 / 8); - PROVIDE (__preinit_array_start =3D .); - .preinit_array : { *(.preinit_array) } - PROVIDE (__preinit_array_end =3D .); - PROVIDE (__init_array_start =3D .); - .init_array : { *(.init_array) } - PROVIDE (__init_array_end =3D .); - PROVIDE (__fini_array_start =3D .); - .fini_array : { *(.fini_array) } - PROVIDE (__fini_array_end =3D .); - - .ctors : { - __CTOR_LIST__ =3D .; - *(.ctors) - CONSTRUCTORS - LONG(0) - __CTOR_END__ =3D .; - } - - .dtors : { - __DTOR_LIST__ =3D .; - *(.dtors) - LONG(0) - __DTOR_END__ =3D .; - } - - .data : { /* Data */ - *(.data) - } - - _edata =3D .; /* End of data section */ - - __bss_start =3D .; /* BSS */ - .bss : { - *(.bss) - *(.app.bss) - } - _end =3D . ; - - /* Sections to be discarded */ - /DISCARD/ : { - *(.text.exit) - *(.data.exit) - *(.exitcall.exit) - } - - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } -} diff --git a/extras/mini-os-intree/arch/x86/minios-x86_64.lds b/extras/mini-os-intree/arch/x86/minios-x86_64.lds deleted file mode 100644 index 3da0a9f..0000000 --- a/extras/mini-os-intree/arch/x86/minios-x86_64.lds +++ /dev/null @@ -1,74 +0,0 @@ -OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") -OUTPUT_ARCH(i386:x86-64) -ENTRY(_start) -SECTIONS -{ - . =3D 0x0; - _text =3D .; /* Text and read-only data */ - .text : { - *(.text) - *(.gnu.warning) - } =3D 0x9090 - - _etext =3D .; /* End of text section */ - - .rodata : { *(.rodata) *(.rodata.*) } - . =3D ALIGN(4096); - _erodata =3D .; - - /* newlib initialization functions */ - . =3D ALIGN(64 / 8); - PROVIDE (__preinit_array_start =3D .); - .preinit_array : { *(.preinit_array) } - PROVIDE (__preinit_array_end =3D .); - PROVIDE (__init_array_start =3D .); - .init_array : { *(.init_array) } - PROVIDE (__init_array_end =3D .); - PROVIDE (__fini_array_start =3D .); - .fini_array : { *(.fini_array) } - PROVIDE (__fini_array_end =3D .); - - .ctors : { - __CTOR_LIST__ =3D .; - *(.ctors) - CONSTRUCTORS - QUAD(0) - __CTOR_END__ =3D .; - } - - .dtors : { - __DTOR_LIST__ =3D .; - *(.dtors) - QUAD(0) - __DTOR_END__ =3D .; - } - - .data : { /* Data */ - *(.data) - } - - _edata =3D .; /* End of data section */ - - __bss_start =3D .; /* BSS */ - .bss : { - *(.bss) - *(.app.bss) - } - _end =3D . ; - - /* Sections to be discarded */ - /DISCARD/ : { - *(.text.exit) - *(.data.exit) - *(.exitcall.exit) - } - - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } -} diff --git a/extras/mini-os-intree/arch/x86/mm.c b/extras/mini-os-intree/arch/x86/mm.c deleted file mode 100644 index 9c6d1b8..0000000 --- a/extras/mini-os-intree/arch/x86/mm.c +++ /dev/null @@ -1,957 +0,0 @@ -/* - **************************************************************************** - * (C) 2003 - Rolf Neugebauer - Intel Research Cambridge - * (C) 2005 - Grzegorz Milos - Intel Research Cambridge - **************************************************************************** - * - * File: mm.c - * Author: Rolf Neugebauer (neugebar@dcs.gla.ac.uk) - * Changes: Grzegorz Milos - * - * Date: Aug 2003, chages Aug 2005 - * - * Environment: Xen Minimal OS - * Description: memory management related functions - * contains buddy page allocator from Xen. - * - **************************************************************************** - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#include -#include -#include -#include -#include -#include -#include - -#ifdef MM_DEBUG -#define DEBUG(_f, _a...) \ - printk("MINI_OS(file=3Dmm.c, line=3D%d) " _f "\n", __LINE__, ## _a) -#else -#define DEBUG(_f, _a...) ((void)0) -#endif - -unsigned long *phys_to_machine_mapping; -unsigned long mfn_zero; -extern char stack[]; -extern void page_walk(unsigned long va); - -/* - * Make pt_pfn a new 'level' page table frame and hook it into the page - * table at offset in previous level MFN (pref_l_mfn). pt_pfn is a guest - * PFN. - */ -static void new_pt_frame(unsigned long *pt_pfn, unsigned long prev_l_mfn, - unsigned long offset, unsigned long level) -{ - pgentry_t *tab =3D (pgentry_t *)start_info.pt_base; - unsigned long pt_page =3D (unsigned long)pfn_to_virt(*pt_pfn); - pgentry_t prot_e, prot_t; - mmu_update_t mmu_updates[1]; - int rc; - - prot_e =3D prot_t =3D 0; - DEBUG("Allocating new L%d pt frame for pfn=3D%lx, " - "prev_l_mfn=3D%lx, offset=3D%lx", - level, *pt_pfn, prev_l_mfn, offset); - - /* We need to clear the page, otherwise we might fail to map it - as a page table page */ - memset((void*) pt_page, 0, PAGE_SIZE); - - switch ( level ) - { - case L1_FRAME: - prot_e =3D L1_PROT; - prot_t =3D L2_PROT; - break; - case L2_FRAME: - prot_e =3D L2_PROT; - prot_t =3D L3_PROT; - break; -#if defined(__x86_64__) - case L3_FRAME: - prot_e =3D L3_PROT; - prot_t =3D L4_PROT; - break; -#endif - default: - printk("new_pt_frame() called with invalid level number %d\n", level); - do_exit(); - break; - } - - /* Make PFN a page table page */ -#if defined(__x86_64__) - tab =3D pte_to_virt(tab[l4_table_offset(pt_page)]); -#endif - tab =3D pte_to_virt(tab[l3_table_offset(pt_page)]); - - mmu_updates[0].ptr =3D (tab[l2_table_offset(pt_page)] & PAGE_MASK) + - sizeof(pgentry_t) * l1_table_offset(pt_page); - mmu_updates[0].val =3D (pgentry_t)pfn_to_mfn(*pt_pfn) << PAGE_SHIFT | - (prot_e & ~_PAGE_RW); - - if ( (rc =3D HYPERVISOR_mmu_update(mmu_updates, 1, NULL, DOMID_SELF)) < 0 ) - { - printk("ERROR: PTE for new page table page could not be updated\n"); - printk(" mmu_update failed with rc=3D%d\n", rc); - do_exit(); - } - - /* Hook the new page table page into the hierarchy */ - mmu_updates[0].ptr =3D - ((pgentry_t)prev_l_mfn << PAGE_SHIFT) + sizeof(pgentry_t) * offset; - mmu_updates[0].val =3D (pgentry_t)pfn_to_mfn(*pt_pfn) << PAGE_SHIFT | prot_t; - - if ( (rc =3D HYPERVISOR_mmu_update(mmu_updates, 1, NULL, DOMID_SELF)) < 0 ) - { - printk("ERROR: mmu_update failed with rc=3D%d\n", rc); - do_exit(); - } - - *pt_pfn +=3D 1; -} - -/* - * Checks if a pagetable frame is needed at 'level' to map a given - * address. Note, this function is specific to the initial page table - * building. - */ -static int need_pt_frame(unsigned long va, int level) -{ - unsigned long hyp_virt_start =3D HYPERVISOR_VIRT_START; -#if defined(__x86_64__) - unsigned long hyp_virt_end =3D HYPERVISOR_VIRT_END; -#else - unsigned long hyp_virt_end =3D 0xffffffff; -#endif - - /* In general frames will _not_ be needed if they were already - allocated to map the hypervisor into our VA space */ -#if defined(__x86_64__) - if ( level =3D=3D L3_FRAME ) - { - if ( l4_table_offset(va) >=3D - l4_table_offset(hyp_virt_start) && - l4_table_offset(va) <=3D - l4_table_offset(hyp_virt_end)) - return 0; - return 1; - } - else -#endif - - if ( level =3D=3D L2_FRAME ) - { -#if defined(__x86_64__) - if ( l4_table_offset(va) >=3D - l4_table_offset(hyp_virt_start) && - l4_table_offset(va) <=3D - l4_table_offset(hyp_virt_end)) -#endif - if ( l3_table_offset(va) >=3D - l3_table_offset(hyp_virt_start) && - l3_table_offset(va) <=3D - l3_table_offset(hyp_virt_end)) - return 0; - - return 1; - } - else - /* Always need l1 frames */ - if ( level =3D=3D L1_FRAME ) - return 1; - - printk("ERROR: Unknown frame level %d, hypervisor %llx,%llx\n", - level, hyp_virt_start, hyp_virt_end); - return -1; -} - -/* - * Build the initial pagetable. - */ -static void build_pagetable(unsigned long *start_pfn, unsigned long *max_pfn) -{ - unsigned long start_address, end_address; - unsigned long pfn_to_map, pt_pfn =3D *start_pfn; - static mmu_update_t mmu_updates[L1_PAGETABLE_ENTRIES + 1]; - pgentry_t *tab =3D (pgentry_t *)start_info.pt_base, page; - unsigned long pt_mfn =3D pfn_to_mfn(virt_to_pfn(start_info.pt_base)); - unsigned long offset; - int count =3D 0; - int rc; - - pfn_to_map =3D - (start_info.nr_pt_frames - NOT_L1_FRAMES) * L1_PAGETABLE_ENTRIES; - - if ( *max_pfn >=3D virt_to_pfn(HYPERVISOR_VIRT_START) ) - { - printk("WARNING: Mini-OS trying to use Xen virtual space. " - "Truncating memory from %dMB to ", - ((unsigned long)pfn_to_virt(*max_pfn) - - (unsigned long)&_text)>>20); - *max_pfn =3D virt_to_pfn(HYPERVISOR_VIRT_START - PAGE_SIZE); - printk("%dMB\n", - ((unsigned long)pfn_to_virt(*max_pfn) - - (unsigned long)&_text)>>20); - } - - start_address =3D (unsigned long)pfn_to_virt(pfn_to_map); - end_address =3D (unsigned long)pfn_to_virt(*max_pfn); - - /* We worked out the virtual memory range to map, now mapping loop */ - printk("Mapping memory range 0x%lx - 0x%lx\n", start_address, end_address); - - while ( start_address < end_address ) - { - tab =3D (pgentry_t *)start_info.pt_base; - pt_mfn =3D pfn_to_mfn(virt_to_pfn(start_info.pt_base)); - -#if defined(__x86_64__) - offset =3D l4_table_offset(start_address); - /* Need new L3 pt frame */ - if ( !(start_address & L3_MASK) ) - if ( need_pt_frame(start_address, L3_FRAME) ) - new_pt_frame(&pt_pfn, pt_mfn, offset, L3_FRAME); - - page =3D tab[offset]; - pt_mfn =3D pte_to_mfn(page); - tab =3D to_virt(mfn_to_pfn(pt_mfn) << PAGE_SHIFT); -#endif - offset =3D l3_table_offset(start_address); - /* Need new L2 pt frame */ - if ( !(start_address & L2_MASK) ) - if ( need_pt_frame(start_address, L2_FRAME) ) - new_pt_frame(&pt_pfn, pt_mfn, offset, L2_FRAME); - - page =3D tab[offset]; - pt_mfn =3D pte_to_mfn(page); - tab =3D to_virt(mfn_to_pfn(pt_mfn) << PAGE_SHIFT); - offset =3D l2_table_offset(start_address); - /* Need new L1 pt frame */ - if ( !(start_address & L1_MASK) ) - if ( need_pt_frame(start_address, L1_FRAME) ) - new_pt_frame(&pt_pfn, pt_mfn, offset, L1_FRAME); - - page =3D tab[offset]; - pt_mfn =3D pte_to_mfn(page); - offset =3D l1_table_offset(start_address); - - mmu_updates[count].ptr =3D - ((pgentry_t)pt_mfn << PAGE_SHIFT) + sizeof(pgentry_t) * offset; - mmu_updates[count].val =3D - (pgentry_t)pfn_to_mfn(pfn_to_map++) << PAGE_SHIFT | L1_PROT; - count++; - if ( count =3D=3D L1_PAGETABLE_ENTRIES || pfn_to_map =3D=3D *max_pfn ) - { - rc =3D HYPERVISOR_mmu_update(mmu_updates, count, NULL, DOMID_SELF); - if ( rc < 0 ) - { - printk("ERROR: build_pagetable(): PTE could not be updated\n"); - printk(" mmu_update failed with rc=3D%d\n", rc); - do_exit(); - } - count =3D 0; - } - start_address +=3D PAGE_SIZE; - } - - *start_pfn =3D pt_pfn; -} - -/* - * Mark portion of the address space read only. - */ -extern struct shared_info shared_info; -static void set_readonly(void *text, void *etext) -{ - unsigned long start_address =3D - ((unsigned long) text + PAGE_SIZE - 1) & PAGE_MASK; - unsigned long end_address =3D (unsigned long) etext; - static mmu_update_t mmu_updates[L1_PAGETABLE_ENTRIES + 1]; - pgentry_t *tab =3D (pgentry_t *)start_info.pt_base, page; - unsigned long mfn =3D pfn_to_mfn(virt_to_pfn(start_info.pt_base)); - unsigned long offset; - int count =3D 0; - int rc; - - printk("setting %p-%p readonly\n", text, etext); - - while ( start_address + PAGE_SIZE <=3D end_address ) - { - tab =3D (pgentry_t *)start_info.pt_base; - mfn =3D pfn_to_mfn(virt_to_pfn(start_info.pt_base)); - -#if defined(__x86_64__) - offset =3D l4_table_offset(start_address); - page =3D tab[offset]; - mfn =3D pte_to_mfn(page); - tab =3D to_virt(mfn_to_pfn(mfn) << PAGE_SHIFT); -#endif - offset =3D l3_table_offset(start_address); - page =3D tab[offset]; - mfn =3D pte_to_mfn(page); - tab =3D to_virt(mfn_to_pfn(mfn) << PAGE_SHIFT); - offset =3D l2_table_offset(start_address); - page =3D tab[offset]; - mfn =3D pte_to_mfn(page); - tab =3D to_virt(mfn_to_pfn(mfn) << PAGE_SHIFT); - - offset =3D l1_table_offset(start_address); - - if ( start_address !=3D (unsigned long)&shared_info ) - { - mmu_updates[count].ptr =3D - ((pgentry_t)mfn << PAGE_SHIFT) + sizeof(pgentry_t) * offset; - mmu_updates[count].val =3D tab[offset] & ~_PAGE_RW; - count++; - } - else - printk("skipped %p\n", start_address); - - start_address +=3D PAGE_SIZE; - - if ( count =3D=3D L1_PAGETABLE_ENTRIES || - start_address + PAGE_SIZE > end_address ) - { - rc =3D HYPERVISOR_mmu_update(mmu_updates, count, NULL, DOMID_SELF); - if ( rc < 0 ) - { - printk("ERROR: set_readonly(): PTE could not be updated\n"); - do_exit(); - } - count =3D 0; - } - } - - { - mmuext_op_t op =3D { - .cmd =3D MMUEXT_TLB_FLUSH_ALL, - }; - int count; - HYPERVISOR_mmuext_op(&op, 1, &count, DOMID_SELF); - } -} - -/* - * A useful mem testing function. Write the address to every address in the - * range provided and read back the value. If verbose, print page walk to - * some VA - * - * If we get MEM_TEST_MAX_ERRORS we might as well stop - */ -#define MEM_TEST_MAX_ERRORS 10 -int mem_test(unsigned long *start_va, unsigned long *end_va, int verbose) -{ - unsigned long mask =3D 0x10000; - unsigned long *pointer; - int error_count =3D 0; - - /* write values and print page walks */ - if ( verbose && (((unsigned long)start_va) & 0xfffff) ) - { - printk("MemTest Start: 0x%lx\n", start_va); - page_walk((unsigned long)start_va); - } - for ( pointer =3D start_va; pointer < end_va; pointer++ ) - { - if ( verbose && !(((unsigned long)pointer) & 0xfffff) ) - { - printk("Writing to %lx\n", pointer); - page_walk((unsigned long)pointer); - } - *pointer =3D (unsigned long)pointer & ~mask; - } - if ( verbose && (((unsigned long)end_va) & 0xfffff) ) - { - printk("MemTest End: %lx\n", end_va-1); - page_walk((unsigned long)end_va-1); - } - - /* verify values */ - for ( pointer =3D start_va; pointer < end_va; pointer++ ) - { - if ( ((unsigned long)pointer & ~mask) !=3D *pointer ) - { - printk("Read error at 0x%lx. Read: 0x%lx, should read 0x%lx\n", - (unsigned long)pointer, *pointer, - ((unsigned long)pointer & ~mask)); - error_count++; - if ( error_count >=3D MEM_TEST_MAX_ERRORS ) - { - printk("mem_test: too many errors\n"); - return -1; - } - } - } - return 0; -} - - -/* - * get the PTE for virtual address va if it exists. Otherwise NULL. - */ -static pgentry_t *get_pgt(unsigned long va) -{ - unsigned long mfn; - pgentry_t *tab; - unsigned offset; - - tab =3D (pgentry_t *)start_info.pt_base; - mfn =3D virt_to_mfn(start_info.pt_base); - -#if defined(__x86_64__) - offset =3D l4_table_offset(va); - if ( !(tab[offset] & _PAGE_PRESENT) ) - return NULL; - mfn =3D pte_to_mfn(tab[offset]); - tab =3D mfn_to_virt(mfn); -#endif - offset =3D l3_table_offset(va); - if ( !(tab[offset] & _PAGE_PRESENT) ) - return NULL; - mfn =3D pte_to_mfn(tab[offset]); - tab =3D mfn_to_virt(mfn); - offset =3D l2_table_offset(va); - if ( !(tab[offset] & _PAGE_PRESENT) ) - return NULL; - mfn =3D pte_to_mfn(tab[offset]); - tab =3D mfn_to_virt(mfn); - offset =3D l1_table_offset(va); - return &tab[offset]; -} - - -/* - * return a valid PTE for a given virtual address. If PTE does not exist, - * allocate page-table pages. - */ -pgentry_t *need_pgt(unsigned long va) -{ - unsigned long pt_mfn; - pgentry_t *tab; - unsigned long pt_pfn; - unsigned offset; - - tab =3D (pgentry_t *)start_info.pt_base; - pt_mfn =3D virt_to_mfn(start_info.pt_base); - -#if defined(__x86_64__) - offset =3D l4_table_offset(va); - if ( !(tab[offset] & _PAGE_PRESENT) ) - { - pt_pfn =3D virt_to_pfn(alloc_page()); - new_pt_frame(&pt_pfn, pt_mfn, offset, L3_FRAME); - } - ASSERT(tab[offset] & _PAGE_PRESENT); - pt_mfn =3D pte_to_mfn(tab[offset]); - tab =3D mfn_to_virt(pt_mfn); -#endif - offset =3D l3_table_offset(va); - if ( !(tab[offset] & _PAGE_PRESENT) ) - { - pt_pfn =3D virt_to_pfn(alloc_page()); - new_pt_frame(&pt_pfn, pt_mfn, offset, L2_FRAME); - } - ASSERT(tab[offset] & _PAGE_PRESENT); - pt_mfn =3D pte_to_mfn(tab[offset]); - tab =3D mfn_to_virt(pt_mfn); - offset =3D l2_table_offset(va); - if ( !(tab[offset] & _PAGE_PRESENT) ) - { - pt_pfn =3D virt_to_pfn(alloc_page()); - new_pt_frame(&pt_pfn, pt_mfn, offset, L1_FRAME); - } - ASSERT(tab[offset] & _PAGE_PRESENT); - pt_mfn =3D pte_to_mfn(tab[offset]); - tab =3D mfn_to_virt(pt_mfn); - - offset =3D l1_table_offset(va); - return &tab[offset]; -} - -/* - * Reserve an area of virtual address space for mappings and Heap - */ -static unsigned long demand_map_area_start; -#ifdef __x86_64__ -#define DEMAND_MAP_PAGES ((128ULL << 30) / PAGE_SIZE) -#else -#define DEMAND_MAP_PAGES ((2ULL << 30) / PAGE_SIZE) -#endif - -#ifndef HAVE_LIBC -#define HEAP_PAGES 0 -#else -unsigned long heap, brk, heap_mapped, heap_end; -#ifdef __x86_64__ -#define HEAP_PAGES ((128ULL << 30) / PAGE_SIZE) -#else -#define HEAP_PAGES ((1ULL << 30) / PAGE_SIZE) -#endif -#endif - -void arch_init_demand_mapping_area(unsigned long cur_pfn) -{ - cur_pfn++; - - demand_map_area_start =3D (unsigned long) pfn_to_virt(cur_pfn); - cur_pfn +=3D DEMAND_MAP_PAGES; - printk("Demand map pfns at %lx-%lx.\n", - demand_map_area_start, pfn_to_virt(cur_pfn)); - -#ifdef HAVE_LIBC - cur_pfn++; - heap_mapped =3D brk =3D heap =3D (unsigned long) pfn_to_virt(cur_pfn); - cur_pfn +=3D HEAP_PAGES; - heap_end =3D (unsigned long) pfn_to_virt(cur_pfn); - printk("Heap resides at %lx-%lx.\n", brk, heap_end); -#endif -} - -unsigned long allocate_ondemand(unsigned long n, unsigned long alignment) -{ - unsigned long x; - unsigned long y =3D 0; - - /* Find a properly aligned run of n contiguous frames */ - for ( x =3D 0; - x <=3D DEMAND_MAP_PAGES - n; - x =3D (x + y + 1 + alignment - 1) & ~(alignment - 1) ) - { - unsigned long addr =3D demand_map_area_start + x * PAGE_SIZE; - pgentry_t *pgt =3D get_pgt(addr); - for ( y =3D 0; y < n; y++, addr +=3D PAGE_SIZE ) - { - if ( !(addr & L1_MASK) ) - pgt =3D get_pgt(addr); - if ( pgt ) - { - if ( *pgt & _PAGE_PRESENT ) - break; - pgt++; - } - } - if ( y =3D=3D n ) - break; - } - if ( y !=3D n ) - { - printk("Failed to find %ld frames!\n", n); - return 0; - } - return demand_map_area_start + x * PAGE_SIZE; -} - -/* - * Map an array of MFNs contiguously into virtual address space starting at - * va. map f[i*stride]+i*increment for i in 0..n-1. - */ -#define MAP_BATCH ((STACK_SIZE / 2) / sizeof(mmu_update_t)) -void do_map_frames(unsigned long va, - const unsigned long *mfns, unsigned long n, - unsigned long stride, unsigned long incr, - domid_t id, int *err, unsigned long prot) -{ - pgentry_t *pgt =3D NULL; - unsigned long done =3D 0; - unsigned long i; - int rc; - - if ( !mfns ) - { - printk("do_map_frames: no mfns supplied\n"); - return; - } - DEBUG("va=3D%p n=3D0x%lx, mfns[0]=3D0x%lx stride=3D0x%lx incr=3D0x%lx prot=3D0x%lx\n", - va, n, mfns[0], stride, incr, prot); - - if ( err ) - memset(err, 0x00, n * sizeof(int)); - while ( done < n ) - { - unsigned long todo; - - if ( err ) - todo =3D 1; - else - todo =3D n - done; - - if ( todo > MAP_BATCH ) - todo =3D MAP_BATCH; - - { - mmu_update_t mmu_updates[todo]; - - for ( i =3D 0; i < todo; i++, va +=3D PAGE_SIZE, pgt++) - { - if ( !pgt || !(va & L1_MASK) ) - pgt =3D need_pgt(va); - - mmu_updates[i].ptr =3D virt_to_mach(pgt) | MMU_NORMAL_PT_UPDATE; - mmu_updates[i].val =3D ((pgentry_t)(mfns[(done + i) * stride] + - (done + i) * incr) - << PAGE_SHIFT) | prot; - } - - rc =3D HYPERVISOR_mmu_update(mmu_updates, todo, NULL, id); - if ( rc < 0 ) - { - if (err) - err[done * stride] =3D rc; - else { - printk("Map %ld (%lx, ...) at %p failed: %d.\n", - todo, mfns[done * stride] + done * incr, va, rc); - do_exit(); - } - } - } - done +=3D todo; - } -} - -/* - * Map an array of MFNs contiguous into virtual address space. Virtual - * addresses are allocated from the on demand area. - */ -void *map_frames_ex(const unsigned long *mfns, unsigned long n, - unsigned long stride, unsigned long incr, - unsigned long alignment, - domid_t id, int *err, unsigned long prot) -{ - unsigned long va =3D allocate_ondemand(n, alignment); - - if ( !va ) - return NULL; - - do_map_frames(va, mfns, n, stride, incr, id, err, prot); - - return (void *)va; -} - -/* - * Unmap nun_frames frames mapped at virtual address va. - */ -#define UNMAP_BATCH ((STACK_SIZE / 2) / sizeof(multicall_entry_t)) -int unmap_frames(unsigned long va, unsigned long num_frames) -{ - int n =3D UNMAP_BATCH; - multicall_entry_t call[n]; - int ret; - int i; - - ASSERT(!((unsigned long)va & ~PAGE_MASK)); - - DEBUG("va=3D%p, num=3D0x%lx\n", va, num_frames); - - while ( num_frames ) { - if ( n > num_frames ) - n =3D num_frames; - - for ( i =3D 0; i < n; i++ ) - { - int arg =3D 0; - /* simply update the PTE for the VA and invalidate TLB */ - call[i].op =3D __HYPERVISOR_update_va_mapping; - call[i].args[arg++] =3D va; - call[i].args[arg++] =3D 0; -#ifdef __i386__ - call[i].args[arg++] =3D 0; -#endif - call[i].args[arg++] =3D UVMF_INVLPG; - - va +=3D PAGE_SIZE; - } - - ret =3D HYPERVISOR_multicall(call, n); - if ( ret ) - { - printk("update_va_mapping hypercall failed with rc=3D%d.\n", ret); - return -ret; - } - - for ( i =3D 0; i < n; i++ ) - { - if ( call[i].result ) - { - printk("update_va_mapping failed for with rc=3D%d.\n", ret); - return -(call[i].result); - } - } - num_frames -=3D n; - } - return 0; -} - -/* - * Allocate pages which are contiguous in machine memory. - * Returns a VA to where they are mapped or 0 on failure. - * - * addr_bits indicates if the region has restrictions on where it is - * located. Typical values are 32 (if for example PCI devices can't access - * 64bit memory) or 0 for no restrictions. - * - * Allocated pages can be freed using the page allocators free_pages() - * function. - * - * based on Linux function xen_create_contiguous_region() - */ -#define MAX_CONTIG_ORDER 9 /* 2MB */ -unsigned long alloc_contig_pages(int order, unsigned int addr_bits) -{ - unsigned long in_va, va; - unsigned long in_frames[1UL << order], out_frames, mfn; - multicall_entry_t call[1UL << order]; - unsigned int i, num_pages =3D 1UL << order; - int ret, exch_success; - - /* pass in num_pages 'extends' of size 1 and - * request 1 extend of size 'order */ - struct xen_memory_exchange exchange =3D { - .in =3D { - .nr_extents =3D num_pages, - .extent_order =3D 0, - .domid =3D DOMID_SELF - }, - .out =3D { - .nr_extents =3D 1, - .extent_order =3D order, - .address_bits =3D addr_bits, - .domid =3D DOMID_SELF - }, - .nr_exchanged =3D 0 - }; - - if ( order > MAX_CONTIG_ORDER ) - { - printk("alloc_contig_pages: order too large 0x%x > 0x%x\n", - order, MAX_CONTIG_ORDER); - return 0; - } - - /* Allocate some potentially discontiguous pages */ - in_va =3D alloc_pages(order); - if ( !in_va ) - { - printk("alloc_contig_pages: could not get enough pages (order=3D0x%x\n", - order); - return 0; - } - - /* set up arguments for exchange hyper call */ - set_xen_guest_handle(exchange.in.extent_start, in_frames); - set_xen_guest_handle(exchange.out.extent_start, &out_frames); - - /* unmap current frames, keep a list of MFNs */ - for ( i =3D 0; i < num_pages; i++ ) - { - int arg =3D 0; - - va =3D in_va + (PAGE_SIZE * i); - in_frames[i] =3D virt_to_mfn(va); - - /* update P2M mapping */ - phys_to_machine_mapping[virt_to_pfn(va)] =3D INVALID_P2M_ENTRY; - - /* build multi call */ - call[i].op =3D __HYPERVISOR_update_va_mapping; - call[i].args[arg++] =3D va; - call[i].args[arg++] =3D 0; -#ifdef __i386__ - call[i].args[arg++] =3D 0; -#endif - call[i].args[arg++] =3D UVMF_INVLPG; - } - - ret =3D HYPERVISOR_multicall(call, i); - if ( ret ) - { - printk("Odd, update_va_mapping hypercall failed with rc=3D%d.\n", ret); - return 0; - } - - /* try getting a contig range of MFNs */ - out_frames =3D virt_to_pfn(in_va); /* PFNs to populate */ - ret =3D HYPERVISOR_memory_op(XENMEM_exchange, &exchange); - if ( ret ) { - printk("mem exchanged order=3D0x%x failed with rc=3D%d, nr_exchanged=3D%d\n", - order, ret, exchange.nr_exchanged); - /* we still need to return the allocated pages above to the pool - * ie. map them back into the 1:1 mapping etc. so we continue but - * in the end return the pages to the page allocator and return 0. */ - exch_success =3D 0; - } - else - exch_success =3D 1; - - /* map frames into 1:1 and update p2m */ - for ( i =3D 0; i < num_pages; i++ ) - { - int arg =3D 0; - pte_t pte; - - va =3D in_va + (PAGE_SIZE * i); - mfn =3D i < exchange.nr_exchanged =3F (out_frames + i) : in_frames[i]; - pte =3D __pte(mfn << PAGE_SHIFT | L1_PROT); - - /* update P2M mapping */ - phys_to_machine_mapping[virt_to_pfn(va)] =3D mfn; - - /* build multi call */ - call[i].op =3D __HYPERVISOR_update_va_mapping; - call[i].args[arg++] =3D va; -#ifdef __x86_64__ - call[i].args[arg++] =3D (pgentry_t)pte.pte; -#else - call[i].args[arg++] =3D pte.pte_low; - call[i].args[arg++] =3D pte.pte_high; -#endif - call[i].args[arg++] =3D UVMF_INVLPG; - } - ret =3D HYPERVISOR_multicall(call, i); - if ( ret ) - { - printk("update_va_mapping hypercall no. 2 failed with rc=3D%d.\n", ret); - return 0; - } - - if ( !exch_success ) - { - /* since the exchanged failed we just free the pages as well */ - free_pages((void *) in_va, order); - return 0; - } - - return in_va; -} - -/* - * Clear some of the bootstrap memory - */ -static void clear_bootstrap(void) -{ - pte_t nullpte =3D { }; - int rc; - - /* Use first page as the CoW zero page */ --===============4576138641625528538== 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 --===============4576138641625528538==-- From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:16:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:16: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 1YTqFW-0002AY-Ot; Fri, 06 Mar 2015 11:16:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFV-0002A9-8k for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:57 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 78/44-02777-8AC89F45; Fri, 06 Mar 2015 11:16:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1425640614!15259840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26049 invoked from network); 6 Mar 2015 11:16:55 -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; 6 Mar 2015 11:16:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFS-0006Bz-7l for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqFS-0001iQ-6S for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:54 +0000 Date: Fri, 06 Mar 2015 11:16:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'wip.build-system-v5' of git://xenbits.xen.org/people/liuw/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 226db8c65525e341bd94f5359b1d48aa81b9057f Merge: d568f5b668b19b8f257dc60eb3252b74bf70ec10 7280bb923ad9853f541207f8e1aa1b4f1c513c91 Author: Ian Campbell AuthorDate: Fri Feb 27 16:20:27 2015 +0000 Commit: Ian Campbell CommitDate: Fri Feb 27 16:20:27 2015 +0000 Merge branch 'wip.build-system-v5' of git://xenbits.xen.org/people/liuw/xen into staging Conflicts: Config.mk ijc -- resolved trivial conflict with 6dacedd707c2 "tools: update seabios rel-1.8.0" .gitignore | 7 +- Config.mk | 6 + Makefile | 71 +- extras/mini-os/COPYING | 36 - extras/mini-os/Config.mk | 57 - extras/mini-os/Makefile | 226 --- extras/mini-os/README | 46 - extras/mini-os/app.lds | 11 - extras/mini-os/arch/arm/arm32.S | 294 ---- extras/mini-os/arch/arm/events.c | 31 - extras/mini-os/arch/arm/hypercalls32.S | 64 - extras/mini-os/arch/arm/minios-arm32.lds | 83 -- extras/mini-os/arch/arm/mm.c | 139 -- extras/mini-os/arch/arm/panic.c | 98 -- extras/mini-os/arch/arm/sched.c | 47 - extras/mini-os/arch/arm/setup.c | 119 -- extras/mini-os/arch/arm/time.c | 136 -- extras/mini-os/arch/x86/Makefile | 31 - extras/mini-os/arch/x86/arch.mk | 22 - extras/mini-os/arch/x86/events.c | 35 - extras/mini-os/arch/x86/ioremap.c | 75 - extras/mini-os/arch/x86/iorw.c | 35 - extras/mini-os/arch/x86/minios-x86_32.lds | 74 - extras/mini-os/arch/x86/minios-x86_64.lds | 74 - extras/mini-os/arch/x86/mm.c | 957 ------------ extras/mini-os/arch/x86/sched.c | 139 -- extras/mini-os/arch/x86/setup.c | 168 --- extras/mini-os/arch/x86/time.c | 238 --- extras/mini-os/arch/x86/traps.c | 333 ----- extras/mini-os/arch/x86/x86_32.S | 305 ---- extras/mini-os/arch/x86/x86_64.S | 383 ----- extras/mini-os/blkfront.c | 736 ---------- extras/mini-os/console/console.c | 164 -- extras/mini-os/console/console.h | 2 - extras/mini-os/console/xenbus.c | 195 --- extras/mini-os/console/xencons_ring.c | 195 --- extras/mini-os/daytime.c | 67 - extras/mini-os/domain_config | 19 - extras/mini-os/events.c | 269 ---- extras/mini-os/fbfront.c | 710 --------- extras/mini-os/gntmap.c | 250 ---- extras/mini-os/gnttab.c | 196 --- extras/mini-os/hypervisor.c | 132 -- extras/mini-os/include/arch/cc.h | 87 -- extras/mini-os/include/arch/perf.h | 15 - extras/mini-os/include/arch/sys_arch.h | 35 - extras/mini-os/include/arm/arch_endian.h | 7 - extras/mini-os/include/arm/arch_limits.h | 9 - extras/mini-os/include/arm/arch_mm.h | 38 - extras/mini-os/include/arm/arch_sched.h | 19 - extras/mini-os/include/arm/arch_spinlock.h | 36 - extras/mini-os/include/arm/arm32/arch_wordsize.h | 1 - extras/mini-os/include/arm/gic.h | 1 - extras/mini-os/include/arm/hypercall-arm.h | 98 -- extras/mini-os/include/arm/os.h | 216 --- extras/mini-os/include/arm/traps.h | 20 - extras/mini-os/include/blkfront.h | 54 - extras/mini-os/include/byteorder.h | 36 - extras/mini-os/include/byteswap.h | 39 - extras/mini-os/include/compiler.h | 10 - extras/mini-os/include/console.h | 89 -- extras/mini-os/include/ctype.h | 60 - extras/mini-os/include/endian.h | 19 - extras/mini-os/include/err.h | 31 - extras/mini-os/include/errno-base.h | 39 - extras/mini-os/include/errno.h | 122 -- extras/mini-os/include/events.h | 59 - extras/mini-os/include/fbfront.h | 46 - extras/mini-os/include/fcntl.h | 99 -- extras/mini-os/include/gntmap.h | 35 - extras/mini-os/include/gnttab.h | 17 - extras/mini-os/include/hypervisor.h | 48 - extras/mini-os/include/ioremap.h | 33 - extras/mini-os/include/iorw.h | 16 - extras/mini-os/include/kernel.h | 9 - extras/mini-os/include/lib-gpl.h | 59 - extras/mini-os/include/lib.h | 230 --- extras/mini-os/include/linux/types.h | 5 - extras/mini-os/include/lwipopts.h | 23 - extras/mini-os/include/mm.h | 82 - extras/mini-os/include/netfront.h | 24 - extras/mini-os/include/pcifront.h | 29 - extras/mini-os/include/posix/arpa/inet.h | 7 - extras/mini-os/include/posix/dirent.h | 24 - extras/mini-os/include/posix/err.h | 15 - extras/mini-os/include/posix/fcntl.h | 11 - extras/mini-os/include/posix/limits.h | 48 - extras/mini-os/include/posix/net/if.h | 85 -- extras/mini-os/include/posix/netdb.h | 9 - extras/mini-os/include/posix/netinet/in.h | 7 - extras/mini-os/include/posix/netinet/tcp.h | 6 - extras/mini-os/include/posix/poll.h | 1 - extras/mini-os/include/posix/pthread.h | 64 - extras/mini-os/include/posix/signal.h | 10 - extras/mini-os/include/posix/stdlib.h | 8 - extras/mini-os/include/posix/strings.h | 12 - extras/mini-os/include/posix/sys/ioctl.h | 16 - extras/mini-os/include/posix/sys/mman.h | 22 - extras/mini-os/include/posix/sys/poll.h | 79 - extras/mini-os/include/posix/sys/select.h | 7 - extras/mini-os/include/posix/sys/socket.h | 31 - extras/mini-os/include/posix/sys/stat.h | 7 - extras/mini-os/include/posix/syslog.h | 37 - extras/mini-os/include/posix/termios.h | 87 -- extras/mini-os/include/posix/time.h | 11 - extras/mini-os/include/posix/unistd.h | 16 - extras/mini-os/include/sched.h | 55 - extras/mini-os/include/semaphore.h | 110 -- extras/mini-os/include/spinlock.h | 55 - extras/mini-os/include/sys/lock.h | 52 - extras/mini-os/include/sys/time.h | 47 - extras/mini-os/include/time.h | 63 - extras/mini-os/include/tpm_tis.h | 61 - extras/mini-os/include/tpmback.h | 104 -- extras/mini-os/include/tpmfront.h | 97 -- extras/mini-os/include/types.h | 74 - extras/mini-os/include/wait.h | 105 -- extras/mini-os/include/waittypes.h | 32 - extras/mini-os/include/x86/arch_endian.h | 7 - extras/mini-os/include/x86/arch_limits.h | 20 - extras/mini-os/include/x86/arch_mm.h | 233 --- extras/mini-os/include/x86/arch_sched.h | 25 - extras/mini-os/include/x86/arch_spinlock.h | 94 -- extras/mini-os/include/x86/os.h | 572 -------- extras/mini-os/include/x86/traps.h | 78 - extras/mini-os/include/x86/x86_32/arch_wordsize.h | 1 - .../mini-os/include/x86/x86_32/hypercall-x86_32.h | 337 ----- extras/mini-os/include/x86/x86_64/arch_wordsize.h | 2 - .../mini-os/include/x86/x86_64/hypercall-x86_64.h | 344 ----- extras/mini-os/include/xenbus.h | 120 -- extras/mini-os/include/xmalloc.h | 44 - extras/mini-os/kernel.c | 198 --- extras/mini-os/lib/ctype.c | 29 - extras/mini-os/lib/math.c | 426 ------ extras/mini-os/lib/printf.c | 786 ---------- extras/mini-os/lib/stack_chk_fail.c | 8 - extras/mini-os/lib/string.c | 228 --- extras/mini-os/lib/sys.c | 1550 -------------------- extras/mini-os/lib/xmalloc.c | 319 ---- extras/mini-os/lib/xs.c | 194 --- extras/mini-os/lock.c | 112 -- extras/mini-os/lwip-arch.c | 293 ---- extras/mini-os/lwip-net.c | 386 ----- extras/mini-os/main.c | 193 --- extras/mini-os/minios.mk | 76 - extras/mini-os/mm.c | 441 ------ extras/mini-os/netfront.c | 675 --------- extras/mini-os/pcifront.c | 616 -------- extras/mini-os/sched.c | 304 ---- extras/mini-os/test.c | 577 -------- extras/mini-os/tpm_tis.c | 1523 ------------------- extras/mini-os/tpmback.c | 1136 -------------- extras/mini-os/tpmfront.c | 631 -------- extras/mini-os/xenbus/xenbus.c | 870 ----------- scripts/git-checkout.sh | 2 +- stubdom/Makefile | 7 +- stubdom/configure | 2 +- stubdom/configure.ac | 2 +- tools/misc/mktarball | 4 +- 159 files changed, 83 insertions(+), 24027 deletions(-) diff --cc Config.mk index 811485a,109f1f1..c0c0775 --- a/Config.mk +++ b/Config.mk @@@ -250,12 -251,17 +251,17 @@@ OVMF_UPSTREAM_URL ?= git://xenbits.xen. QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git + MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif -OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 +OVMF_UPSTREAM_REVISION ?= a065efc7c7ce8bb3e5cb3e463099d023d4a92927 QEMU_UPSTREAM_REVISION ?= master + MINIOS_UPSTREAM_REVISION ?= 55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d + # Thu Jan 29 19:10:04 2015 +0000 + # Mini-OS: standalone build + -SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 -# Thu May 22 16:59:16 2014 -0400 -# python3 fixes for vgabios and csm builds. +SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 +# Wed Feb 18 12:49:59 2015 -0500 +# docs: Note v1.8.0 release ETHERBOOT_NICS ?= rtl8139 8086100e -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:16:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:16: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 1YTqFW-0002AY-Ot; Fri, 06 Mar 2015 11:16:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFV-0002A9-8k for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:57 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 78/44-02777-8AC89F45; Fri, 06 Mar 2015 11:16:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1425640614!15259840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26049 invoked from network); 6 Mar 2015 11:16:55 -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; 6 Mar 2015 11:16:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFS-0006Bz-7l for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqFS-0001iQ-6S for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:16:54 +0000 Date: Fri, 06 Mar 2015 11:16:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'wip.build-system-v5' of git://xenbits.xen.org/people/liuw/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 226db8c65525e341bd94f5359b1d48aa81b9057f Merge: d568f5b668b19b8f257dc60eb3252b74bf70ec10 7280bb923ad9853f541207f8e1aa1b4f1c513c91 Author: Ian Campbell AuthorDate: Fri Feb 27 16:20:27 2015 +0000 Commit: Ian Campbell CommitDate: Fri Feb 27 16:20:27 2015 +0000 Merge branch 'wip.build-system-v5' of git://xenbits.xen.org/people/liuw/xen into staging Conflicts: Config.mk ijc -- resolved trivial conflict with 6dacedd707c2 "tools: update seabios rel-1.8.0" .gitignore | 7 +- Config.mk | 6 + Makefile | 71 +- extras/mini-os/COPYING | 36 - extras/mini-os/Config.mk | 57 - extras/mini-os/Makefile | 226 --- extras/mini-os/README | 46 - extras/mini-os/app.lds | 11 - extras/mini-os/arch/arm/arm32.S | 294 ---- extras/mini-os/arch/arm/events.c | 31 - extras/mini-os/arch/arm/hypercalls32.S | 64 - extras/mini-os/arch/arm/minios-arm32.lds | 83 -- extras/mini-os/arch/arm/mm.c | 139 -- extras/mini-os/arch/arm/panic.c | 98 -- extras/mini-os/arch/arm/sched.c | 47 - extras/mini-os/arch/arm/setup.c | 119 -- extras/mini-os/arch/arm/time.c | 136 -- extras/mini-os/arch/x86/Makefile | 31 - extras/mini-os/arch/x86/arch.mk | 22 - extras/mini-os/arch/x86/events.c | 35 - extras/mini-os/arch/x86/ioremap.c | 75 - extras/mini-os/arch/x86/iorw.c | 35 - extras/mini-os/arch/x86/minios-x86_32.lds | 74 - extras/mini-os/arch/x86/minios-x86_64.lds | 74 - extras/mini-os/arch/x86/mm.c | 957 ------------ extras/mini-os/arch/x86/sched.c | 139 -- extras/mini-os/arch/x86/setup.c | 168 --- extras/mini-os/arch/x86/time.c | 238 --- extras/mini-os/arch/x86/traps.c | 333 ----- extras/mini-os/arch/x86/x86_32.S | 305 ---- extras/mini-os/arch/x86/x86_64.S | 383 ----- extras/mini-os/blkfront.c | 736 ---------- extras/mini-os/console/console.c | 164 -- extras/mini-os/console/console.h | 2 - extras/mini-os/console/xenbus.c | 195 --- extras/mini-os/console/xencons_ring.c | 195 --- extras/mini-os/daytime.c | 67 - extras/mini-os/domain_config | 19 - extras/mini-os/events.c | 269 ---- extras/mini-os/fbfront.c | 710 --------- extras/mini-os/gntmap.c | 250 ---- extras/mini-os/gnttab.c | 196 --- extras/mini-os/hypervisor.c | 132 -- extras/mini-os/include/arch/cc.h | 87 -- extras/mini-os/include/arch/perf.h | 15 - extras/mini-os/include/arch/sys_arch.h | 35 - extras/mini-os/include/arm/arch_endian.h | 7 - extras/mini-os/include/arm/arch_limits.h | 9 - extras/mini-os/include/arm/arch_mm.h | 38 - extras/mini-os/include/arm/arch_sched.h | 19 - extras/mini-os/include/arm/arch_spinlock.h | 36 - extras/mini-os/include/arm/arm32/arch_wordsize.h | 1 - extras/mini-os/include/arm/gic.h | 1 - extras/mini-os/include/arm/hypercall-arm.h | 98 -- extras/mini-os/include/arm/os.h | 216 --- extras/mini-os/include/arm/traps.h | 20 - extras/mini-os/include/blkfront.h | 54 - extras/mini-os/include/byteorder.h | 36 - extras/mini-os/include/byteswap.h | 39 - extras/mini-os/include/compiler.h | 10 - extras/mini-os/include/console.h | 89 -- extras/mini-os/include/ctype.h | 60 - extras/mini-os/include/endian.h | 19 - extras/mini-os/include/err.h | 31 - extras/mini-os/include/errno-base.h | 39 - extras/mini-os/include/errno.h | 122 -- extras/mini-os/include/events.h | 59 - extras/mini-os/include/fbfront.h | 46 - extras/mini-os/include/fcntl.h | 99 -- extras/mini-os/include/gntmap.h | 35 - extras/mini-os/include/gnttab.h | 17 - extras/mini-os/include/hypervisor.h | 48 - extras/mini-os/include/ioremap.h | 33 - extras/mini-os/include/iorw.h | 16 - extras/mini-os/include/kernel.h | 9 - extras/mini-os/include/lib-gpl.h | 59 - extras/mini-os/include/lib.h | 230 --- extras/mini-os/include/linux/types.h | 5 - extras/mini-os/include/lwipopts.h | 23 - extras/mini-os/include/mm.h | 82 - extras/mini-os/include/netfront.h | 24 - extras/mini-os/include/pcifront.h | 29 - extras/mini-os/include/posix/arpa/inet.h | 7 - extras/mini-os/include/posix/dirent.h | 24 - extras/mini-os/include/posix/err.h | 15 - extras/mini-os/include/posix/fcntl.h | 11 - extras/mini-os/include/posix/limits.h | 48 - extras/mini-os/include/posix/net/if.h | 85 -- extras/mini-os/include/posix/netdb.h | 9 - extras/mini-os/include/posix/netinet/in.h | 7 - extras/mini-os/include/posix/netinet/tcp.h | 6 - extras/mini-os/include/posix/poll.h | 1 - extras/mini-os/include/posix/pthread.h | 64 - extras/mini-os/include/posix/signal.h | 10 - extras/mini-os/include/posix/stdlib.h | 8 - extras/mini-os/include/posix/strings.h | 12 - extras/mini-os/include/posix/sys/ioctl.h | 16 - extras/mini-os/include/posix/sys/mman.h | 22 - extras/mini-os/include/posix/sys/poll.h | 79 - extras/mini-os/include/posix/sys/select.h | 7 - extras/mini-os/include/posix/sys/socket.h | 31 - extras/mini-os/include/posix/sys/stat.h | 7 - extras/mini-os/include/posix/syslog.h | 37 - extras/mini-os/include/posix/termios.h | 87 -- extras/mini-os/include/posix/time.h | 11 - extras/mini-os/include/posix/unistd.h | 16 - extras/mini-os/include/sched.h | 55 - extras/mini-os/include/semaphore.h | 110 -- extras/mini-os/include/spinlock.h | 55 - extras/mini-os/include/sys/lock.h | 52 - extras/mini-os/include/sys/time.h | 47 - extras/mini-os/include/time.h | 63 - extras/mini-os/include/tpm_tis.h | 61 - extras/mini-os/include/tpmback.h | 104 -- extras/mini-os/include/tpmfront.h | 97 -- extras/mini-os/include/types.h | 74 - extras/mini-os/include/wait.h | 105 -- extras/mini-os/include/waittypes.h | 32 - extras/mini-os/include/x86/arch_endian.h | 7 - extras/mini-os/include/x86/arch_limits.h | 20 - extras/mini-os/include/x86/arch_mm.h | 233 --- extras/mini-os/include/x86/arch_sched.h | 25 - extras/mini-os/include/x86/arch_spinlock.h | 94 -- extras/mini-os/include/x86/os.h | 572 -------- extras/mini-os/include/x86/traps.h | 78 - extras/mini-os/include/x86/x86_32/arch_wordsize.h | 1 - .../mini-os/include/x86/x86_32/hypercall-x86_32.h | 337 ----- extras/mini-os/include/x86/x86_64/arch_wordsize.h | 2 - .../mini-os/include/x86/x86_64/hypercall-x86_64.h | 344 ----- extras/mini-os/include/xenbus.h | 120 -- extras/mini-os/include/xmalloc.h | 44 - extras/mini-os/kernel.c | 198 --- extras/mini-os/lib/ctype.c | 29 - extras/mini-os/lib/math.c | 426 ------ extras/mini-os/lib/printf.c | 786 ---------- extras/mini-os/lib/stack_chk_fail.c | 8 - extras/mini-os/lib/string.c | 228 --- extras/mini-os/lib/sys.c | 1550 -------------------- extras/mini-os/lib/xmalloc.c | 319 ---- extras/mini-os/lib/xs.c | 194 --- extras/mini-os/lock.c | 112 -- extras/mini-os/lwip-arch.c | 293 ---- extras/mini-os/lwip-net.c | 386 ----- extras/mini-os/main.c | 193 --- extras/mini-os/minios.mk | 76 - extras/mini-os/mm.c | 441 ------ extras/mini-os/netfront.c | 675 --------- extras/mini-os/pcifront.c | 616 -------- extras/mini-os/sched.c | 304 ---- extras/mini-os/test.c | 577 -------- extras/mini-os/tpm_tis.c | 1523 ------------------- extras/mini-os/tpmback.c | 1136 -------------- extras/mini-os/tpmfront.c | 631 -------- extras/mini-os/xenbus/xenbus.c | 870 ----------- scripts/git-checkout.sh | 2 +- stubdom/Makefile | 7 +- stubdom/configure | 2 +- stubdom/configure.ac | 2 +- tools/misc/mktarball | 4 +- 159 files changed, 83 insertions(+), 24027 deletions(-) diff --cc Config.mk index 811485a,109f1f1..c0c0775 --- a/Config.mk +++ b/Config.mk @@@ -250,12 -251,17 +251,17 @@@ OVMF_UPSTREAM_URL ?= git://xenbits.xen. QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git + MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif -OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 +OVMF_UPSTREAM_REVISION ?= a065efc7c7ce8bb3e5cb3e463099d023d4a92927 QEMU_UPSTREAM_REVISION ?= master + MINIOS_UPSTREAM_REVISION ?= 55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d + # Thu Jan 29 19:10:04 2015 +0000 + # Mini-OS: standalone build + -SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 -# Thu May 22 16:59:16 2014 -0400 -# python3 fixes for vgabios and csm builds. +SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 +# Wed Feb 18 12:49:59 2015 -0500 +# docs: Note v1.8.0 release ETHERBOOT_NICS ?= rtl8139 8086100e -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:17:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:17:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFf-0002CT-Rq; Fri, 06 Mar 2015 11:17:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFe-0002C8-ST for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:06 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 4A/28-02884-2BC89F45; Fri, 06 Mar 2015 11:17:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1425640624!13701624!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26253 invoked from network); 6 Mar 2015 11:17:05 -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; 6 Mar 2015 11:17:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFc-0006Cb-Cy for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqFc-0001j2-Ad for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:04 +0000 Date: Fri, 06 Mar 2015 11:17:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] factor out construct_memop_from_reservation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a714fdb0858130a74998ab7c8bb0d58b5d614def Author: Wei Liu AuthorDate: Fri Feb 27 17:56:20 2015 +0100 Commit: Jan Beulich CommitDate: Fri Feb 27 17:56:20 2015 +0100 factor out construct_memop_from_reservation No functional change. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/common/memory.c | 46 +++++++++++++++++++++++++++++----------------- 1 files changed, 29 insertions(+), 17 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index e84ace9..9d9d43c 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -692,11 +692,37 @@ out: return rc; } +static int construct_memop_from_reservation( + const struct xen_memory_reservation *r, + struct memop_args *a) +{ + unsigned int address_bits; + + a->extent_list = r->extent_start; + a->nr_extents = r->nr_extents; + a->extent_order = r->extent_order; + a->memflags = 0; + + address_bits = XENMEMF_get_address_bits(r->mem_flags); + if ( (address_bits != 0) && + (address_bits < (get_order_from_pages(max_page) + PAGE_SHIFT)) ) + { + if ( address_bits <= PAGE_SHIFT ) + return -EINVAL; + a->memflags = MEMF_bits(address_bits); + } + + a->memflags |= MEMF_node(XENMEMF_get_node(r->mem_flags)); + if ( r->mem_flags & XENMEMF_exact_node_request ) + a->memflags |= MEMF_exact_node; + + return 0; +} + long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { struct domain *d; long rc; - unsigned int address_bits; struct xen_memory_reservation reservation; struct memop_args args; domid_t domid; @@ -718,25 +744,11 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( unlikely(start_extent >= reservation.nr_extents) ) return start_extent; - args.extent_list = reservation.extent_start; - args.nr_extents = reservation.nr_extents; - args.extent_order = reservation.extent_order; + if ( construct_memop_from_reservation(&reservation, &args) ) + return start_extent; args.nr_done = start_extent; args.preempted = 0; - args.memflags = 0; - - address_bits = XENMEMF_get_address_bits(reservation.mem_flags); - if ( (address_bits != 0) && - (address_bits < (get_order_from_pages(max_page) + PAGE_SHIFT)) ) - { - if ( address_bits <= PAGE_SHIFT ) - return start_extent; - args.memflags = MEMF_bits(address_bits); - } - args.memflags |= MEMF_node(XENMEMF_get_node(reservation.mem_flags)); - if ( reservation.mem_flags & XENMEMF_exact_node_request ) - args.memflags |= MEMF_exact_node; if ( op == XENMEM_populate_physmap && (reservation.mem_flags & XENMEMF_populate_on_demand) ) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:17:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:17:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFf-0002CT-Rq; Fri, 06 Mar 2015 11:17:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFe-0002C8-ST for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:06 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 4A/28-02884-2BC89F45; Fri, 06 Mar 2015 11:17:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1425640624!13701624!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26253 invoked from network); 6 Mar 2015 11:17:05 -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; 6 Mar 2015 11:17:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFc-0006Cb-Cy for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqFc-0001j2-Ad for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:04 +0000 Date: Fri, 06 Mar 2015 11:17:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] factor out construct_memop_from_reservation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a714fdb0858130a74998ab7c8bb0d58b5d614def Author: Wei Liu AuthorDate: Fri Feb 27 17:56:20 2015 +0100 Commit: Jan Beulich CommitDate: Fri Feb 27 17:56:20 2015 +0100 factor out construct_memop_from_reservation No functional change. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/common/memory.c | 46 +++++++++++++++++++++++++++++----------------- 1 files changed, 29 insertions(+), 17 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index e84ace9..9d9d43c 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -692,11 +692,37 @@ out: return rc; } +static int construct_memop_from_reservation( + const struct xen_memory_reservation *r, + struct memop_args *a) +{ + unsigned int address_bits; + + a->extent_list = r->extent_start; + a->nr_extents = r->nr_extents; + a->extent_order = r->extent_order; + a->memflags = 0; + + address_bits = XENMEMF_get_address_bits(r->mem_flags); + if ( (address_bits != 0) && + (address_bits < (get_order_from_pages(max_page) + PAGE_SHIFT)) ) + { + if ( address_bits <= PAGE_SHIFT ) + return -EINVAL; + a->memflags = MEMF_bits(address_bits); + } + + a->memflags |= MEMF_node(XENMEMF_get_node(r->mem_flags)); + if ( r->mem_flags & XENMEMF_exact_node_request ) + a->memflags |= MEMF_exact_node; + + return 0; +} + long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { struct domain *d; long rc; - unsigned int address_bits; struct xen_memory_reservation reservation; struct memop_args args; domid_t domid; @@ -718,25 +744,11 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( unlikely(start_extent >= reservation.nr_extents) ) return start_extent; - args.extent_list = reservation.extent_start; - args.nr_extents = reservation.nr_extents; - args.extent_order = reservation.extent_order; + if ( construct_memop_from_reservation(&reservation, &args) ) + return start_extent; args.nr_done = start_extent; args.preempted = 0; - args.memflags = 0; - - address_bits = XENMEMF_get_address_bits(reservation.mem_flags); - if ( (address_bits != 0) && - (address_bits < (get_order_from_pages(max_page) + PAGE_SHIFT)) ) - { - if ( address_bits <= PAGE_SHIFT ) - return start_extent; - args.memflags = MEMF_bits(address_bits); - } - args.memflags |= MEMF_node(XENMEMF_get_node(reservation.mem_flags)); - if ( reservation.mem_flags & XENMEMF_exact_node_request ) - args.memflags |= MEMF_exact_node; if ( op == XENMEM_populate_physmap && (reservation.mem_flags & XENMEMF_populate_on_demand) ) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:17:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:17: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 1YTqFt-0002F8-05; Fri, 06 Mar 2015 11:17:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFr-0002Eu-EG for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:19 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 22/3D-03219-EBC89F45; Fri, 06 Mar 2015 11:17:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425640634!13636954!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25619 invoked from network); 6 Mar 2015 11:17: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; 6 Mar 2015 11:17:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFm-0006Cl-IG for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqFm-0001jx-Gg for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:14 +0000 Date: Fri, 06 Mar 2015 11:17:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/iommu: arm: Remove temporary the SMMU driver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e00aa014c429d58d1dbcf9fed8edf477d0335133 Author: Julien Grall AuthorDate: Wed Feb 25 18:52:54 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 13:55:23 2015 +0000 xen/iommu: arm: Remove temporary the SMMU driver The current SMMU driver has completly diverged. That makes me hard to maintain. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/drivers/passthrough/arm/Makefile | 1 - xen/drivers/passthrough/arm/smmu.c | 1784 ---------------------------------- 2 files changed, 0 insertions(+), 1785 deletions(-) diff --git a/xen/drivers/passthrough/arm/Makefile b/xen/drivers/passthrough/arm/Makefile index f4cd26e..0484b79 100644 --- a/xen/drivers/passthrough/arm/Makefile +++ b/xen/drivers/passthrough/arm/Makefile @@ -1,2 +1 @@ obj-y += iommu.o -obj-y += smmu.o diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c deleted file mode 100644 index 42bde75..0000000 --- a/xen/drivers/passthrough/arm/smmu.c +++ /dev/null @@ -1,1784 +0,0 @@ -/* - * IOMMU API for ARM architected SMMU implementations. - * - * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * Based on Linux drivers/iommu/arm-smmu.c (commit 89a23cd) - * Copyright (C) 2013 ARM Limited - * - * Author: Will Deacon - * - * Xen modification: - * Julien Grall - * Copyright (C) 2014 Linaro Limited. - * - * This driver currently supports: - * - SMMUv1 and v2 implementations (didn't try v2 SMMU) - * - Stream-matching and stream-indexing - * - v7/v8 long-descriptor format - * - Non-secure access to the SMMU - * - 4k pages, p2m shared with the processor - * - Up to 40-bit addressing - * - Context fault reporting - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* Driver options */ -#define SMMU_OPT_SECURE_CONFIG_ACCESS (1 << 0) - -/* Maximum number of stream IDs assigned to a single device */ -#define MAX_MASTER_STREAMIDS MAX_PHANDLE_ARGS - -/* Maximum stream ID */ -#define SMMU_MAX_STREAMIDS (PAGE_SIZE_64K - 1) - -/* Maximum number of context banks per SMMU */ -#define SMMU_MAX_CBS 128 - -/* Maximum number of mapping groups per SMMU */ -#define SMMU_MAX_SMRS 128 - -/* SMMU global address space */ -#define SMMU_GR0(smmu) ((smmu)->base) -#define SMMU_GR1(smmu) ((smmu)->base + (smmu)->pagesize) - -/* - * SMMU global address space with conditional offset to access secure aliases of - * non-secure registers (e.g. nsCR0: 0x400, nsGFSR: 0x448, nsGFSYNR0: 0x450) - */ -#define SMMU_GR0_NS(smmu) \ - ((smmu)->base + \ - ((smmu->options & SMMU_OPT_SECURE_CONFIG_ACCESS) \ - ? 0x400 : 0)) - -/* Page table bits */ -#define SMMU_PTE_PAGE (((pteval_t)3) << 0) -#define SMMU_PTE_CONT (((pteval_t)1) << 52) -#define SMMU_PTE_AF (((pteval_t)1) << 10) -#define SMMU_PTE_SH_NS (((pteval_t)0) << 8) -#define SMMU_PTE_SH_OS (((pteval_t)2) << 8) -#define SMMU_PTE_SH_IS (((pteval_t)3) << 8) - -#if PAGE_SIZE == PAGE_SIZE_4K -#define SMMU_PTE_CONT_ENTRIES 16 -#elif PAGE_SIZE == PAGE_SIZE_64K -#define SMMU_PTE_CONT_ENTRIES 32 -#else -#define SMMU_PTE_CONT_ENTRIES 1 -#endif - -#define SMMU_PTE_CONT_SIZE (PAGE_SIZE * SMMU_PTE_CONT_ENTRIES) -#define SMMU_PTE_CONT_MASK (~(SMMU_PTE_CONT_SIZE - 1)) -#define SMMU_PTE_HWTABLE_SIZE (PTRS_PER_PTE * sizeof(pte_t)) - -/* Stage-1 PTE */ -#define SMMU_PTE_AP_UNPRIV (((pteval_t)1) << 6) -#define SMMU_PTE_AP_RDONLY (((pteval_t)2) << 6) -#define SMMU_PTE_ATTRINDX_SHIFT 2 -#define SMMU_PTE_nG (((pteval_t)1) << 11) - -/* Stage-2 PTE */ -#define SMMU_PTE_HAP_FAULT (((pteval_t)0) << 6) -#define SMMU_PTE_HAP_READ (((pteval_t)1) << 6) -#define SMMU_PTE_HAP_WRITE (((pteval_t)2) << 6) -#define SMMU_PTE_MEMATTR_OIWB (((pteval_t)0xf) << 2) -#define SMMU_PTE_MEMATTR_NC (((pteval_t)0x5) << 2) -#define SMMU_PTE_MEMATTR_DEV (((pteval_t)0x1) << 2) - -/* Configuration registers */ -#define SMMU_GR0_sCR0 0x0 -#define SMMU_sCR0_CLIENTPD (1 << 0) -#define SMMU_sCR0_GFRE (1 << 1) -#define SMMU_sCR0_GFIE (1 << 2) -#define SMMU_sCR0_GCFGFRE (1 << 4) -#define SMMU_sCR0_GCFGFIE (1 << 5) -#define SMMU_sCR0_USFCFG (1 << 10) -#define SMMU_sCR0_VMIDPNE (1 << 11) -#define SMMU_sCR0_PTM (1 << 12) -#define SMMU_sCR0_FB (1 << 13) -#define SMMU_sCR0_BSU_SHIFT 14 -#define SMMU_sCR0_BSU_MASK 0x3 - -/* Identification registers */ -#define SMMU_GR0_ID0 0x20 -#define SMMU_GR0_ID1 0x24 -#define SMMU_GR0_ID2 0x28 -#define SMMU_GR0_ID3 0x2c -#define SMMU_GR0_ID4 0x30 -#define SMMU_GR0_ID5 0x34 -#define SMMU_GR0_ID6 0x38 -#define SMMU_GR0_ID7 0x3c -#define SMMU_GR0_sGFSR 0x48 -#define SMMU_GR0_sGFSYNR0 0x50 -#define SMMU_GR0_sGFSYNR1 0x54 -#define SMMU_GR0_sGFSYNR2 0x58 -#define SMMU_GR0_PIDR0 0xfe0 -#define SMMU_GR0_PIDR1 0xfe4 -#define SMMU_GR0_PIDR2 0xfe8 - -#define SMMU_ID0_S1TS (1 << 30) -#define SMMU_ID0_S2TS (1 << 29) -#define SMMU_ID0_NTS (1 << 28) -#define SMMU_ID0_SMS (1 << 27) -#define SMMU_ID0_PTFS_SHIFT 24 -#define SMMU_ID0_PTFS_MASK 0x2 -#define SMMU_ID0_PTFS_V8_ONLY 0x2 -#define SMMU_ID0_CTTW (1 << 14) -#define SMMU_ID0_NUMIRPT_SHIFT 16 -#define SMMU_ID0_NUMIRPT_MASK 0xff -#define SMMU_ID0_NUMSMRG_SHIFT 0 -#define SMMU_ID0_NUMSMRG_MASK 0xff - -#define SMMU_ID1_PAGESIZE (1 << 31) -#define SMMU_ID1_NUMPAGENDXB_SHIFT 28 -#define SMMU_ID1_NUMPAGENDXB_MASK 7 -#define SMMU_ID1_NUMS2CB_SHIFT 16 -#define SMMU_ID1_NUMS2CB_MASK 0xff -#define SMMU_ID1_NUMCB_SHIFT 0 -#define SMMU_ID1_NUMCB_MASK 0xff - -#define SMMU_ID2_OAS_SHIFT 4 -#define SMMU_ID2_OAS_MASK 0xf -#define SMMU_ID2_IAS_SHIFT 0 -#define SMMU_ID2_IAS_MASK 0xf -#define SMMU_ID2_UBS_SHIFT 8 -#define SMMU_ID2_UBS_MASK 0xf -#define SMMU_ID2_PTFS_4K (1 << 12) -#define SMMU_ID2_PTFS_16K (1 << 13) -#define SMMU_ID2_PTFS_64K (1 << 14) - -#define SMMU_PIDR2_ARCH_SHIFT 4 -#define SMMU_PIDR2_ARCH_MASK 0xf - -/* Global TLB invalidation */ -#define SMMU_GR0_STLBIALL 0x60 -#define SMMU_GR0_TLBIVMID 0x64 -#define SMMU_GR0_TLBIALLNSNH 0x68 -#define SMMU_GR0_TLBIALLH 0x6c -#define SMMU_GR0_sTLBGSYNC 0x70 -#define SMMU_GR0_sTLBGSTATUS 0x74 -#define SMMU_sTLBGSTATUS_GSACTIVE (1 << 0) -#define SMMU_TLB_LOOP_TIMEOUT 1000000 /* 1s! */ - -/* Stream mapping registers */ -#define SMMU_GR0_SMR(n) (0x800 + ((n) << 2)) -#define SMMU_SMR_VALID (1 << 31) -#define SMMU_SMR_MASK_SHIFT 16 -#define SMMU_SMR_MASK_MASK 0x7fff -#define SMMU_SMR_ID_SHIFT 0 -#define SMMU_SMR_ID_MASK 0x7fff - -#define SMMU_GR0_S2CR(n) (0xc00 + ((n) << 2)) -#define SMMU_S2CR_CBNDX_SHIFT 0 -#define SMMU_S2CR_CBNDX_MASK 0xff -#define SMMU_S2CR_TYPE_SHIFT 16 -#define SMMU_S2CR_TYPE_MASK 0x3 -#define SMMU_S2CR_TYPE_TRANS (0 << SMMU_S2CR_TYPE_SHIFT) -#define SMMU_S2CR_TYPE_BYPASS (1 << SMMU_S2CR_TYPE_SHIFT) -#define SMMU_S2CR_TYPE_FAULT (2 << SMMU_S2CR_TYPE_SHIFT) - -/* Context bank attribute registers */ -#define SMMU_GR1_CBAR(n) (0x0 + ((n) << 2)) -#define SMMU_CBAR_VMID_SHIFT 0 -#define SMMU_CBAR_VMID_MASK 0xff -#define SMMU_CBAR_S1_MEMATTR_SHIFT 12 -#define SMMU_CBAR_S1_MEMATTR_MASK 0xf -#define SMMU_CBAR_S1_MEMATTR_WB 0xf -#define SMMU_CBAR_TYPE_SHIFT 16 -#define SMMU_CBAR_TYPE_MASK 0x3 -#define SMMU_CBAR_TYPE_S2_TRANS (0 << SMMU_CBAR_TYPE_SHIFT) -#define SMMU_CBAR_TYPE_S1_TRANS_S2_BYPASS (1 << SMMU_CBAR_TYPE_SHIFT) -#define SMMU_CBAR_TYPE_S1_TRANS_S2_FAULT (2 << SMMU_CBAR_TYPE_SHIFT) -#define SMMU_CBAR_TYPE_S1_TRANS_S2_TRANS (3 << SMMU_CBAR_TYPE_SHIFT) -#define SMMU_CBAR_IRPTNDX_SHIFT 24 -#define SMMU_CBAR_IRPTNDX_MASK 0xff - -#define SMMU_GR1_CBA2R(n) (0x800 + ((n) << 2)) -#define SMMU_CBA2R_RW64_32BIT (0 << 0) -#define SMMU_CBA2R_RW64_64BIT (1 << 0) - -/* Translation context bank */ -#define SMMU_CB_BASE(smmu) ((smmu)->base + ((smmu)->size >> 1)) -#define SMMU_CB(smmu, n) ((n) * (smmu)->pagesize) - -#define SMMU_CB_SCTLR 0x0 -#define SMMU_CB_RESUME 0x8 -#define SMMU_CB_TCR2 0x10 -#define SMMU_CB_TTBR0_LO 0x20 -#define SMMU_CB_TTBR0_HI 0x24 -#define SMMU_CB_TCR 0x30 -#define SMMU_CB_S1_MAIR0 0x38 -#define SMMU_CB_FSR 0x58 -#define SMMU_CB_FAR_LO 0x60 -#define SMMU_CB_FAR_HI 0x64 -#define SMMU_CB_FSYNR0 0x68 -#define SMMU_CB_S1_TLBIASID 0x610 - -#define SMMU_SCTLR_S1_ASIDPNE (1 << 12) -#define SMMU_SCTLR_CFCFG (1 << 7) -#define SMMU_SCTLR_CFIE (1 << 6) -#define SMMU_SCTLR_CFRE (1 << 5) -#define SMMU_SCTLR_E (1 << 4) -#define SMMU_SCTLR_AFE (1 << 2) -#define SMMU_SCTLR_TRE (1 << 1) -#define SMMU_SCTLR_M (1 << 0) -#define SMMU_SCTLR_EAE_SBOP (SMMU_SCTLR_AFE | SMMU_SCTLR_TRE) - -#define SMMU_RESUME_RETRY (0 << 0) -#define SMMU_RESUME_TERMINATE (1 << 0) - -#define SMMU_TCR_EAE (1 << 31) - -#define SMMU_TCR_PASIZE_SHIFT 16 -#define SMMU_TCR_PASIZE_MASK 0x7 - -#define SMMU_TCR_TG0_4K (0 << 14) -#define SMMU_TCR_TG0_64K (1 << 14) - -#define SMMU_TCR_SH0_SHIFT 12 -#define SMMU_TCR_SH0_MASK 0x3 -#define SMMU_TCR_SH_NS 0 -#define SMMU_TCR_SH_OS 2 -#define SMMU_TCR_SH_IS 3 - -#define SMMU_TCR_ORGN0_SHIFT 10 -#define SMMU_TCR_IRGN0_SHIFT 8 -#define SMMU_TCR_RGN_MASK 0x3 -#define SMMU_TCR_RGN_NC 0 -#define SMMU_TCR_RGN_WBWA 1 -#define SMMU_TCR_RGN_WT 2 -#define SMMU_TCR_RGN_WB 3 - -#define SMMU_TCR_SL0_SHIFT 6 -#define SMMU_TCR_SL0_MASK 0x3 -#define SMMU_TCR_SL0_LVL_2 0 -#define SMMU_TCR_SL0_LVL_1 1 - -#define SMMU_TCR_T1SZ_SHIFT 16 -#define SMMU_TCR_T0SZ_SHIFT 0 -#define SMMU_TCR_SZ_MASK 0xf - -#define SMMU_TCR2_SEP_SHIFT 15 -#define SMMU_TCR2_SEP_MASK 0x7 - -#define SMMU_TCR2_PASIZE_SHIFT 0 -#define SMMU_TCR2_PASIZE_MASK 0x7 - -/* Common definitions for PASize and SEP fields */ -#define SMMU_TCR2_ADDR_32 0 -#define SMMU_TCR2_ADDR_36 1 -#define SMMU_TCR2_ADDR_40 2 -#define SMMU_TCR2_ADDR_42 3 -#define SMMU_TCR2_ADDR_44 4 -#define SMMU_TCR2_ADDR_48 5 - -#define SMMU_TTBRn_HI_ASID_SHIFT 16 - -#define SMMU_MAIR_ATTR_SHIFT(n) ((n) << 3) -#define SMMU_MAIR_ATTR_MASK 0xff -#define SMMU_MAIR_ATTR_DEVICE 0x04 -#define SMMU_MAIR_ATTR_NC 0x44 -#define SMMU_MAIR_ATTR_WBRWA 0xff -#define SMMU_MAIR_ATTR_IDX_NC 0 -#define SMMU_MAIR_ATTR_IDX_CACHE 1 -#define SMMU_MAIR_ATTR_IDX_DEV 2 - -#define SMMU_FSR_MULTI (1 << 31) -#define SMMU_FSR_SS (1 << 30) -#define SMMU_FSR_UUT (1 << 8) -#define SMMU_FSR_ASF (1 << 7) -#define SMMU_FSR_TLBLKF (1 << 6) -#define SMMU_FSR_TLBMCF (1 << 5) -#define SMMU_FSR_EF (1 << 4) -#define SMMU_FSR_PF (1 << 3) -#define SMMU_FSR_AFF (1 << 2) -#define SMMU_FSR_TF (1 << 1) - -#define SMMU_FSR_IGN (SMMU_FSR_AFF | SMMU_FSR_ASF | \ - SMMU_FSR_TLBMCF | SMMU_FSR_TLBLKF) -#define SMMU_FSR_FAULT (SMMU_FSR_MULTI | SMMU_FSR_SS | \ - SMMU_FSR_UUT | SMMU_FSR_EF | \ - SMMU_FSR_PF | SMMU_FSR_TF | \ - SMMU_FSR_IGN) - -#define SMMU_FSYNR0_WNR (1 << 4) - -#define smmu_print(dev, lvl, fmt, ...) \ - printk(lvl "smmu: %s: " fmt, dt_node_full_name(dev->node), ## __VA_ARGS__) - -#define smmu_err(dev, fmt, ...) smmu_print(dev, XENLOG_ERR, fmt, ## __VA_ARGS__) - -#define smmu_dbg(dev, fmt, ...) \ - smmu_print(dev, XENLOG_DEBUG, fmt, ## __VA_ARGS__) - -#define smmu_info(dev, fmt, ...) \ - smmu_print(dev, XENLOG_INFO, fmt, ## __VA_ARGS__) - -#define smmu_warn(dev, fmt, ...) \ - smmu_print(dev, XENLOG_WARNING, fmt, ## __VA_ARGS__) - -struct arm_smmu_device { - const struct dt_device_node *node; - - void __iomem *base; - unsigned long size; - unsigned long pagesize; - -#define SMMU_FEAT_COHERENT_WALK (1 << 0) -#define SMMU_FEAT_STREAM_MATCH (1 << 1) -#define SMMU_FEAT_TRANS_S1 (1 << 2) -#define SMMU_FEAT_TRANS_S2 (1 << 3) -#define SMMU_FEAT_TRANS_NESTED (1 << 4) - u32 features; - u32 options; - int version; - - u32 num_context_banks; - u32 num_s2_context_banks; - DECLARE_BITMAP(context_map, SMMU_MAX_CBS); - atomic_t irptndx; - - u32 num_mapping_groups; - DECLARE_BITMAP(smr_map, SMMU_MAX_SMRS); - - unsigned long input_size; - unsigned long s1_output_size; - unsigned long s2_output_size; - - u32 num_global_irqs; - u32 num_context_irqs; - unsigned int *irqs; - - u32 smr_mask_mask; - u32 smr_id_mask; - - unsigned long *sids; - - struct list_head list; - struct rb_root masters; -}; - -struct arm_smmu_smr { - u8 idx; - u16 mask; - u16 id; -}; - -#define INVALID_IRPTNDX 0xff - -#define SMMU_CB_ASID(cfg) ((cfg)->cbndx) -#define SMMU_CB_VMID(cfg) ((cfg)->cbndx + 1) - -struct arm_smmu_domain_cfg { - struct arm_smmu_device *smmu; - u8 cbndx; - u8 irptndx; - u32 cbar; - /* Domain associated to this device */ - struct domain *domain; - /* List of master which use this structure */ - struct list_head masters; - - /* Used to link domain context for a same domain */ - struct list_head list; -}; - -struct arm_smmu_master { - const struct dt_device_node *dt_node; - - /* - * The following is specific to the master's position in the - * SMMU chain. - */ - struct rb_node node; - u32 num_streamids; - u16 streamids[MAX_MASTER_STREAMIDS]; - int num_s2crs; - - struct arm_smmu_smr *smrs; - struct arm_smmu_domain_cfg *cfg; - - /* Used to link masters in a same domain context */ - struct list_head list; -}; - -static LIST_HEAD(arm_smmu_devices); - -struct arm_smmu_domain { - spinlock_t lock; - struct list_head contexts; -}; - -struct arm_smmu_option_prop { - u32 opt; - const char *prop; -}; - -static const struct arm_smmu_option_prop arm_smmu_options [] __initconst = -{ - { SMMU_OPT_SECURE_CONFIG_ACCESS, "calxeda,smmu-secure-config-access" }, - { 0, NULL}, -}; - -static void __init check_driver_options(struct arm_smmu_device *smmu) -{ - int i = 0; - - do { - if ( dt_property_read_bool(smmu->node, arm_smmu_options[i].prop) ) - { - smmu->options |= arm_smmu_options[i].opt; - smmu_dbg(smmu, "option %s\n", arm_smmu_options[i].prop); - } - } while ( arm_smmu_options[++i].opt ); -} - -static void arm_smmu_context_fault(int irq, void *data, - struct cpu_user_regs *regs) -{ - u32 fsr, far, fsynr; - uint64_t iova; - struct arm_smmu_domain_cfg *cfg = data; - struct arm_smmu_device *smmu = cfg->smmu; - void __iomem *cb_base; - - cb_base = SMMU_CB_BASE(smmu) + SMMU_CB(smmu, cfg->cbndx); - fsr = readl_relaxed(cb_base + SMMU_CB_FSR); - - if ( !(fsr & SMMU_FSR_FAULT) ) - return; - - if ( fsr & SMMU_FSR_IGN ) - smmu_err(smmu, "Unexpected context fault (fsr 0x%u)\n", fsr); - - fsynr = readl_relaxed(cb_base + SMMU_CB_FSYNR0); - far = readl_relaxed(cb_base + SMMU_CB_FAR_LO); - iova = far; - far = readl_relaxed(cb_base + SMMU_CB_FAR_HI); - iova |= ((uint64_t)far << 32); - - smmu_err(smmu, "Unhandled context fault for domain %u\n", - cfg->domain->domain_id); - smmu_err(smmu, "\tFSR 0x%x, IOVA 0x%"PRIx64", FSYNR 0x%x, CB %d\n", - fsr, iova, fsynr, cfg->cbndx); - - /* Clear the faulting FSR */ - writel(fsr, cb_base + SMMU_CB_FSR); - - /* Terminate any stalled transactions */ - if ( fsr & SMMU_FSR_SS ) - writel_relaxed(SMMU_RESUME_TERMINATE, cb_base + SMMU_CB_RESUME); -} - -static void arm_smmu_global_fault(int irq, void *data, - struct cpu_user_regs *regs) -{ - u32 gfsr, gfsynr0, gfsynr1, gfsynr2; - struct arm_smmu_device *smmu = data; - void __iomem *gr0_base = SMMU_GR0_NS(smmu); - - gfsr = readl_relaxed(gr0_base + SMMU_GR0_sGFSR); - gfsynr0 = readl_relaxed(gr0_base + SMMU_GR0_sGFSYNR0); - gfsynr1 = readl_relaxed(gr0_base + SMMU_GR0_sGFSYNR1); - gfsynr2 = readl_relaxed(gr0_base + SMMU_GR0_sGFSYNR2); - - if ( !gfsr ) - return; - - smmu_err(smmu, "Unexpected global fault, this could be serious\n"); - smmu_err(smmu, - "\tGFSR 0x%08x, GFSYNR0 0x%08x, GFSYNR1 0x%08x, GFSYNR2 0x%08x\n", - gfsr, gfsynr0, gfsynr1, gfsynr2); - writel(gfsr, gr0_base + SMMU_GR0_sGFSR); -} - -static struct arm_smmu_master * -find_smmu_master(struct arm_smmu_device *smmu, - const struct dt_device_node *dev_node) -{ - struct rb_node *node = smmu->masters.rb_node; - - while ( node ) - { - struct arm_smmu_master *master; - - master = container_of(node, struct arm_smmu_master, node); - - if ( dev_node < master->dt_node ) - node = node->rb_left; - else if ( dev_node > master->dt_node ) - node = node->rb_right; - else - return master; - } - - return NULL; -} - -static __init int insert_smmu_master(struct arm_smmu_device *smmu, - struct arm_smmu_master *master) -{ - struct rb_node **new, *parent; - - new = &smmu->masters.rb_node; - parent = NULL; - while ( *new ) - { - struct arm_smmu_master *this; - - this = container_of(*new, struct arm_smmu_master, node); - - parent = *new; - if ( master->dt_node < this->dt_node ) - new = &((*new)->rb_left); - else if (master->dt_node > this->dt_node) - new = &((*new)->rb_right); - else - return -EEXIST; - } - - rb_link_node(&master->node, parent, new); - rb_insert_color(&master->node, &smmu->masters); - return 0; -} - -static __init int register_smmu_master(struct arm_smmu_device *smmu, - struct dt_phandle_args *masterspec) -{ - int i, sid; - struct arm_smmu_master *master; - int rc = 0; - - smmu_dbg(smmu, "Try to add master %s\n", masterspec->np->name); - - master = find_smmu_master(smmu, masterspec->np); - if ( master ) - { - smmu_err(smmu, - "rejecting multiple registrations for master device %s\n", - masterspec->np->name); - return -EBUSY; - } - - if ( masterspec->args_count > MAX_MASTER_STREAMIDS ) - { - smmu_err(smmu, - "reached maximum number (%d) of stream IDs for master device %s\n", - MAX_MASTER_STREAMIDS, masterspec->np->name); - return -ENOSPC; - } - - master = xzalloc(struct arm_smmu_master); - if ( !master ) - return -ENOMEM; - - INIT_LIST_HEAD(&master->list); - master->dt_node = masterspec->np; - master->num_streamids = masterspec->args_count; - - dt_device_set_protected(masterspec->np); - - for ( i = 0; i < master->num_streamids; ++i ) - { - sid = masterspec->args[i]; - if ( test_and_set_bit(sid, smmu->sids) ) - { - smmu_err(smmu, "duplicate stream ID (%d)\n", sid); - xfree(master); - return -EEXIST; - } - master->streamids[i] = masterspec->args[i]; - } - - rc = insert_smmu_master(smmu, master); - /* Insertion should never fail */ - ASSERT(rc == 0); - - return 0; -} - -static int __arm_smmu_alloc_bitmap(unsigned long *map, int start, int end) -{ - int idx; - - do - { - idx = find_next_zero_bit(map, end, start); - if ( idx == end ) - return -ENOSPC; - } while ( test_and_set_bit(idx, map) ); - - return idx; -} - -static void __arm_smmu_free_bitmap(unsigned long *map, int idx) -{ - clear_bit(idx, map); -} - -static void arm_smmu_tlb_sync(struct arm_smmu_device *smmu) -{ - int count = 0; - void __iomem *gr0_base = SMMU_GR0(smmu); - - writel_relaxed(0, gr0_base + SMMU_GR0_sTLBGSYNC); - while ( readl_relaxed(gr0_base + SMMU_GR0_sTLBGSTATUS) & - SMMU_sTLBGSTATUS_GSACTIVE ) - { - cpu_relax(); - if ( ++count == SMMU_TLB_LOOP_TIMEOUT ) - { - smmu_err(smmu, "TLB sync timed out -- SMMU may be deadlocked\n"); - return; - } - udelay(1); - } -} - -static void arm_smmu_tlb_inv_context(struct arm_smmu_domain_cfg *cfg) -{ - struct arm_smmu_device *smmu = cfg->smmu; - void __iomem *base = SMMU_GR0(smmu); - - writel_relaxed(SMMU_CB_VMID(cfg), - base + SMMU_GR0_TLBIVMID); - - arm_smmu_tlb_sync(smmu); -} - -static void arm_smmu_iotlb_flush_all(struct domain *d) -{ - struct arm_smmu_domain *smmu_domain = domain_hvm_iommu(d)->arch.priv; - struct arm_smmu_domain_cfg *cfg; - - spin_lock(&smmu_domain->lock); - list_for_each_entry(cfg, &smmu_domain->contexts, list) - arm_smmu_tlb_inv_context(cfg); - spin_unlock(&smmu_domain->lock); -} - -static void arm_smmu_iotlb_flush(struct domain *d, unsigned long gfn, - unsigned int page_count) -{ - /* ARM SMMU v1 doesn't have flush by VMA and VMID */ - arm_smmu_iotlb_flush_all(d); -} - -static int determine_smr_mask(struct arm_smmu_device *smmu, - struct arm_smmu_master *master, - struct arm_smmu_smr *smr, int start, int order) -{ - u16 i, zero_bits_mask, one_bits_mask, const_mask; - int nr; - - nr = 1 << order; - - if ( nr == 1 ) - { - /* no mask, use streamid to match and be done with it */ - smr->mask = 0; - smr->id = master->streamids[start]; - return 0; - } - - zero_bits_mask = 0; - one_bits_mask = 0xffff; - for ( i = start; i < start + nr; i++) - { - zero_bits_mask |= master->streamids[i]; /* const 0 bits */ - one_bits_mask &= master->streamids[i]; /* const 1 bits */ - } - zero_bits_mask = ~zero_bits_mask; - - /* bits having constant values (either 0 or 1) */ - const_mask = zero_bits_mask | one_bits_mask; - - i = hweight16(~const_mask); - if ( (1 << i) == nr ) - { - smr->mask = ~const_mask; - smr->id = one_bits_mask; - } - else - /* no usable mask for this set of streamids */ - return 1; - - if ( ((smr->mask & smmu->smr_mask_mask) != smr->mask) || - ((smr->id & smmu->smr_id_mask) != smr->id) ) - /* insufficient number of mask/id bits */ - return 1; - - return 0; -} - -static int determine_smr_mapping(struct arm_smmu_device *smmu, - struct arm_smmu_master *master, - struct arm_smmu_smr *smrs, int max_smrs) -{ - int nr_sid, nr, i, bit, start; - - /* - * This function is called only once -- when a master is added - * to a domain. If master->num_s2crs != 0 then this master - * was already added to a domain. - */ - BUG_ON(master->num_s2crs); - - start = nr = 0; - nr_sid = master->num_streamids; - do - { - /* - * largest power-of-2 number of streamids for which to - * determine a usable mask/id pair for stream matching - */ - bit = fls(nr_sid); - if (!bit) - return 0; - - /* - * iterate over power-of-2 numbers to determine - * largest possible mask/id pair for stream matching - * of next 2**i streamids - */ - for ( i = bit - 1; i >= 0; i-- ) - { - if( !determine_smr_mask(smmu, master, - &smrs[master->num_s2crs], - start, i)) - break; - } - - if ( i < 0 ) - goto out; - - nr = 1 << i; - nr_sid -= nr; - start += nr; - master->num_s2crs++; - } while ( master->num_s2crs <= max_smrs ); - -out: - if ( nr_sid ) - { - /* not enough mapping groups available */ - master->num_s2crs = 0; - return -ENOSPC; - } - - return 0; -} - -static int arm_smmu_master_configure_smrs(struct arm_smmu_device *smmu, - struct arm_smmu_master *master) -{ - int i, max_smrs, ret; - struct arm_smmu_smr *smrs; - void __iomem *gr0_base = SMMU_GR0(smmu); - - if ( !(smmu->features & SMMU_FEAT_STREAM_MATCH) ) - return 0; - - if ( master->smrs ) - return -EEXIST; - - max_smrs = min(smmu->num_mapping_groups, master->num_streamids); - smrs = xmalloc_array(struct arm_smmu_smr, max_smrs); - if ( !smrs ) - { - smmu_err(smmu, "failed to allocated %d SMRs for master %s\n", - max_smrs, dt_node_name(master->dt_node)); - return -ENOMEM; - } - - ret = determine_smr_mapping(smmu, master, smrs, max_smrs); - if ( ret ) - goto err_free_smrs; - - /* Allocate the SMRs on the root SMMU */ - for ( i = 0; i < master->num_s2crs; ++i ) - { - int idx = __arm_smmu_alloc_bitmap(smmu->smr_map, 0, - smmu->num_mapping_groups); - if ( idx < 0 ) - { - smmu_err(smmu, "failed to allocate free SMR\n"); - goto err_free_bitmap; - } - smrs[i].idx = idx; - } - - /* It worked! Now, poke the actual hardware */ - for ( i = 0; i < master->num_s2crs; ++i ) - { - u32 reg = SMMU_SMR_VALID | smrs[i].id << SMMU_SMR_ID_SHIFT | - smrs[i].mask << SMMU_SMR_MASK_SHIFT; - smmu_dbg(smmu, "SMR%d: 0x%x\n", smrs[i].idx, reg); - writel_relaxed(reg, gr0_base + SMMU_GR0_SMR(smrs[i].idx)); - } - - master->smrs = smrs; - return 0; - -err_free_bitmap: - while (--i >= 0) - __arm_smmu_free_bitmap(smmu->smr_map, smrs[i].idx); - master->num_s2crs = 0; -err_free_smrs: - xfree(smrs); - return -ENOSPC; -} - -/* Forward declaration */ -static void arm_smmu_destroy_domain_context(struct arm_smmu_domain_cfg *cfg); - -static int arm_smmu_domain_add_master(struct domain *d, - struct arm_smmu_domain_cfg *cfg, - struct arm_smmu_master *master) -{ - int i, ret; - struct arm_smmu_device *smmu = cfg->smmu; - void __iomem *gr0_base = SMMU_GR0(smmu); - struct arm_smmu_smr *smrs = master->smrs; - - if ( master->cfg ) - return -EBUSY; - - ret = arm_smmu_master_configure_smrs(smmu, master); - if ( ret ) - return ret; - - /* Now we're at the root, time to point at our context bank */ - if ( !master->num_s2crs ) - master->num_s2crs = master->num_streamids; - - for ( i = 0; i < master->num_s2crs; ++i ) - { - u32 idx, s2cr; - - idx = smrs ? smrs[i].idx : master->streamids[i]; - s2cr = (SMMU_S2CR_TYPE_TRANS << SMMU_S2CR_TYPE_SHIFT) | - (cfg->cbndx << SMMU_S2CR_CBNDX_SHIFT); - smmu_dbg(smmu, "S2CR%d: 0x%x\n", idx, s2cr); - writel_relaxed(s2cr, gr0_base + SMMU_GR0_S2CR(idx)); - } - - master->cfg = cfg; - list_add(&master->list, &cfg->masters); - - return 0; -} - -static void arm_smmu_domain_remove_master(struct arm_smmu_master *master) -{ - int i; - struct arm_smmu_domain_cfg *cfg = master->cfg; - struct arm_smmu_device *smmu = cfg->smmu; - void __iomem *gr0_base = SMMU_GR0(smmu); - struct arm_smmu_smr *smrs = master->smrs; - - /* - * We *must* clear the S2CR first, because freeing the SMR means - * that it can be reallocated immediately - */ - for ( i = 0; i < master->num_streamids; ++i ) - { - u16 sid = master->streamids[i]; - writel_relaxed(SMMU_S2CR_TYPE_FAULT, - gr0_base + SMMU_GR0_S2CR(sid)); - } - - /* Invalidate the SMRs before freeing back to the allocator */ - for (i = 0; i < master->num_s2crs; ++i) { - u8 idx = smrs[i].idx; - writel_relaxed(~SMMU_SMR_VALID, gr0_base + SMMU_GR0_SMR(idx)); - __arm_smmu_free_bitmap(smmu->smr_map, idx); - } - - master->smrs = NULL; - master->num_s2crs = 0; - xfree(smrs); - - master->cfg = NULL; - list_del(&master->list); - INIT_LIST_HEAD(&master->list); -} - -static void arm_smmu_init_context_bank(struct arm_smmu_domain_cfg *cfg) -{ - u32 reg; - struct arm_smmu_device *smmu = cfg->smmu; - void __iomem *cb_base, *gr1_base; - paddr_t p2maddr; - - ASSERT(cfg->domain != NULL); - p2maddr = page_to_maddr(cfg->domain->arch.p2m.root); - - gr1_base = SMMU_GR1(smmu); - cb_base = SMMU_CB_BASE(smmu) + SMMU_CB(smmu, cfg->cbndx); - - /* CBAR */ - reg = cfg->cbar; - if ( smmu->version == 1 ) - reg |= cfg->irptndx << SMMU_CBAR_IRPTNDX_SHIFT; - - reg |= SMMU_CB_VMID(cfg) << SMMU_CBAR_VMID_SHIFT; - writel_relaxed(reg, gr1_base + SMMU_GR1_CBAR(cfg->cbndx)); - - if ( smmu->version > 1 ) - { - /* CBA2R */ -#ifdef CONFIG_ARM_64 - reg = SMMU_CBA2R_RW64_64BIT; -#else - reg = SMMU_CBA2R_RW64_32BIT; -#endif - writel_relaxed(reg, gr1_base + SMMU_GR1_CBA2R(cfg->cbndx)); - } - - /* TTBR0 */ - reg = (p2maddr & ((1ULL << 32) - 1)); - writel_relaxed(reg, cb_base + SMMU_CB_TTBR0_LO); - reg = (p2maddr >> 32); - writel_relaxed(reg, cb_base + SMMU_CB_TTBR0_HI); - - /* - * TCR - * We use long descriptor, with inner-shareable WBWA tables in TTBR0. - */ - if ( smmu->version > 1 ) - { - /* 4K Page Table */ - if ( PAGE_SIZE == PAGE_SIZE_4K ) - reg = SMMU_TCR_TG0_4K; - else - reg = SMMU_TCR_TG0_64K; - - switch ( smmu->s2_output_size ) { - case 32: - reg |= (SMMU_TCR2_ADDR_32 << SMMU_TCR_PASIZE_SHIFT); - break; - case 36: - reg |= (SMMU_TCR2_ADDR_36 << SMMU_TCR_PASIZE_SHIFT); - break; - case 40: - reg |= (SMMU_TCR2_ADDR_40 << SMMU_TCR_PASIZE_SHIFT); - break; - case 42: - reg |= (SMMU_TCR2_ADDR_42 << SMMU_TCR_PASIZE_SHIFT); - break; - case 44: - reg |= (SMMU_TCR2_ADDR_44 << SMMU_TCR_PASIZE_SHIFT); - break; - case 48: - reg |= (SMMU_TCR2_ADDR_48 << SMMU_TCR_PASIZE_SHIFT); - break; - } - } - else - reg = 0; - - /* The attribute to walk the page table should be the same as VTCR_EL2 */ - reg |= SMMU_TCR_EAE | - (SMMU_TCR_SH_IS << SMMU_TCR_SH0_SHIFT) | - (SMMU_TCR_RGN_WBWA << SMMU_TCR_ORGN0_SHIFT) | - (SMMU_TCR_RGN_WBWA << SMMU_TCR_IRGN0_SHIFT) | - (SMMU_TCR_SL0_LVL_1 << SMMU_TCR_SL0_SHIFT) | - /* T0SZ=(1)100 = -8 ( 32 -(-8) = 40 bit physical addresses ) */ - (0x18 << SMMU_TCR_T0SZ_SHIFT); - writel_relaxed(reg, cb_base + SMMU_CB_TCR); - - /* SCTLR */ - reg = SMMU_SCTLR_CFCFG | - SMMU_SCTLR_CFIE | - SMMU_SCTLR_CFRE | - SMMU_SCTLR_M | - SMMU_SCTLR_EAE_SBOP; - - writel_relaxed(reg, cb_base + SMMU_CB_SCTLR); -} - -static struct arm_smmu_domain_cfg * -arm_smmu_alloc_domain_context(struct domain *d, - struct arm_smmu_device *smmu) -{ - unsigned int irq; - int ret, start; - struct arm_smmu_domain_cfg *cfg; - struct arm_smmu_domain *smmu_domain = domain_hvm_iommu(d)->arch.priv; - - ASSERT(spin_is_locked(&smmu_domain->lock)); - - cfg = xzalloc(struct arm_smmu_domain_cfg); - if ( !cfg ) - return NULL; - - /* Master already initialized to another domain ... */ - if ( cfg->domain != NULL ) - goto out_free_mem; - - cfg->cbar = SMMU_CBAR_TYPE_S2_TRANS; - start = 0; - - ret = __arm_smmu_alloc_bitmap(smmu->context_map, start, - smmu->num_context_banks); - if ( ret < 0 ) - goto out_free_mem; - - cfg->cbndx = ret; - if ( smmu->version == 1 ) - { - cfg->irptndx = atomic_inc_return(&smmu->irptndx); - cfg->irptndx %= smmu->num_context_irqs; - } - else - cfg->irptndx = cfg->cbndx; - - irq = smmu->irqs[smmu->num_global_irqs + cfg->irptndx]; - ret = request_irq(irq, IRQF_SHARED, arm_smmu_context_fault, - "arm-smmu-context-fault", cfg); - if ( ret ) - { - smmu_err(smmu, "failed to request context IRQ %d (%u)\n", - cfg->irptndx, irq); - cfg->irptndx = INVALID_IRPTNDX; - goto out_free_context; - } - - cfg->domain = d; - cfg->smmu = smmu; - if ( smmu->features & SMMU_FEAT_COHERENT_WALK ) - iommu_set_feature(d, IOMMU_FEAT_COHERENT_WALK); - - arm_smmu_init_context_bank(cfg); - list_add(&cfg->list, &smmu_domain->contexts); - INIT_LIST_HEAD(&cfg->masters); - - return cfg; - -out_free_context: - __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx); -out_free_mem: - xfree(cfg); - - return NULL; -} - -static void arm_smmu_destroy_domain_context(struct arm_smmu_domain_cfg *cfg) -{ - struct domain *d = cfg->domain; - struct arm_smmu_domain *smmu_domain = domain_hvm_iommu(d)->arch.priv; - struct arm_smmu_device *smmu = cfg->smmu; - void __iomem *cb_base; - unsigned int irq; - - ASSERT(spin_is_locked(&smmu_domain->lock)); - BUG_ON(!list_empty(&cfg->masters)); - - /* Disable the context bank and nuke the TLB before freeing it */ - cb_base = SMMU_CB_BASE(smmu) + SMMU_CB(smmu, cfg->cbndx); - writel_relaxed(0, cb_base + SMMU_CB_SCTLR); - arm_smmu_tlb_inv_context(cfg); - - if ( cfg->irptndx != INVALID_IRPTNDX ) - { - irq = smmu->irqs[smmu->num_global_irqs + cfg->irptndx]; - release_irq(irq, cfg); - } - - __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx); - list_del(&cfg->list); - xfree(cfg); -} - -static struct arm_smmu_device * -arm_smmu_find_smmu_by_dev(const struct dt_device_node *dev) -{ - struct arm_smmu_device *smmu; - struct arm_smmu_master *master = NULL; - - list_for_each_entry( smmu, &arm_smmu_devices, list ) - { - master = find_smmu_master(smmu, dev); - if ( master ) - break; - } - - if ( !master ) - return NULL; - - return smmu; -} - -static int arm_smmu_attach_dev(struct domain *d, - const struct dt_device_node *dev) -{ - struct arm_smmu_device *smmu = arm_smmu_find_smmu_by_dev(dev); - struct arm_smmu_master *master; - struct arm_smmu_domain *smmu_domain = domain_hvm_iommu(d)->arch.priv; - struct arm_smmu_domain_cfg *cfg = NULL; - struct arm_smmu_domain_cfg *curr; - int ret; - - printk(XENLOG_DEBUG "arm-smmu: attach %s to domain %d\n", - dt_node_full_name(dev), d->domain_id); - - if ( !smmu ) - { - printk(XENLOG_ERR "%s: cannot attach to SMMU, is it on the same bus?\n", - dt_node_full_name(dev)); - return -ENODEV; - } - - master = find_smmu_master(smmu, dev); - BUG_ON(master == NULL); - - /* Check if the device is already assigned to someone */ - if ( master->cfg ) - return -EBUSY; - - spin_lock(&smmu_domain->lock); - list_for_each_entry( curr, &smmu_domain->contexts, list ) - { - if ( curr->smmu == smmu ) - { - cfg = curr; - break; - } - } - - if ( !cfg ) - { - cfg = arm_smmu_alloc_domain_context(d, smmu); - if ( !cfg ) - { - smmu_err(smmu, "unable to allocate context for domain %u\n", - d->domain_id); - spin_unlock(&smmu_domain->lock); - return -ENOMEM; - } - } - spin_unlock(&smmu_domain->lock); - - ret = arm_smmu_domain_add_master(d, cfg, master); - if ( ret ) - { - spin_lock(&smmu_domain->lock); - if ( list_empty(&cfg->masters) ) - arm_smmu_destroy_domain_context(cfg); - spin_unlock(&smmu_domain->lock); - } - - return ret; -} - -static int arm_smmu_detach_dev(struct domain *d, - const struct dt_device_node *dev) -{ - struct arm_smmu_domain *smmu_domain = domain_hvm_iommu(d)->arch.priv; - struct arm_smmu_master *master; - struct arm_smmu_device *smmu = arm_smmu_find_smmu_by_dev(dev); - struct arm_smmu_domain_cfg *cfg; - - printk(XENLOG_DEBUG "arm-smmu: detach %s to domain %d\n", - dt_node_full_name(dev), d->domain_id); - - if ( !smmu ) - { - printk(XENLOG_ERR "%s: cannot find the SMMU, is it on the same bus?\n", - dt_node_full_name(dev)); - return -ENODEV; - } - - master = find_smmu_master(smmu, dev); - BUG_ON(master == NULL); - - cfg = master->cfg; - - /* Sanity check to avoid removing a device that doesn't belong to - * the domain - */ - if ( !cfg || cfg->domain != d ) - { - printk(XENLOG_ERR "%s: was not attach to domain %d\n", - dt_node_full_name(dev), d->domain_id); - return -ESRCH; - } - - arm_smmu_domain_remove_master(master); - - spin_lock(&smmu_domain->lock); - if ( list_empty(&cfg->masters) ) - arm_smmu_destroy_domain_context(cfg); - spin_unlock(&smmu_domain->lock); - - return 0; -} - -static int arm_smmu_reassign_dt_dev(struct domain *s, struct domain *t, - const struct dt_device_node *dev) -{ - int ret = 0; - - /* Don't allow remapping on other domain than hwdom */ - if ( t != hardware_domain ) - return -EPERM; - - if ( t == s ) - return 0; - - ret = arm_smmu_detach_dev(s, dev); - if ( ret ) - return ret; - - ret = arm_smmu_attach_dev(t, dev); - - return ret; -} - -static __init int arm_smmu_id_size_to_bits(int size) -{ - switch ( size ) - { - case 0: - return 32; - case 1: - return 36; - case 2: - return 40; - case 3: - return 42; - case 4: - return 44; - case 5: - default: - return 48; - } -} - -static __init int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) -{ - unsigned long size; - void __iomem *gr0_base = SMMU_GR0(smmu); - u32 id; - - smmu_info(smmu, "probing hardware configuration...\n"); - - /* - * Primecell ID - */ - id = readl_relaxed(gr0_base + SMMU_GR0_PIDR2); - smmu->version = ((id >> SMMU_PIDR2_ARCH_SHIFT) & SMMU_PIDR2_ARCH_MASK) + 1; - smmu_info(smmu, "SMMUv%d with:\n", smmu->version); - - /* ID0 */ - id = readl_relaxed(gr0_base + SMMU_GR0_ID0); -#ifndef CONFIG_ARM_64 - if ( ((id >> SMMU_ID0_PTFS_SHIFT) & SMMU_ID0_PTFS_MASK) == - SMMU_ID0_PTFS_V8_ONLY ) - { - smmu_err(smmu, "\tno v7 descriptor support!\n"); - return -ENODEV; - } -#endif - if ( id & SMMU_ID0_S1TS ) - { - smmu->features |= SMMU_FEAT_TRANS_S1; - smmu_info(smmu, "\tstage 1 translation\n"); - } - - if ( id & SMMU_ID0_S2TS ) - { - smmu->features |= SMMU_FEAT_TRANS_S2; - smmu_info(smmu, "\tstage 2 translation\n"); - } - - if ( id & SMMU_ID0_NTS ) - { - smmu->features |= SMMU_FEAT_TRANS_NESTED; - smmu_info(smmu, "\tnested translation\n"); - } - - if ( !(smmu->features & - (SMMU_FEAT_TRANS_S1 | SMMU_FEAT_TRANS_S2 | - SMMU_FEAT_TRANS_NESTED)) ) - { - smmu_err(smmu, "\tno translation support!\n"); - return -ENODEV; - } - - /* We need at least support for Stage 2 */ - if ( !(smmu->features & SMMU_FEAT_TRANS_S2) ) - { - smmu_err(smmu, "\tno stage 2 translation!\n"); - return -ENODEV; - } - - if ( id & SMMU_ID0_CTTW ) - { - smmu->features |= SMMU_FEAT_COHERENT_WALK; - smmu_info(smmu, "\tcoherent table walk\n"); - } - - if ( id & SMMU_ID0_SMS ) - { - u32 smr, sid, mask; - - smmu->features |= SMMU_FEAT_STREAM_MATCH; - smmu->num_mapping_groups = (id >> SMMU_ID0_NUMSMRG_SHIFT) & - SMMU_ID0_NUMSMRG_MASK; - if ( smmu->num_mapping_groups == 0 ) - { - smmu_err(smmu, - "stream-matching supported, but no SMRs present!\n"); - return -ENODEV; - } - - smr = SMMU_SMR_MASK_MASK << SMMU_SMR_MASK_SHIFT; - smr |= (SMMU_SMR_ID_MASK << SMMU_SMR_ID_SHIFT); - writel_relaxed(smr, gr0_base + SMMU_GR0_SMR(0)); - smr = readl_relaxed(gr0_base + SMMU_GR0_SMR(0)); - - mask = (smr >> SMMU_SMR_MASK_SHIFT) & SMMU_SMR_MASK_MASK; - sid = (smr >> SMMU_SMR_ID_SHIFT) & SMMU_SMR_ID_MASK; - if ( (mask & sid) != sid ) - { - smmu_err(smmu, - "SMR mask bits (0x%x) insufficient for ID field (0x%x)\n", - mask, sid); - return -ENODEV; - } - smmu->smr_mask_mask = mask; - smmu->smr_id_mask = sid; - - smmu_info(smmu, - "\tstream matching with %u register groups, mask 0x%x\n", - smmu->num_mapping_groups, mask); - } - - /* ID1 */ - id = readl_relaxed(gr0_base + SMMU_GR0_ID1); - smmu->pagesize = (id & SMMU_ID1_PAGESIZE) ? PAGE_SIZE_64K : PAGE_SIZE_4K; - - /* Check for size mismatch of SMMU address space from mapped region */ - size = 1 << (((id >> SMMU_ID1_NUMPAGENDXB_SHIFT) & - SMMU_ID1_NUMPAGENDXB_MASK) + 1); - size *= (smmu->pagesize << 1); - if ( smmu->size != size ) - smmu_warn(smmu, "SMMU address space size (0x%lx) differs " - "from mapped region size (0x%lx)!\n", size, smmu->size); - - smmu->num_s2_context_banks = (id >> SMMU_ID1_NUMS2CB_SHIFT) & - SMMU_ID1_NUMS2CB_MASK; - smmu->num_context_banks = (id >> SMMU_ID1_NUMCB_SHIFT) & - SMMU_ID1_NUMCB_MASK; - if ( smmu->num_s2_context_banks > smmu->num_context_banks ) - { - smmu_err(smmu, "impossible number of S2 context banks!\n"); - return -ENODEV; - } - smmu_info(smmu, "\t%u context banks (%u stage-2 only)\n", - smmu->num_context_banks, smmu->num_s2_context_banks); - - /* ID2 */ - id = readl_relaxed(gr0_base + SMMU_GR0_ID2); - size = arm_smmu_id_size_to_bits((id >> SMMU_ID2_IAS_SHIFT) & - SMMU_ID2_IAS_MASK); - - /* - * Stage-1 output limited by stage-2 input size due to VTCR_EL2 - * setup (see setup_virt_paging) - */ - /* Current maximum output size of 40 bits */ - smmu->s1_output_size = min(40UL, size); - - /* The stage-2 output mask is also applied for bypass */ - size = arm_smmu_id_size_to_bits((id >> SMMU_ID2_OAS_SHIFT) & - SMMU_ID2_OAS_MASK); - smmu->s2_output_size = min((unsigned long)PADDR_BITS, size); - - if ( smmu->version == 1 ) - smmu->input_size = 32; - else - { -#ifdef CONFIG_ARM_64 - size = (id >> SMMU_ID2_UBS_SHIFT) & SMMU_ID2_UBS_MASK; - size = min(39, arm_smmu_id_size_to_bits(size)); -#else - size = 32; -#endif - smmu->input_size = size; - - if ( (PAGE_SIZE == PAGE_SIZE_4K && !(id & SMMU_ID2_PTFS_4K) ) || - (PAGE_SIZE == PAGE_SIZE_64K && !(id & SMMU_ID2_PTFS_64K)) || - (PAGE_SIZE != PAGE_SIZE_4K && PAGE_SIZE != PAGE_SIZE_64K) ) - { - smmu_err(smmu, "CPU page size 0x%lx unsupported\n", - PAGE_SIZE); - return -ENODEV; - } - } - - smmu_info(smmu, "\t%lu-bit VA, %lu-bit IPA, %lu-bit PA\n", - smmu->input_size, smmu->s1_output_size, smmu->s2_output_size); - return 0; -} - -static __init void arm_smmu_device_reset(struct arm_smmu_device *smmu) -{ - void __iomem *gr0_base = SMMU_GR0(smmu); - void __iomem *cb_base; - int i = 0; - u32 reg; - - smmu_dbg(smmu, "device reset\n"); - - /* Clear Global FSR */ - reg = readl_relaxed(SMMU_GR0_NS(smmu) + SMMU_GR0_sGFSR); - writel(reg, SMMU_GR0_NS(smmu) + SMMU_GR0_sGFSR); - - /* Mark all SMRn as invalid and all S2CRn as fault */ - for ( i = 0; i < smmu->num_mapping_groups; ++i ) - { - writel_relaxed(~SMMU_SMR_VALID, gr0_base + SMMU_GR0_SMR(i)); - writel_relaxed(SMMU_S2CR_TYPE_FAULT, gr0_base + SMMU_GR0_S2CR(i)); - } - - /* Make sure all context banks are disabled and clear CB_FSR */ - for ( i = 0; i < smmu->num_context_banks; ++i ) - { - cb_base = SMMU_CB_BASE(smmu) + SMMU_CB(smmu, i); - writel_relaxed(0, cb_base + SMMU_CB_SCTLR); - writel_relaxed(SMMU_FSR_FAULT, cb_base + SMMU_CB_FSR); - } - - /* Invalidate the TLB, just in case */ - writel_relaxed(0, gr0_base + SMMU_GR0_STLBIALL); - writel_relaxed(0, gr0_base + SMMU_GR0_TLBIALLH); - writel_relaxed(0, gr0_base + SMMU_GR0_TLBIALLNSNH); - - reg = readl_relaxed(SMMU_GR0_NS(smmu) + SMMU_GR0_sCR0); - - /* Enable fault reporting */ - reg |= (SMMU_sCR0_GFRE | SMMU_sCR0_GFIE | - SMMU_sCR0_GCFGFRE | SMMU_sCR0_GCFGFIE); - - /* Disable TLB broadcasting. */ - reg |= (SMMU_sCR0_VMIDPNE | SMMU_sCR0_PTM); - - /* Enable client access, generate a fault if no mapping is found */ - reg &= ~(SMMU_sCR0_CLIENTPD); - reg |= SMMU_sCR0_USFCFG; - - /* Disable forced broadcasting */ - reg &= ~SMMU_sCR0_FB; - - /* Don't upgrade barriers when client devices are not mapped to - * a translation context banks (just here for clarity as Xen policy - * is to deny invalid transaction). */ - reg &= ~(SMMU_sCR0_BSU_MASK << SMMU_sCR0_BSU_SHIFT); - - /* Push the button */ - arm_smmu_tlb_sync(smmu); - writel_relaxed(reg, SMMU_GR0_NS(smmu) + SMMU_GR0_sCR0); -} - -static int arm_smmu_iommu_domain_init(struct domain *d) -{ - struct arm_smmu_domain *smmu_domain; - - smmu_domain = xzalloc(struct arm_smmu_domain); - if ( !smmu_domain ) - return -ENOMEM; - - spin_lock_init(&smmu_domain->lock); - INIT_LIST_HEAD(&smmu_domain->contexts); - - domain_hvm_iommu(d)->arch.priv = smmu_domain; - - return 0; -} - -static void __hwdom_init arm_smmu_iommu_hwdom_init(struct domain *d) -{ -} - -static void arm_smmu_iommu_domain_teardown(struct domain *d) -{ - struct arm_smmu_domain *smmu_domain = domain_hvm_iommu(d)->arch.priv; - - ASSERT(list_empty(&smmu_domain->contexts)); - xfree(smmu_domain); -} - -static int arm_smmu_map_page(struct domain *d, unsigned long gfn, - unsigned long mfn, unsigned int flags) -{ - p2m_type_t t; - - /* Grant mappings can be used for DMA requests. The dev_bus_addr returned by - * the hypercall is the MFN (not the IPA). For device protected by - * an IOMMU, Xen needs to add a 1:1 mapping in the domain p2m to - * allow DMA request to work. - * This is only valid when the domain is directed mapped. Hence this - * function should only be used by gnttab code with gfn == mfn. - */ - BUG_ON(!is_domain_direct_mapped(d)); - BUG_ON(mfn != gfn); - - /* We only support readable and writable flags */ - if ( !(flags & (IOMMUF_readable | IOMMUF_writable)) ) - return -EINVAL; - - t = (flags & IOMMUF_writable) ? p2m_iommu_map_rw : p2m_iommu_map_ro; - - /* The function guest_physmap_add_entry replaces the current mapping - * if there is already one... - */ - return guest_physmap_add_entry(d, gfn, mfn, 0, t); -} - -static int arm_smmu_unmap_page(struct domain *d, unsigned long gfn) -{ - /* This function should only be used by gnttab code when the domain - * is direct mapped - */ - if ( !is_domain_direct_mapped(d) ) - return -EINVAL; - - guest_physmap_remove_page(d, gfn, gfn, 0); - - return 0; -} - -static const struct iommu_ops arm_smmu_iommu_ops = { - .init = arm_smmu_iommu_domain_init, - .hwdom_init = arm_smmu_iommu_hwdom_init, - .teardown = arm_smmu_iommu_domain_teardown, - .iotlb_flush = arm_smmu_iotlb_flush, - .iotlb_flush_all = arm_smmu_iotlb_flush_all, - .assign_dt_device = arm_smmu_attach_dev, - .reassign_dt_device = arm_smmu_reassign_dt_dev, - .map_page = arm_smmu_map_page, - .unmap_page = arm_smmu_unmap_page, -}; - -static int __init smmu_init(struct dt_device_node *dev, - const void *data) -{ - struct arm_smmu_device *smmu; - int res; - u64 addr, size; - unsigned int num_irqs, i; - struct dt_phandle_args masterspec; - struct rb_node *node; - - /* Even if the device can't be initialized, we don't want to give - * the smmu device to dom0. - */ - dt_device_set_used_by(dev, DOMID_XEN); - - smmu = xzalloc(struct arm_smmu_device); - if ( !smmu ) - { - printk(XENLOG_ERR "%s: failed to allocate arm_smmu_device\n", - dt_node_full_name(dev)); - return -ENOMEM; - } - - smmu->node = dev; - check_driver_options(smmu); - - res = dt_device_get_address(smmu->node, 0, &addr, &size); - if ( res ) - { - smmu_err(smmu, "unable to retrieve the base address of the SMMU\n"); - goto out_err; - } - - smmu->base = ioremap_nocache(addr, size); - if ( !smmu->base ) - { - smmu_err(smmu, "unable to map the SMMU memory\n"); - goto out_err; - } - - smmu->size = size; - - if ( !dt_property_read_u32(smmu->node, "#global-interrupts", - &smmu->num_global_irqs) ) - { - smmu_err(smmu, "missing #global-interrupts\n"); - goto out_unmap; - } - - num_irqs = dt_number_of_irq(smmu->node); - if ( num_irqs > smmu->num_global_irqs ) - smmu->num_context_irqs = num_irqs - smmu->num_global_irqs; - - if ( !smmu->num_context_irqs ) - { - smmu_err(smmu, "found %d interrupts but expected at least %d\n", - num_irqs, smmu->num_global_irqs + 1); - goto out_unmap; - } - - smmu->irqs = xzalloc_array(unsigned int, num_irqs); - if ( !smmu->irqs ) - { - smmu_err(smmu, "failed to allocated %d irqs\n", num_irqs); - goto out_unmap; - } - - for ( i = 0; i < num_irqs; i++ ) - { - res = platform_get_irq(smmu->node, i); - if ( res < 0 ) - { - smmu_err(smmu, "failed to get irq index %d\n", i); - goto out_free_irqs; - } - smmu->irqs[i] = res; - } - - smmu->sids = xzalloc_array(unsigned long, - BITS_TO_LONGS(SMMU_MAX_STREAMIDS)); - if ( !smmu->sids ) - { - smmu_err(smmu, "failed to allocated bitmap for stream ID tracking\n"); - goto out_free_masters; - } - - - i = 0; - smmu->masters = RB_ROOT; - while ( !dt_parse_phandle_with_args(smmu->node, "mmu-masters", - "#stream-id-cells", i, &masterspec) ) - { - res = register_smmu_master(smmu, &masterspec); - if ( res ) - { - smmu_err(smmu, "failed to add master %s\n", - masterspec.np->name); - goto out_free_masters; - } - i++; - } - - smmu_info(smmu, "registered %d master devices\n", i); - - res = arm_smmu_device_cfg_probe(smmu); - if ( res ) - { - smmu_err(smmu, "failed to probe the SMMU\n"); - goto out_free_masters; - } - - if ( smmu->version > 1 && - smmu->num_context_banks != smmu->num_context_irqs ) - { - smmu_err(smmu, - "found only %d context interrupt(s) but %d required\n", - smmu->num_context_irqs, smmu->num_context_banks); - goto out_free_masters; - } - - smmu_dbg(smmu, "register global IRQs handler\n"); - - for ( i = 0; i < smmu->num_global_irqs; ++i ) - { - smmu_dbg(smmu, "\t- global IRQ %u\n", smmu->irqs[i]); - res = request_irq(smmu->irqs[i], IRQF_SHARED, arm_smmu_global_fault, - "arm-smmu global fault", smmu); - if ( res ) - { - smmu_err(smmu, "failed to request global IRQ %d (%u)\n", - i, smmu->irqs[i]); - goto out_release_irqs; - } - } - - INIT_LIST_HEAD(&smmu->list); - list_add(&smmu->list, &arm_smmu_devices); - - arm_smmu_device_reset(smmu); - - iommu_set_ops(&arm_smmu_iommu_ops); - - /* sids field can be freed... */ - xfree(smmu->sids); - smmu->sids = NULL; - - return 0; - -out_release_irqs: - while (i--) - release_irq(smmu->irqs[i], smmu); - -out_free_masters: - for ( node = rb_first(&smmu->masters); node; node = rb_next(node) ) - { - struct arm_smmu_master *master; - - master = container_of(node, struct arm_smmu_master, node); - xfree(master); - } - - xfree(smmu->sids); - -out_free_irqs: - xfree(smmu->irqs); - -out_unmap: - iounmap(smmu->base); - -out_err: - xfree(smmu); - - return -ENODEV; -} - -static const char * const smmu_dt_compat[] __initconst = -{ - "arm,mmu-400", - NULL -}; - -DT_DEVICE_START(smmu, "ARM SMMU", DEVICE_IOMMU) - .compatible = smmu_dt_compat, - .init = smmu_init, -DT_DEVICE_END - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * 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 Fri Mar 06 11:17:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:17: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 1YTqFt-0002F8-05; Fri, 06 Mar 2015 11:17:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFr-0002Eu-EG for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:19 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 22/3D-03219-EBC89F45; Fri, 06 Mar 2015 11:17:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425640634!13636954!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25619 invoked from network); 6 Mar 2015 11:17: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; 6 Mar 2015 11:17:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFm-0006Cl-IG for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqFm-0001jx-Gg for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:14 +0000 Date: Fri, 06 Mar 2015 11:17:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/iommu: arm: Remove temporary the SMMU driver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e00aa014c429d58d1dbcf9fed8edf477d0335133 Author: Julien Grall AuthorDate: Wed Feb 25 18:52:54 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 13:55:23 2015 +0000 xen/iommu: arm: Remove temporary the SMMU driver The current SMMU driver has completly diverged. That makes me hard to maintain. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/drivers/passthrough/arm/Makefile | 1 - xen/drivers/passthrough/arm/smmu.c | 1784 ---------------------------------- 2 files changed, 0 insertions(+), 1785 deletions(-) diff --git a/xen/drivers/passthrough/arm/Makefile b/xen/drivers/passthrough/arm/Makefile index f4cd26e..0484b79 100644 --- a/xen/drivers/passthrough/arm/Makefile +++ b/xen/drivers/passthrough/arm/Makefile @@ -1,2 +1 @@ obj-y += iommu.o -obj-y += smmu.o diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c deleted file mode 100644 index 42bde75..0000000 --- a/xen/drivers/passthrough/arm/smmu.c +++ /dev/null @@ -1,1784 +0,0 @@ -/* - * IOMMU API for ARM architected SMMU implementations. - * - * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * Based on Linux drivers/iommu/arm-smmu.c (commit 89a23cd) - * Copyright (C) 2013 ARM Limited - * - * Author: Will Deacon - * - * Xen modification: - * Julien Grall - * Copyright (C) 2014 Linaro Limited. - * - * This driver currently supports: - * - SMMUv1 and v2 implementations (didn't try v2 SMMU) - * - Stream-matching and stream-indexing - * - v7/v8 long-descriptor format - * - Non-secure access to the SMMU - * - 4k pages, p2m shared with the processor - * - Up to 40-bit addressing - * - Context fault reporting - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* Driver options */ -#define SMMU_OPT_SECURE_CONFIG_ACCESS (1 << 0) - -/* Maximum number of stream IDs assigned to a single device */ -#define MAX_MASTER_STREAMIDS MAX_PHANDLE_ARGS - -/* Maximum stream ID */ -#define SMMU_MAX_STREAMIDS (PAGE_SIZE_64K - 1) - -/* Maximum number of context banks per SMMU */ -#define SMMU_MAX_CBS 128 - -/* Maximum number of mapping groups per SMMU */ -#define SMMU_MAX_SMRS 128 - -/* SMMU global address space */ -#define SMMU_GR0(smmu) ((smmu)->base) -#define SMMU_GR1(smmu) ((smmu)->base + (smmu)->pagesize) - -/* - * SMMU global address space with conditional offset to access secure aliases of - * non-secure registers (e.g. nsCR0: 0x400, nsGFSR: 0x448, nsGFSYNR0: 0x450) - */ -#define SMMU_GR0_NS(smmu) \ - ((smmu)->base + \ - ((smmu->options & SMMU_OPT_SECURE_CONFIG_ACCESS) \ - ? 0x400 : 0)) - -/* Page table bits */ -#define SMMU_PTE_PAGE (((pteval_t)3) << 0) -#define SMMU_PTE_CONT (((pteval_t)1) << 52) -#define SMMU_PTE_AF (((pteval_t)1) << 10) -#define SMMU_PTE_SH_NS (((pteval_t)0) << 8) -#define SMMU_PTE_SH_OS (((pteval_t)2) << 8) -#define SMMU_PTE_SH_IS (((pteval_t)3) << 8) - -#if PAGE_SIZE == PAGE_SIZE_4K -#define SMMU_PTE_CONT_ENTRIES 16 -#elif PAGE_SIZE == PAGE_SIZE_64K -#define SMMU_PTE_CONT_ENTRIES 32 -#else -#define SMMU_PTE_CONT_ENTRIES 1 -#endif - -#define SMMU_PTE_CONT_SIZE (PAGE_SIZE * SMMU_PTE_CONT_ENTRIES) -#define SMMU_PTE_CONT_MASK (~(SMMU_PTE_CONT_SIZE - 1)) -#define SMMU_PTE_HWTABLE_SIZE (PTRS_PER_PTE * sizeof(pte_t)) - -/* Stage-1 PTE */ -#define SMMU_PTE_AP_UNPRIV (((pteval_t)1) << 6) -#define SMMU_PTE_AP_RDONLY (((pteval_t)2) << 6) -#define SMMU_PTE_ATTRINDX_SHIFT 2 -#define SMMU_PTE_nG (((pteval_t)1) << 11) - -/* Stage-2 PTE */ -#define SMMU_PTE_HAP_FAULT (((pteval_t)0) << 6) -#define SMMU_PTE_HAP_READ (((pteval_t)1) << 6) -#define SMMU_PTE_HAP_WRITE (((pteval_t)2) << 6) -#define SMMU_PTE_MEMATTR_OIWB (((pteval_t)0xf) << 2) -#define SMMU_PTE_MEMATTR_NC (((pteval_t)0x5) << 2) -#define SMMU_PTE_MEMATTR_DEV (((pteval_t)0x1) << 2) - -/* Configuration registers */ -#define SMMU_GR0_sCR0 0x0 -#define SMMU_sCR0_CLIENTPD (1 << 0) -#define SMMU_sCR0_GFRE (1 << 1) -#define SMMU_sCR0_GFIE (1 << 2) -#define SMMU_sCR0_GCFGFRE (1 << 4) -#define SMMU_sCR0_GCFGFIE (1 << 5) -#define SMMU_sCR0_USFCFG (1 << 10) -#define SMMU_sCR0_VMIDPNE (1 << 11) -#define SMMU_sCR0_PTM (1 << 12) -#define SMMU_sCR0_FB (1 << 13) -#define SMMU_sCR0_BSU_SHIFT 14 -#define SMMU_sCR0_BSU_MASK 0x3 - -/* Identification registers */ -#define SMMU_GR0_ID0 0x20 -#define SMMU_GR0_ID1 0x24 -#define SMMU_GR0_ID2 0x28 -#define SMMU_GR0_ID3 0x2c -#define SMMU_GR0_ID4 0x30 -#define SMMU_GR0_ID5 0x34 -#define SMMU_GR0_ID6 0x38 -#define SMMU_GR0_ID7 0x3c -#define SMMU_GR0_sGFSR 0x48 -#define SMMU_GR0_sGFSYNR0 0x50 -#define SMMU_GR0_sGFSYNR1 0x54 -#define SMMU_GR0_sGFSYNR2 0x58 -#define SMMU_GR0_PIDR0 0xfe0 -#define SMMU_GR0_PIDR1 0xfe4 -#define SMMU_GR0_PIDR2 0xfe8 - -#define SMMU_ID0_S1TS (1 << 30) -#define SMMU_ID0_S2TS (1 << 29) -#define SMMU_ID0_NTS (1 << 28) -#define SMMU_ID0_SMS (1 << 27) -#define SMMU_ID0_PTFS_SHIFT 24 -#define SMMU_ID0_PTFS_MASK 0x2 -#define SMMU_ID0_PTFS_V8_ONLY 0x2 -#define SMMU_ID0_CTTW (1 << 14) -#define SMMU_ID0_NUMIRPT_SHIFT 16 -#define SMMU_ID0_NUMIRPT_MASK 0xff -#define SMMU_ID0_NUMSMRG_SHIFT 0 -#define SMMU_ID0_NUMSMRG_MASK 0xff - -#define SMMU_ID1_PAGESIZE (1 << 31) -#define SMMU_ID1_NUMPAGENDXB_SHIFT 28 -#define SMMU_ID1_NUMPAGENDXB_MASK 7 -#define SMMU_ID1_NUMS2CB_SHIFT 16 -#define SMMU_ID1_NUMS2CB_MASK 0xff -#define SMMU_ID1_NUMCB_SHIFT 0 -#define SMMU_ID1_NUMCB_MASK 0xff - -#define SMMU_ID2_OAS_SHIFT 4 -#define SMMU_ID2_OAS_MASK 0xf -#define SMMU_ID2_IAS_SHIFT 0 -#define SMMU_ID2_IAS_MASK 0xf -#define SMMU_ID2_UBS_SHIFT 8 -#define SMMU_ID2_UBS_MASK 0xf -#define SMMU_ID2_PTFS_4K (1 << 12) -#define SMMU_ID2_PTFS_16K (1 << 13) -#define SMMU_ID2_PTFS_64K (1 << 14) - -#define SMMU_PIDR2_ARCH_SHIFT 4 -#define SMMU_PIDR2_ARCH_MASK 0xf - -/* Global TLB invalidation */ -#define SMMU_GR0_STLBIALL 0x60 -#define SMMU_GR0_TLBIVMID 0x64 -#define SMMU_GR0_TLBIALLNSNH 0x68 -#define SMMU_GR0_TLBIALLH 0x6c -#define SMMU_GR0_sTLBGSYNC 0x70 -#define SMMU_GR0_sTLBGSTATUS 0x74 -#define SMMU_sTLBGSTATUS_GSACTIVE (1 << 0) -#define SMMU_TLB_LOOP_TIMEOUT 1000000 /* 1s! */ - -/* Stream mapping registers */ -#define SMMU_GR0_SMR(n) (0x800 + ((n) << 2)) -#define SMMU_SMR_VALID (1 << 31) -#define SMMU_SMR_MASK_SHIFT 16 -#define SMMU_SMR_MASK_MASK 0x7fff -#define SMMU_SMR_ID_SHIFT 0 -#define SMMU_SMR_ID_MASK 0x7fff - -#define SMMU_GR0_S2CR(n) (0xc00 + ((n) << 2)) -#define SMMU_S2CR_CBNDX_SHIFT 0 -#define SMMU_S2CR_CBNDX_MASK 0xff -#define SMMU_S2CR_TYPE_SHIFT 16 -#define SMMU_S2CR_TYPE_MASK 0x3 -#define SMMU_S2CR_TYPE_TRANS (0 << SMMU_S2CR_TYPE_SHIFT) -#define SMMU_S2CR_TYPE_BYPASS (1 << SMMU_S2CR_TYPE_SHIFT) -#define SMMU_S2CR_TYPE_FAULT (2 << SMMU_S2CR_TYPE_SHIFT) - -/* Context bank attribute registers */ -#define SMMU_GR1_CBAR(n) (0x0 + ((n) << 2)) -#define SMMU_CBAR_VMID_SHIFT 0 -#define SMMU_CBAR_VMID_MASK 0xff -#define SMMU_CBAR_S1_MEMATTR_SHIFT 12 -#define SMMU_CBAR_S1_MEMATTR_MASK 0xf -#define SMMU_CBAR_S1_MEMATTR_WB 0xf -#define SMMU_CBAR_TYPE_SHIFT 16 -#define SMMU_CBAR_TYPE_MASK 0x3 -#define SMMU_CBAR_TYPE_S2_TRANS (0 << SMMU_CBAR_TYPE_SHIFT) -#define SMMU_CBAR_TYPE_S1_TRANS_S2_BYPASS (1 << SMMU_CBAR_TYPE_SHIFT) -#define SMMU_CBAR_TYPE_S1_TRANS_S2_FAULT (2 << SMMU_CBAR_TYPE_SHIFT) -#define SMMU_CBAR_TYPE_S1_TRANS_S2_TRANS (3 << SMMU_CBAR_TYPE_SHIFT) -#define SMMU_CBAR_IRPTNDX_SHIFT 24 -#define SMMU_CBAR_IRPTNDX_MASK 0xff - -#define SMMU_GR1_CBA2R(n) (0x800 + ((n) << 2)) -#define SMMU_CBA2R_RW64_32BIT (0 << 0) -#define SMMU_CBA2R_RW64_64BIT (1 << 0) - -/* Translation context bank */ -#define SMMU_CB_BASE(smmu) ((smmu)->base + ((smmu)->size >> 1)) -#define SMMU_CB(smmu, n) ((n) * (smmu)->pagesize) - -#define SMMU_CB_SCTLR 0x0 -#define SMMU_CB_RESUME 0x8 -#define SMMU_CB_TCR2 0x10 -#define SMMU_CB_TTBR0_LO 0x20 -#define SMMU_CB_TTBR0_HI 0x24 -#define SMMU_CB_TCR 0x30 -#define SMMU_CB_S1_MAIR0 0x38 -#define SMMU_CB_FSR 0x58 -#define SMMU_CB_FAR_LO 0x60 -#define SMMU_CB_FAR_HI 0x64 -#define SMMU_CB_FSYNR0 0x68 -#define SMMU_CB_S1_TLBIASID 0x610 - -#define SMMU_SCTLR_S1_ASIDPNE (1 << 12) -#define SMMU_SCTLR_CFCFG (1 << 7) -#define SMMU_SCTLR_CFIE (1 << 6) -#define SMMU_SCTLR_CFRE (1 << 5) -#define SMMU_SCTLR_E (1 << 4) -#define SMMU_SCTLR_AFE (1 << 2) -#define SMMU_SCTLR_TRE (1 << 1) -#define SMMU_SCTLR_M (1 << 0) -#define SMMU_SCTLR_EAE_SBOP (SMMU_SCTLR_AFE | SMMU_SCTLR_TRE) - -#define SMMU_RESUME_RETRY (0 << 0) -#define SMMU_RESUME_TERMINATE (1 << 0) - -#define SMMU_TCR_EAE (1 << 31) - -#define SMMU_TCR_PASIZE_SHIFT 16 -#define SMMU_TCR_PASIZE_MASK 0x7 - -#define SMMU_TCR_TG0_4K (0 << 14) -#define SMMU_TCR_TG0_64K (1 << 14) - -#define SMMU_TCR_SH0_SHIFT 12 -#define SMMU_TCR_SH0_MASK 0x3 -#define SMMU_TCR_SH_NS 0 -#define SMMU_TCR_SH_OS 2 -#define SMMU_TCR_SH_IS 3 - -#define SMMU_TCR_ORGN0_SHIFT 10 -#define SMMU_TCR_IRGN0_SHIFT 8 -#define SMMU_TCR_RGN_MASK 0x3 -#define SMMU_TCR_RGN_NC 0 -#define SMMU_TCR_RGN_WBWA 1 -#define SMMU_TCR_RGN_WT 2 -#define SMMU_TCR_RGN_WB 3 - -#define SMMU_TCR_SL0_SHIFT 6 -#define SMMU_TCR_SL0_MASK 0x3 -#define SMMU_TCR_SL0_LVL_2 0 -#define SMMU_TCR_SL0_LVL_1 1 - -#define SMMU_TCR_T1SZ_SHIFT 16 -#define SMMU_TCR_T0SZ_SHIFT 0 -#define SMMU_TCR_SZ_MASK 0xf - -#define SMMU_TCR2_SEP_SHIFT 15 -#define SMMU_TCR2_SEP_MASK 0x7 - -#define SMMU_TCR2_PASIZE_SHIFT 0 -#define SMMU_TCR2_PASIZE_MASK 0x7 - -/* Common definitions for PASize and SEP fields */ -#define SMMU_TCR2_ADDR_32 0 -#define SMMU_TCR2_ADDR_36 1 -#define SMMU_TCR2_ADDR_40 2 -#define SMMU_TCR2_ADDR_42 3 -#define SMMU_TCR2_ADDR_44 4 -#define SMMU_TCR2_ADDR_48 5 - -#define SMMU_TTBRn_HI_ASID_SHIFT 16 - -#define SMMU_MAIR_ATTR_SHIFT(n) ((n) << 3) -#define SMMU_MAIR_ATTR_MASK 0xff -#define SMMU_MAIR_ATTR_DEVICE 0x04 -#define SMMU_MAIR_ATTR_NC 0x44 -#define SMMU_MAIR_ATTR_WBRWA 0xff -#define SMMU_MAIR_ATTR_IDX_NC 0 -#define SMMU_MAIR_ATTR_IDX_CACHE 1 -#define SMMU_MAIR_ATTR_IDX_DEV 2 - -#define SMMU_FSR_MULTI (1 << 31) -#define SMMU_FSR_SS (1 << 30) -#define SMMU_FSR_UUT (1 << 8) -#define SMMU_FSR_ASF (1 << 7) -#define SMMU_FSR_TLBLKF (1 << 6) -#define SMMU_FSR_TLBMCF (1 << 5) -#define SMMU_FSR_EF (1 << 4) -#define SMMU_FSR_PF (1 << 3) -#define SMMU_FSR_AFF (1 << 2) -#define SMMU_FSR_TF (1 << 1) - -#define SMMU_FSR_IGN (SMMU_FSR_AFF | SMMU_FSR_ASF | \ - SMMU_FSR_TLBMCF | SMMU_FSR_TLBLKF) -#define SMMU_FSR_FAULT (SMMU_FSR_MULTI | SMMU_FSR_SS | \ - SMMU_FSR_UUT | SMMU_FSR_EF | \ - SMMU_FSR_PF | SMMU_FSR_TF | \ - SMMU_FSR_IGN) - -#define SMMU_FSYNR0_WNR (1 << 4) - -#define smmu_print(dev, lvl, fmt, ...) \ - printk(lvl "smmu: %s: " fmt, dt_node_full_name(dev->node), ## __VA_ARGS__) - -#define smmu_err(dev, fmt, ...) smmu_print(dev, XENLOG_ERR, fmt, ## __VA_ARGS__) - -#define smmu_dbg(dev, fmt, ...) \ - smmu_print(dev, XENLOG_DEBUG, fmt, ## __VA_ARGS__) - -#define smmu_info(dev, fmt, ...) \ - smmu_print(dev, XENLOG_INFO, fmt, ## __VA_ARGS__) - -#define smmu_warn(dev, fmt, ...) \ - smmu_print(dev, XENLOG_WARNING, fmt, ## __VA_ARGS__) - -struct arm_smmu_device { - const struct dt_device_node *node; - - void __iomem *base; - unsigned long size; - unsigned long pagesize; - -#define SMMU_FEAT_COHERENT_WALK (1 << 0) -#define SMMU_FEAT_STREAM_MATCH (1 << 1) -#define SMMU_FEAT_TRANS_S1 (1 << 2) -#define SMMU_FEAT_TRANS_S2 (1 << 3) -#define SMMU_FEAT_TRANS_NESTED (1 << 4) - u32 features; - u32 options; - int version; - - u32 num_context_banks; - u32 num_s2_context_banks; - DECLARE_BITMAP(context_map, SMMU_MAX_CBS); - atomic_t irptndx; - - u32 num_mapping_groups; - DECLARE_BITMAP(smr_map, SMMU_MAX_SMRS); - - unsigned long input_size; - unsigned long s1_output_size; - unsigned long s2_output_size; - - u32 num_global_irqs; - u32 num_context_irqs; - unsigned int *irqs; - - u32 smr_mask_mask; - u32 smr_id_mask; - - unsigned long *sids; - - struct list_head list; - struct rb_root masters; -}; - -struct arm_smmu_smr { - u8 idx; - u16 mask; - u16 id; -}; - -#define INVALID_IRPTNDX 0xff - -#define SMMU_CB_ASID(cfg) ((cfg)->cbndx) -#define SMMU_CB_VMID(cfg) ((cfg)->cbndx + 1) - -struct arm_smmu_domain_cfg { - struct arm_smmu_device *smmu; - u8 cbndx; - u8 irptndx; - u32 cbar; - /* Domain associated to this device */ - struct domain *domain; - /* List of master which use this structure */ - struct list_head masters; - - /* Used to link domain context for a same domain */ - struct list_head list; -}; - -struct arm_smmu_master { - const struct dt_device_node *dt_node; - - /* - * The following is specific to the master's position in the - * SMMU chain. - */ - struct rb_node node; - u32 num_streamids; - u16 streamids[MAX_MASTER_STREAMIDS]; - int num_s2crs; - - struct arm_smmu_smr *smrs; - struct arm_smmu_domain_cfg *cfg; - - /* Used to link masters in a same domain context */ - struct list_head list; -}; - -static LIST_HEAD(arm_smmu_devices); - -struct arm_smmu_domain { - spinlock_t lock; - struct list_head contexts; -}; - -struct arm_smmu_option_prop { - u32 opt; - const char *prop; -}; - -static const struct arm_smmu_option_prop arm_smmu_options [] __initconst = -{ - { SMMU_OPT_SECURE_CONFIG_ACCESS, "calxeda,smmu-secure-config-access" }, - { 0, NULL}, -}; - -static void __init check_driver_options(struct arm_smmu_device *smmu) -{ - int i = 0; - - do { - if ( dt_property_read_bool(smmu->node, arm_smmu_options[i].prop) ) - { - smmu->options |= arm_smmu_options[i].opt; - smmu_dbg(smmu, "option %s\n", arm_smmu_options[i].prop); - } - } while ( arm_smmu_options[++i].opt ); -} - -static void arm_smmu_context_fault(int irq, void *data, - struct cpu_user_regs *regs) -{ - u32 fsr, far, fsynr; - uint64_t iova; - struct arm_smmu_domain_cfg *cfg = data; - struct arm_smmu_device *smmu = cfg->smmu; - void __iomem *cb_base; - - cb_base = SMMU_CB_BASE(smmu) + SMMU_CB(smmu, cfg->cbndx); - fsr = readl_relaxed(cb_base + SMMU_CB_FSR); - - if ( !(fsr & SMMU_FSR_FAULT) ) - return; - - if ( fsr & SMMU_FSR_IGN ) - smmu_err(smmu, "Unexpected context fault (fsr 0x%u)\n", fsr); - - fsynr = readl_relaxed(cb_base + SMMU_CB_FSYNR0); - far = readl_relaxed(cb_base + SMMU_CB_FAR_LO); - iova = far; - far = readl_relaxed(cb_base + SMMU_CB_FAR_HI); - iova |= ((uint64_t)far << 32); - - smmu_err(smmu, "Unhandled context fault for domain %u\n", - cfg->domain->domain_id); - smmu_err(smmu, "\tFSR 0x%x, IOVA 0x%"PRIx64", FSYNR 0x%x, CB %d\n", - fsr, iova, fsynr, cfg->cbndx); - - /* Clear the faulting FSR */ - writel(fsr, cb_base + SMMU_CB_FSR); - - /* Terminate any stalled transactions */ - if ( fsr & SMMU_FSR_SS ) - writel_relaxed(SMMU_RESUME_TERMINATE, cb_base + SMMU_CB_RESUME); -} - -static void arm_smmu_global_fault(int irq, void *data, - struct cpu_user_regs *regs) -{ - u32 gfsr, gfsynr0, gfsynr1, gfsynr2; - struct arm_smmu_device *smmu = data; - void __iomem *gr0_base = SMMU_GR0_NS(smmu); - - gfsr = readl_relaxed(gr0_base + SMMU_GR0_sGFSR); - gfsynr0 = readl_relaxed(gr0_base + SMMU_GR0_sGFSYNR0); - gfsynr1 = readl_relaxed(gr0_base + SMMU_GR0_sGFSYNR1); - gfsynr2 = readl_relaxed(gr0_base + SMMU_GR0_sGFSYNR2); - - if ( !gfsr ) - return; - - smmu_err(smmu, "Unexpected global fault, this could be serious\n"); - smmu_err(smmu, - "\tGFSR 0x%08x, GFSYNR0 0x%08x, GFSYNR1 0x%08x, GFSYNR2 0x%08x\n", - gfsr, gfsynr0, gfsynr1, gfsynr2); - writel(gfsr, gr0_base + SMMU_GR0_sGFSR); -} - -static struct arm_smmu_master * -find_smmu_master(struct arm_smmu_device *smmu, - const struct dt_device_node *dev_node) -{ - struct rb_node *node = smmu->masters.rb_node; - - while ( node ) - { - struct arm_smmu_master *master; - - master = container_of(node, struct arm_smmu_master, node); - - if ( dev_node < master->dt_node ) - node = node->rb_left; - else if ( dev_node > master->dt_node ) - node = node->rb_right; - else - return master; - } - - return NULL; -} - -static __init int insert_smmu_master(struct arm_smmu_device *smmu, - struct arm_smmu_master *master) -{ - struct rb_node **new, *parent; - - new = &smmu->masters.rb_node; - parent = NULL; - while ( *new ) - { - struct arm_smmu_master *this; - - this = container_of(*new, struct arm_smmu_master, node); - - parent = *new; - if ( master->dt_node < this->dt_node ) - new = &((*new)->rb_left); - else if (master->dt_node > this->dt_node) - new = &((*new)->rb_right); - else - return -EEXIST; - } - - rb_link_node(&master->node, parent, new); - rb_insert_color(&master->node, &smmu->masters); - return 0; -} - -static __init int register_smmu_master(struct arm_smmu_device *smmu, - struct dt_phandle_args *masterspec) -{ - int i, sid; - struct arm_smmu_master *master; - int rc = 0; - - smmu_dbg(smmu, "Try to add master %s\n", masterspec->np->name); - - master = find_smmu_master(smmu, masterspec->np); - if ( master ) - { - smmu_err(smmu, - "rejecting multiple registrations for master device %s\n", - masterspec->np->name); - return -EBUSY; - } - - if ( masterspec->args_count > MAX_MASTER_STREAMIDS ) - { - smmu_err(smmu, - "reached maximum number (%d) of stream IDs for master device %s\n", - MAX_MASTER_STREAMIDS, masterspec->np->name); - return -ENOSPC; - } - - master = xzalloc(struct arm_smmu_master); - if ( !master ) - return -ENOMEM; - - INIT_LIST_HEAD(&master->list); - master->dt_node = masterspec->np; - master->num_streamids = masterspec->args_count; - - dt_device_set_protected(masterspec->np); - - for ( i = 0; i < master->num_streamids; ++i ) - { - sid = masterspec->args[i]; - if ( test_and_set_bit(sid, smmu->sids) ) - { - smmu_err(smmu, "duplicate stream ID (%d)\n", sid); - xfree(master); - return -EEXIST; - } - master->streamids[i] = masterspec->args[i]; - } - - rc = insert_smmu_master(smmu, master); - /* Insertion should never fail */ - ASSERT(rc == 0); - - return 0; -} - -static int __arm_smmu_alloc_bitmap(unsigned long *map, int start, int end) -{ - int idx; - - do - { - idx = find_next_zero_bit(map, end, start); - if ( idx == end ) - return -ENOSPC; - } while ( test_and_set_bit(idx, map) ); - - return idx; -} - -static void __arm_smmu_free_bitmap(unsigned long *map, int idx) -{ - clear_bit(idx, map); -} - -static void arm_smmu_tlb_sync(struct arm_smmu_device *smmu) -{ - int count = 0; - void __iomem *gr0_base = SMMU_GR0(smmu); - - writel_relaxed(0, gr0_base + SMMU_GR0_sTLBGSYNC); - while ( readl_relaxed(gr0_base + SMMU_GR0_sTLBGSTATUS) & - SMMU_sTLBGSTATUS_GSACTIVE ) - { - cpu_relax(); - if ( ++count == SMMU_TLB_LOOP_TIMEOUT ) - { - smmu_err(smmu, "TLB sync timed out -- SMMU may be deadlocked\n"); - return; - } - udelay(1); - } -} - -static void arm_smmu_tlb_inv_context(struct arm_smmu_domain_cfg *cfg) -{ - struct arm_smmu_device *smmu = cfg->smmu; - void __iomem *base = SMMU_GR0(smmu); - - writel_relaxed(SMMU_CB_VMID(cfg), - base + SMMU_GR0_TLBIVMID); - - arm_smmu_tlb_sync(smmu); -} - -static void arm_smmu_iotlb_flush_all(struct domain *d) -{ - struct arm_smmu_domain *smmu_domain = domain_hvm_iommu(d)->arch.priv; - struct arm_smmu_domain_cfg *cfg; - - spin_lock(&smmu_domain->lock); - list_for_each_entry(cfg, &smmu_domain->contexts, list) - arm_smmu_tlb_inv_context(cfg); - spin_unlock(&smmu_domain->lock); -} - -static void arm_smmu_iotlb_flush(struct domain *d, unsigned long gfn, - unsigned int page_count) -{ - /* ARM SMMU v1 doesn't have flush by VMA and VMID */ - arm_smmu_iotlb_flush_all(d); -} - -static int determine_smr_mask(struct arm_smmu_device *smmu, - struct arm_smmu_master *master, - struct arm_smmu_smr *smr, int start, int order) -{ - u16 i, zero_bits_mask, one_bits_mask, const_mask; - int nr; - - nr = 1 << order; - - if ( nr == 1 ) - { - /* no mask, use streamid to match and be done with it */ - smr->mask = 0; - smr->id = master->streamids[start]; - return 0; - } - - zero_bits_mask = 0; - one_bits_mask = 0xffff; - for ( i = start; i < start + nr; i++) - { - zero_bits_mask |= master->streamids[i]; /* const 0 bits */ - one_bits_mask &= master->streamids[i]; /* const 1 bits */ - } - zero_bits_mask = ~zero_bits_mask; - - /* bits having constant values (either 0 or 1) */ - const_mask = zero_bits_mask | one_bits_mask; - - i = hweight16(~const_mask); - if ( (1 << i) == nr ) - { - smr->mask = ~const_mask; - smr->id = one_bits_mask; - } - else - /* no usable mask for this set of streamids */ - return 1; - - if ( ((smr->mask & smmu->smr_mask_mask) != smr->mask) || - ((smr->id & smmu->smr_id_mask) != smr->id) ) - /* insufficient number of mask/id bits */ - return 1; - - return 0; -} - -static int determine_smr_mapping(struct arm_smmu_device *smmu, - struct arm_smmu_master *master, - struct arm_smmu_smr *smrs, int max_smrs) -{ - int nr_sid, nr, i, bit, start; - - /* - * This function is called only once -- when a master is added - * to a domain. If master->num_s2crs != 0 then this master - * was already added to a domain. - */ - BUG_ON(master->num_s2crs); - - start = nr = 0; - nr_sid = master->num_streamids; - do - { - /* - * largest power-of-2 number of streamids for which to - * determine a usable mask/id pair for stream matching - */ - bit = fls(nr_sid); - if (!bit) - return 0; - - /* - * iterate over power-of-2 numbers to determine - * largest possible mask/id pair for stream matching - * of next 2**i streamids - */ - for ( i = bit - 1; i >= 0; i-- ) - { - if( !determine_smr_mask(smmu, master, - &smrs[master->num_s2crs], - start, i)) - break; - } - - if ( i < 0 ) - goto out; - - nr = 1 << i; - nr_sid -= nr; - start += nr; - master->num_s2crs++; - } while ( master->num_s2crs <= max_smrs ); - -out: - if ( nr_sid ) - { - /* not enough mapping groups available */ - master->num_s2crs = 0; - return -ENOSPC; - } - - return 0; -} - -static int arm_smmu_master_configure_smrs(struct arm_smmu_device *smmu, - struct arm_smmu_master *master) -{ - int i, max_smrs, ret; - struct arm_smmu_smr *smrs; - void __iomem *gr0_base = SMMU_GR0(smmu); - - if ( !(smmu->features & SMMU_FEAT_STREAM_MATCH) ) - return 0; - - if ( master->smrs ) - return -EEXIST; - - max_smrs = min(smmu->num_mapping_groups, master->num_streamids); - smrs = xmalloc_array(struct arm_smmu_smr, max_smrs); - if ( !smrs ) - { - smmu_err(smmu, "failed to allocated %d SMRs for master %s\n", - max_smrs, dt_node_name(master->dt_node)); - return -ENOMEM; - } - - ret = determine_smr_mapping(smmu, master, smrs, max_smrs); - if ( ret ) - goto err_free_smrs; - - /* Allocate the SMRs on the root SMMU */ - for ( i = 0; i < master->num_s2crs; ++i ) - { - int idx = __arm_smmu_alloc_bitmap(smmu->smr_map, 0, - smmu->num_mapping_groups); - if ( idx < 0 ) - { - smmu_err(smmu, "failed to allocate free SMR\n"); - goto err_free_bitmap; - } - smrs[i].idx = idx; - } - - /* It worked! Now, poke the actual hardware */ - for ( i = 0; i < master->num_s2crs; ++i ) - { - u32 reg = SMMU_SMR_VALID | smrs[i].id << SMMU_SMR_ID_SHIFT | - smrs[i].mask << SMMU_SMR_MASK_SHIFT; - smmu_dbg(smmu, "SMR%d: 0x%x\n", smrs[i].idx, reg); - writel_relaxed(reg, gr0_base + SMMU_GR0_SMR(smrs[i].idx)); - } - - master->smrs = smrs; - return 0; - -err_free_bitmap: - while (--i >= 0) - __arm_smmu_free_bitmap(smmu->smr_map, smrs[i].idx); - master->num_s2crs = 0; -err_free_smrs: - xfree(smrs); - return -ENOSPC; -} - -/* Forward declaration */ -static void arm_smmu_destroy_domain_context(struct arm_smmu_domain_cfg *cfg); - -static int arm_smmu_domain_add_master(struct domain *d, - struct arm_smmu_domain_cfg *cfg, - struct arm_smmu_master *master) -{ - int i, ret; - struct arm_smmu_device *smmu = cfg->smmu; - void __iomem *gr0_base = SMMU_GR0(smmu); - struct arm_smmu_smr *smrs = master->smrs; - - if ( master->cfg ) - return -EBUSY; - - ret = arm_smmu_master_configure_smrs(smmu, master); - if ( ret ) - return ret; - - /* Now we're at the root, time to point at our context bank */ - if ( !master->num_s2crs ) - master->num_s2crs = master->num_streamids; - - for ( i = 0; i < master->num_s2crs; ++i ) - { - u32 idx, s2cr; - - idx = smrs ? smrs[i].idx : master->streamids[i]; - s2cr = (SMMU_S2CR_TYPE_TRANS << SMMU_S2CR_TYPE_SHIFT) | - (cfg->cbndx << SMMU_S2CR_CBNDX_SHIFT); - smmu_dbg(smmu, "S2CR%d: 0x%x\n", idx, s2cr); - writel_relaxed(s2cr, gr0_base + SMMU_GR0_S2CR(idx)); - } - - master->cfg = cfg; - list_add(&master->list, &cfg->masters); - - return 0; -} - -static void arm_smmu_domain_remove_master(struct arm_smmu_master *master) -{ - int i; - struct arm_smmu_domain_cfg *cfg = master->cfg; - struct arm_smmu_device *smmu = cfg->smmu; - void __iomem *gr0_base = SMMU_GR0(smmu); - struct arm_smmu_smr *smrs = master->smrs; - - /* - * We *must* clear the S2CR first, because freeing the SMR means - * that it can be reallocated immediately - */ - for ( i = 0; i < master->num_streamids; ++i ) - { - u16 sid = master->streamids[i]; - writel_relaxed(SMMU_S2CR_TYPE_FAULT, - gr0_base + SMMU_GR0_S2CR(sid)); - } - - /* Invalidate the SMRs before freeing back to the allocator */ - for (i = 0; i < master->num_s2crs; ++i) { - u8 idx = smrs[i].idx; - writel_relaxed(~SMMU_SMR_VALID, gr0_base + SMMU_GR0_SMR(idx)); - __arm_smmu_free_bitmap(smmu->smr_map, idx); - } - - master->smrs = NULL; - master->num_s2crs = 0; - xfree(smrs); - - master->cfg = NULL; - list_del(&master->list); - INIT_LIST_HEAD(&master->list); -} - -static void arm_smmu_init_context_bank(struct arm_smmu_domain_cfg *cfg) -{ - u32 reg; - struct arm_smmu_device *smmu = cfg->smmu; - void __iomem *cb_base, *gr1_base; - paddr_t p2maddr; - - ASSERT(cfg->domain != NULL); - p2maddr = page_to_maddr(cfg->domain->arch.p2m.root); - - gr1_base = SMMU_GR1(smmu); - cb_base = SMMU_CB_BASE(smmu) + SMMU_CB(smmu, cfg->cbndx); - - /* CBAR */ - reg = cfg->cbar; - if ( smmu->version == 1 ) - reg |= cfg->irptndx << SMMU_CBAR_IRPTNDX_SHIFT; - - reg |= SMMU_CB_VMID(cfg) << SMMU_CBAR_VMID_SHIFT; - writel_relaxed(reg, gr1_base + SMMU_GR1_CBAR(cfg->cbndx)); - - if ( smmu->version > 1 ) - { - /* CBA2R */ -#ifdef CONFIG_ARM_64 - reg = SMMU_CBA2R_RW64_64BIT; -#else - reg = SMMU_CBA2R_RW64_32BIT; -#endif - writel_relaxed(reg, gr1_base + SMMU_GR1_CBA2R(cfg->cbndx)); - } - - /* TTBR0 */ - reg = (p2maddr & ((1ULL << 32) - 1)); - writel_relaxed(reg, cb_base + SMMU_CB_TTBR0_LO); - reg = (p2maddr >> 32); - writel_relaxed(reg, cb_base + SMMU_CB_TTBR0_HI); - - /* - * TCR - * We use long descriptor, with inner-shareable WBWA tables in TTBR0. - */ - if ( smmu->version > 1 ) - { - /* 4K Page Table */ - if ( PAGE_SIZE == PAGE_SIZE_4K ) - reg = SMMU_TCR_TG0_4K; - else - reg = SMMU_TCR_TG0_64K; - - switch ( smmu->s2_output_size ) { - case 32: - reg |= (SMMU_TCR2_ADDR_32 << SMMU_TCR_PASIZE_SHIFT); - break; - case 36: - reg |= (SMMU_TCR2_ADDR_36 << SMMU_TCR_PASIZE_SHIFT); - break; - case 40: - reg |= (SMMU_TCR2_ADDR_40 << SMMU_TCR_PASIZE_SHIFT); - break; - case 42: - reg |= (SMMU_TCR2_ADDR_42 << SMMU_TCR_PASIZE_SHIFT); - break; - case 44: - reg |= (SMMU_TCR2_ADDR_44 << SMMU_TCR_PASIZE_SHIFT); - break; - case 48: - reg |= (SMMU_TCR2_ADDR_48 << SMMU_TCR_PASIZE_SHIFT); - break; - } - } - else - reg = 0; - - /* The attribute to walk the page table should be the same as VTCR_EL2 */ - reg |= SMMU_TCR_EAE | - (SMMU_TCR_SH_IS << SMMU_TCR_SH0_SHIFT) | - (SMMU_TCR_RGN_WBWA << SMMU_TCR_ORGN0_SHIFT) | - (SMMU_TCR_RGN_WBWA << SMMU_TCR_IRGN0_SHIFT) | - (SMMU_TCR_SL0_LVL_1 << SMMU_TCR_SL0_SHIFT) | - /* T0SZ=(1)100 = -8 ( 32 -(-8) = 40 bit physical addresses ) */ - (0x18 << SMMU_TCR_T0SZ_SHIFT); - writel_relaxed(reg, cb_base + SMMU_CB_TCR); - - /* SCTLR */ - reg = SMMU_SCTLR_CFCFG | - SMMU_SCTLR_CFIE | - SMMU_SCTLR_CFRE | - SMMU_SCTLR_M | - SMMU_SCTLR_EAE_SBOP; - - writel_relaxed(reg, cb_base + SMMU_CB_SCTLR); -} - -static struct arm_smmu_domain_cfg * -arm_smmu_alloc_domain_context(struct domain *d, - struct arm_smmu_device *smmu) -{ - unsigned int irq; - int ret, start; - struct arm_smmu_domain_cfg *cfg; - struct arm_smmu_domain *smmu_domain = domain_hvm_iommu(d)->arch.priv; - - ASSERT(spin_is_locked(&smmu_domain->lock)); - - cfg = xzalloc(struct arm_smmu_domain_cfg); - if ( !cfg ) - return NULL; - - /* Master already initialized to another domain ... */ - if ( cfg->domain != NULL ) - goto out_free_mem; - - cfg->cbar = SMMU_CBAR_TYPE_S2_TRANS; - start = 0; - - ret = __arm_smmu_alloc_bitmap(smmu->context_map, start, - smmu->num_context_banks); - if ( ret < 0 ) - goto out_free_mem; - - cfg->cbndx = ret; - if ( smmu->version == 1 ) - { - cfg->irptndx = atomic_inc_return(&smmu->irptndx); - cfg->irptndx %= smmu->num_context_irqs; - } - else - cfg->irptndx = cfg->cbndx; - - irq = smmu->irqs[smmu->num_global_irqs + cfg->irptndx]; - ret = request_irq(irq, IRQF_SHARED, arm_smmu_context_fault, - "arm-smmu-context-fault", cfg); - if ( ret ) - { - smmu_err(smmu, "failed to request context IRQ %d (%u)\n", - cfg->irptndx, irq); - cfg->irptndx = INVALID_IRPTNDX; - goto out_free_context; - } - - cfg->domain = d; - cfg->smmu = smmu; - if ( smmu->features & SMMU_FEAT_COHERENT_WALK ) - iommu_set_feature(d, IOMMU_FEAT_COHERENT_WALK); - - arm_smmu_init_context_bank(cfg); - list_add(&cfg->list, &smmu_domain->contexts); - INIT_LIST_HEAD(&cfg->masters); - - return cfg; - -out_free_context: - __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx); -out_free_mem: - xfree(cfg); - - return NULL; -} - -static void arm_smmu_destroy_domain_context(struct arm_smmu_domain_cfg *cfg) -{ - struct domain *d = cfg->domain; - struct arm_smmu_domain *smmu_domain = domain_hvm_iommu(d)->arch.priv; - struct arm_smmu_device *smmu = cfg->smmu; - void __iomem *cb_base; - unsigned int irq; - - ASSERT(spin_is_locked(&smmu_domain->lock)); - BUG_ON(!list_empty(&cfg->masters)); - - /* Disable the context bank and nuke the TLB before freeing it */ - cb_base = SMMU_CB_BASE(smmu) + SMMU_CB(smmu, cfg->cbndx); - writel_relaxed(0, cb_base + SMMU_CB_SCTLR); - arm_smmu_tlb_inv_context(cfg); - - if ( cfg->irptndx != INVALID_IRPTNDX ) - { - irq = smmu->irqs[smmu->num_global_irqs + cfg->irptndx]; - release_irq(irq, cfg); - } - - __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx); - list_del(&cfg->list); - xfree(cfg); -} - -static struct arm_smmu_device * -arm_smmu_find_smmu_by_dev(const struct dt_device_node *dev) -{ - struct arm_smmu_device *smmu; - struct arm_smmu_master *master = NULL; - - list_for_each_entry( smmu, &arm_smmu_devices, list ) - { - master = find_smmu_master(smmu, dev); - if ( master ) - break; - } - - if ( !master ) - return NULL; - - return smmu; -} - -static int arm_smmu_attach_dev(struct domain *d, - const struct dt_device_node *dev) -{ - struct arm_smmu_device *smmu = arm_smmu_find_smmu_by_dev(dev); - struct arm_smmu_master *master; - struct arm_smmu_domain *smmu_domain = domain_hvm_iommu(d)->arch.priv; - struct arm_smmu_domain_cfg *cfg = NULL; - struct arm_smmu_domain_cfg *curr; - int ret; - - printk(XENLOG_DEBUG "arm-smmu: attach %s to domain %d\n", - dt_node_full_name(dev), d->domain_id); - - if ( !smmu ) - { - printk(XENLOG_ERR "%s: cannot attach to SMMU, is it on the same bus?\n", - dt_node_full_name(dev)); - return -ENODEV; - } - - master = find_smmu_master(smmu, dev); - BUG_ON(master == NULL); - - /* Check if the device is already assigned to someone */ - if ( master->cfg ) - return -EBUSY; - - spin_lock(&smmu_domain->lock); - list_for_each_entry( curr, &smmu_domain->contexts, list ) - { - if ( curr->smmu == smmu ) - { - cfg = curr; - break; - } - } - - if ( !cfg ) - { - cfg = arm_smmu_alloc_domain_context(d, smmu); - if ( !cfg ) - { - smmu_err(smmu, "unable to allocate context for domain %u\n", - d->domain_id); - spin_unlock(&smmu_domain->lock); - return -ENOMEM; - } - } - spin_unlock(&smmu_domain->lock); - - ret = arm_smmu_domain_add_master(d, cfg, master); - if ( ret ) - { - spin_lock(&smmu_domain->lock); - if ( list_empty(&cfg->masters) ) - arm_smmu_destroy_domain_context(cfg); - spin_unlock(&smmu_domain->lock); - } - - return ret; -} - -static int arm_smmu_detach_dev(struct domain *d, - const struct dt_device_node *dev) -{ - struct arm_smmu_domain *smmu_domain = domain_hvm_iommu(d)->arch.priv; - struct arm_smmu_master *master; - struct arm_smmu_device *smmu = arm_smmu_find_smmu_by_dev(dev); - struct arm_smmu_domain_cfg *cfg; - - printk(XENLOG_DEBUG "arm-smmu: detach %s to domain %d\n", - dt_node_full_name(dev), d->domain_id); - - if ( !smmu ) - { - printk(XENLOG_ERR "%s: cannot find the SMMU, is it on the same bus?\n", - dt_node_full_name(dev)); - return -ENODEV; - } - - master = find_smmu_master(smmu, dev); - BUG_ON(master == NULL); - - cfg = master->cfg; - - /* Sanity check to avoid removing a device that doesn't belong to - * the domain - */ - if ( !cfg || cfg->domain != d ) - { - printk(XENLOG_ERR "%s: was not attach to domain %d\n", - dt_node_full_name(dev), d->domain_id); - return -ESRCH; - } - - arm_smmu_domain_remove_master(master); - - spin_lock(&smmu_domain->lock); - if ( list_empty(&cfg->masters) ) - arm_smmu_destroy_domain_context(cfg); - spin_unlock(&smmu_domain->lock); - - return 0; -} - -static int arm_smmu_reassign_dt_dev(struct domain *s, struct domain *t, - const struct dt_device_node *dev) -{ - int ret = 0; - - /* Don't allow remapping on other domain than hwdom */ - if ( t != hardware_domain ) - return -EPERM; - - if ( t == s ) - return 0; - - ret = arm_smmu_detach_dev(s, dev); - if ( ret ) - return ret; - - ret = arm_smmu_attach_dev(t, dev); - - return ret; -} - -static __init int arm_smmu_id_size_to_bits(int size) -{ - switch ( size ) - { - case 0: - return 32; - case 1: - return 36; - case 2: - return 40; - case 3: - return 42; - case 4: - return 44; - case 5: - default: - return 48; - } -} - -static __init int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) -{ - unsigned long size; - void __iomem *gr0_base = SMMU_GR0(smmu); - u32 id; - - smmu_info(smmu, "probing hardware configuration...\n"); - - /* - * Primecell ID - */ - id = readl_relaxed(gr0_base + SMMU_GR0_PIDR2); - smmu->version = ((id >> SMMU_PIDR2_ARCH_SHIFT) & SMMU_PIDR2_ARCH_MASK) + 1; - smmu_info(smmu, "SMMUv%d with:\n", smmu->version); - - /* ID0 */ - id = readl_relaxed(gr0_base + SMMU_GR0_ID0); -#ifndef CONFIG_ARM_64 - if ( ((id >> SMMU_ID0_PTFS_SHIFT) & SMMU_ID0_PTFS_MASK) == - SMMU_ID0_PTFS_V8_ONLY ) - { - smmu_err(smmu, "\tno v7 descriptor support!\n"); - return -ENODEV; - } -#endif - if ( id & SMMU_ID0_S1TS ) - { - smmu->features |= SMMU_FEAT_TRANS_S1; - smmu_info(smmu, "\tstage 1 translation\n"); - } - - if ( id & SMMU_ID0_S2TS ) - { - smmu->features |= SMMU_FEAT_TRANS_S2; - smmu_info(smmu, "\tstage 2 translation\n"); - } - - if ( id & SMMU_ID0_NTS ) - { - smmu->features |= SMMU_FEAT_TRANS_NESTED; - smmu_info(smmu, "\tnested translation\n"); - } - - if ( !(smmu->features & - (SMMU_FEAT_TRANS_S1 | SMMU_FEAT_TRANS_S2 | - SMMU_FEAT_TRANS_NESTED)) ) - { - smmu_err(smmu, "\tno translation support!\n"); - return -ENODEV; - } - - /* We need at least support for Stage 2 */ - if ( !(smmu->features & SMMU_FEAT_TRANS_S2) ) - { - smmu_err(smmu, "\tno stage 2 translation!\n"); - return -ENODEV; - } - - if ( id & SMMU_ID0_CTTW ) - { - smmu->features |= SMMU_FEAT_COHERENT_WALK; - smmu_info(smmu, "\tcoherent table walk\n"); - } - - if ( id & SMMU_ID0_SMS ) - { - u32 smr, sid, mask; - - smmu->features |= SMMU_FEAT_STREAM_MATCH; - smmu->num_mapping_groups = (id >> SMMU_ID0_NUMSMRG_SHIFT) & - SMMU_ID0_NUMSMRG_MASK; - if ( smmu->num_mapping_groups == 0 ) - { - smmu_err(smmu, - "stream-matching supported, but no SMRs present!\n"); - return -ENODEV; - } - - smr = SMMU_SMR_MASK_MASK << SMMU_SMR_MASK_SHIFT; - smr |= (SMMU_SMR_ID_MASK << SMMU_SMR_ID_SHIFT); - writel_relaxed(smr, gr0_base + SMMU_GR0_SMR(0)); - smr = readl_relaxed(gr0_base + SMMU_GR0_SMR(0)); - - mask = (smr >> SMMU_SMR_MASK_SHIFT) & SMMU_SMR_MASK_MASK; - sid = (smr >> SMMU_SMR_ID_SHIFT) & SMMU_SMR_ID_MASK; - if ( (mask & sid) != sid ) - { - smmu_err(smmu, - "SMR mask bits (0x%x) insufficient for ID field (0x%x)\n", - mask, sid); - return -ENODEV; - } - smmu->smr_mask_mask = mask; - smmu->smr_id_mask = sid; - - smmu_info(smmu, - "\tstream matching with %u register groups, mask 0x%x\n", - smmu->num_mapping_groups, mask); - } - - /* ID1 */ - id = readl_relaxed(gr0_base + SMMU_GR0_ID1); - smmu->pagesize = (id & SMMU_ID1_PAGESIZE) ? PAGE_SIZE_64K : PAGE_SIZE_4K; - - /* Check for size mismatch of SMMU address space from mapped region */ - size = 1 << (((id >> SMMU_ID1_NUMPAGENDXB_SHIFT) & - SMMU_ID1_NUMPAGENDXB_MASK) + 1); - size *= (smmu->pagesize << 1); - if ( smmu->size != size ) - smmu_warn(smmu, "SMMU address space size (0x%lx) differs " - "from mapped region size (0x%lx)!\n", size, smmu->size); - - smmu->num_s2_context_banks = (id >> SMMU_ID1_NUMS2CB_SHIFT) & - SMMU_ID1_NUMS2CB_MASK; - smmu->num_context_banks = (id >> SMMU_ID1_NUMCB_SHIFT) & - SMMU_ID1_NUMCB_MASK; - if ( smmu->num_s2_context_banks > smmu->num_context_banks ) - { - smmu_err(smmu, "impossible number of S2 context banks!\n"); - return -ENODEV; - } - smmu_info(smmu, "\t%u context banks (%u stage-2 only)\n", - smmu->num_context_banks, smmu->num_s2_context_banks); - - /* ID2 */ - id = readl_relaxed(gr0_base + SMMU_GR0_ID2); - size = arm_smmu_id_size_to_bits((id >> SMMU_ID2_IAS_SHIFT) & - SMMU_ID2_IAS_MASK); - - /* - * Stage-1 output limited by stage-2 input size due to VTCR_EL2 - * setup (see setup_virt_paging) - */ - /* Current maximum output size of 40 bits */ - smmu->s1_output_size = min(40UL, size); - - /* The stage-2 output mask is also applied for bypass */ - size = arm_smmu_id_size_to_bits((id >> SMMU_ID2_OAS_SHIFT) & - SMMU_ID2_OAS_MASK); - smmu->s2_output_size = min((unsigned long)PADDR_BITS, size); - - if ( smmu->version == 1 ) - smmu->input_size = 32; - else - { -#ifdef CONFIG_ARM_64 - size = (id >> SMMU_ID2_UBS_SHIFT) & SMMU_ID2_UBS_MASK; - size = min(39, arm_smmu_id_size_to_bits(size)); -#else - size = 32; -#endif - smmu->input_size = size; - - if ( (PAGE_SIZE == PAGE_SIZE_4K && !(id & SMMU_ID2_PTFS_4K) ) || - (PAGE_SIZE == PAGE_SIZE_64K && !(id & SMMU_ID2_PTFS_64K)) || - (PAGE_SIZE != PAGE_SIZE_4K && PAGE_SIZE != PAGE_SIZE_64K) ) - { - smmu_err(smmu, "CPU page size 0x%lx unsupported\n", - PAGE_SIZE); - return -ENODEV; - } - } - - smmu_info(smmu, "\t%lu-bit VA, %lu-bit IPA, %lu-bit PA\n", - smmu->input_size, smmu->s1_output_size, smmu->s2_output_size); - return 0; -} - -static __init void arm_smmu_device_reset(struct arm_smmu_device *smmu) -{ - void __iomem *gr0_base = SMMU_GR0(smmu); - void __iomem *cb_base; - int i = 0; - u32 reg; - - smmu_dbg(smmu, "device reset\n"); - - /* Clear Global FSR */ - reg = readl_relaxed(SMMU_GR0_NS(smmu) + SMMU_GR0_sGFSR); - writel(reg, SMMU_GR0_NS(smmu) + SMMU_GR0_sGFSR); - - /* Mark all SMRn as invalid and all S2CRn as fault */ - for ( i = 0; i < smmu->num_mapping_groups; ++i ) - { - writel_relaxed(~SMMU_SMR_VALID, gr0_base + SMMU_GR0_SMR(i)); - writel_relaxed(SMMU_S2CR_TYPE_FAULT, gr0_base + SMMU_GR0_S2CR(i)); - } - - /* Make sure all context banks are disabled and clear CB_FSR */ - for ( i = 0; i < smmu->num_context_banks; ++i ) - { - cb_base = SMMU_CB_BASE(smmu) + SMMU_CB(smmu, i); - writel_relaxed(0, cb_base + SMMU_CB_SCTLR); - writel_relaxed(SMMU_FSR_FAULT, cb_base + SMMU_CB_FSR); - } - - /* Invalidate the TLB, just in case */ - writel_relaxed(0, gr0_base + SMMU_GR0_STLBIALL); - writel_relaxed(0, gr0_base + SMMU_GR0_TLBIALLH); - writel_relaxed(0, gr0_base + SMMU_GR0_TLBIALLNSNH); - - reg = readl_relaxed(SMMU_GR0_NS(smmu) + SMMU_GR0_sCR0); - - /* Enable fault reporting */ - reg |= (SMMU_sCR0_GFRE | SMMU_sCR0_GFIE | - SMMU_sCR0_GCFGFRE | SMMU_sCR0_GCFGFIE); - - /* Disable TLB broadcasting. */ - reg |= (SMMU_sCR0_VMIDPNE | SMMU_sCR0_PTM); - - /* Enable client access, generate a fault if no mapping is found */ - reg &= ~(SMMU_sCR0_CLIENTPD); - reg |= SMMU_sCR0_USFCFG; - - /* Disable forced broadcasting */ - reg &= ~SMMU_sCR0_FB; - - /* Don't upgrade barriers when client devices are not mapped to - * a translation context banks (just here for clarity as Xen policy - * is to deny invalid transaction). */ - reg &= ~(SMMU_sCR0_BSU_MASK << SMMU_sCR0_BSU_SHIFT); - - /* Push the button */ - arm_smmu_tlb_sync(smmu); - writel_relaxed(reg, SMMU_GR0_NS(smmu) + SMMU_GR0_sCR0); -} - -static int arm_smmu_iommu_domain_init(struct domain *d) -{ - struct arm_smmu_domain *smmu_domain; - - smmu_domain = xzalloc(struct arm_smmu_domain); - if ( !smmu_domain ) - return -ENOMEM; - - spin_lock_init(&smmu_domain->lock); - INIT_LIST_HEAD(&smmu_domain->contexts); - - domain_hvm_iommu(d)->arch.priv = smmu_domain; - - return 0; -} - -static void __hwdom_init arm_smmu_iommu_hwdom_init(struct domain *d) -{ -} - -static void arm_smmu_iommu_domain_teardown(struct domain *d) -{ - struct arm_smmu_domain *smmu_domain = domain_hvm_iommu(d)->arch.priv; - - ASSERT(list_empty(&smmu_domain->contexts)); - xfree(smmu_domain); -} - -static int arm_smmu_map_page(struct domain *d, unsigned long gfn, - unsigned long mfn, unsigned int flags) -{ - p2m_type_t t; - - /* Grant mappings can be used for DMA requests. The dev_bus_addr returned by - * the hypercall is the MFN (not the IPA). For device protected by - * an IOMMU, Xen needs to add a 1:1 mapping in the domain p2m to - * allow DMA request to work. - * This is only valid when the domain is directed mapped. Hence this - * function should only be used by gnttab code with gfn == mfn. - */ - BUG_ON(!is_domain_direct_mapped(d)); - BUG_ON(mfn != gfn); - - /* We only support readable and writable flags */ - if ( !(flags & (IOMMUF_readable | IOMMUF_writable)) ) - return -EINVAL; - - t = (flags & IOMMUF_writable) ? p2m_iommu_map_rw : p2m_iommu_map_ro; - - /* The function guest_physmap_add_entry replaces the current mapping - * if there is already one... - */ - return guest_physmap_add_entry(d, gfn, mfn, 0, t); -} - -static int arm_smmu_unmap_page(struct domain *d, unsigned long gfn) -{ - /* This function should only be used by gnttab code when the domain - * is direct mapped - */ - if ( !is_domain_direct_mapped(d) ) - return -EINVAL; - - guest_physmap_remove_page(d, gfn, gfn, 0); - - return 0; -} - -static const struct iommu_ops arm_smmu_iommu_ops = { - .init = arm_smmu_iommu_domain_init, - .hwdom_init = arm_smmu_iommu_hwdom_init, - .teardown = arm_smmu_iommu_domain_teardown, - .iotlb_flush = arm_smmu_iotlb_flush, - .iotlb_flush_all = arm_smmu_iotlb_flush_all, - .assign_dt_device = arm_smmu_attach_dev, - .reassign_dt_device = arm_smmu_reassign_dt_dev, - .map_page = arm_smmu_map_page, - .unmap_page = arm_smmu_unmap_page, -}; - -static int __init smmu_init(struct dt_device_node *dev, - const void *data) -{ - struct arm_smmu_device *smmu; - int res; - u64 addr, size; - unsigned int num_irqs, i; - struct dt_phandle_args masterspec; - struct rb_node *node; - - /* Even if the device can't be initialized, we don't want to give - * the smmu device to dom0. - */ - dt_device_set_used_by(dev, DOMID_XEN); - - smmu = xzalloc(struct arm_smmu_device); - if ( !smmu ) - { - printk(XENLOG_ERR "%s: failed to allocate arm_smmu_device\n", - dt_node_full_name(dev)); - return -ENOMEM; - } - - smmu->node = dev; - check_driver_options(smmu); - - res = dt_device_get_address(smmu->node, 0, &addr, &size); - if ( res ) - { - smmu_err(smmu, "unable to retrieve the base address of the SMMU\n"); - goto out_err; - } - - smmu->base = ioremap_nocache(addr, size); - if ( !smmu->base ) - { - smmu_err(smmu, "unable to map the SMMU memory\n"); - goto out_err; - } - - smmu->size = size; - - if ( !dt_property_read_u32(smmu->node, "#global-interrupts", - &smmu->num_global_irqs) ) - { - smmu_err(smmu, "missing #global-interrupts\n"); - goto out_unmap; - } - - num_irqs = dt_number_of_irq(smmu->node); - if ( num_irqs > smmu->num_global_irqs ) - smmu->num_context_irqs = num_irqs - smmu->num_global_irqs; - - if ( !smmu->num_context_irqs ) - { - smmu_err(smmu, "found %d interrupts but expected at least %d\n", - num_irqs, smmu->num_global_irqs + 1); - goto out_unmap; - } - - smmu->irqs = xzalloc_array(unsigned int, num_irqs); - if ( !smmu->irqs ) - { - smmu_err(smmu, "failed to allocated %d irqs\n", num_irqs); - goto out_unmap; - } - - for ( i = 0; i < num_irqs; i++ ) - { - res = platform_get_irq(smmu->node, i); - if ( res < 0 ) - { - smmu_err(smmu, "failed to get irq index %d\n", i); - goto out_free_irqs; - } - smmu->irqs[i] = res; - } - - smmu->sids = xzalloc_array(unsigned long, - BITS_TO_LONGS(SMMU_MAX_STREAMIDS)); - if ( !smmu->sids ) - { - smmu_err(smmu, "failed to allocated bitmap for stream ID tracking\n"); - goto out_free_masters; - } - - - i = 0; - smmu->masters = RB_ROOT; - while ( !dt_parse_phandle_with_args(smmu->node, "mmu-masters", - "#stream-id-cells", i, &masterspec) ) - { - res = register_smmu_master(smmu, &masterspec); - if ( res ) - { - smmu_err(smmu, "failed to add master %s\n", - masterspec.np->name); - goto out_free_masters; - } - i++; - } - - smmu_info(smmu, "registered %d master devices\n", i); - - res = arm_smmu_device_cfg_probe(smmu); - if ( res ) - { - smmu_err(smmu, "failed to probe the SMMU\n"); - goto out_free_masters; - } - - if ( smmu->version > 1 && - smmu->num_context_banks != smmu->num_context_irqs ) - { - smmu_err(smmu, - "found only %d context interrupt(s) but %d required\n", - smmu->num_context_irqs, smmu->num_context_banks); - goto out_free_masters; - } - - smmu_dbg(smmu, "register global IRQs handler\n"); - - for ( i = 0; i < smmu->num_global_irqs; ++i ) - { - smmu_dbg(smmu, "\t- global IRQ %u\n", smmu->irqs[i]); - res = request_irq(smmu->irqs[i], IRQF_SHARED, arm_smmu_global_fault, - "arm-smmu global fault", smmu); - if ( res ) - { - smmu_err(smmu, "failed to request global IRQ %d (%u)\n", - i, smmu->irqs[i]); - goto out_release_irqs; - } - } - - INIT_LIST_HEAD(&smmu->list); - list_add(&smmu->list, &arm_smmu_devices); - - arm_smmu_device_reset(smmu); - - iommu_set_ops(&arm_smmu_iommu_ops); - - /* sids field can be freed... */ - xfree(smmu->sids); - smmu->sids = NULL; - - return 0; - -out_release_irqs: - while (i--) - release_irq(smmu->irqs[i], smmu); - -out_free_masters: - for ( node = rb_first(&smmu->masters); node; node = rb_next(node) ) - { - struct arm_smmu_master *master; - - master = container_of(node, struct arm_smmu_master, node); - xfree(master); - } - - xfree(smmu->sids); - -out_free_irqs: - xfree(smmu->irqs); - -out_unmap: - iounmap(smmu->base); - -out_err: - xfree(smmu); - - return -ENODEV; -} - -static const char * const smmu_dt_compat[] __initconst = -{ - "arm,mmu-400", - NULL -}; - -DT_DEVICE_START(smmu, "ARM SMMU", DEVICE_IOMMU) - .compatible = smmu_dt_compat, - .init = smmu_init, -DT_DEVICE_END - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * 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 Fri Mar 06 11:17:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:17: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 1YTqG2-0002HK-6w; Fri, 06 Mar 2015 11:17:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqG0-0002Gw-04 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:28 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 5A/B0-31919-7CC89F45; Fri, 06 Mar 2015 11:17:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1425640645!15264436!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27401 invoked from network); 6 Mar 2015 11:17:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:17:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFw-0006Cp-RN for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqFw-0001kL-MV for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:24 +0000 Date: Fri, 06 Mar 2015 11:17:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Introduce a generic way to describe device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c5d3075d97ebe26661df063ee95b14168ad10f7 Author: Julien Grall AuthorDate: Wed Feb 25 18:52:55 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 13:55:23 2015 +0000 xen/arm: Introduce a generic way to describe device Currently, Xen is supporting PCI and Platform device (based on Device Tree). While Xen only supports Platform device on ARM, Xen will gain support of PCI soon. Some drivers, such as IOMMU drivers, may handle PCI and platform device in the same way. Only few lines of code differs. Rather than requesting to provide 2 set of functions (one for PCI and one for platform device), introduce a generic structure "device" which is embedded in each specialized device. As x86 only supports PCI, introduce a new type device_t which will be an alias to pci_dev for this architecture. It will avoid to add a new field for this place. Signed-off-by: Julien Grall Acked-by: Jan Beulich Acked-by: Stefano Stabellini CC: Keir Fraser CC: Andrew Cooper --- xen/common/device_tree.c | 3 +++ xen/include/asm-arm/device.h | 26 ++++++++++++++++++++++++++ xen/include/asm-x86/device.h | 25 +++++++++++++++++++++++++ xen/include/xen/device_tree.h | 13 +++++++++++++ xen/include/xen/iommu.h | 1 + xen/include/xen/pci.h | 1 + 6 files changed, 69 insertions(+), 0 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 34a1b9e..d1c716f 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -1454,6 +1454,9 @@ static unsigned long __init unflatten_dt_node(const void *fdt, ((char *)pp->value)[sz - 1] = 0; dt_dprintk("fixed up name for %s -> %s\n", pathp, (char *)pp->value); + /* Generic device initialization */ + np->dev.type = DEV_DT; + np->dev.of_node = np; } } if ( allnextpp ) diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index b6b32bc..1cedd49 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -2,8 +2,34 @@ #define __ASM_ARM_DEVICE_H #include + +enum device_type +{ + DEV_DT, +}; + +struct dev_archdata { + void *iommu; /* IOMMU private data */ +}; + +/* struct device - The basic device structure */ +struct device +{ + enum device_type type; +#ifdef HAS_DEVICE_TREE + struct dt_device_node *of_node; /* Used by drivers imported from Linux */ +#endif + struct dev_archdata archdata; +}; + +typedef struct device device_t; + #include +/* TODO: Correctly implement dev_is_pci when PCI is supported on ARM */ +#define dev_is_pci(dev) ((void)(dev), 0) +#define dev_is_dt(dev) ((dev->type == DEV_DT) + enum device_class { DEVICE_SERIAL, diff --git a/xen/include/asm-x86/device.h b/xen/include/asm-x86/device.h new file mode 100644 index 0000000..f2acc7e --- /dev/null +++ b/xen/include/asm-x86/device.h @@ -0,0 +1,25 @@ +#ifndef __ASM_X86_DEVICE_H +#define __ASM_X86_DEVICE_H + +#include + +/* + * x86 only supports PCI. Therefore it's possible to directly use + * pci_dev to avoid adding new field. + */ + +typedef struct pci_dev device_t; + +#define dev_is_pci(dev) ((void)(dev), 1) +#define pci_to_dev(pci) (pci) + +#endif /* __ASM_X86_DEVICE_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 6502369..c8a0375 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -11,7 +11,9 @@ #define __XEN_DEVICE_TREE_H__ #include +#include #include +#include #include #include #include @@ -80,8 +82,19 @@ struct dt_device_node { /* IOMMU specific fields */ bool is_protected; struct list_head domain_list; + + struct device dev; }; +#define dt_to_dev(dt_node) (&(dt_node)->dev) + +static inline struct dt_device_node *dev_to_dt(struct device *dev) +{ + ASSERT(dev->type == DEV_DT); + + return container_of(dev, struct dt_device_node, dev); +} + #define MAX_PHANDLE_ARGS 16 struct dt_phandle_args { struct dt_device_node *np; diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 8eb764a..ecb2627 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -25,6 +25,7 @@ #include #include #include +#include #include extern bool_t iommu_enable, iommu_enabled; diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 5f295f3..3988ee68 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -13,6 +13,7 @@ #include #include #include +#include #include /* -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:17:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:17: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 1YTqG2-0002HK-6w; Fri, 06 Mar 2015 11:17:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqG0-0002Gw-04 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:28 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 5A/B0-31919-7CC89F45; Fri, 06 Mar 2015 11:17:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1425640645!15264436!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27401 invoked from network); 6 Mar 2015 11:17:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:17:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqFw-0006Cp-RN for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqFw-0001kL-MV for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:24 +0000 Date: Fri, 06 Mar 2015 11:17:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Introduce a generic way to describe device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c5d3075d97ebe26661df063ee95b14168ad10f7 Author: Julien Grall AuthorDate: Wed Feb 25 18:52:55 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 13:55:23 2015 +0000 xen/arm: Introduce a generic way to describe device Currently, Xen is supporting PCI and Platform device (based on Device Tree). While Xen only supports Platform device on ARM, Xen will gain support of PCI soon. Some drivers, such as IOMMU drivers, may handle PCI and platform device in the same way. Only few lines of code differs. Rather than requesting to provide 2 set of functions (one for PCI and one for platform device), introduce a generic structure "device" which is embedded in each specialized device. As x86 only supports PCI, introduce a new type device_t which will be an alias to pci_dev for this architecture. It will avoid to add a new field for this place. Signed-off-by: Julien Grall Acked-by: Jan Beulich Acked-by: Stefano Stabellini CC: Keir Fraser CC: Andrew Cooper --- xen/common/device_tree.c | 3 +++ xen/include/asm-arm/device.h | 26 ++++++++++++++++++++++++++ xen/include/asm-x86/device.h | 25 +++++++++++++++++++++++++ xen/include/xen/device_tree.h | 13 +++++++++++++ xen/include/xen/iommu.h | 1 + xen/include/xen/pci.h | 1 + 6 files changed, 69 insertions(+), 0 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 34a1b9e..d1c716f 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -1454,6 +1454,9 @@ static unsigned long __init unflatten_dt_node(const void *fdt, ((char *)pp->value)[sz - 1] = 0; dt_dprintk("fixed up name for %s -> %s\n", pathp, (char *)pp->value); + /* Generic device initialization */ + np->dev.type = DEV_DT; + np->dev.of_node = np; } } if ( allnextpp ) diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index b6b32bc..1cedd49 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -2,8 +2,34 @@ #define __ASM_ARM_DEVICE_H #include + +enum device_type +{ + DEV_DT, +}; + +struct dev_archdata { + void *iommu; /* IOMMU private data */ +}; + +/* struct device - The basic device structure */ +struct device +{ + enum device_type type; +#ifdef HAS_DEVICE_TREE + struct dt_device_node *of_node; /* Used by drivers imported from Linux */ +#endif + struct dev_archdata archdata; +}; + +typedef struct device device_t; + #include +/* TODO: Correctly implement dev_is_pci when PCI is supported on ARM */ +#define dev_is_pci(dev) ((void)(dev), 0) +#define dev_is_dt(dev) ((dev->type == DEV_DT) + enum device_class { DEVICE_SERIAL, diff --git a/xen/include/asm-x86/device.h b/xen/include/asm-x86/device.h new file mode 100644 index 0000000..f2acc7e --- /dev/null +++ b/xen/include/asm-x86/device.h @@ -0,0 +1,25 @@ +#ifndef __ASM_X86_DEVICE_H +#define __ASM_X86_DEVICE_H + +#include + +/* + * x86 only supports PCI. Therefore it's possible to directly use + * pci_dev to avoid adding new field. + */ + +typedef struct pci_dev device_t; + +#define dev_is_pci(dev) ((void)(dev), 1) +#define pci_to_dev(pci) (pci) + +#endif /* __ASM_X86_DEVICE_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 6502369..c8a0375 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -11,7 +11,9 @@ #define __XEN_DEVICE_TREE_H__ #include +#include #include +#include #include #include #include @@ -80,8 +82,19 @@ struct dt_device_node { /* IOMMU specific fields */ bool is_protected; struct list_head domain_list; + + struct device dev; }; +#define dt_to_dev(dt_node) (&(dt_node)->dev) + +static inline struct dt_device_node *dev_to_dt(struct device *dev) +{ + ASSERT(dev->type == DEV_DT); + + return container_of(dev, struct dt_device_node, dev); +} + #define MAX_PHANDLE_ARGS 16 struct dt_phandle_args { struct dt_device_node *np; diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 8eb764a..ecb2627 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -25,6 +25,7 @@ #include #include #include +#include #include extern bool_t iommu_enable, iommu_enabled; diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 5f295f3..3988ee68 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -13,6 +13,7 @@ #include #include #include +#include #include /* -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:17:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:17: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 1YTqGC-0002JB-AD; Fri, 06 Mar 2015 11:17:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGA-0002Il-85 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:38 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id D2/CE-02885-1DC89F45; Fri, 06 Mar 2015 11:17:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1425640655!13655123!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 503 invoked from network); 6 Mar 2015 11:17:36 -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; 6 Mar 2015 11:17:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqG7-0006Cz-02 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqG6-0001ko-VS for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:34 +0000 Date: Fri, 06 Mar 2015 11:17:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/iommu: Consolidate device assignment ops into a single set X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6a7601b4b2726f7922a856c116834cc725ab7817 Author: Julien Grall AuthorDate: Wed Feb 25 18:52:56 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 13:55:23 2015 +0000 xen/iommu: Consolidate device assignment ops into a single set On ARM, the way to assign device tree node is exactly the same as PCI. Futhermore, all devices can be represented by a 'device_t'. Therefore there is no need to add separate ops. The x86 iommu drivers has not been modified to replace 'struct pci_dev' by "device_t" because the latter is an alias of the former. Signed-off-by: Julien Grall Acked-by: Jan Beulich Acked-by: Stefano Stabellini \ Acked-by: Ian Campbell --- xen/drivers/passthrough/device_tree.c | 5 +++-- xen/drivers/passthrough/pci.c | 20 +++++++++++--------- xen/include/xen/iommu.h | 17 ++++++----------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthrough/device_tree.c index 3e47df5..377d41d 100644 --- a/xen/drivers/passthrough/device_tree.c +++ b/xen/drivers/passthrough/device_tree.c @@ -41,7 +41,7 @@ int iommu_assign_dt_device(struct domain *d, struct dt_device_node *dev) if ( !list_empty(&dev->domain_list) ) goto fail; - rc = hd->platform_ops->assign_dt_device(d, dev); + rc = hd->platform_ops->assign_device(d, 0, dt_to_dev(dev)); if ( rc ) goto fail; @@ -68,7 +68,8 @@ int iommu_deassign_dt_device(struct domain *d, struct dt_device_node *dev) spin_lock(&dtdevs_lock); - rc = hd->platform_ops->reassign_dt_device(d, hardware_domain, dev); + rc = hd->platform_ops->reassign_device(d, hardware_domain, + 0, dt_to_dev(dev)); if ( rc ) goto fail; diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index b93e7d8..4b83583 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -1254,7 +1254,7 @@ int iommu_add_device(struct pci_dev *pdev) if ( !iommu_enabled || !hd->platform_ops ) return 0; - rc = hd->platform_ops->add_device(pdev->devfn, pdev); + rc = hd->platform_ops->add_device(pdev->devfn, pci_to_dev(pdev)); if ( rc || !pdev->phantom_stride ) return rc; @@ -1263,7 +1263,7 @@ int iommu_add_device(struct pci_dev *pdev) devfn += pdev->phantom_stride; if ( PCI_SLOT(devfn) != PCI_SLOT(pdev->devfn) ) return 0; - rc = hd->platform_ops->add_device(devfn, pdev); + rc = hd->platform_ops->add_device(devfn, pci_to_dev(pdev)); if ( rc ) printk(XENLOG_WARNING "IOMMU: add %04x:%02x:%02x.%u failed (%d)\n", pdev->seg, pdev->bus, PCI_SLOT(devfn), PCI_FUNC(devfn), rc); @@ -1284,7 +1284,7 @@ int iommu_enable_device(struct pci_dev *pdev) !hd->platform_ops->enable_device ) return 0; - return hd->platform_ops->enable_device(pdev); + return hd->platform_ops->enable_device(pci_to_dev(pdev)); } int iommu_remove_device(struct pci_dev *pdev) @@ -1306,7 +1306,7 @@ int iommu_remove_device(struct pci_dev *pdev) devfn += pdev->phantom_stride; if ( PCI_SLOT(devfn) != PCI_SLOT(pdev->devfn) ) break; - rc = hd->platform_ops->remove_device(devfn, pdev); + rc = hd->platform_ops->remove_device(devfn, pci_to_dev(pdev)); if ( !rc ) continue; @@ -1315,7 +1315,7 @@ int iommu_remove_device(struct pci_dev *pdev) return rc; } - return hd->platform_ops->remove_device(pdev->devfn, pdev); + return hd->platform_ops->remove_device(pdev->devfn, pci_to_dev(pdev)); } /* @@ -1383,7 +1383,7 @@ static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) pdev->fault.count = 0; - if ( (rc = hd->platform_ops->assign_device(d, devfn, pdev)) ) + if ( (rc = hd->platform_ops->assign_device(d, devfn, pci_to_dev(pdev))) ) goto done; for ( ; pdev->phantom_stride; rc = 0 ) @@ -1391,7 +1391,7 @@ static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) devfn += pdev->phantom_stride; if ( PCI_SLOT(devfn) != PCI_SLOT(pdev->devfn) ) break; - rc = hd->platform_ops->assign_device(d, devfn, pdev); + rc = hd->platform_ops->assign_device(d, devfn, pci_to_dev(pdev)); if ( rc ) printk(XENLOG_G_WARNING "d%d: assign %04x:%02x:%02x.%u failed (%d)\n", d->domain_id, seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), @@ -1426,7 +1426,8 @@ int deassign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) devfn += pdev->phantom_stride; if ( PCI_SLOT(devfn) != PCI_SLOT(pdev->devfn) ) break; - ret = hd->platform_ops->reassign_device(d, hardware_domain, devfn, pdev); + ret = hd->platform_ops->reassign_device(d, hardware_domain, devfn, + pci_to_dev(pdev)); if ( !ret ) continue; @@ -1436,7 +1437,8 @@ int deassign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) } devfn = pdev->devfn; - ret = hd->platform_ops->reassign_device(d, hardware_domain, devfn, pdev); + ret = hd->platform_ops->reassign_device(d, hardware_domain, devfn, + pci_to_dev(pdev)); if ( ret ) { dprintk(XENLOG_G_ERR, diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index ecb2627..bf4aff0 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -124,22 +124,17 @@ struct page_info; struct iommu_ops { int (*init)(struct domain *d); void (*hwdom_init)(struct domain *d); -#ifdef HAS_PCI - int (*add_device)(u8 devfn, struct pci_dev *); - int (*enable_device)(struct pci_dev *pdev); - int (*remove_device)(u8 devfn, struct pci_dev *); - int (*assign_device)(struct domain *, u8 devfn, struct pci_dev *); + int (*add_device)(u8 devfn, device_t *dev); + int (*enable_device)(device_t *dev); + int (*remove_device)(u8 devfn, device_t *dev); + int (*assign_device)(struct domain *, u8 devfn, device_t *dev); int (*reassign_device)(struct domain *s, struct domain *t, - u8 devfn, struct pci_dev *); + u8 devfn, device_t *dev); +#ifdef HAS_PCI int (*get_device_group_id)(u16 seg, u8 bus, u8 devfn); int (*update_ire_from_msi)(struct msi_desc *msi_desc, struct msi_msg *msg); void (*read_msi_from_ire)(struct msi_desc *msi_desc, struct msi_msg *msg); #endif /* HAS_PCI */ -#ifdef HAS_DEVICE_TREE - int (*assign_dt_device)(struct domain *d, const struct dt_device_node *dev); - int (*reassign_dt_device)(struct domain *s, struct domain *t, - const struct dt_device_node *dev); -#endif void (*teardown)(struct domain *d); int (*map_page)(struct domain *d, unsigned long gfn, unsigned long mfn, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:17:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:17: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 1YTqGC-0002JB-AD; Fri, 06 Mar 2015 11:17:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGA-0002Il-85 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:38 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id D2/CE-02885-1DC89F45; Fri, 06 Mar 2015 11:17:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1425640655!13655123!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 503 invoked from network); 6 Mar 2015 11:17:36 -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; 6 Mar 2015 11:17:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqG7-0006Cz-02 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqG6-0001ko-VS for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:34 +0000 Date: Fri, 06 Mar 2015 11:17:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/iommu: Consolidate device assignment ops into a single set X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6a7601b4b2726f7922a856c116834cc725ab7817 Author: Julien Grall AuthorDate: Wed Feb 25 18:52:56 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 13:55:23 2015 +0000 xen/iommu: Consolidate device assignment ops into a single set On ARM, the way to assign device tree node is exactly the same as PCI. Futhermore, all devices can be represented by a 'device_t'. Therefore there is no need to add separate ops. The x86 iommu drivers has not been modified to replace 'struct pci_dev' by "device_t" because the latter is an alias of the former. Signed-off-by: Julien Grall Acked-by: Jan Beulich Acked-by: Stefano Stabellini \ Acked-by: Ian Campbell --- xen/drivers/passthrough/device_tree.c | 5 +++-- xen/drivers/passthrough/pci.c | 20 +++++++++++--------- xen/include/xen/iommu.h | 17 ++++++----------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthrough/device_tree.c index 3e47df5..377d41d 100644 --- a/xen/drivers/passthrough/device_tree.c +++ b/xen/drivers/passthrough/device_tree.c @@ -41,7 +41,7 @@ int iommu_assign_dt_device(struct domain *d, struct dt_device_node *dev) if ( !list_empty(&dev->domain_list) ) goto fail; - rc = hd->platform_ops->assign_dt_device(d, dev); + rc = hd->platform_ops->assign_device(d, 0, dt_to_dev(dev)); if ( rc ) goto fail; @@ -68,7 +68,8 @@ int iommu_deassign_dt_device(struct domain *d, struct dt_device_node *dev) spin_lock(&dtdevs_lock); - rc = hd->platform_ops->reassign_dt_device(d, hardware_domain, dev); + rc = hd->platform_ops->reassign_device(d, hardware_domain, + 0, dt_to_dev(dev)); if ( rc ) goto fail; diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index b93e7d8..4b83583 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -1254,7 +1254,7 @@ int iommu_add_device(struct pci_dev *pdev) if ( !iommu_enabled || !hd->platform_ops ) return 0; - rc = hd->platform_ops->add_device(pdev->devfn, pdev); + rc = hd->platform_ops->add_device(pdev->devfn, pci_to_dev(pdev)); if ( rc || !pdev->phantom_stride ) return rc; @@ -1263,7 +1263,7 @@ int iommu_add_device(struct pci_dev *pdev) devfn += pdev->phantom_stride; if ( PCI_SLOT(devfn) != PCI_SLOT(pdev->devfn) ) return 0; - rc = hd->platform_ops->add_device(devfn, pdev); + rc = hd->platform_ops->add_device(devfn, pci_to_dev(pdev)); if ( rc ) printk(XENLOG_WARNING "IOMMU: add %04x:%02x:%02x.%u failed (%d)\n", pdev->seg, pdev->bus, PCI_SLOT(devfn), PCI_FUNC(devfn), rc); @@ -1284,7 +1284,7 @@ int iommu_enable_device(struct pci_dev *pdev) !hd->platform_ops->enable_device ) return 0; - return hd->platform_ops->enable_device(pdev); + return hd->platform_ops->enable_device(pci_to_dev(pdev)); } int iommu_remove_device(struct pci_dev *pdev) @@ -1306,7 +1306,7 @@ int iommu_remove_device(struct pci_dev *pdev) devfn += pdev->phantom_stride; if ( PCI_SLOT(devfn) != PCI_SLOT(pdev->devfn) ) break; - rc = hd->platform_ops->remove_device(devfn, pdev); + rc = hd->platform_ops->remove_device(devfn, pci_to_dev(pdev)); if ( !rc ) continue; @@ -1315,7 +1315,7 @@ int iommu_remove_device(struct pci_dev *pdev) return rc; } - return hd->platform_ops->remove_device(pdev->devfn, pdev); + return hd->platform_ops->remove_device(pdev->devfn, pci_to_dev(pdev)); } /* @@ -1383,7 +1383,7 @@ static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) pdev->fault.count = 0; - if ( (rc = hd->platform_ops->assign_device(d, devfn, pdev)) ) + if ( (rc = hd->platform_ops->assign_device(d, devfn, pci_to_dev(pdev))) ) goto done; for ( ; pdev->phantom_stride; rc = 0 ) @@ -1391,7 +1391,7 @@ static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) devfn += pdev->phantom_stride; if ( PCI_SLOT(devfn) != PCI_SLOT(pdev->devfn) ) break; - rc = hd->platform_ops->assign_device(d, devfn, pdev); + rc = hd->platform_ops->assign_device(d, devfn, pci_to_dev(pdev)); if ( rc ) printk(XENLOG_G_WARNING "d%d: assign %04x:%02x:%02x.%u failed (%d)\n", d->domain_id, seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), @@ -1426,7 +1426,8 @@ int deassign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) devfn += pdev->phantom_stride; if ( PCI_SLOT(devfn) != PCI_SLOT(pdev->devfn) ) break; - ret = hd->platform_ops->reassign_device(d, hardware_domain, devfn, pdev); + ret = hd->platform_ops->reassign_device(d, hardware_domain, devfn, + pci_to_dev(pdev)); if ( !ret ) continue; @@ -1436,7 +1437,8 @@ int deassign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) } devfn = pdev->devfn; - ret = hd->platform_ops->reassign_device(d, hardware_domain, devfn, pdev); + ret = hd->platform_ops->reassign_device(d, hardware_domain, devfn, + pci_to_dev(pdev)); if ( ret ) { dprintk(XENLOG_G_ERR, diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index ecb2627..bf4aff0 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -124,22 +124,17 @@ struct page_info; struct iommu_ops { int (*init)(struct domain *d); void (*hwdom_init)(struct domain *d); -#ifdef HAS_PCI - int (*add_device)(u8 devfn, struct pci_dev *); - int (*enable_device)(struct pci_dev *pdev); - int (*remove_device)(u8 devfn, struct pci_dev *); - int (*assign_device)(struct domain *, u8 devfn, struct pci_dev *); + int (*add_device)(u8 devfn, device_t *dev); + int (*enable_device)(device_t *dev); + int (*remove_device)(u8 devfn, device_t *dev); + int (*assign_device)(struct domain *, u8 devfn, device_t *dev); int (*reassign_device)(struct domain *s, struct domain *t, - u8 devfn, struct pci_dev *); + u8 devfn, device_t *dev); +#ifdef HAS_PCI int (*get_device_group_id)(u16 seg, u8 bus, u8 devfn); int (*update_ire_from_msi)(struct msi_desc *msi_desc, struct msi_msg *msg); void (*read_msi_from_ire)(struct msi_desc *msi_desc, struct msi_msg *msg); #endif /* HAS_PCI */ -#ifdef HAS_DEVICE_TREE - int (*assign_dt_device)(struct domain *d, const struct dt_device_node *dev); - int (*reassign_dt_device)(struct domain *s, struct domain *t, - const struct dt_device_node *dev); -#endif void (*teardown)(struct domain *d); int (*map_page)(struct domain *d, unsigned long gfn, unsigned long mfn, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:17:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:17: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 1YTqGL-0002Kr-EY; Fri, 06 Mar 2015 11:17:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGJ-0002KY-Vh for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:49 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id E1/B6-03164-BDC89F45; Fri, 06 Mar 2015 11:17:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1425640665!10163275!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30002 invoked from network); 6 Mar 2015 11:17:46 -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; 6 Mar 2015 11:17:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGH-0006D5-6C for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqGH-0001lB-4K for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:45 +0000 Date: Fri, 06 Mar 2015 11:17:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Describe devices supported by a driver with dt_device_match X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f9eff198f9d4863e80078a33001a9bb90a99a4b1 Author: Julien Grall AuthorDate: Wed Feb 25 18:52:57 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 13:55:23 2015 +0000 xen/arm: Describe devices supported by a driver with dt_device_match Xen is currently using a list of compatible strings to match drivers again device nodes. This leads to having double definitions in the GIC code. Furthermore Linux drivers are using dt_device_match (actually called of_device_id in Linux) to list device supported by the drivers. Remove the exisiting compatible field and replace with a dt_match field Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/device.c | 21 ++------------------- xen/arch/arm/gic-v2.c | 10 ++++------ xen/arch/arm/gic-v3.c | 8 ++++---- xen/drivers/char/exynos4210-uart.c | 8 ++++---- xen/drivers/char/ns16550.c | 12 ++++++------ xen/drivers/char/omap-uart.c | 8 ++++---- xen/drivers/char/pl011.c | 8 ++++---- xen/drivers/char/scif-uart.c | 8 ++++---- xen/include/asm-arm/device.h | 4 ++-- xen/include/asm-arm/gic.h | 15 +++++---------- 10 files changed, 39 insertions(+), 63 deletions(-) diff --git a/xen/arch/arm/device.c b/xen/arch/arm/device.c index 1f9dbf7..675784c 100644 --- a/xen/arch/arm/device.c +++ b/xen/arch/arm/device.c @@ -23,23 +23,6 @@ extern const struct device_desc _sdevice[], _edevice[]; -static bool_t __init device_is_compatible(const struct device_desc *desc, - const struct dt_device_node *dev) -{ - const char *const *compat; - - if ( !desc->compatible ) - return 0; - - for ( compat = desc->compatible; *compat; compat++ ) - { - if ( dt_device_is_compatible(dev, *compat) ) - return 1; - } - - return 0; -} - int __init device_init(struct dt_device_node *dev, enum device_class class, const void *data) { @@ -55,7 +38,7 @@ int __init device_init(struct dt_device_node *dev, enum device_class class, if ( desc->class != class ) continue; - if ( device_is_compatible(desc, dev) ) + if ( dt_match_node(desc->dt_match, dev) ) { ASSERT(desc->init != NULL); @@ -75,7 +58,7 @@ enum device_class device_get_class(const struct dt_device_node *dev) for ( desc = _sdevice; desc != _edevice; desc++ ) { - if ( device_is_compatible(desc, dev) ) + if ( dt_match_node(desc->dt_match, dev) ) return desc->class; } diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index c05b64a..e551549 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -776,16 +776,14 @@ static int __init gicv2_init(struct dt_device_node *node, const void *data) return 0; } -static const char * const gicv2_dt_compat[] __initconst = +static const struct dt_device_match gicv2_dt_match[] __initconst = { - DT_COMPAT_GIC_CORTEX_A15, - DT_COMPAT_GIC_CORTEX_A7, - DT_COMPAT_GIC_400, - NULL + DT_MATCH_GIC_V2, + { /* sentinel */ }, }; DT_DEVICE_START(gicv2, "GICv2", DEVICE_GIC) - .compatible = gicv2_dt_compat, + .dt_match = gicv2_dt_match, .init = gicv2_init, DT_DEVICE_END diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 1558e17..66cc2a2 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -1320,14 +1320,14 @@ static int __init gicv3_init(struct dt_device_node *node, const void *data) return res; } -static const char * const gicv3_dt_compat[] __initconst = +static const struct dt_device_match gicv3_dt_match[] __initconst = { - DT_COMPAT_GIC_V3, - NULL + DT_MATCH_GIC_V3, + { /* sentinel */ }, }; DT_DEVICE_START(gicv3, "GICv3", DEVICE_GIC) - .compatible = gicv3_dt_compat, + .dt_match = gicv3_dt_match, .init = gicv3_init, DT_DEVICE_END diff --git a/xen/drivers/char/exynos4210-uart.c b/xen/drivers/char/exynos4210-uart.c index cba8729..bac1c2b 100644 --- a/xen/drivers/char/exynos4210-uart.c +++ b/xen/drivers/char/exynos4210-uart.c @@ -352,14 +352,14 @@ static int __init exynos4210_uart_init(struct dt_device_node *dev, return 0; } -static const char * const exynos4210_dt_compat[] __initconst = +static const struct dt_device_match exynos4210_dt_match[] __initconst = { - "samsung,exynos4210-uart", - NULL + DT_MATCH_COMPATIBLE("samsung,exynos4210-uart"), + { /* sentinel */ }, }; DT_DEVICE_START(exynos4210, "Exynos 4210 UART", DEVICE_SERIAL) - .compatible = exynos4210_dt_compat, + .dt_match = exynos4210_dt_match, .init = exynos4210_uart_init, DT_DEVICE_END diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 161b251..d443880 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -1185,16 +1185,16 @@ static int __init ns16550_uart_dt_init(struct dt_device_node *dev, return 0; } -static const char * const ns16550_dt_compat[] __initconst = +static const struct dt_device_match ns16550_dt_match[] __initconst = { - "ns16550", - "ns16550a", - "snps,dw-apb-uart", - NULL + DT_MATCH_COMPATIBLE("ns16550"), + DT_MATCH_COMPATIBLE("ns16550a"), + DT_MATCH_COMPATIBLE("snps,dw-apb-uart"), + { /* sentinel */ }, }; DT_DEVICE_START(ns16550, "NS16550 UART", DEVICE_SERIAL) - .compatible = ns16550_dt_compat, + .dt_match = ns16550_dt_match, .init = ns16550_uart_dt_init, DT_DEVICE_END diff --git a/xen/drivers/char/omap-uart.c b/xen/drivers/char/omap-uart.c index 16d1454..d8f64ea 100644 --- a/xen/drivers/char/omap-uart.c +++ b/xen/drivers/char/omap-uart.c @@ -350,14 +350,14 @@ static int __init omap_uart_init(struct dt_device_node *dev, return 0; } -static const char * const omap_uart_dt_compat[] __initconst = +static const struct dt_device_match omap_uart_dt_match[] __initconst = { - "ti,omap4-uart", - NULL + DT_MATCH_COMPATIBLE("ti,omap4-uart"), + { /* sentinel */ }, }; DT_DEVICE_START(omap_uart, "OMAP UART", DEVICE_SERIAL) - .compatible = omap_uart_dt_compat, + .dt_match = omap_uart_dt_match, .init = omap_uart_init, DT_DEVICE_END diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index 57274d9..67e6df5 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -285,14 +285,14 @@ static int __init pl011_uart_init(struct dt_device_node *dev, return 0; } -static const char * const pl011_dt_compat[] __initconst = +static const struct dt_device_match pl011_dt_match[] __initconst = { - "arm,pl011", - NULL + DT_MATCH_COMPATIBLE("arm,pl011"), + { /* sentinel */ }, }; DT_DEVICE_START(pl011, "PL011 UART", DEVICE_SERIAL) - .compatible = pl011_dt_compat, + .dt_match = pl011_dt_match, .init = pl011_uart_init, DT_DEVICE_END diff --git a/xen/drivers/char/scif-uart.c b/xen/drivers/char/scif-uart.c index 1a1c496..51a2233 100644 --- a/xen/drivers/char/scif-uart.c +++ b/xen/drivers/char/scif-uart.c @@ -346,14 +346,14 @@ static int __init scif_uart_init(struct dt_device_node *dev, return 0; } -static const char * const scif_uart_dt_compat[] __initconst = +static const struct dt_device_match scif_uart_dt_match[] __initconst = { - "renesas,scif", - NULL + DT_MATCH_COMPATIBLE("renesas,scif"), + { /* sentinel */ }, }; DT_DEVICE_START(scif_uart, "SCIF UART", DEVICE_SERIAL) - .compatible = scif_uart_dt_compat, + .dt_match = scif_uart_dt_match, .init = scif_uart_init, DT_DEVICE_END diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index 1cedd49..a72f7c9 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -44,8 +44,8 @@ struct device_desc { const char *name; /* Device class */ enum device_class class; - /* Array of device tree 'compatible' strings */ - const char *const *compatible; + /* List of devices supported by this driver */ + const struct dt_device_match *dt_match; /* Device initialization */ int (*init)(struct dt_device_node *dev, const void *data); }; diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 0396a8e..6f5767f 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -153,17 +153,12 @@ #include #include -#define DT_COMPAT_GIC_400 "arm,gic-400" -#define DT_COMPAT_GIC_CORTEX_A15 "arm,cortex-a15-gic" -#define DT_COMPAT_GIC_CORTEX_A7 "arm,cortex-a7-gic" +#define DT_MATCH_GIC_V2 \ + DT_MATCH_COMPATIBLE("arm,cortex-a15-gic"), \ + DT_MATCH_COMPATIBLE("arm,cortex-a7-gic"), \ + DT_MATCH_COMPATIBLE("arm,gic-400") -#define DT_MATCH_GIC_V2 DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A15), \ - DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A7), \ - DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_400) - -#define DT_COMPAT_GIC_V3 "arm,gic-v3" - -#define DT_MATCH_GIC_V3 DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_V3) +#define DT_MATCH_GIC_V3 DT_MATCH_COMPATIBLE("arm,gic-v3") /* * GICv3 registers that needs to be saved/restored -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:17:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:17: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 1YTqGL-0002Kr-EY; Fri, 06 Mar 2015 11:17:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGJ-0002KY-Vh for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:49 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id E1/B6-03164-BDC89F45; Fri, 06 Mar 2015 11:17:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1425640665!10163275!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30002 invoked from network); 6 Mar 2015 11:17:46 -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; 6 Mar 2015 11:17:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGH-0006D5-6C for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqGH-0001lB-4K for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:45 +0000 Date: Fri, 06 Mar 2015 11:17:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Describe devices supported by a driver with dt_device_match X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f9eff198f9d4863e80078a33001a9bb90a99a4b1 Author: Julien Grall AuthorDate: Wed Feb 25 18:52:57 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 13:55:23 2015 +0000 xen/arm: Describe devices supported by a driver with dt_device_match Xen is currently using a list of compatible strings to match drivers again device nodes. This leads to having double definitions in the GIC code. Furthermore Linux drivers are using dt_device_match (actually called of_device_id in Linux) to list device supported by the drivers. Remove the exisiting compatible field and replace with a dt_match field Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/device.c | 21 ++------------------- xen/arch/arm/gic-v2.c | 10 ++++------ xen/arch/arm/gic-v3.c | 8 ++++---- xen/drivers/char/exynos4210-uart.c | 8 ++++---- xen/drivers/char/ns16550.c | 12 ++++++------ xen/drivers/char/omap-uart.c | 8 ++++---- xen/drivers/char/pl011.c | 8 ++++---- xen/drivers/char/scif-uart.c | 8 ++++---- xen/include/asm-arm/device.h | 4 ++-- xen/include/asm-arm/gic.h | 15 +++++---------- 10 files changed, 39 insertions(+), 63 deletions(-) diff --git a/xen/arch/arm/device.c b/xen/arch/arm/device.c index 1f9dbf7..675784c 100644 --- a/xen/arch/arm/device.c +++ b/xen/arch/arm/device.c @@ -23,23 +23,6 @@ extern const struct device_desc _sdevice[], _edevice[]; -static bool_t __init device_is_compatible(const struct device_desc *desc, - const struct dt_device_node *dev) -{ - const char *const *compat; - - if ( !desc->compatible ) - return 0; - - for ( compat = desc->compatible; *compat; compat++ ) - { - if ( dt_device_is_compatible(dev, *compat) ) - return 1; - } - - return 0; -} - int __init device_init(struct dt_device_node *dev, enum device_class class, const void *data) { @@ -55,7 +38,7 @@ int __init device_init(struct dt_device_node *dev, enum device_class class, if ( desc->class != class ) continue; - if ( device_is_compatible(desc, dev) ) + if ( dt_match_node(desc->dt_match, dev) ) { ASSERT(desc->init != NULL); @@ -75,7 +58,7 @@ enum device_class device_get_class(const struct dt_device_node *dev) for ( desc = _sdevice; desc != _edevice; desc++ ) { - if ( device_is_compatible(desc, dev) ) + if ( dt_match_node(desc->dt_match, dev) ) return desc->class; } diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index c05b64a..e551549 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -776,16 +776,14 @@ static int __init gicv2_init(struct dt_device_node *node, const void *data) return 0; } -static const char * const gicv2_dt_compat[] __initconst = +static const struct dt_device_match gicv2_dt_match[] __initconst = { - DT_COMPAT_GIC_CORTEX_A15, - DT_COMPAT_GIC_CORTEX_A7, - DT_COMPAT_GIC_400, - NULL + DT_MATCH_GIC_V2, + { /* sentinel */ }, }; DT_DEVICE_START(gicv2, "GICv2", DEVICE_GIC) - .compatible = gicv2_dt_compat, + .dt_match = gicv2_dt_match, .init = gicv2_init, DT_DEVICE_END diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 1558e17..66cc2a2 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -1320,14 +1320,14 @@ static int __init gicv3_init(struct dt_device_node *node, const void *data) return res; } -static const char * const gicv3_dt_compat[] __initconst = +static const struct dt_device_match gicv3_dt_match[] __initconst = { - DT_COMPAT_GIC_V3, - NULL + DT_MATCH_GIC_V3, + { /* sentinel */ }, }; DT_DEVICE_START(gicv3, "GICv3", DEVICE_GIC) - .compatible = gicv3_dt_compat, + .dt_match = gicv3_dt_match, .init = gicv3_init, DT_DEVICE_END diff --git a/xen/drivers/char/exynos4210-uart.c b/xen/drivers/char/exynos4210-uart.c index cba8729..bac1c2b 100644 --- a/xen/drivers/char/exynos4210-uart.c +++ b/xen/drivers/char/exynos4210-uart.c @@ -352,14 +352,14 @@ static int __init exynos4210_uart_init(struct dt_device_node *dev, return 0; } -static const char * const exynos4210_dt_compat[] __initconst = +static const struct dt_device_match exynos4210_dt_match[] __initconst = { - "samsung,exynos4210-uart", - NULL + DT_MATCH_COMPATIBLE("samsung,exynos4210-uart"), + { /* sentinel */ }, }; DT_DEVICE_START(exynos4210, "Exynos 4210 UART", DEVICE_SERIAL) - .compatible = exynos4210_dt_compat, + .dt_match = exynos4210_dt_match, .init = exynos4210_uart_init, DT_DEVICE_END diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 161b251..d443880 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -1185,16 +1185,16 @@ static int __init ns16550_uart_dt_init(struct dt_device_node *dev, return 0; } -static const char * const ns16550_dt_compat[] __initconst = +static const struct dt_device_match ns16550_dt_match[] __initconst = { - "ns16550", - "ns16550a", - "snps,dw-apb-uart", - NULL + DT_MATCH_COMPATIBLE("ns16550"), + DT_MATCH_COMPATIBLE("ns16550a"), + DT_MATCH_COMPATIBLE("snps,dw-apb-uart"), + { /* sentinel */ }, }; DT_DEVICE_START(ns16550, "NS16550 UART", DEVICE_SERIAL) - .compatible = ns16550_dt_compat, + .dt_match = ns16550_dt_match, .init = ns16550_uart_dt_init, DT_DEVICE_END diff --git a/xen/drivers/char/omap-uart.c b/xen/drivers/char/omap-uart.c index 16d1454..d8f64ea 100644 --- a/xen/drivers/char/omap-uart.c +++ b/xen/drivers/char/omap-uart.c @@ -350,14 +350,14 @@ static int __init omap_uart_init(struct dt_device_node *dev, return 0; } -static const char * const omap_uart_dt_compat[] __initconst = +static const struct dt_device_match omap_uart_dt_match[] __initconst = { - "ti,omap4-uart", - NULL + DT_MATCH_COMPATIBLE("ti,omap4-uart"), + { /* sentinel */ }, }; DT_DEVICE_START(omap_uart, "OMAP UART", DEVICE_SERIAL) - .compatible = omap_uart_dt_compat, + .dt_match = omap_uart_dt_match, .init = omap_uart_init, DT_DEVICE_END diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index 57274d9..67e6df5 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -285,14 +285,14 @@ static int __init pl011_uart_init(struct dt_device_node *dev, return 0; } -static const char * const pl011_dt_compat[] __initconst = +static const struct dt_device_match pl011_dt_match[] __initconst = { - "arm,pl011", - NULL + DT_MATCH_COMPATIBLE("arm,pl011"), + { /* sentinel */ }, }; DT_DEVICE_START(pl011, "PL011 UART", DEVICE_SERIAL) - .compatible = pl011_dt_compat, + .dt_match = pl011_dt_match, .init = pl011_uart_init, DT_DEVICE_END diff --git a/xen/drivers/char/scif-uart.c b/xen/drivers/char/scif-uart.c index 1a1c496..51a2233 100644 --- a/xen/drivers/char/scif-uart.c +++ b/xen/drivers/char/scif-uart.c @@ -346,14 +346,14 @@ static int __init scif_uart_init(struct dt_device_node *dev, return 0; } -static const char * const scif_uart_dt_compat[] __initconst = +static const struct dt_device_match scif_uart_dt_match[] __initconst = { - "renesas,scif", - NULL + DT_MATCH_COMPATIBLE("renesas,scif"), + { /* sentinel */ }, }; DT_DEVICE_START(scif_uart, "SCIF UART", DEVICE_SERIAL) - .compatible = scif_uart_dt_compat, + .dt_match = scif_uart_dt_match, .init = scif_uart_init, DT_DEVICE_END diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index 1cedd49..a72f7c9 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -44,8 +44,8 @@ struct device_desc { const char *name; /* Device class */ enum device_class class; - /* Array of device tree 'compatible' strings */ - const char *const *compatible; + /* List of devices supported by this driver */ + const struct dt_device_match *dt_match; /* Device initialization */ int (*init)(struct dt_device_node *dev, const void *data); }; diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 0396a8e..6f5767f 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -153,17 +153,12 @@ #include #include -#define DT_COMPAT_GIC_400 "arm,gic-400" -#define DT_COMPAT_GIC_CORTEX_A15 "arm,cortex-a15-gic" -#define DT_COMPAT_GIC_CORTEX_A7 "arm,cortex-a7-gic" +#define DT_MATCH_GIC_V2 \ + DT_MATCH_COMPATIBLE("arm,cortex-a15-gic"), \ + DT_MATCH_COMPATIBLE("arm,cortex-a7-gic"), \ + DT_MATCH_COMPATIBLE("arm,gic-400") -#define DT_MATCH_GIC_V2 DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A15), \ - DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A7), \ - DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_400) - -#define DT_COMPAT_GIC_V3 "arm,gic-v3" - -#define DT_MATCH_GIC_V3 DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_V3) +#define DT_MATCH_GIC_V3 DT_MATCH_COMPATIBLE("arm,gic-v3") /* * GICv3 registers that needs to be saved/restored -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:18:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:18: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 1YTqGZ-0002Md-Hq; Fri, 06 Mar 2015 11:18:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGX-0002ML-Er for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:01 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 69/CC-03712-8EC89F45; Fri, 06 Mar 2015 11:18:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1425640675!13496150!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27711 invoked from network); 6 Mar 2015 11:17:56 -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; 6 Mar 2015 11:17:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGR-0006DE-Cd for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqGR-0001lX-As for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:55 +0000 Date: Fri, 06 Mar 2015 11:17:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/iommu: arm: Import the SMMU driver from Linux X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a5d65ee331bb5c1a512c3c6936b0f548db84a8fd Author: Julien Grall AuthorDate: Wed Feb 25 18:52:58 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 13:55:23 2015 +0000 xen/iommu: arm: Import the SMMU driver from Linux Based on commit e6b5be2be4e30037eb551e0ed09dd97bd00d85d3. It's a verbatim of the Linux SMMU drivers code. No Xen code has yet been added and the file is not built. Compare to the previous drivers it gains support of PCI. Though it will need a bit of plumbing for Xen. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/drivers/passthrough/arm/smmu.c | 2193 ++++++++++++++++++++++++++++++++++++ 1 files changed, 2193 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c new file mode 100644 index 0000000..6cd47b7 --- /dev/null +++ b/xen/drivers/passthrough/arm/smmu.c @@ -0,0 +1,2193 @@ +/* + * IOMMU API for ARM architected SMMU implementations. + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Copyright (C) 2013 ARM Limited + * + * Author: Will Deacon + * + * This driver currently supports: + * - SMMUv1 and v2 implementations + * - Stream-matching and stream-indexing + * - v7/v8 long-descriptor format + * - Non-secure access to the SMMU + * - 4k and 64k pages, with contiguous pte hints. + * - Up to 48-bit addressing (dependent on VA_BITS) + * - Context fault reporting + */ + +#define pr_fmt(fmt) "arm-smmu: " fmt + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +/* Maximum number of stream IDs assigned to a single device */ +#define MAX_MASTER_STREAMIDS MAX_PHANDLE_ARGS + +/* Maximum number of context banks per SMMU */ +#define ARM_SMMU_MAX_CBS 128 + +/* Maximum number of mapping groups per SMMU */ +#define ARM_SMMU_MAX_SMRS 128 + +/* SMMU global address space */ +#define ARM_SMMU_GR0(smmu) ((smmu)->base) +#define ARM_SMMU_GR1(smmu) ((smmu)->base + (1 << (smmu)->pgshift)) + +/* + * SMMU global address space with conditional offset to access secure + * aliases of non-secure registers (e.g. nsCR0: 0x400, nsGFSR: 0x448, + * nsGFSYNR0: 0x450) + */ +#define ARM_SMMU_GR0_NS(smmu) \ + ((smmu)->base + \ + ((smmu->options & ARM_SMMU_OPT_SECURE_CFG_ACCESS) \ + ? 0x400 : 0)) + +/* Page table bits */ +#define ARM_SMMU_PTE_XN (((pteval_t)3) << 53) +#define ARM_SMMU_PTE_CONT (((pteval_t)1) << 52) +#define ARM_SMMU_PTE_AF (((pteval_t)1) << 10) +#define ARM_SMMU_PTE_SH_NS (((pteval_t)0) << 8) +#define ARM_SMMU_PTE_SH_OS (((pteval_t)2) << 8) +#define ARM_SMMU_PTE_SH_IS (((pteval_t)3) << 8) +#define ARM_SMMU_PTE_PAGE (((pteval_t)3) << 0) + +#if PAGE_SIZE == SZ_4K +#define ARM_SMMU_PTE_CONT_ENTRIES 16 +#elif PAGE_SIZE == SZ_64K +#define ARM_SMMU_PTE_CONT_ENTRIES 32 +#else +#define ARM_SMMU_PTE_CONT_ENTRIES 1 +#endif + +#define ARM_SMMU_PTE_CONT_SIZE (PAGE_SIZE * ARM_SMMU_PTE_CONT_ENTRIES) +#define ARM_SMMU_PTE_CONT_MASK (~(ARM_SMMU_PTE_CONT_SIZE - 1)) + +/* Stage-1 PTE */ +#define ARM_SMMU_PTE_AP_UNPRIV (((pteval_t)1) << 6) +#define ARM_SMMU_PTE_AP_RDONLY (((pteval_t)2) << 6) +#define ARM_SMMU_PTE_ATTRINDX_SHIFT 2 +#define ARM_SMMU_PTE_nG (((pteval_t)1) << 11) + +/* Stage-2 PTE */ +#define ARM_SMMU_PTE_HAP_FAULT (((pteval_t)0) << 6) +#define ARM_SMMU_PTE_HAP_READ (((pteval_t)1) << 6) +#define ARM_SMMU_PTE_HAP_WRITE (((pteval_t)2) << 6) +#define ARM_SMMU_PTE_MEMATTR_OIWB (((pteval_t)0xf) << 2) +#define ARM_SMMU_PTE_MEMATTR_NC (((pteval_t)0x5) << 2) +#define ARM_SMMU_PTE_MEMATTR_DEV (((pteval_t)0x1) << 2) + +/* Configuration registers */ +#define ARM_SMMU_GR0_sCR0 0x0 +#define sCR0_CLIENTPD (1 << 0) +#define sCR0_GFRE (1 << 1) +#define sCR0_GFIE (1 << 2) +#define sCR0_GCFGFRE (1 << 4) +#define sCR0_GCFGFIE (1 << 5) +#define sCR0_USFCFG (1 << 10) +#define sCR0_VMIDPNE (1 << 11) +#define sCR0_PTM (1 << 12) +#define sCR0_FB (1 << 13) +#define sCR0_BSU_SHIFT 14 +#define sCR0_BSU_MASK 0x3 + +/* Identification registers */ +#define ARM_SMMU_GR0_ID0 0x20 +#define ARM_SMMU_GR0_ID1 0x24 +#define ARM_SMMU_GR0_ID2 0x28 +#define ARM_SMMU_GR0_ID3 0x2c +#define ARM_SMMU_GR0_ID4 0x30 +#define ARM_SMMU_GR0_ID5 0x34 +#define ARM_SMMU_GR0_ID6 0x38 +#define ARM_SMMU_GR0_ID7 0x3c +#define ARM_SMMU_GR0_sGFSR 0x48 +#define ARM_SMMU_GR0_sGFSYNR0 0x50 +#define ARM_SMMU_GR0_sGFSYNR1 0x54 +#define ARM_SMMU_GR0_sGFSYNR2 0x58 +#define ARM_SMMU_GR0_PIDR0 0xfe0 +#define ARM_SMMU_GR0_PIDR1 0xfe4 +#define ARM_SMMU_GR0_PIDR2 0xfe8 + +#define ID0_S1TS (1 << 30) +#define ID0_S2TS (1 << 29) +#define ID0_NTS (1 << 28) +#define ID0_SMS (1 << 27) +#define ID0_PTFS_SHIFT 24 +#define ID0_PTFS_MASK 0x2 +#define ID0_PTFS_V8_ONLY 0x2 +#define ID0_CTTW (1 << 14) +#define ID0_NUMIRPT_SHIFT 16 +#define ID0_NUMIRPT_MASK 0xff +#define ID0_NUMSIDB_SHIFT 9 +#define ID0_NUMSIDB_MASK 0xf +#define ID0_NUMSMRG_SHIFT 0 +#define ID0_NUMSMRG_MASK 0xff + +#define ID1_PAGESIZE (1 << 31) +#define ID1_NUMPAGENDXB_SHIFT 28 +#define ID1_NUMPAGENDXB_MASK 7 +#define ID1_NUMS2CB_SHIFT 16 +#define ID1_NUMS2CB_MASK 0xff +#define ID1_NUMCB_SHIFT 0 +#define ID1_NUMCB_MASK 0xff + +#define ID2_OAS_SHIFT 4 +#define ID2_OAS_MASK 0xf +#define ID2_IAS_SHIFT 0 +#define ID2_IAS_MASK 0xf +#define ID2_UBS_SHIFT 8 +#define ID2_UBS_MASK 0xf +#define ID2_PTFS_4K (1 << 12) +#define ID2_PTFS_16K (1 << 13) +#define ID2_PTFS_64K (1 << 14) + +#define PIDR2_ARCH_SHIFT 4 +#define PIDR2_ARCH_MASK 0xf + +/* Global TLB invalidation */ +#define ARM_SMMU_GR0_STLBIALL 0x60 +#define ARM_SMMU_GR0_TLBIVMID 0x64 +#define ARM_SMMU_GR0_TLBIALLNSNH 0x68 +#define ARM_SMMU_GR0_TLBIALLH 0x6c +#define ARM_SMMU_GR0_sTLBGSYNC 0x70 +#define ARM_SMMU_GR0_sTLBGSTATUS 0x74 +#define sTLBGSTATUS_GSACTIVE (1 << 0) +#define TLB_LOOP_TIMEOUT 1000000 /* 1s! */ + +/* Stream mapping registers */ +#define ARM_SMMU_GR0_SMR(n) (0x800 + ((n) << 2)) +#define SMR_VALID (1 << 31) +#define SMR_MASK_SHIFT 16 +#define SMR_MASK_MASK 0x7fff +#define SMR_ID_SHIFT 0 +#define SMR_ID_MASK 0x7fff + +#define ARM_SMMU_GR0_S2CR(n) (0xc00 + ((n) << 2)) +#define S2CR_CBNDX_SHIFT 0 +#define S2CR_CBNDX_MASK 0xff +#define S2CR_TYPE_SHIFT 16 +#define S2CR_TYPE_MASK 0x3 +#define S2CR_TYPE_TRANS (0 << S2CR_TYPE_SHIFT) +#define S2CR_TYPE_BYPASS (1 << S2CR_TYPE_SHIFT) +#define S2CR_TYPE_FAULT (2 << S2CR_TYPE_SHIFT) + +/* Context bank attribute registers */ +#define ARM_SMMU_GR1_CBAR(n) (0x0 + ((n) << 2)) +#define CBAR_VMID_SHIFT 0 +#define CBAR_VMID_MASK 0xff +#define CBAR_S1_BPSHCFG_SHIFT 8 +#define CBAR_S1_BPSHCFG_MASK 3 +#define CBAR_S1_BPSHCFG_NSH 3 +#define CBAR_S1_MEMATTR_SHIFT 12 +#define CBAR_S1_MEMATTR_MASK 0xf +#define CBAR_S1_MEMATTR_WB 0xf +#define CBAR_TYPE_SHIFT 16 +#define CBAR_TYPE_MASK 0x3 +#define CBAR_TYPE_S2_TRANS (0 << CBAR_TYPE_SHIFT) +#define CBAR_TYPE_S1_TRANS_S2_BYPASS (1 << CBAR_TYPE_SHIFT) +#define CBAR_TYPE_S1_TRANS_S2_FAULT (2 << CBAR_TYPE_SHIFT) +#define CBAR_TYPE_S1_TRANS_S2_TRANS (3 << CBAR_TYPE_SHIFT) +#define CBAR_IRPTNDX_SHIFT 24 +#define CBAR_IRPTNDX_MASK 0xff + +#define ARM_SMMU_GR1_CBA2R(n) (0x800 + ((n) << 2)) +#define CBA2R_RW64_32BIT (0 << 0) +#define CBA2R_RW64_64BIT (1 << 0) + +/* Translation context bank */ +#define ARM_SMMU_CB_BASE(smmu) ((smmu)->base + ((smmu)->size >> 1)) +#define ARM_SMMU_CB(smmu, n) ((n) * (1 << (smmu)->pgshift)) + +#define ARM_SMMU_CB_SCTLR 0x0 +#define ARM_SMMU_CB_RESUME 0x8 +#define ARM_SMMU_CB_TTBCR2 0x10 +#define ARM_SMMU_CB_TTBR0_LO 0x20 +#define ARM_SMMU_CB_TTBR0_HI 0x24 +#define ARM_SMMU_CB_TTBCR 0x30 +#define ARM_SMMU_CB_S1_MAIR0 0x38 +#define ARM_SMMU_CB_FSR 0x58 +#define ARM_SMMU_CB_FAR_LO 0x60 +#define ARM_SMMU_CB_FAR_HI 0x64 +#define ARM_SMMU_CB_FSYNR0 0x68 +#define ARM_SMMU_CB_S1_TLBIASID 0x610 + +#define SCTLR_S1_ASIDPNE (1 << 12) +#define SCTLR_CFCFG (1 << 7) +#define SCTLR_CFIE (1 << 6) +#define SCTLR_CFRE (1 << 5) +#define SCTLR_E (1 << 4) +#define SCTLR_AFE (1 << 2) +#define SCTLR_TRE (1 << 1) +#define SCTLR_M (1 << 0) +#define SCTLR_EAE_SBOP (SCTLR_AFE | SCTLR_TRE) + +#define RESUME_RETRY (0 << 0) +#define RESUME_TERMINATE (1 << 0) + +#define TTBCR_EAE (1 << 31) + +#define TTBCR_PASIZE_SHIFT 16 +#define TTBCR_PASIZE_MASK 0x7 + +#define TTBCR_TG0_4K (0 << 14) +#define TTBCR_TG0_64K (1 << 14) + +#define TTBCR_SH0_SHIFT 12 +#define TTBCR_SH0_MASK 0x3 +#define TTBCR_SH_NS 0 +#define TTBCR_SH_OS 2 +#define TTBCR_SH_IS 3 + +#define TTBCR_ORGN0_SHIFT 10 +#define TTBCR_IRGN0_SHIFT 8 +#define TTBCR_RGN_MASK 0x3 +#define TTBCR_RGN_NC 0 +#define TTBCR_RGN_WBWA 1 +#define TTBCR_RGN_WT 2 +#define TTBCR_RGN_WB 3 + +#define TTBCR_SL0_SHIFT 6 +#define TTBCR_SL0_MASK 0x3 +#define TTBCR_SL0_LVL_2 0 +#define TTBCR_SL0_LVL_1 1 + +#define TTBCR_T1SZ_SHIFT 16 +#define TTBCR_T0SZ_SHIFT 0 +#define TTBCR_SZ_MASK 0xf + +#define TTBCR2_SEP_SHIFT 15 +#define TTBCR2_SEP_MASK 0x7 + +#define TTBCR2_PASIZE_SHIFT 0 +#define TTBCR2_PASIZE_MASK 0x7 + +/* Common definitions for PASize and SEP fields */ +#define TTBCR2_ADDR_32 0 +#define TTBCR2_ADDR_36 1 +#define TTBCR2_ADDR_40 2 +#define TTBCR2_ADDR_42 3 +#define TTBCR2_ADDR_44 4 +#define TTBCR2_ADDR_48 5 + +#define TTBRn_HI_ASID_SHIFT 16 + +#define MAIR_ATTR_SHIFT(n) ((n) << 3) +#define MAIR_ATTR_MASK 0xff +#define MAIR_ATTR_DEVICE 0x04 +#define MAIR_ATTR_NC 0x44 +#define MAIR_ATTR_WBRWA 0xff +#define MAIR_ATTR_IDX_NC 0 +#define MAIR_ATTR_IDX_CACHE 1 +#define MAIR_ATTR_IDX_DEV 2 + +#define FSR_MULTI (1 << 31) +#define FSR_SS (1 << 30) +#define FSR_UUT (1 << 8) +#define FSR_ASF (1 << 7) +#define FSR_TLBLKF (1 << 6) +#define FSR_TLBMCF (1 << 5) +#define FSR_EF (1 << 4) +#define FSR_PF (1 << 3) +#define FSR_AFF (1 << 2) +#define FSR_TF (1 << 1) + +#define FSR_IGN (FSR_AFF | FSR_ASF | \ + FSR_TLBMCF | FSR_TLBLKF) +#define FSR_FAULT (FSR_MULTI | FSR_SS | FSR_UUT | \ + FSR_EF | FSR_PF | FSR_TF | FSR_IGN) + +#define FSYNR0_WNR (1 << 4) + +static int force_stage; +module_param_named(force_stage, force_stage, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(force_stage, + "Force SMMU mappings to be installed at a particular stage of translation. A value of '1' or '2' forces the corresponding stage. All other values are ignored (i.e. no stage is forced). Note that selecting a specific stage will disable support for nested translation."); + +enum arm_smmu_arch_version { + ARM_SMMU_V1 = 1, + ARM_SMMU_V2, +}; + +struct arm_smmu_smr { + u8 idx; + u16 mask; + u16 id; +}; + +struct arm_smmu_master_cfg { + int num_streamids; + u16 streamids[MAX_MASTER_STREAMIDS]; + struct arm_smmu_smr *smrs; +}; + +struct arm_smmu_master { + struct device_node *of_node; + struct rb_node node; + struct arm_smmu_master_cfg cfg; +}; + +struct arm_smmu_device { + struct device *dev; + + void __iomem *base; + unsigned long size; + unsigned long pgshift; + +#define ARM_SMMU_FEAT_COHERENT_WALK (1 << 0) +#define ARM_SMMU_FEAT_STREAM_MATCH (1 << 1) +#define ARM_SMMU_FEAT_TRANS_S1 (1 << 2) +#define ARM_SMMU_FEAT_TRANS_S2 (1 << 3) +#define ARM_SMMU_FEAT_TRANS_NESTED (1 << 4) + u32 features; + +#define ARM_SMMU_OPT_SECURE_CFG_ACCESS (1 << 0) + u32 options; + enum arm_smmu_arch_version version; + + u32 num_context_banks; + u32 num_s2_context_banks; + DECLARE_BITMAP(context_map, ARM_SMMU_MAX_CBS); + atomic_t irptndx; + + u32 num_mapping_groups; + DECLARE_BITMAP(smr_map, ARM_SMMU_MAX_SMRS); + + unsigned long s1_input_size; + unsigned long s1_output_size; + unsigned long s2_input_size; + unsigned long s2_output_size; + + u32 num_global_irqs; + u32 num_context_irqs; + unsigned int *irqs; + + struct list_head list; + struct rb_root masters; +}; + +struct arm_smmu_cfg { + u8 cbndx; + u8 irptndx; + u32 cbar; + pgd_t *pgd; +}; +#define INVALID_IRPTNDX 0xff + +#define ARM_SMMU_CB_ASID(cfg) ((cfg)->cbndx) +#define ARM_SMMU_CB_VMID(cfg) ((cfg)->cbndx + 1) + +enum arm_smmu_domain_stage { + ARM_SMMU_DOMAIN_S1 = 0, + ARM_SMMU_DOMAIN_S2, + ARM_SMMU_DOMAIN_NESTED, +}; + +struct arm_smmu_domain { + struct arm_smmu_device *smmu; + struct arm_smmu_cfg cfg; + enum arm_smmu_domain_stage stage; + spinlock_t lock; +}; + +static DEFINE_SPINLOCK(arm_smmu_devices_lock); +static LIST_HEAD(arm_smmu_devices); + +struct arm_smmu_option_prop { + u32 opt; + const char *prop; +}; + +static struct arm_smmu_option_prop arm_smmu_options[] = { + { ARM_SMMU_OPT_SECURE_CFG_ACCESS, "calxeda,smmu-secure-config-access" }, + { 0, NULL}, +}; + +static void parse_driver_options(struct arm_smmu_device *smmu) +{ + int i = 0; + + do { + if (of_property_read_bool(smmu->dev->of_node, + arm_smmu_options[i].prop)) { + smmu->options |= arm_smmu_options[i].opt; + dev_notice(smmu->dev, "option %s\n", + arm_smmu_options[i].prop); + } + } while (arm_smmu_options[++i].opt); +} + +static struct device_node *dev_get_dev_node(struct device *dev) +{ + if (dev_is_pci(dev)) { + struct pci_bus *bus = to_pci_dev(dev)->bus; + + while (!pci_is_root_bus(bus)) + bus = bus->parent; + return bus->bridge->parent->of_node; + } + + return dev->of_node; +} + +static struct arm_smmu_master *find_smmu_master(struct arm_smmu_device *smmu, + struct device_node *dev_node) +{ + struct rb_node *node = smmu->masters.rb_node; + + while (node) { + struct arm_smmu_master *master; + + master = container_of(node, struct arm_smmu_master, node); + + if (dev_node < master->of_node) + node = node->rb_left; + else if (dev_node > master->of_node) + node = node->rb_right; + else + return master; + } + + return NULL; +} + +static struct arm_smmu_master_cfg * +find_smmu_master_cfg(struct device *dev) +{ + struct arm_smmu_master_cfg *cfg = NULL; + struct iommu_group *group = iommu_group_get(dev); + + if (group) { + cfg = iommu_group_get_iommudata(group); + iommu_group_put(group); + } + + return cfg; +} + +static int insert_smmu_master(struct arm_smmu_device *smmu, + struct arm_smmu_master *master) +{ + struct rb_node **new, *parent; + + new = &smmu->masters.rb_node; + parent = NULL; + while (*new) { + struct arm_smmu_master *this + = container_of(*new, struct arm_smmu_master, node); + + parent = *new; + if (master->of_node < this->of_node) + new = &((*new)->rb_left); + else if (master->of_node > this->of_node) + new = &((*new)->rb_right); + else + return -EEXIST; + } + + rb_link_node(&master->node, parent, new); + rb_insert_color(&master->node, &smmu->masters); + return 0; +} + +static int register_smmu_master(struct arm_smmu_device *smmu, + struct device *dev, + struct of_phandle_args *masterspec) +{ + int i; + struct arm_smmu_master *master; + + master = find_smmu_master(smmu, masterspec->np); + if (master) { + dev_err(dev, + "rejecting multiple registrations for master device %s\n", + masterspec->np->name); + return -EBUSY; + } + + if (masterspec->args_count > MAX_MASTER_STREAMIDS) { + dev_err(dev, + "reached maximum number (%d) of stream IDs for master device %s\n", + MAX_MASTER_STREAMIDS, masterspec->np->name); + return -ENOSPC; + } + + master = devm_kzalloc(dev, sizeof(*master), GFP_KERNEL); + if (!master) + return -ENOMEM; + + master->of_node = masterspec->np; + master->cfg.num_streamids = masterspec->args_count; + + for (i = 0; i < master->cfg.num_streamids; ++i) { + u16 streamid = masterspec->args[i]; + + if (!(smmu->features & ARM_SMMU_FEAT_STREAM_MATCH) && + (streamid >= smmu->num_mapping_groups)) { + dev_err(dev, + "stream ID for master device %s greater than maximum allowed (%d)\n", + masterspec->np->name, smmu->num_mapping_groups); + return -ERANGE; + } + master->cfg.streamids[i] = streamid; + } + return insert_smmu_master(smmu, master); +} + +static struct arm_smmu_device *find_smmu_for_device(struct device *dev) +{ + struct arm_smmu_device *smmu; + struct arm_smmu_master *master = NULL; + struct device_node *dev_node = dev_get_dev_node(dev); + + spin_lock(&arm_smmu_devices_lock); + list_for_each_entry(smmu, &arm_smmu_devices, list) { + master = find_smmu_master(smmu, dev_node); + if (master) + break; + } + spin_unlock(&arm_smmu_devices_lock); + + return master ? smmu : NULL; +} + +static int __arm_smmu_alloc_bitmap(unsigned long *map, int start, int end) +{ + int idx; + + do { + idx = find_next_zero_bit(map, end, start); + if (idx == end) + return -ENOSPC; + } while (test_and_set_bit(idx, map)); + + return idx; +} + +static void __arm_smmu_free_bitmap(unsigned long *map, int idx) +{ + clear_bit(idx, map); +} + +/* Wait for any pending TLB invalidations to complete */ +static void arm_smmu_tlb_sync(struct arm_smmu_device *smmu) +{ + int count = 0; + void __iomem *gr0_base = ARM_SMMU_GR0(smmu); + + writel_relaxed(0, gr0_base + ARM_SMMU_GR0_sTLBGSYNC); + while (readl_relaxed(gr0_base + ARM_SMMU_GR0_sTLBGSTATUS) + & sTLBGSTATUS_GSACTIVE) { + cpu_relax(); + if (++count == TLB_LOOP_TIMEOUT) { + dev_err_ratelimited(smmu->dev, + "TLB sync timed out -- SMMU may be deadlocked\n"); + return; + } + udelay(1); + } +} + +static void arm_smmu_tlb_inv_context(struct arm_smmu_domain *smmu_domain) +{ + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; + struct arm_smmu_device *smmu = smmu_domain->smmu; + void __iomem *base = ARM_SMMU_GR0(smmu); + bool stage1 = cfg->cbar != CBAR_TYPE_S2_TRANS; + + if (stage1) { + base = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB(smmu, cfg->cbndx); + writel_relaxed(ARM_SMMU_CB_ASID(cfg), + base + ARM_SMMU_CB_S1_TLBIASID); + } else { + base = ARM_SMMU_GR0(smmu); + writel_relaxed(ARM_SMMU_CB_VMID(cfg), + base + ARM_SMMU_GR0_TLBIVMID); + } + + arm_smmu_tlb_sync(smmu); +} + +static irqreturn_t arm_smmu_context_fault(int irq, void *dev) +{ + int flags, ret; + u32 fsr, far, fsynr, resume; + unsigned long iova; + struct iommu_domain *domain = dev; + struct arm_smmu_domain *smmu_domain = domain->priv; + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; + struct arm_smmu_device *smmu = smmu_domain->smmu; + void __iomem *cb_base; + + cb_base = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB(smmu, cfg->cbndx); + fsr = readl_relaxed(cb_base + ARM_SMMU_CB_FSR); + + if (!(fsr & FSR_FAULT)) + return IRQ_NONE; + + if (fsr & FSR_IGN) + dev_err_ratelimited(smmu->dev, + "Unexpected context fault (fsr 0x%x)\n", + fsr); + + fsynr = readl_relaxed(cb_base + ARM_SMMU_CB_FSYNR0); + flags = fsynr & FSYNR0_WNR ? IOMMU_FAULT_WRITE : IOMMU_FAULT_READ; + + far = readl_relaxed(cb_base + ARM_SMMU_CB_FAR_LO); + iova = far; +#ifdef CONFIG_64BIT + far = readl_relaxed(cb_base + ARM_SMMU_CB_FAR_HI); + iova |= ((unsigned long)far << 32); +#endif + + if (!report_iommu_fault(domain, smmu->dev, iova, flags)) { + ret = IRQ_HANDLED; + resume = RESUME_RETRY; + } else { + dev_err_ratelimited(smmu->dev, + "Unhandled context fault: iova=0x%08lx, fsynr=0x%x, cb=%d\n", + iova, fsynr, cfg->cbndx); + ret = IRQ_NONE; + resume = RESUME_TERMINATE; + } + + /* Clear the faulting FSR */ + writel(fsr, cb_base + ARM_SMMU_CB_FSR); + + /* Retry or terminate any stalled transactions */ + if (fsr & FSR_SS) + writel_relaxed(resume, cb_base + ARM_SMMU_CB_RESUME); + + return ret; +} + +static irqreturn_t arm_smmu_global_fault(int irq, void *dev) +{ + u32 gfsr, gfsynr0, gfsynr1, gfsynr2; + struct arm_smmu_device *smmu = dev; + void __iomem *gr0_base = ARM_SMMU_GR0_NS(smmu); + + gfsr = readl_relaxed(gr0_base + ARM_SMMU_GR0_sGFSR); + gfsynr0 = readl_relaxed(gr0_base + ARM_SMMU_GR0_sGFSYNR0); + gfsynr1 = readl_relaxed(gr0_base + ARM_SMMU_GR0_sGFSYNR1); + gfsynr2 = readl_relaxed(gr0_base + ARM_SMMU_GR0_sGFSYNR2); + + if (!gfsr) + return IRQ_NONE; + + dev_err_ratelimited(smmu->dev, + "Unexpected global fault, this could be serious\n"); + dev_err_ratelimited(smmu->dev, + "\tGFSR 0x%08x, GFSYNR0 0x%08x, GFSYNR1 0x%08x, GFSYNR2 0x%08x\n", + gfsr, gfsynr0, gfsynr1, gfsynr2); + + writel(gfsr, gr0_base + ARM_SMMU_GR0_sGFSR); + return IRQ_HANDLED; +} + +static void arm_smmu_flush_pgtable(struct arm_smmu_device *smmu, void *addr, + size_t size) +{ + unsigned long offset = (unsigned long)addr & ~PAGE_MASK; + + + /* Ensure new page tables are visible to the hardware walker */ + if (smmu->features & ARM_SMMU_FEAT_COHERENT_WALK) { + dsb(ishst); + } else { + /* + * If the SMMU can't walk tables in the CPU caches, treat them + * like non-coherent DMA since we need to flush the new entries + * all the way out to memory. There's no possibility of + * recursion here as the SMMU table walker will not be wired + * through another SMMU. + */ + dma_map_page(smmu->dev, virt_to_page(addr), offset, size, + DMA_TO_DEVICE); + } +} + +static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain) +{ + u32 reg; + bool stage1; + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; + struct arm_smmu_device *smmu = smmu_domain->smmu; + void __iomem *cb_base, *gr0_base, *gr1_base; + + gr0_base = ARM_SMMU_GR0(smmu); + gr1_base = ARM_SMMU_GR1(smmu); + stage1 = cfg->cbar != CBAR_TYPE_S2_TRANS; + cb_base = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB(smmu, cfg->cbndx); + + /* CBAR */ + reg = cfg->cbar; + if (smmu->version == ARM_SMMU_V1) + reg |= cfg->irptndx << CBAR_IRPTNDX_SHIFT; + + /* + * Use the weakest shareability/memory types, so they are + * overridden by the ttbcr/pte. + */ + if (stage1) { + reg |= (CBAR_S1_BPSHCFG_NSH << CBAR_S1_BPSHCFG_SHIFT) | + (CBAR_S1_MEMATTR_WB << CBAR_S1_MEMATTR_SHIFT); + } else { + reg |= ARM_SMMU_CB_VMID(cfg) << CBAR_VMID_SHIFT; + } + writel_relaxed(reg, gr1_base + ARM_SMMU_GR1_CBAR(cfg->cbndx)); + + if (smmu->version > ARM_SMMU_V1) { + /* CBA2R */ +#ifdef CONFIG_64BIT + reg = CBA2R_RW64_64BIT; +#else + reg = CBA2R_RW64_32BIT; +#endif + writel_relaxed(reg, + gr1_base + ARM_SMMU_GR1_CBA2R(cfg->cbndx)); + + /* TTBCR2 */ + switch (smmu->s1_input_size) { + case 32: + reg = (TTBCR2_ADDR_32 << TTBCR2_SEP_SHIFT); + break; + case 36: + reg = (TTBCR2_ADDR_36 << TTBCR2_SEP_SHIFT); + break; + case 39: + case 40: + reg = (TTBCR2_ADDR_40 << TTBCR2_SEP_SHIFT); + break; + case 42: + reg = (TTBCR2_ADDR_42 << TTBCR2_SEP_SHIFT); + break; + case 44: + reg = (TTBCR2_ADDR_44 << TTBCR2_SEP_SHIFT); + break; + case 48: + reg = (TTBCR2_ADDR_48 << TTBCR2_SEP_SHIFT); + break; + } + + switch (smmu->s1_output_size) { + case 32: + reg |= (TTBCR2_ADDR_32 << TTBCR2_PASIZE_SHIFT); + break; + case 36: + reg |= (TTBCR2_ADDR_36 << TTBCR2_PASIZE_SHIFT); + break; + case 39: + case 40: + reg |= (TTBCR2_ADDR_40 << TTBCR2_PASIZE_SHIFT); + break; + case 42: + reg |= (TTBCR2_ADDR_42 << TTBCR2_PASIZE_SHIFT); + break; + case 44: + reg |= (TTBCR2_ADDR_44 << TTBCR2_PASIZE_SHIFT); + break; + case 48: + reg |= (TTBCR2_ADDR_48 << TTBCR2_PASIZE_SHIFT); + break; + } + + if (stage1) + writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBCR2); + } + + /* TTBR0 */ + arm_smmu_flush_pgtable(smmu, cfg->pgd, + PTRS_PER_PGD * sizeof(pgd_t)); + reg = __pa(cfg->pgd); + writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBR0_LO); + reg = (phys_addr_t)__pa(cfg->pgd) >> 32; + if (stage1) + reg |= ARM_SMMU_CB_ASID(cfg) << TTBRn_HI_ASID_SHIFT; + writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBR0_HI); + + /* + * TTBCR + * We use long descriptor, with inner-shareable WBWA tables in TTBR0. + */ + if (smmu->version > ARM_SMMU_V1) { + if (PAGE_SIZE == SZ_4K) + reg = TTBCR_TG0_4K; + else + reg = TTBCR_TG0_64K; + + if (!stage1) { + reg |= (64 - smmu->s2_input_size) << TTBCR_T0SZ_SHIFT; + + switch (smmu->s2_output_size) { + case 32: + reg |= (TTBCR2_ADDR_32 << TTBCR_PASIZE_SHIFT); + break; + case 36: + reg |= (TTBCR2_ADDR_36 << TTBCR_PASIZE_SHIFT); + break; + case 40: + reg |= (TTBCR2_ADDR_40 << TTBCR_PASIZE_SHIFT); + break; + case 42: + reg |= (TTBCR2_ADDR_42 << TTBCR_PASIZE_SHIFT); + break; + case 44: + reg |= (TTBCR2_ADDR_44 << TTBCR_PASIZE_SHIFT); + break; + case 48: + reg |= (TTBCR2_ADDR_48 << TTBCR_PASIZE_SHIFT); + break; + } + } else { + reg |= (64 - smmu->s1_input_size) << TTBCR_T0SZ_SHIFT; + } + } else { + reg = 0; + } + + reg |= TTBCR_EAE | + (TTBCR_SH_IS << TTBCR_SH0_SHIFT) | + (TTBCR_RGN_WBWA << TTBCR_ORGN0_SHIFT) | + (TTBCR_RGN_WBWA << TTBCR_IRGN0_SHIFT); + + if (!stage1) + reg |= (TTBCR_SL0_LVL_1 << TTBCR_SL0_SHIFT); + + writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBCR); + + /* MAIR0 (stage-1 only) */ + if (stage1) { + reg = (MAIR_ATTR_NC << MAIR_ATTR_SHIFT(MAIR_ATTR_IDX_NC)) | + (MAIR_ATTR_WBRWA << MAIR_ATTR_SHIFT(MAIR_ATTR_IDX_CACHE)) | + (MAIR_ATTR_DEVICE << MAIR_ATTR_SHIFT(MAIR_ATTR_IDX_DEV)); + writel_relaxed(reg, cb_base + ARM_SMMU_CB_S1_MAIR0); + } + + /* SCTLR */ + reg = SCTLR_CFCFG | SCTLR_CFIE | SCTLR_CFRE | SCTLR_M | SCTLR_EAE_SBOP; + if (stage1) + reg |= SCTLR_S1_ASIDPNE; +#ifdef __BIG_ENDIAN + reg |= SCTLR_E; +#endif + writel_relaxed(reg, cb_base + ARM_SMMU_CB_SCTLR); +} + +static int arm_smmu_init_domain_context(struct iommu_domain *domain, + struct arm_smmu_device *smmu) +{ + int irq, start, ret = 0; + unsigned long flags; + struct arm_smmu_domain *smmu_domain = domain->priv; + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; + + spin_lock_irqsave(&smmu_domain->lock, flags); + if (smmu_domain->smmu) + goto out_unlock; + + /* + * Mapping the requested stage onto what we support is surprisingly + * complicated, mainly because the spec allows S1+S2 SMMUs without + * support for nested translation. That means we end up with the + * following table: + * + * Requested Supported Actual + * S1 N S1 + * S1 S1+S2 S1 + * S1 S2 S2 + * S1 S1 S1 + * N N N + * N S1+S2 S2 + * N S2 S2 + * N S1 S1 + * + * Note that you can't actually request stage-2 mappings. + */ + if (!(smmu->features & ARM_SMMU_FEAT_TRANS_S1)) + smmu_domain->stage = ARM_SMMU_DOMAIN_S2; + if (!(smmu->features & ARM_SMMU_FEAT_TRANS_S2)) + smmu_domain->stage = ARM_SMMU_DOMAIN_S1; + + switch (smmu_domain->stage) { + case ARM_SMMU_DOMAIN_S1: + cfg->cbar = CBAR_TYPE_S1_TRANS_S2_BYPASS; + start = smmu->num_s2_context_banks; + break; + case ARM_SMMU_DOMAIN_NESTED: + /* + * We will likely want to change this if/when KVM gets + * involved. + */ + case ARM_SMMU_DOMAIN_S2: + cfg->cbar = CBAR_TYPE_S2_TRANS; + start = 0; + break; + default: + ret = -EINVAL; + goto out_unlock; + } + + ret = __arm_smmu_alloc_bitmap(smmu->context_map, start, + smmu->num_context_banks); + if (IS_ERR_VALUE(ret)) + goto out_unlock; + + cfg->cbndx = ret; + if (smmu->version == ARM_SMMU_V1) { + cfg->irptndx = atomic_inc_return(&smmu->irptndx); + cfg->irptndx %= smmu->num_context_irqs; + } else { + cfg->irptndx = cfg->cbndx; + } + + ACCESS_ONCE(smmu_domain->smmu) = smmu; + arm_smmu_init_context_bank(smmu_domain); + spin_unlock_irqrestore(&smmu_domain->lock, flags); + + irq = smmu->irqs[smmu->num_global_irqs + cfg->irptndx]; + ret = request_irq(irq, arm_smmu_context_fault, IRQF_SHARED, + "arm-smmu-context-fault", domain); + if (IS_ERR_VALUE(ret)) { + dev_err(smmu->dev, "failed to request context IRQ %d (%u)\n", + cfg->irptndx, irq); + cfg->irptndx = INVALID_IRPTNDX; + } + + return 0; + +out_unlock: + spin_unlock_irqrestore(&smmu_domain->lock, flags); + return ret; +} + +static void arm_smmu_destroy_domain_context(struct iommu_domain *domain) +{ + struct arm_smmu_domain *smmu_domain = domain->priv; + struct arm_smmu_device *smmu = smmu_domain->smmu; + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; + void __iomem *cb_base; + int irq; + + if (!smmu) + return; + + /* Disable the context bank and nuke the TLB before freeing it. */ + cb_base = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB(smmu, cfg->cbndx); + writel_relaxed(0, cb_base + ARM_SMMU_CB_SCTLR); + arm_smmu_tlb_inv_context(smmu_domain); + + if (cfg->irptndx != INVALID_IRPTNDX) { + irq = smmu->irqs[smmu->num_global_irqs + cfg->irptndx]; + free_irq(irq, domain); + } + + __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx); +} + +static int arm_smmu_domain_init(struct iommu_domain *domain) +{ + struct arm_smmu_domain *smmu_domain; + pgd_t *pgd; + + /* + * Allocate the domain and initialise some of its data structures. + * We can't really do anything meaningful until we've added a + * master. + */ + smmu_domain = kzalloc(sizeof(*smmu_domain), GFP_KERNEL); + if (!smmu_domain) + return -ENOMEM; + + pgd = kcalloc(PTRS_PER_PGD, sizeof(pgd_t), GFP_KERNEL); + if (!pgd) + goto out_free_domain; + smmu_domain->cfg.pgd = pgd; + + spin_lock_init(&smmu_domain->lock); + domain->priv = smmu_domain; + return 0; + +out_free_domain: + kfree(smmu_domain); + return -ENOMEM; +} + +static void arm_smmu_free_ptes(pmd_t *pmd) +{ + pgtable_t table = pmd_pgtable(*pmd); + + __free_page(table); +} + +static void arm_smmu_free_pmds(pud_t *pud) +{ + int i; + pmd_t *pmd, *pmd_base = pmd_offset(pud, 0); + + pmd = pmd_base; + for (i = 0; i < PTRS_PER_PMD; ++i) { + if (pmd_none(*pmd)) + continue; + + arm_smmu_free_ptes(pmd); + pmd++; + } + + pmd_free(NULL, pmd_base); +} + +static void arm_smmu_free_puds(pgd_t *pgd) +{ + int i; + pud_t *pud, *pud_base = pud_offset(pgd, 0); + + pud = pud_base; + for (i = 0; i < PTRS_PER_PUD; ++i) { + if (pud_none(*pud)) + continue; + + arm_smmu_free_pmds(pud); + pud++; + } + + pud_free(NULL, pud_base); +} + +static void arm_smmu_free_pgtables(struct arm_smmu_domain *smmu_domain) +{ + int i; + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; + pgd_t *pgd, *pgd_base = cfg->pgd; + + /* + * Recursively free the page tables for this domain. We don't + * care about speculative TLB filling because the tables should + * not be active in any context bank at this point (SCTLR.M is 0). + */ + pgd = pgd_base; + for (i = 0; i < PTRS_PER_PGD; ++i) { + if (pgd_none(*pgd)) + continue; + arm_smmu_free_puds(pgd); + pgd++; + } + + kfree(pgd_base); +} + +static void arm_smmu_domain_destroy(struct iommu_domain *domain) +{ + struct arm_smmu_domain *smmu_domain = domain->priv; + + /* + * Free the domain resources. We assume that all devices have + * already been detached. + */ + arm_smmu_destroy_domain_context(domain); + arm_smmu_free_pgtables(smmu_domain); + kfree(smmu_domain); +} + +static int arm_smmu_master_configure_smrs(struct arm_smmu_device *smmu, + struct arm_smmu_master_cfg *cfg) +{ + int i; + struct arm_smmu_smr *smrs; + void __iomem *gr0_base = ARM_SMMU_GR0(smmu); + + if (!(smmu->features & ARM_SMMU_FEAT_STREAM_MATCH)) + return 0; + + if (cfg->smrs) + return -EEXIST; + + smrs = kmalloc_array(cfg->num_streamids, sizeof(*smrs), GFP_KERNEL); + if (!smrs) { + dev_err(smmu->dev, "failed to allocate %d SMRs\n", + cfg->num_streamids); + return -ENOMEM; + } + + /* Allocate the SMRs on the SMMU */ + for (i = 0; i < cfg->num_streamids; ++i) { + int idx = __arm_smmu_alloc_bitmap(smmu->smr_map, 0, + smmu->num_mapping_groups); + if (IS_ERR_VALUE(idx)) { + dev_err(smmu->dev, "failed to allocate free SMR\n"); + goto err_free_smrs; + } + + smrs[i] = (struct arm_smmu_smr) { + .idx = idx, + .mask = 0, /* We don't currently share SMRs */ + .id = cfg->streamids[i], + }; + } + + /* It worked! Now, poke the actual hardware */ + for (i = 0; i < cfg->num_streamids; ++i) { + u32 reg = SMR_VALID | smrs[i].id << SMR_ID_SHIFT | + smrs[i].mask << SMR_MASK_SHIFT; + writel_relaxed(reg, gr0_base + ARM_SMMU_GR0_SMR(smrs[i].idx)); + } + + cfg->smrs = smrs; + return 0; + +err_free_smrs: + while (--i >= 0) + __arm_smmu_free_bitmap(smmu->smr_map, smrs[i].idx); + kfree(smrs); + return -ENOSPC; +} + +static void arm_smmu_master_free_smrs(struct arm_smmu_device *smmu, + struct arm_smmu_master_cfg *cfg) +{ + int i; + void __iomem *gr0_base = ARM_SMMU_GR0(smmu); + struct arm_smmu_smr *smrs = cfg->smrs; + + if (!smrs) + return; + + /* Invalidate the SMRs before freeing back to the allocator */ + for (i = 0; i < cfg->num_streamids; ++i) { + u8 idx = smrs[i].idx; + + writel_relaxed(~SMR_VALID, gr0_base + ARM_SMMU_GR0_SMR(idx)); + __arm_smmu_free_bitmap(smmu->smr_map, idx); + } + + cfg->smrs = NULL; + kfree(smrs); +} + +static int arm_smmu_domain_add_master(struct arm_smmu_domain *smmu_domain, + struct arm_smmu_master_cfg *cfg) +{ + int i, ret; + struct arm_smmu_device *smmu = smmu_domain->smmu; + void __iomem *gr0_base = ARM_SMMU_GR0(smmu); + + /* Devices in an IOMMU group may already be configured */ + ret = arm_smmu_master_configure_smrs(smmu, cfg); + if (ret) + return ret == -EEXIST ? 0 : ret; + + for (i = 0; i < cfg->num_streamids; ++i) { + u32 idx, s2cr; + + idx = cfg->smrs ? cfg->smrs[i].idx : cfg->streamids[i]; + s2cr = S2CR_TYPE_TRANS | + (smmu_domain->cfg.cbndx << S2CR_CBNDX_SHIFT); + writel_relaxed(s2cr, gr0_base + ARM_SMMU_GR0_S2CR(idx)); + } + + return 0; +} + +static void arm_smmu_domain_remove_master(struct arm_smmu_domain *smmu_domain, + struct arm_smmu_master_cfg *cfg) +{ + int i; + struct arm_smmu_device *smmu = smmu_domain->smmu; + void __iomem *gr0_base = ARM_SMMU_GR0(smmu); + + /* An IOMMU group is torn down by the first device to be removed */ + if ((smmu->features & ARM_SMMU_FEAT_STREAM_MATCH) && !cfg->smrs) + return; + + /* + * We *must* clear the S2CR first, because freeing the SMR means + * that it can be re-allocated immediately. + */ + for (i = 0; i < cfg->num_streamids; ++i) { + u32 idx = cfg->smrs ? cfg->smrs[i].idx : cfg->streamids[i]; + + writel_relaxed(S2CR_TYPE_BYPASS, + gr0_base + ARM_SMMU_GR0_S2CR(idx)); + } + + arm_smmu_master_free_smrs(smmu, cfg); +} + +static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) +{ + int ret; + struct arm_smmu_domain *smmu_domain = domain->priv; + struct arm_smmu_device *smmu, *dom_smmu; + struct arm_smmu_master_cfg *cfg; + + smmu = find_smmu_for_device(dev); + if (!smmu) { + dev_err(dev, "cannot attach to SMMU, is it on the same bus?\n"); + return -ENXIO; + } + + if (dev->archdata.iommu) { + dev_err(dev, "already attached to IOMMU domain\n"); + return -EEXIST; + } + + /* + * Sanity check the domain. We don't support domains across + * different SMMUs. + */ + dom_smmu = ACCESS_ONCE(smmu_domain->smmu); + if (!dom_smmu) { + /* Now that we have a master, we can finalise the domain */ + ret = arm_smmu_init_domain_context(domain, smmu); + if (IS_ERR_VALUE(ret)) + return ret; + + dom_smmu = smmu_domain->smmu; + } + + if (dom_smmu != smmu) { + dev_err(dev, + "cannot attach to SMMU %s whilst already attached to domain on SMMU %s\n", + dev_name(smmu_domain->smmu->dev), dev_name(smmu->dev)); + return -EINVAL; + } + + /* Looks ok, so add the device to the domain */ + cfg = find_smmu_master_cfg(dev); + if (!cfg) + return -ENODEV; + + ret = arm_smmu_domain_add_master(smmu_domain, cfg); + if (!ret) + dev->archdata.iommu = domain; + return ret; +} + +static void arm_smmu_detach_dev(struct iommu_domain *domain, struct device *dev) +{ + struct arm_smmu_domain *smmu_domain = domain->priv; + struct arm_smmu_master_cfg *cfg; + + cfg = find_smmu_master_cfg(dev); + if (!cfg) + return; + + dev->archdata.iommu = NULL; + arm_smmu_domain_remove_master(smmu_domain, cfg); +} + +static bool arm_smmu_pte_is_contiguous_range(unsigned long addr, + unsigned long end) +{ + return !(addr & ~ARM_SMMU_PTE_CONT_MASK) && + (addr + ARM_SMMU_PTE_CONT_SIZE <= end); +} + +static int arm_smmu_alloc_init_pte(struct arm_smmu_device *smmu, pmd_t *pmd, + unsigned long addr, unsigned long end, + unsigned long pfn, int prot, int stage) +{ + pte_t *pte, *start; + pteval_t pteval = ARM_SMMU_PTE_PAGE | ARM_SMMU_PTE_AF; + + if (pmd_none(*pmd)) { + /* Allocate a new set of tables */ + pgtable_t table = alloc_page(GFP_ATOMIC|__GFP_ZERO); + + if (!table) + return -ENOMEM; + + arm_smmu_flush_pgtable(smmu, page_address(table), PAGE_SIZE); + pmd_populate(NULL, pmd, table); + arm_smmu_flush_pgtable(smmu, pmd, sizeof(*pmd)); + } + + if (stage == 1) { + pteval |= ARM_SMMU_PTE_AP_UNPRIV | ARM_SMMU_PTE_nG; + if (!(prot & IOMMU_WRITE) && (prot & IOMMU_READ)) + pteval |= ARM_SMMU_PTE_AP_RDONLY; + + if (prot & IOMMU_CACHE) + pteval |= (MAIR_ATTR_IDX_CACHE << + ARM_SMMU_PTE_ATTRINDX_SHIFT); + } else { + pteval |= ARM_SMMU_PTE_HAP_FAULT; + if (prot & IOMMU_READ) + pteval |= ARM_SMMU_PTE_HAP_READ; + if (prot & IOMMU_WRITE) + pteval |= ARM_SMMU_PTE_HAP_WRITE; + if (prot & IOMMU_CACHE) + pteval |= ARM_SMMU_PTE_MEMATTR_OIWB; + else + pteval |= ARM_SMMU_PTE_MEMATTR_NC; + } + + if (prot & IOMMU_NOEXEC) + pteval |= ARM_SMMU_PTE_XN; + + /* If no access, create a faulting entry to avoid TLB fills */ + if (!(prot & (IOMMU_READ | IOMMU_WRITE))) + pteval &= ~ARM_SMMU_PTE_PAGE; + + pteval |= ARM_SMMU_PTE_SH_IS; + start = pmd_page_vaddr(*pmd) + pte_index(addr); + pte = start; + + /* + * Install the page table entries. This is fairly complicated + * since we attempt to make use of the contiguous hint in the + * ptes where possible. The contiguous hint indicates a series + * of ARM_SMMU_PTE_CONT_ENTRIES ptes mapping a physically + * contiguous region with the following constraints: + * + * - The region start is aligned to ARM_SMMU_PTE_CONT_SIZE + * - Each pte in the region has the contiguous hint bit set + * + * This complicates unmapping (also handled by this code, when + * neither IOMMU_READ or IOMMU_WRITE are set) because it is + * possible, yet highly unlikely, that a client may unmap only + * part of a contiguous range. This requires clearing of the + * contiguous hint bits in the range before installing the new + * faulting entries. + * + * Note that re-mapping an address range without first unmapping + * it is not supported, so TLB invalidation is not required here + * and is instead performed at unmap and domain-init time. + */ + do { + int i = 1; + + pteval &= ~ARM_SMMU_PTE_CONT; + + if (arm_smmu_pte_is_contiguous_range(addr, end)) { + i = ARM_SMMU_PTE_CONT_ENTRIES; + pteval |= ARM_SMMU_PTE_CONT; + } else if (pte_val(*pte) & + (ARM_SMMU_PTE_CONT | ARM_SMMU_PTE_PAGE)) { + int j; + pte_t *cont_start; + unsigned long idx = pte_index(addr); + + idx &= ~(ARM_SMMU_PTE_CONT_ENTRIES - 1); + cont_start = pmd_page_vaddr(*pmd) + idx; + for (j = 0; j < ARM_SMMU_PTE_CONT_ENTRIES; ++j) + pte_val(*(cont_start + j)) &= + ~ARM_SMMU_PTE_CONT; + + arm_smmu_flush_pgtable(smmu, cont_start, + sizeof(*pte) * + ARM_SMMU_PTE_CONT_ENTRIES); + } + + do { + *pte = pfn_pte(pfn, __pgprot(pteval)); + } while (pte++, pfn++, addr += PAGE_SIZE, --i); + } while (addr != end); + + arm_smmu_flush_pgtable(smmu, start, sizeof(*pte) * (pte - start)); + return 0; +} + +static int arm_smmu_alloc_init_pmd(struct arm_smmu_device *smmu, pud_t *pud, + unsigned long addr, unsigned long end, + phys_addr_t phys, int prot, int stage) +{ + int ret; + pmd_t *pmd; + unsigned long next, pfn = __phys_to_pfn(phys); + +#ifndef __PAGETABLE_PMD_FOLDED + if (pud_none(*pud)) { + pmd = (pmd_t *)get_zeroed_page(GFP_ATOMIC); + if (!pmd) + return -ENOMEM; + + arm_smmu_flush_pgtable(smmu, pmd, PAGE_SIZE); + pud_populate(NULL, pud, pmd); + arm_smmu_flush_pgtable(smmu, pud, sizeof(*pud)); + + pmd += pmd_index(addr); + } else +#endif + pmd = pmd_offset(pud, addr); + + do { + next = pmd_addr_end(addr, end); + ret = arm_smmu_alloc_init_pte(smmu, pmd, addr, next, pfn, + prot, stage); + phys += next - addr; + pfn = __phys_to_pfn(phys); + } while (pmd++, addr = next, addr < end); + + return ret; +} + +static int arm_smmu_alloc_init_pud(struct arm_smmu_device *smmu, pgd_t *pgd, + unsigned long addr, unsigned long end, + phys_addr_t phys, int prot, int stage) +{ + int ret = 0; + pud_t *pud; + unsigned long next; + +#ifndef __PAGETABLE_PUD_FOLDED + if (pgd_none(*pgd)) { + pud = (pud_t *)get_zeroed_page(GFP_ATOMIC); + if (!pud) + return -ENOMEM; + + arm_smmu_flush_pgtable(smmu, pud, PAGE_SIZE); + pgd_populate(NULL, pgd, pud); + arm_smmu_flush_pgtable(smmu, pgd, sizeof(*pgd)); + + pud += pud_index(addr); + } else +#endif + pud = pud_offset(pgd, addr); + + do { + next = pud_addr_end(addr, end); + ret = arm_smmu_alloc_init_pmd(smmu, pud, addr, next, phys, + prot, stage); + phys += next - addr; + } while (pud++, addr = next, addr < end); + + return ret; +} + +static int arm_smmu_handle_mapping(struct arm_smmu_domain *smmu_domain, + unsigned long iova, phys_addr_t paddr, + size_t size, int prot) +{ + int ret, stage; + unsigned long end; + phys_addr_t input_mask, output_mask; + struct arm_smmu_device *smmu = smmu_domain->smmu; + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; + pgd_t *pgd = cfg->pgd; + unsigned long flags; + + if (cfg->cbar == CBAR_TYPE_S2_TRANS) { + stage = 2; + input_mask = (1ULL << smmu->s2_input_size) - 1; + output_mask = (1ULL << smmu->s2_output_size) - 1; + } else { + stage = 1; + input_mask = (1ULL << smmu->s1_input_size) - 1; + output_mask = (1ULL << smmu->s1_output_size) - 1; + } + + if (!pgd) + return -EINVAL; + + if (size & ~PAGE_MASK) + return -EINVAL; + + if ((phys_addr_t)iova & ~input_mask) + return -ERANGE; + + if (paddr & ~output_mask) + return -ERANGE; + + spin_lock_irqsave(&smmu_domain->lock, flags); + pgd += pgd_index(iova); + end = iova + size; + do { + unsigned long next = pgd_addr_end(iova, end); + + ret = arm_smmu_alloc_init_pud(smmu, pgd, iova, next, paddr, + prot, stage); + if (ret) + goto out_unlock; + + paddr += next - iova; + iova = next; + } while (pgd++, iova != end); + +out_unlock: + spin_unlock_irqrestore(&smmu_domain->lock, flags); + + return ret; +} + +static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova, + phys_addr_t paddr, size_t size, int prot) +{ + struct arm_smmu_domain *smmu_domain = domain->priv; + + if (!smmu_domain) + return -ENODEV; + + return arm_smmu_handle_mapping(smmu_domain, iova, paddr, size, prot); +} + +static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova, + size_t size) +{ + int ret; + struct arm_smmu_domain *smmu_domain = domain->priv; + + ret = arm_smmu_handle_mapping(smmu_domain, iova, 0, size, 0); + arm_smmu_tlb_inv_context(smmu_domain); + return ret ? 0 : size; +} + +static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain, + dma_addr_t iova) +{ + pgd_t *pgdp, pgd; + pud_t pud; + pmd_t pmd; + pte_t pte; + struct arm_smmu_domain *smmu_domain = domain->priv; + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; + + pgdp = cfg->pgd; + if (!pgdp) + return 0; + + pgd = *(pgdp + pgd_index(iova)); + if (pgd_none(pgd)) + return 0; + + pud = *pud_offset(&pgd, iova); + if (pud_none(pud)) + return 0; + + pmd = *pmd_offset(&pud, iova); + if (pmd_none(pmd)) + return 0; + + pte = *(pmd_page_vaddr(pmd) + pte_index(iova)); + if (pte_none(pte)) + return 0; + + return __pfn_to_phys(pte_pfn(pte)) | (iova & ~PAGE_MASK); +} + +static bool arm_smmu_capable(enum iommu_cap cap) +{ + switch (cap) { + case IOMMU_CAP_CACHE_COHERENCY: + /* + * Return true here as the SMMU can always send out coherent + * requests. + */ + return true; + case IOMMU_CAP_INTR_REMAP: + return true; /* MSIs are just memory writes */ + case IOMMU_CAP_NOEXEC: + return true; + default: + return false; + } +} + +static int __arm_smmu_get_pci_sid(struct pci_dev *pdev, u16 alias, void *data) +{ + *((u16 *)data) = alias; + return 0; /* Continue walking */ +} + +static void __arm_smmu_release_pci_iommudata(void *data) +{ + kfree(data); +} + +static int arm_smmu_add_device(struct device *dev) +{ + struct arm_smmu_device *smmu; + struct arm_smmu_master_cfg *cfg; + struct iommu_group *group; + void (*releasefn)(void *) = NULL; + int ret; + + smmu = find_smmu_for_device(dev); + if (!smmu) + return -ENODEV; + + group = iommu_group_alloc(); + if (IS_ERR(group)) { + dev_err(dev, "Failed to allocate IOMMU group\n"); + return PTR_ERR(group); + } + + if (dev_is_pci(dev)) { + struct pci_dev *pdev = to_pci_dev(dev); + + cfg = kzalloc(sizeof(*cfg), GFP_KERNEL); + if (!cfg) { + ret = -ENOMEM; + goto out_put_group; + } + + cfg->num_streamids = 1; + /* + * Assume Stream ID == Requester ID for now. + * We need a way to describe the ID mappings in FDT. + */ + pci_for_each_dma_alias(pdev, __arm_smmu_get_pci_sid, + &cfg->streamids[0]); + releasefn = __arm_smmu_release_pci_iommudata; + } else { + struct arm_smmu_master *master; + + master = find_smmu_master(smmu, dev->of_node); + if (!master) { + ret = -ENODEV; + goto out_put_group; + } + + cfg = &master->cfg; + } + + iommu_group_set_iommudata(group, cfg, releasefn); + ret = iommu_group_add_device(group, dev); + +out_put_group: + iommu_group_put(group); + return ret; +} + +static void arm_smmu_remove_device(struct device *dev) +{ + iommu_group_remove_device(dev); +} + +static int arm_smmu_domain_get_attr(struct iommu_domain *domain, + enum iommu_attr attr, void *data) +{ + struct arm_smmu_domain *smmu_domain = domain->priv; + + switch (attr) { + case DOMAIN_ATTR_NESTING: + *(int *)data = (smmu_domain->stage == ARM_SMMU_DOMAIN_NESTED); + return 0; + default: + return -ENODEV; + } +} + +static int arm_smmu_domain_set_attr(struct iommu_domain *domain, + enum iommu_attr attr, void *data) +{ + struct arm_smmu_domain *smmu_domain = domain->priv; + + switch (attr) { + case DOMAIN_ATTR_NESTING: + if (smmu_domain->smmu) + return -EPERM; + if (*(int *)data) + smmu_domain->stage = ARM_SMMU_DOMAIN_NESTED; + else + smmu_domain->stage = ARM_SMMU_DOMAIN_S1; + + return 0; + default: + return -ENODEV; + } +} + +static const struct iommu_ops arm_smmu_ops = { + .capable = arm_smmu_capable, + .domain_init = arm_smmu_domain_init, + .domain_destroy = arm_smmu_domain_destroy, + .attach_dev = arm_smmu_attach_dev, + .detach_dev = arm_smmu_detach_dev, + .map = arm_smmu_map, + .unmap = arm_smmu_unmap, + .map_sg = default_iommu_map_sg, + .iova_to_phys = arm_smmu_iova_to_phys, + .add_device = arm_smmu_add_device, + .remove_device = arm_smmu_remove_device, + .domain_get_attr = arm_smmu_domain_get_attr, + .domain_set_attr = arm_smmu_domain_set_attr, + .pgsize_bitmap = (SECTION_SIZE | + ARM_SMMU_PTE_CONT_SIZE | + PAGE_SIZE), +}; + +static void arm_smmu_device_reset(struct arm_smmu_device *smmu) +{ + void __iomem *gr0_base = ARM_SMMU_GR0(smmu); + void __iomem *cb_base; + int i = 0; + u32 reg; + + /* clear global FSR */ + reg = readl_relaxed(ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sGFSR); + writel(reg, ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sGFSR); + + /* Mark all SMRn as invalid and all S2CRn as bypass */ + for (i = 0; i < smmu->num_mapping_groups; ++i) { + writel_relaxed(0, gr0_base + ARM_SMMU_GR0_SMR(i)); + writel_relaxed(S2CR_TYPE_BYPASS, + gr0_base + ARM_SMMU_GR0_S2CR(i)); + } + + /* Make sure all context banks are disabled and clear CB_FSR */ + for (i = 0; i < smmu->num_context_banks; ++i) { + cb_base = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB(smmu, i); + writel_relaxed(0, cb_base + ARM_SMMU_CB_SCTLR); + writel_relaxed(FSR_FAULT, cb_base + ARM_SMMU_CB_FSR); + } + + /* Invalidate the TLB, just in case */ + writel_relaxed(0, gr0_base + ARM_SMMU_GR0_STLBIALL); + writel_relaxed(0, gr0_base + ARM_SMMU_GR0_TLBIALLH); + writel_relaxed(0, gr0_base + ARM_SMMU_GR0_TLBIALLNSNH); + + reg = readl_relaxed(ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sCR0); + + /* Enable fault reporting */ + reg |= (sCR0_GFRE | sCR0_GFIE | sCR0_GCFGFRE | sCR0_GCFGFIE); + + /* Disable TLB broadcasting. */ + reg |= (sCR0_VMIDPNE | sCR0_PTM); + + /* Enable client access, but bypass when no mapping is found */ + reg &= ~(sCR0_CLIENTPD | sCR0_USFCFG); + + /* Disable forced broadcasting */ + reg &= ~sCR0_FB; + + /* Don't upgrade barriers */ + reg &= ~(sCR0_BSU_MASK << sCR0_BSU_SHIFT); + + /* Push the button */ + arm_smmu_tlb_sync(smmu); + writel(reg, ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sCR0); +} + +static int arm_smmu_id_size_to_bits(int size) +{ + switch (size) { + case 0: + return 32; + case 1: + return 36; + case 2: + return 40; + case 3: + return 42; + case 4: + return 44; + case 5: + default: + return 48; + } +} + +static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) +{ + unsigned long size; + void __iomem *gr0_base = ARM_SMMU_GR0(smmu); + u32 id; + + dev_notice(smmu->dev, "probing hardware configuration...\n"); + dev_notice(smmu->dev, "SMMUv%d with:\n", smmu->version); + + /* ID0 */ + id = readl_relaxed(gr0_base + ARM_SMMU_GR0_ID0); +#ifndef CONFIG_64BIT + if (((id >> ID0_PTFS_SHIFT) & ID0_PTFS_MASK) == ID0_PTFS_V8_ONLY) { + dev_err(smmu->dev, "\tno v7 descriptor support!\n"); + return -ENODEV; + } +#endif + + /* Restrict available stages based on module parameter */ + if (force_stage == 1) + id &= ~(ID0_S2TS | ID0_NTS); + else if (force_stage == 2) + id &= ~(ID0_S1TS | ID0_NTS); + + if (id & ID0_S1TS) { + smmu->features |= ARM_SMMU_FEAT_TRANS_S1; + dev_notice(smmu->dev, "\tstage 1 translation\n"); + } + + if (id & ID0_S2TS) { + smmu->features |= ARM_SMMU_FEAT_TRANS_S2; + dev_notice(smmu->dev, "\tstage 2 translation\n"); + } + + if (id & ID0_NTS) { + smmu->features |= ARM_SMMU_FEAT_TRANS_NESTED; + dev_notice(smmu->dev, "\tnested translation\n"); + } + + if (!(smmu->features & + (ARM_SMMU_FEAT_TRANS_S1 | ARM_SMMU_FEAT_TRANS_S2))) { + dev_err(smmu->dev, "\tno translation support!\n"); + return -ENODEV; + } + + if (id & ID0_CTTW) { + smmu->features |= ARM_SMMU_FEAT_COHERENT_WALK; + dev_notice(smmu->dev, "\tcoherent table walk\n"); + } + + if (id & ID0_SMS) { + u32 smr, sid, mask; + + smmu->features |= ARM_SMMU_FEAT_STREAM_MATCH; + smmu->num_mapping_groups = (id >> ID0_NUMSMRG_SHIFT) & + ID0_NUMSMRG_MASK; + if (smmu->num_mapping_groups == 0) { + dev_err(smmu->dev, + "stream-matching supported, but no SMRs present!\n"); + return -ENODEV; + } + + smr = SMR_MASK_MASK << SMR_MASK_SHIFT; + smr |= (SMR_ID_MASK << SMR_ID_SHIFT); + writel_relaxed(smr, gr0_base + ARM_SMMU_GR0_SMR(0)); + smr = readl_relaxed(gr0_base + ARM_SMMU_GR0_SMR(0)); + + mask = (smr >> SMR_MASK_SHIFT) & SMR_MASK_MASK; + sid = (smr >> SMR_ID_SHIFT) & SMR_ID_MASK; + if ((mask & sid) != sid) { + dev_err(smmu->dev, + "SMR mask bits (0x%x) insufficient for ID field (0x%x)\n", + mask, sid); + return -ENODEV; + } + + dev_notice(smmu->dev, + "\tstream matching with %u register groups, mask 0x%x", + smmu->num_mapping_groups, mask); + } else { + smmu->num_mapping_groups = (id >> ID0_NUMSIDB_SHIFT) & + ID0_NUMSIDB_MASK; + } + + /* ID1 */ + id = readl_relaxed(gr0_base + ARM_SMMU_GR0_ID1); + smmu->pgshift = (id & ID1_PAGESIZE) ? 16 : 12; + + /* Check for size mismatch of SMMU address space from mapped region */ + size = 1 << + (((id >> ID1_NUMPAGENDXB_SHIFT) & ID1_NUMPAGENDXB_MASK) + 1); + size *= 2 << smmu->pgshift; + if (smmu->size != size) + dev_warn(smmu->dev, + "SMMU address space size (0x%lx) differs from mapped region size (0x%lx)!\n", + size, smmu->size); + + smmu->num_s2_context_banks = (id >> ID1_NUMS2CB_SHIFT) & + ID1_NUMS2CB_MASK; + smmu->num_context_banks = (id >> ID1_NUMCB_SHIFT) & ID1_NUMCB_MASK; + if (smmu->num_s2_context_banks > smmu->num_context_banks) { + dev_err(smmu->dev, "impossible number of S2 context banks!\n"); + return -ENODEV; + } + dev_notice(smmu->dev, "\t%u context banks (%u stage-2 only)\n", + smmu->num_context_banks, smmu->num_s2_context_banks); + + /* ID2 */ + id = readl_relaxed(gr0_base + ARM_SMMU_GR0_ID2); + 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); + + /* Stage-2 input size limited due to pgd allocation (PTRS_PER_PGD) */ +#ifdef CONFIG_64BIT + smmu->s2_input_size = min_t(unsigned long, VA_BITS, size); +#else + smmu->s2_input_size = min(32UL, size); +#endif + + /* The stage-2 output mask is also applied for bypass */ + size = arm_smmu_id_size_to_bits((id >> ID2_OAS_SHIFT) & ID2_OAS_MASK); + smmu->s2_output_size = min_t(unsigned long, PHYS_MASK_SHIFT, size); + + if (smmu->version == ARM_SMMU_V1) { + smmu->s1_input_size = 32; + } else { +#ifdef CONFIG_64BIT + size = (id >> ID2_UBS_SHIFT) & ID2_UBS_MASK; + size = min(VA_BITS, arm_smmu_id_size_to_bits(size)); +#else + size = 32; +#endif + smmu->s1_input_size = size; + + if ((PAGE_SIZE == SZ_4K && !(id & ID2_PTFS_4K)) || + (PAGE_SIZE == SZ_64K && !(id & ID2_PTFS_64K)) || + (PAGE_SIZE != SZ_4K && PAGE_SIZE != SZ_64K)) { + dev_err(smmu->dev, "CPU page size 0x%lx unsupported\n", + PAGE_SIZE); + return -ENODEV; + } + } + + if (smmu->features & ARM_SMMU_FEAT_TRANS_S1) + dev_notice(smmu->dev, "\tStage-1: %lu-bit VA -> %lu-bit IPA\n", + smmu->s1_input_size, smmu->s1_output_size); + + if (smmu->features & ARM_SMMU_FEAT_TRANS_S2) + dev_notice(smmu->dev, "\tStage-2: %lu-bit IPA -> %lu-bit PA\n", + smmu->s2_input_size, smmu->s2_output_size); + + return 0; +} + +static const struct of_device_id arm_smmu_of_match[] = { + { .compatible = "arm,smmu-v1", .data = (void *)ARM_SMMU_V1 }, + { .compatible = "arm,smmu-v2", .data = (void *)ARM_SMMU_V2 }, + { .compatible = "arm,mmu-400", .data = (void *)ARM_SMMU_V1 }, + { .compatible = "arm,mmu-401", .data = (void *)ARM_SMMU_V1 }, + { .compatible = "arm,mmu-500", .data = (void *)ARM_SMMU_V2 }, + { }, +}; +MODULE_DEVICE_TABLE(of, arm_smmu_of_match); + +static int arm_smmu_device_dt_probe(struct platform_device *pdev) +{ + const struct of_device_id *of_id; + struct resource *res; + struct arm_smmu_device *smmu; + struct device *dev = &pdev->dev; + struct rb_node *node; + struct of_phandle_args masterspec; + int num_irqs, i, err; + + smmu = devm_kzalloc(dev, sizeof(*smmu), GFP_KERNEL); + if (!smmu) { + dev_err(dev, "failed to allocate arm_smmu_device\n"); + return -ENOMEM; + } + smmu->dev = dev; + + of_id = of_match_node(arm_smmu_of_match, dev->of_node); + smmu->version = (enum arm_smmu_arch_version)of_id->data; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + smmu->base = devm_ioremap_resource(dev, res); + if (IS_ERR(smmu->base)) + return PTR_ERR(smmu->base); + smmu->size = resource_size(res); + + if (of_property_read_u32(dev->of_node, "#global-interrupts", + &smmu->num_global_irqs)) { + dev_err(dev, "missing #global-interrupts property\n"); + return -ENODEV; + } + + num_irqs = 0; + while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, num_irqs))) { + num_irqs++; + if (num_irqs > smmu->num_global_irqs) + smmu->num_context_irqs++; + } + + if (!smmu->num_context_irqs) { + dev_err(dev, "found %d interrupts but expected at least %d\n", + num_irqs, smmu->num_global_irqs + 1); + return -ENODEV; + } + + smmu->irqs = devm_kzalloc(dev, sizeof(*smmu->irqs) * num_irqs, + GFP_KERNEL); + if (!smmu->irqs) { + dev_err(dev, "failed to allocate %d irqs\n", num_irqs); + return -ENOMEM; + } + + for (i = 0; i < num_irqs; ++i) { + int irq = platform_get_irq(pdev, i); + + if (irq < 0) { + dev_err(dev, "failed to get irq index %d\n", i); + return -ENODEV; + } + smmu->irqs[i] = irq; + } + + err = arm_smmu_device_cfg_probe(smmu); + if (err) + return err; + + i = 0; + smmu->masters = RB_ROOT; + while (!of_parse_phandle_with_args(dev->of_node, "mmu-masters", + "#stream-id-cells", i, + &masterspec)) { + err = register_smmu_master(smmu, dev, &masterspec); + if (err) { + dev_err(dev, "failed to add master %s\n", + masterspec.np->name); + goto out_put_masters; + } + + i++; + } + dev_notice(dev, "registered %d master devices\n", i); + + parse_driver_options(smmu); + + if (smmu->version > ARM_SMMU_V1 && + smmu->num_context_banks != smmu->num_context_irqs) { + dev_err(dev, + "found only %d context interrupt(s) but %d required\n", + smmu->num_context_irqs, smmu->num_context_banks); + err = -ENODEV; + goto out_put_masters; + } + + for (i = 0; i < smmu->num_global_irqs; ++i) { + err = request_irq(smmu->irqs[i], + arm_smmu_global_fault, + IRQF_SHARED, + "arm-smmu global fault", + smmu); + if (err) { + dev_err(dev, "failed to request global IRQ %d (%u)\n", + i, smmu->irqs[i]); + goto out_free_irqs; + } + } + + INIT_LIST_HEAD(&smmu->list); + spin_lock(&arm_smmu_devices_lock); + list_add(&smmu->list, &arm_smmu_devices); + spin_unlock(&arm_smmu_devices_lock); + + arm_smmu_device_reset(smmu); + return 0; + +out_free_irqs: + while (i--) + free_irq(smmu->irqs[i], smmu); + +out_put_masters: + for (node = rb_first(&smmu->masters); node; node = rb_next(node)) { + struct arm_smmu_master *master + = container_of(node, struct arm_smmu_master, node); + of_node_put(master->of_node); + } + + return err; +} + +static int arm_smmu_device_remove(struct platform_device *pdev) +{ + int i; + struct device *dev = &pdev->dev; + struct arm_smmu_device *curr, *smmu = NULL; + struct rb_node *node; + + spin_lock(&arm_smmu_devices_lock); + list_for_each_entry(curr, &arm_smmu_devices, list) { + if (curr->dev == dev) { + smmu = curr; + list_del(&smmu->list); + break; + } + } + spin_unlock(&arm_smmu_devices_lock); + + if (!smmu) + return -ENODEV; + + for (node = rb_first(&smmu->masters); node; node = rb_next(node)) { + struct arm_smmu_master *master + = container_of(node, struct arm_smmu_master, node); + of_node_put(master->of_node); + } + + if (!bitmap_empty(smmu->context_map, ARM_SMMU_MAX_CBS)) + dev_err(dev, "removing device with active domains!\n"); + + for (i = 0; i < smmu->num_global_irqs; ++i) + free_irq(smmu->irqs[i], smmu); + + /* Turn the thing off */ + writel(sCR0_CLIENTPD, ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sCR0); + return 0; +} + +static struct platform_driver arm_smmu_driver = { + .driver = { + .name = "arm-smmu", + .of_match_table = of_match_ptr(arm_smmu_of_match), + }, + .probe = arm_smmu_device_dt_probe, + .remove = arm_smmu_device_remove, +}; + +static int __init arm_smmu_init(void) +{ + struct device_node *np; + int ret; + + /* + * Play nice with systems that don't have an ARM SMMU by checking that + * an ARM SMMU exists in the system before proceeding with the driver + * and IOMMU bus operation registration. + */ + np = of_find_matching_node(NULL, arm_smmu_of_match); + if (!np) + return 0; + + of_node_put(np); + + ret = platform_driver_register(&arm_smmu_driver); + if (ret) + return ret; + + /* Oh, for a proper bus abstraction */ + if (!iommu_present(&platform_bus_type)) + bus_set_iommu(&platform_bus_type, &arm_smmu_ops); + +#ifdef CONFIG_ARM_AMBA + if (!iommu_present(&amba_bustype)) + bus_set_iommu(&amba_bustype, &arm_smmu_ops); +#endif + +#ifdef CONFIG_PCI + if (!iommu_present(&pci_bus_type)) + bus_set_iommu(&pci_bus_type, &arm_smmu_ops); +#endif + + return 0; +} + +static void __exit arm_smmu_exit(void) +{ + return platform_driver_unregister(&arm_smmu_driver); +} + +subsys_initcall(arm_smmu_init); +module_exit(arm_smmu_exit); + +MODULE_DESCRIPTION("IOMMU API for ARM architected SMMU implementations"); +MODULE_AUTHOR("Will Deacon "); +MODULE_LICENSE("GPL v2"); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:18:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:18: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 1YTqGZ-0002Md-Hq; Fri, 06 Mar 2015 11:18:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGX-0002ML-Er for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:01 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 69/CC-03712-8EC89F45; Fri, 06 Mar 2015 11:18:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1425640675!13496150!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27711 invoked from network); 6 Mar 2015 11:17:56 -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; 6 Mar 2015 11:17:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGR-0006DE-Cd for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqGR-0001lX-As for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:17:55 +0000 Date: Fri, 06 Mar 2015 11:17:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/iommu: arm: Import the SMMU driver from Linux X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a5d65ee331bb5c1a512c3c6936b0f548db84a8fd Author: Julien Grall AuthorDate: Wed Feb 25 18:52:58 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 13:55:23 2015 +0000 xen/iommu: arm: Import the SMMU driver from Linux Based on commit e6b5be2be4e30037eb551e0ed09dd97bd00d85d3. It's a verbatim of the Linux SMMU drivers code. No Xen code has yet been added and the file is not built. Compare to the previous drivers it gains support of PCI. Though it will need a bit of plumbing for Xen. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/drivers/passthrough/arm/smmu.c | 2193 ++++++++++++++++++++++++++++++++++++ 1 files changed, 2193 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c new file mode 100644 index 0000000..6cd47b7 --- /dev/null +++ b/xen/drivers/passthrough/arm/smmu.c @@ -0,0 +1,2193 @@ +/* + * IOMMU API for ARM architected SMMU implementations. + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Copyright (C) 2013 ARM Limited + * + * Author: Will Deacon + * + * This driver currently supports: + * - SMMUv1 and v2 implementations + * - Stream-matching and stream-indexing + * - v7/v8 long-descriptor format + * - Non-secure access to the SMMU + * - 4k and 64k pages, with contiguous pte hints. + * - Up to 48-bit addressing (dependent on VA_BITS) + * - Context fault reporting + */ + +#define pr_fmt(fmt) "arm-smmu: " fmt + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +/* Maximum number of stream IDs assigned to a single device */ +#define MAX_MASTER_STREAMIDS MAX_PHANDLE_ARGS + +/* Maximum number of context banks per SMMU */ +#define ARM_SMMU_MAX_CBS 128 + +/* Maximum number of mapping groups per SMMU */ +#define ARM_SMMU_MAX_SMRS 128 + +/* SMMU global address space */ +#define ARM_SMMU_GR0(smmu) ((smmu)->base) +#define ARM_SMMU_GR1(smmu) ((smmu)->base + (1 << (smmu)->pgshift)) + +/* + * SMMU global address space with conditional offset to access secure + * aliases of non-secure registers (e.g. nsCR0: 0x400, nsGFSR: 0x448, + * nsGFSYNR0: 0x450) + */ +#define ARM_SMMU_GR0_NS(smmu) \ + ((smmu)->base + \ + ((smmu->options & ARM_SMMU_OPT_SECURE_CFG_ACCESS) \ + ? 0x400 : 0)) + +/* Page table bits */ +#define ARM_SMMU_PTE_XN (((pteval_t)3) << 53) +#define ARM_SMMU_PTE_CONT (((pteval_t)1) << 52) +#define ARM_SMMU_PTE_AF (((pteval_t)1) << 10) +#define ARM_SMMU_PTE_SH_NS (((pteval_t)0) << 8) +#define ARM_SMMU_PTE_SH_OS (((pteval_t)2) << 8) +#define ARM_SMMU_PTE_SH_IS (((pteval_t)3) << 8) +#define ARM_SMMU_PTE_PAGE (((pteval_t)3) << 0) + +#if PAGE_SIZE == SZ_4K +#define ARM_SMMU_PTE_CONT_ENTRIES 16 +#elif PAGE_SIZE == SZ_64K +#define ARM_SMMU_PTE_CONT_ENTRIES 32 +#else +#define ARM_SMMU_PTE_CONT_ENTRIES 1 +#endif + +#define ARM_SMMU_PTE_CONT_SIZE (PAGE_SIZE * ARM_SMMU_PTE_CONT_ENTRIES) +#define ARM_SMMU_PTE_CONT_MASK (~(ARM_SMMU_PTE_CONT_SIZE - 1)) + +/* Stage-1 PTE */ +#define ARM_SMMU_PTE_AP_UNPRIV (((pteval_t)1) << 6) +#define ARM_SMMU_PTE_AP_RDONLY (((pteval_t)2) << 6) +#define ARM_SMMU_PTE_ATTRINDX_SHIFT 2 +#define ARM_SMMU_PTE_nG (((pteval_t)1) << 11) + +/* Stage-2 PTE */ +#define ARM_SMMU_PTE_HAP_FAULT (((pteval_t)0) << 6) +#define ARM_SMMU_PTE_HAP_READ (((pteval_t)1) << 6) +#define ARM_SMMU_PTE_HAP_WRITE (((pteval_t)2) << 6) +#define ARM_SMMU_PTE_MEMATTR_OIWB (((pteval_t)0xf) << 2) +#define ARM_SMMU_PTE_MEMATTR_NC (((pteval_t)0x5) << 2) +#define ARM_SMMU_PTE_MEMATTR_DEV (((pteval_t)0x1) << 2) + +/* Configuration registers */ +#define ARM_SMMU_GR0_sCR0 0x0 +#define sCR0_CLIENTPD (1 << 0) +#define sCR0_GFRE (1 << 1) +#define sCR0_GFIE (1 << 2) +#define sCR0_GCFGFRE (1 << 4) +#define sCR0_GCFGFIE (1 << 5) +#define sCR0_USFCFG (1 << 10) +#define sCR0_VMIDPNE (1 << 11) +#define sCR0_PTM (1 << 12) +#define sCR0_FB (1 << 13) +#define sCR0_BSU_SHIFT 14 +#define sCR0_BSU_MASK 0x3 + +/* Identification registers */ +#define ARM_SMMU_GR0_ID0 0x20 +#define ARM_SMMU_GR0_ID1 0x24 +#define ARM_SMMU_GR0_ID2 0x28 +#define ARM_SMMU_GR0_ID3 0x2c +#define ARM_SMMU_GR0_ID4 0x30 +#define ARM_SMMU_GR0_ID5 0x34 +#define ARM_SMMU_GR0_ID6 0x38 +#define ARM_SMMU_GR0_ID7 0x3c +#define ARM_SMMU_GR0_sGFSR 0x48 +#define ARM_SMMU_GR0_sGFSYNR0 0x50 +#define ARM_SMMU_GR0_sGFSYNR1 0x54 +#define ARM_SMMU_GR0_sGFSYNR2 0x58 +#define ARM_SMMU_GR0_PIDR0 0xfe0 +#define ARM_SMMU_GR0_PIDR1 0xfe4 +#define ARM_SMMU_GR0_PIDR2 0xfe8 + +#define ID0_S1TS (1 << 30) +#define ID0_S2TS (1 << 29) +#define ID0_NTS (1 << 28) +#define ID0_SMS (1 << 27) +#define ID0_PTFS_SHIFT 24 +#define ID0_PTFS_MASK 0x2 +#define ID0_PTFS_V8_ONLY 0x2 +#define ID0_CTTW (1 << 14) +#define ID0_NUMIRPT_SHIFT 16 +#define ID0_NUMIRPT_MASK 0xff +#define ID0_NUMSIDB_SHIFT 9 +#define ID0_NUMSIDB_MASK 0xf +#define ID0_NUMSMRG_SHIFT 0 +#define ID0_NUMSMRG_MASK 0xff + +#define ID1_PAGESIZE (1 << 31) +#define ID1_NUMPAGENDXB_SHIFT 28 +#define ID1_NUMPAGENDXB_MASK 7 +#define ID1_NUMS2CB_SHIFT 16 +#define ID1_NUMS2CB_MASK 0xff +#define ID1_NUMCB_SHIFT 0 +#define ID1_NUMCB_MASK 0xff + +#define ID2_OAS_SHIFT 4 +#define ID2_OAS_MASK 0xf +#define ID2_IAS_SHIFT 0 +#define ID2_IAS_MASK 0xf +#define ID2_UBS_SHIFT 8 +#define ID2_UBS_MASK 0xf +#define ID2_PTFS_4K (1 << 12) +#define ID2_PTFS_16K (1 << 13) +#define ID2_PTFS_64K (1 << 14) + +#define PIDR2_ARCH_SHIFT 4 +#define PIDR2_ARCH_MASK 0xf + +/* Global TLB invalidation */ +#define ARM_SMMU_GR0_STLBIALL 0x60 +#define ARM_SMMU_GR0_TLBIVMID 0x64 +#define ARM_SMMU_GR0_TLBIALLNSNH 0x68 +#define ARM_SMMU_GR0_TLBIALLH 0x6c +#define ARM_SMMU_GR0_sTLBGSYNC 0x70 +#define ARM_SMMU_GR0_sTLBGSTATUS 0x74 +#define sTLBGSTATUS_GSACTIVE (1 << 0) +#define TLB_LOOP_TIMEOUT 1000000 /* 1s! */ + +/* Stream mapping registers */ +#define ARM_SMMU_GR0_SMR(n) (0x800 + ((n) << 2)) +#define SMR_VALID (1 << 31) +#define SMR_MASK_SHIFT 16 +#define SMR_MASK_MASK 0x7fff +#define SMR_ID_SHIFT 0 +#define SMR_ID_MASK 0x7fff + +#define ARM_SMMU_GR0_S2CR(n) (0xc00 + ((n) << 2)) +#define S2CR_CBNDX_SHIFT 0 +#define S2CR_CBNDX_MASK 0xff +#define S2CR_TYPE_SHIFT 16 +#define S2CR_TYPE_MASK 0x3 +#define S2CR_TYPE_TRANS (0 << S2CR_TYPE_SHIFT) +#define S2CR_TYPE_BYPASS (1 << S2CR_TYPE_SHIFT) +#define S2CR_TYPE_FAULT (2 << S2CR_TYPE_SHIFT) + +/* Context bank attribute registers */ +#define ARM_SMMU_GR1_CBAR(n) (0x0 + ((n) << 2)) +#define CBAR_VMID_SHIFT 0 +#define CBAR_VMID_MASK 0xff +#define CBAR_S1_BPSHCFG_SHIFT 8 +#define CBAR_S1_BPSHCFG_MASK 3 +#define CBAR_S1_BPSHCFG_NSH 3 +#define CBAR_S1_MEMATTR_SHIFT 12 +#define CBAR_S1_MEMATTR_MASK 0xf +#define CBAR_S1_MEMATTR_WB 0xf +#define CBAR_TYPE_SHIFT 16 +#define CBAR_TYPE_MASK 0x3 +#define CBAR_TYPE_S2_TRANS (0 << CBAR_TYPE_SHIFT) +#define CBAR_TYPE_S1_TRANS_S2_BYPASS (1 << CBAR_TYPE_SHIFT) +#define CBAR_TYPE_S1_TRANS_S2_FAULT (2 << CBAR_TYPE_SHIFT) +#define CBAR_TYPE_S1_TRANS_S2_TRANS (3 << CBAR_TYPE_SHIFT) +#define CBAR_IRPTNDX_SHIFT 24 +#define CBAR_IRPTNDX_MASK 0xff + +#define ARM_SMMU_GR1_CBA2R(n) (0x800 + ((n) << 2)) +#define CBA2R_RW64_32BIT (0 << 0) +#define CBA2R_RW64_64BIT (1 << 0) + +/* Translation context bank */ +#define ARM_SMMU_CB_BASE(smmu) ((smmu)->base + ((smmu)->size >> 1)) +#define ARM_SMMU_CB(smmu, n) ((n) * (1 << (smmu)->pgshift)) + +#define ARM_SMMU_CB_SCTLR 0x0 +#define ARM_SMMU_CB_RESUME 0x8 +#define ARM_SMMU_CB_TTBCR2 0x10 +#define ARM_SMMU_CB_TTBR0_LO 0x20 +#define ARM_SMMU_CB_TTBR0_HI 0x24 +#define ARM_SMMU_CB_TTBCR 0x30 +#define ARM_SMMU_CB_S1_MAIR0 0x38 +#define ARM_SMMU_CB_FSR 0x58 +#define ARM_SMMU_CB_FAR_LO 0x60 +#define ARM_SMMU_CB_FAR_HI 0x64 +#define ARM_SMMU_CB_FSYNR0 0x68 +#define ARM_SMMU_CB_S1_TLBIASID 0x610 + +#define SCTLR_S1_ASIDPNE (1 << 12) +#define SCTLR_CFCFG (1 << 7) +#define SCTLR_CFIE (1 << 6) +#define SCTLR_CFRE (1 << 5) +#define SCTLR_E (1 << 4) +#define SCTLR_AFE (1 << 2) +#define SCTLR_TRE (1 << 1) +#define SCTLR_M (1 << 0) +#define SCTLR_EAE_SBOP (SCTLR_AFE | SCTLR_TRE) + +#define RESUME_RETRY (0 << 0) +#define RESUME_TERMINATE (1 << 0) + +#define TTBCR_EAE (1 << 31) + +#define TTBCR_PASIZE_SHIFT 16 +#define TTBCR_PASIZE_MASK 0x7 + +#define TTBCR_TG0_4K (0 << 14) +#define TTBCR_TG0_64K (1 << 14) + +#define TTBCR_SH0_SHIFT 12 +#define TTBCR_SH0_MASK 0x3 +#define TTBCR_SH_NS 0 +#define TTBCR_SH_OS 2 +#define TTBCR_SH_IS 3 + +#define TTBCR_ORGN0_SHIFT 10 +#define TTBCR_IRGN0_SHIFT 8 +#define TTBCR_RGN_MASK 0x3 +#define TTBCR_RGN_NC 0 +#define TTBCR_RGN_WBWA 1 +#define TTBCR_RGN_WT 2 +#define TTBCR_RGN_WB 3 + +#define TTBCR_SL0_SHIFT 6 +#define TTBCR_SL0_MASK 0x3 +#define TTBCR_SL0_LVL_2 0 +#define TTBCR_SL0_LVL_1 1 + +#define TTBCR_T1SZ_SHIFT 16 +#define TTBCR_T0SZ_SHIFT 0 +#define TTBCR_SZ_MASK 0xf + +#define TTBCR2_SEP_SHIFT 15 +#define TTBCR2_SEP_MASK 0x7 + +#define TTBCR2_PASIZE_SHIFT 0 +#define TTBCR2_PASIZE_MASK 0x7 + +/* Common definitions for PASize and SEP fields */ +#define TTBCR2_ADDR_32 0 +#define TTBCR2_ADDR_36 1 +#define TTBCR2_ADDR_40 2 +#define TTBCR2_ADDR_42 3 +#define TTBCR2_ADDR_44 4 +#define TTBCR2_ADDR_48 5 + +#define TTBRn_HI_ASID_SHIFT 16 + +#define MAIR_ATTR_SHIFT(n) ((n) << 3) +#define MAIR_ATTR_MASK 0xff +#define MAIR_ATTR_DEVICE 0x04 +#define MAIR_ATTR_NC 0x44 +#define MAIR_ATTR_WBRWA 0xff +#define MAIR_ATTR_IDX_NC 0 +#define MAIR_ATTR_IDX_CACHE 1 +#define MAIR_ATTR_IDX_DEV 2 + +#define FSR_MULTI (1 << 31) +#define FSR_SS (1 << 30) +#define FSR_UUT (1 << 8) +#define FSR_ASF (1 << 7) +#define FSR_TLBLKF (1 << 6) +#define FSR_TLBMCF (1 << 5) +#define FSR_EF (1 << 4) +#define FSR_PF (1 << 3) +#define FSR_AFF (1 << 2) +#define FSR_TF (1 << 1) + +#define FSR_IGN (FSR_AFF | FSR_ASF | \ + FSR_TLBMCF | FSR_TLBLKF) +#define FSR_FAULT (FSR_MULTI | FSR_SS | FSR_UUT | \ + FSR_EF | FSR_PF | FSR_TF | FSR_IGN) + +#define FSYNR0_WNR (1 << 4) + +static int force_stage; +module_param_named(force_stage, force_stage, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(force_stage, + "Force SMMU mappings to be installed at a particular stage of translation. A value of '1' or '2' forces the corresponding stage. All other values are ignored (i.e. no stage is forced). Note that selecting a specific stage will disable support for nested translation."); + +enum arm_smmu_arch_version { + ARM_SMMU_V1 = 1, + ARM_SMMU_V2, +}; + +struct arm_smmu_smr { + u8 idx; + u16 mask; + u16 id; +}; + +struct arm_smmu_master_cfg { + int num_streamids; + u16 streamids[MAX_MASTER_STREAMIDS]; + struct arm_smmu_smr *smrs; +}; + +struct arm_smmu_master { + struct device_node *of_node; + struct rb_node node; + struct arm_smmu_master_cfg cfg; +}; + +struct arm_smmu_device { + struct device *dev; + + void __iomem *base; + unsigned long size; + unsigned long pgshift; + +#define ARM_SMMU_FEAT_COHERENT_WALK (1 << 0) +#define ARM_SMMU_FEAT_STREAM_MATCH (1 << 1) +#define ARM_SMMU_FEAT_TRANS_S1 (1 << 2) +#define ARM_SMMU_FEAT_TRANS_S2 (1 << 3) +#define ARM_SMMU_FEAT_TRANS_NESTED (1 << 4) + u32 features; + +#define ARM_SMMU_OPT_SECURE_CFG_ACCESS (1 << 0) + u32 options; + enum arm_smmu_arch_version version; + + u32 num_context_banks; + u32 num_s2_context_banks; + DECLARE_BITMAP(context_map, ARM_SMMU_MAX_CBS); + atomic_t irptndx; + + u32 num_mapping_groups; + DECLARE_BITMAP(smr_map, ARM_SMMU_MAX_SMRS); + + unsigned long s1_input_size; + unsigned long s1_output_size; + unsigned long s2_input_size; + unsigned long s2_output_size; + + u32 num_global_irqs; + u32 num_context_irqs; + unsigned int *irqs; + + struct list_head list; + struct rb_root masters; +}; + +struct arm_smmu_cfg { + u8 cbndx; + u8 irptndx; + u32 cbar; + pgd_t *pgd; +}; +#define INVALID_IRPTNDX 0xff + +#define ARM_SMMU_CB_ASID(cfg) ((cfg)->cbndx) +#define ARM_SMMU_CB_VMID(cfg) ((cfg)->cbndx + 1) + +enum arm_smmu_domain_stage { + ARM_SMMU_DOMAIN_S1 = 0, + ARM_SMMU_DOMAIN_S2, + ARM_SMMU_DOMAIN_NESTED, +}; + +struct arm_smmu_domain { + struct arm_smmu_device *smmu; + struct arm_smmu_cfg cfg; + enum arm_smmu_domain_stage stage; + spinlock_t lock; +}; + +static DEFINE_SPINLOCK(arm_smmu_devices_lock); +static LIST_HEAD(arm_smmu_devices); + +struct arm_smmu_option_prop { + u32 opt; + const char *prop; +}; + +static struct arm_smmu_option_prop arm_smmu_options[] = { + { ARM_SMMU_OPT_SECURE_CFG_ACCESS, "calxeda,smmu-secure-config-access" }, + { 0, NULL}, +}; + +static void parse_driver_options(struct arm_smmu_device *smmu) +{ + int i = 0; + + do { + if (of_property_read_bool(smmu->dev->of_node, + arm_smmu_options[i].prop)) { + smmu->options |= arm_smmu_options[i].opt; + dev_notice(smmu->dev, "option %s\n", + arm_smmu_options[i].prop); + } + } while (arm_smmu_options[++i].opt); +} + +static struct device_node *dev_get_dev_node(struct device *dev) +{ + if (dev_is_pci(dev)) { + struct pci_bus *bus = to_pci_dev(dev)->bus; + + while (!pci_is_root_bus(bus)) + bus = bus->parent; + return bus->bridge->parent->of_node; + } + + return dev->of_node; +} + +static struct arm_smmu_master *find_smmu_master(struct arm_smmu_device *smmu, + struct device_node *dev_node) +{ + struct rb_node *node = smmu->masters.rb_node; + + while (node) { + struct arm_smmu_master *master; + + master = container_of(node, struct arm_smmu_master, node); + + if (dev_node < master->of_node) + node = node->rb_left; + else if (dev_node > master->of_node) + node = node->rb_right; + else + return master; + } + + return NULL; +} + +static struct arm_smmu_master_cfg * +find_smmu_master_cfg(struct device *dev) +{ + struct arm_smmu_master_cfg *cfg = NULL; + struct iommu_group *group = iommu_group_get(dev); + + if (group) { + cfg = iommu_group_get_iommudata(group); + iommu_group_put(group); + } + + return cfg; +} + +static int insert_smmu_master(struct arm_smmu_device *smmu, + struct arm_smmu_master *master) +{ + struct rb_node **new, *parent; + + new = &smmu->masters.rb_node; + parent = NULL; + while (*new) { + struct arm_smmu_master *this + = container_of(*new, struct arm_smmu_master, node); + + parent = *new; + if (master->of_node < this->of_node) + new = &((*new)->rb_left); + else if (master->of_node > this->of_node) + new = &((*new)->rb_right); + else + return -EEXIST; + } + + rb_link_node(&master->node, parent, new); + rb_insert_color(&master->node, &smmu->masters); + return 0; +} + +static int register_smmu_master(struct arm_smmu_device *smmu, + struct device *dev, + struct of_phandle_args *masterspec) +{ + int i; + struct arm_smmu_master *master; + + master = find_smmu_master(smmu, masterspec->np); + if (master) { + dev_err(dev, + "rejecting multiple registrations for master device %s\n", + masterspec->np->name); + return -EBUSY; + } + + if (masterspec->args_count > MAX_MASTER_STREAMIDS) { + dev_err(dev, + "reached maximum number (%d) of stream IDs for master device %s\n", + MAX_MASTER_STREAMIDS, masterspec->np->name); + return -ENOSPC; + } + + master = devm_kzalloc(dev, sizeof(*master), GFP_KERNEL); + if (!master) + return -ENOMEM; + + master->of_node = masterspec->np; + master->cfg.num_streamids = masterspec->args_count; + + for (i = 0; i < master->cfg.num_streamids; ++i) { + u16 streamid = masterspec->args[i]; + + if (!(smmu->features & ARM_SMMU_FEAT_STREAM_MATCH) && + (streamid >= smmu->num_mapping_groups)) { + dev_err(dev, + "stream ID for master device %s greater than maximum allowed (%d)\n", + masterspec->np->name, smmu->num_mapping_groups); + return -ERANGE; + } + master->cfg.streamids[i] = streamid; + } + return insert_smmu_master(smmu, master); +} + +static struct arm_smmu_device *find_smmu_for_device(struct device *dev) +{ + struct arm_smmu_device *smmu; + struct arm_smmu_master *master = NULL; + struct device_node *dev_node = dev_get_dev_node(dev); + + spin_lock(&arm_smmu_devices_lock); + list_for_each_entry(smmu, &arm_smmu_devices, list) { + master = find_smmu_master(smmu, dev_node); + if (master) + break; + } + spin_unlock(&arm_smmu_devices_lock); + + return master ? smmu : NULL; +} + +static int __arm_smmu_alloc_bitmap(unsigned long *map, int start, int end) +{ + int idx; + + do { + idx = find_next_zero_bit(map, end, start); + if (idx == end) + return -ENOSPC; + } while (test_and_set_bit(idx, map)); + + return idx; +} + +static void __arm_smmu_free_bitmap(unsigned long *map, int idx) +{ + clear_bit(idx, map); +} + +/* Wait for any pending TLB invalidations to complete */ +static void arm_smmu_tlb_sync(struct arm_smmu_device *smmu) +{ + int count = 0; + void __iomem *gr0_base = ARM_SMMU_GR0(smmu); + + writel_relaxed(0, gr0_base + ARM_SMMU_GR0_sTLBGSYNC); + while (readl_relaxed(gr0_base + ARM_SMMU_GR0_sTLBGSTATUS) + & sTLBGSTATUS_GSACTIVE) { + cpu_relax(); + if (++count == TLB_LOOP_TIMEOUT) { + dev_err_ratelimited(smmu->dev, + "TLB sync timed out -- SMMU may be deadlocked\n"); + return; + } + udelay(1); + } +} + +static void arm_smmu_tlb_inv_context(struct arm_smmu_domain *smmu_domain) +{ + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; + struct arm_smmu_device *smmu = smmu_domain->smmu; + void __iomem *base = ARM_SMMU_GR0(smmu); + bool stage1 = cfg->cbar != CBAR_TYPE_S2_TRANS; + + if (stage1) { + base = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB(smmu, cfg->cbndx); + writel_relaxed(ARM_SMMU_CB_ASID(cfg), + base + ARM_SMMU_CB_S1_TLBIASID); + } else { + base = ARM_SMMU_GR0(smmu); + writel_relaxed(ARM_SMMU_CB_VMID(cfg), + base + ARM_SMMU_GR0_TLBIVMID); + } + + arm_smmu_tlb_sync(smmu); +} + +static irqreturn_t arm_smmu_context_fault(int irq, void *dev) +{ + int flags, ret; + u32 fsr, far, fsynr, resume; + unsigned long iova; + struct iommu_domain *domain = dev; + struct arm_smmu_domain *smmu_domain = domain->priv; + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; + struct arm_smmu_device *smmu = smmu_domain->smmu; + void __iomem *cb_base; + + cb_base = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB(smmu, cfg->cbndx); + fsr = readl_relaxed(cb_base + ARM_SMMU_CB_FSR); + + if (!(fsr & FSR_FAULT)) + return IRQ_NONE; + + if (fsr & FSR_IGN) + dev_err_ratelimited(smmu->dev, + "Unexpected context fault (fsr 0x%x)\n", + fsr); + + fsynr = readl_relaxed(cb_base + ARM_SMMU_CB_FSYNR0); + flags = fsynr & FSYNR0_WNR ? IOMMU_FAULT_WRITE : IOMMU_FAULT_READ; + + far = readl_relaxed(cb_base + ARM_SMMU_CB_FAR_LO); + iova = far; +#ifdef CONFIG_64BIT + far = readl_relaxed(cb_base + ARM_SMMU_CB_FAR_HI); + iova |= ((unsigned long)far << 32); +#endif + + if (!report_iommu_fault(domain, smmu->dev, iova, flags)) { + ret = IRQ_HANDLED; + resume = RESUME_RETRY; + } else { + dev_err_ratelimited(smmu->dev, + "Unhandled context fault: iova=0x%08lx, fsynr=0x%x, cb=%d\n", + iova, fsynr, cfg->cbndx); + ret = IRQ_NONE; + resume = RESUME_TERMINATE; + } + + /* Clear the faulting FSR */ + writel(fsr, cb_base + ARM_SMMU_CB_FSR); + + /* Retry or terminate any stalled transactions */ + if (fsr & FSR_SS) + writel_relaxed(resume, cb_base + ARM_SMMU_CB_RESUME); + + return ret; +} + +static irqreturn_t arm_smmu_global_fault(int irq, void *dev) +{ + u32 gfsr, gfsynr0, gfsynr1, gfsynr2; + struct arm_smmu_device *smmu = dev; + void __iomem *gr0_base = ARM_SMMU_GR0_NS(smmu); + + gfsr = readl_relaxed(gr0_base + ARM_SMMU_GR0_sGFSR); + gfsynr0 = readl_relaxed(gr0_base + ARM_SMMU_GR0_sGFSYNR0); + gfsynr1 = readl_relaxed(gr0_base + ARM_SMMU_GR0_sGFSYNR1); + gfsynr2 = readl_relaxed(gr0_base + ARM_SMMU_GR0_sGFSYNR2); + + if (!gfsr) + return IRQ_NONE; + + dev_err_ratelimited(smmu->dev, + "Unexpected global fault, this could be serious\n"); + dev_err_ratelimited(smmu->dev, + "\tGFSR 0x%08x, GFSYNR0 0x%08x, GFSYNR1 0x%08x, GFSYNR2 0x%08x\n", + gfsr, gfsynr0, gfsynr1, gfsynr2); + + writel(gfsr, gr0_base + ARM_SMMU_GR0_sGFSR); + return IRQ_HANDLED; +} + +static void arm_smmu_flush_pgtable(struct arm_smmu_device *smmu, void *addr, + size_t size) +{ + unsigned long offset = (unsigned long)addr & ~PAGE_MASK; + + + /* Ensure new page tables are visible to the hardware walker */ + if (smmu->features & ARM_SMMU_FEAT_COHERENT_WALK) { + dsb(ishst); + } else { + /* + * If the SMMU can't walk tables in the CPU caches, treat them + * like non-coherent DMA since we need to flush the new entries + * all the way out to memory. There's no possibility of + * recursion here as the SMMU table walker will not be wired + * through another SMMU. + */ + dma_map_page(smmu->dev, virt_to_page(addr), offset, size, + DMA_TO_DEVICE); + } +} + +static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain) +{ + u32 reg; + bool stage1; + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; + struct arm_smmu_device *smmu = smmu_domain->smmu; + void __iomem *cb_base, *gr0_base, *gr1_base; + + gr0_base = ARM_SMMU_GR0(smmu); + gr1_base = ARM_SMMU_GR1(smmu); + stage1 = cfg->cbar != CBAR_TYPE_S2_TRANS; + cb_base = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB(smmu, cfg->cbndx); + + /* CBAR */ + reg = cfg->cbar; + if (smmu->version == ARM_SMMU_V1) + reg |= cfg->irptndx << CBAR_IRPTNDX_SHIFT; + + /* + * Use the weakest shareability/memory types, so they are + * overridden by the ttbcr/pte. + */ + if (stage1) { + reg |= (CBAR_S1_BPSHCFG_NSH << CBAR_S1_BPSHCFG_SHIFT) | + (CBAR_S1_MEMATTR_WB << CBAR_S1_MEMATTR_SHIFT); + } else { + reg |= ARM_SMMU_CB_VMID(cfg) << CBAR_VMID_SHIFT; + } + writel_relaxed(reg, gr1_base + ARM_SMMU_GR1_CBAR(cfg->cbndx)); + + if (smmu->version > ARM_SMMU_V1) { + /* CBA2R */ +#ifdef CONFIG_64BIT + reg = CBA2R_RW64_64BIT; +#else + reg = CBA2R_RW64_32BIT; +#endif + writel_relaxed(reg, + gr1_base + ARM_SMMU_GR1_CBA2R(cfg->cbndx)); + + /* TTBCR2 */ + switch (smmu->s1_input_size) { + case 32: + reg = (TTBCR2_ADDR_32 << TTBCR2_SEP_SHIFT); + break; + case 36: + reg = (TTBCR2_ADDR_36 << TTBCR2_SEP_SHIFT); + break; + case 39: + case 40: + reg = (TTBCR2_ADDR_40 << TTBCR2_SEP_SHIFT); + break; + case 42: + reg = (TTBCR2_ADDR_42 << TTBCR2_SEP_SHIFT); + break; + case 44: + reg = (TTBCR2_ADDR_44 << TTBCR2_SEP_SHIFT); + break; + case 48: + reg = (TTBCR2_ADDR_48 << TTBCR2_SEP_SHIFT); + break; + } + + switch (smmu->s1_output_size) { + case 32: + reg |= (TTBCR2_ADDR_32 << TTBCR2_PASIZE_SHIFT); + break; + case 36: + reg |= (TTBCR2_ADDR_36 << TTBCR2_PASIZE_SHIFT); + break; + case 39: + case 40: + reg |= (TTBCR2_ADDR_40 << TTBCR2_PASIZE_SHIFT); + break; + case 42: + reg |= (TTBCR2_ADDR_42 << TTBCR2_PASIZE_SHIFT); + break; + case 44: + reg |= (TTBCR2_ADDR_44 << TTBCR2_PASIZE_SHIFT); + break; + case 48: + reg |= (TTBCR2_ADDR_48 << TTBCR2_PASIZE_SHIFT); + break; + } + + if (stage1) + writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBCR2); + } + + /* TTBR0 */ + arm_smmu_flush_pgtable(smmu, cfg->pgd, + PTRS_PER_PGD * sizeof(pgd_t)); + reg = __pa(cfg->pgd); + writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBR0_LO); + reg = (phys_addr_t)__pa(cfg->pgd) >> 32; + if (stage1) + reg |= ARM_SMMU_CB_ASID(cfg) << TTBRn_HI_ASID_SHIFT; + writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBR0_HI); + + /* + * TTBCR + * We use long descriptor, with inner-shareable WBWA tables in TTBR0. + */ + if (smmu->version > ARM_SMMU_V1) { + if (PAGE_SIZE == SZ_4K) + reg = TTBCR_TG0_4K; + else + reg = TTBCR_TG0_64K; + + if (!stage1) { + reg |= (64 - smmu->s2_input_size) << TTBCR_T0SZ_SHIFT; + + switch (smmu->s2_output_size) { + case 32: + reg |= (TTBCR2_ADDR_32 << TTBCR_PASIZE_SHIFT); + break; + case 36: + reg |= (TTBCR2_ADDR_36 << TTBCR_PASIZE_SHIFT); + break; + case 40: + reg |= (TTBCR2_ADDR_40 << TTBCR_PASIZE_SHIFT); + break; + case 42: + reg |= (TTBCR2_ADDR_42 << TTBCR_PASIZE_SHIFT); + break; + case 44: + reg |= (TTBCR2_ADDR_44 << TTBCR_PASIZE_SHIFT); + break; + case 48: + reg |= (TTBCR2_ADDR_48 << TTBCR_PASIZE_SHIFT); + break; + } + } else { + reg |= (64 - smmu->s1_input_size) << TTBCR_T0SZ_SHIFT; + } + } else { + reg = 0; + } + + reg |= TTBCR_EAE | + (TTBCR_SH_IS << TTBCR_SH0_SHIFT) | + (TTBCR_RGN_WBWA << TTBCR_ORGN0_SHIFT) | + (TTBCR_RGN_WBWA << TTBCR_IRGN0_SHIFT); + + if (!stage1) + reg |= (TTBCR_SL0_LVL_1 << TTBCR_SL0_SHIFT); + + writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBCR); + + /* MAIR0 (stage-1 only) */ + if (stage1) { + reg = (MAIR_ATTR_NC << MAIR_ATTR_SHIFT(MAIR_ATTR_IDX_NC)) | + (MAIR_ATTR_WBRWA << MAIR_ATTR_SHIFT(MAIR_ATTR_IDX_CACHE)) | + (MAIR_ATTR_DEVICE << MAIR_ATTR_SHIFT(MAIR_ATTR_IDX_DEV)); + writel_relaxed(reg, cb_base + ARM_SMMU_CB_S1_MAIR0); + } + + /* SCTLR */ + reg = SCTLR_CFCFG | SCTLR_CFIE | SCTLR_CFRE | SCTLR_M | SCTLR_EAE_SBOP; + if (stage1) + reg |= SCTLR_S1_ASIDPNE; +#ifdef __BIG_ENDIAN + reg |= SCTLR_E; +#endif + writel_relaxed(reg, cb_base + ARM_SMMU_CB_SCTLR); +} + +static int arm_smmu_init_domain_context(struct iommu_domain *domain, + struct arm_smmu_device *smmu) +{ + int irq, start, ret = 0; + unsigned long flags; + struct arm_smmu_domain *smmu_domain = domain->priv; + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; + + spin_lock_irqsave(&smmu_domain->lock, flags); + if (smmu_domain->smmu) + goto out_unlock; + + /* + * Mapping the requested stage onto what we support is surprisingly + * complicated, mainly because the spec allows S1+S2 SMMUs without + * support for nested translation. That means we end up with the + * following table: + * + * Requested Supported Actual + * S1 N S1 + * S1 S1+S2 S1 + * S1 S2 S2 + * S1 S1 S1 + * N N N + * N S1+S2 S2 + * N S2 S2 + * N S1 S1 + * + * Note that you can't actually request stage-2 mappings. + */ + if (!(smmu->features & ARM_SMMU_FEAT_TRANS_S1)) + smmu_domain->stage = ARM_SMMU_DOMAIN_S2; + if (!(smmu->features & ARM_SMMU_FEAT_TRANS_S2)) + smmu_domain->stage = ARM_SMMU_DOMAIN_S1; + + switch (smmu_domain->stage) { + case ARM_SMMU_DOMAIN_S1: + cfg->cbar = CBAR_TYPE_S1_TRANS_S2_BYPASS; + start = smmu->num_s2_context_banks; + break; + case ARM_SMMU_DOMAIN_NESTED: + /* + * We will likely want to change this if/when KVM gets + * involved. + */ + case ARM_SMMU_DOMAIN_S2: + cfg->cbar = CBAR_TYPE_S2_TRANS; + start = 0; + break; + default: + ret = -EINVAL; + goto out_unlock; + } + + ret = __arm_smmu_alloc_bitmap(smmu->context_map, start, + smmu->num_context_banks); + if (IS_ERR_VALUE(ret)) + goto out_unlock; + + cfg->cbndx = ret; + if (smmu->version == ARM_SMMU_V1) { + cfg->irptndx = atomic_inc_return(&smmu->irptndx); + cfg->irptndx %= smmu->num_context_irqs; + } else { + cfg->irptndx = cfg->cbndx; + } + + ACCESS_ONCE(smmu_domain->smmu) = smmu; + arm_smmu_init_context_bank(smmu_domain); + spin_unlock_irqrestore(&smmu_domain->lock, flags); + + irq = smmu->irqs[smmu->num_global_irqs + cfg->irptndx]; + ret = request_irq(irq, arm_smmu_context_fault, IRQF_SHARED, + "arm-smmu-context-fault", domain); + if (IS_ERR_VALUE(ret)) { + dev_err(smmu->dev, "failed to request context IRQ %d (%u)\n", + cfg->irptndx, irq); + cfg->irptndx = INVALID_IRPTNDX; + } + + return 0; + +out_unlock: + spin_unlock_irqrestore(&smmu_domain->lock, flags); + return ret; +} + +static void arm_smmu_destroy_domain_context(struct iommu_domain *domain) +{ + struct arm_smmu_domain *smmu_domain = domain->priv; + struct arm_smmu_device *smmu = smmu_domain->smmu; + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; + void __iomem *cb_base; + int irq; + + if (!smmu) + return; + + /* Disable the context bank and nuke the TLB before freeing it. */ + cb_base = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB(smmu, cfg->cbndx); + writel_relaxed(0, cb_base + ARM_SMMU_CB_SCTLR); + arm_smmu_tlb_inv_context(smmu_domain); + + if (cfg->irptndx != INVALID_IRPTNDX) { + irq = smmu->irqs[smmu->num_global_irqs + cfg->irptndx]; + free_irq(irq, domain); + } + + __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx); +} + +static int arm_smmu_domain_init(struct iommu_domain *domain) +{ + struct arm_smmu_domain *smmu_domain; + pgd_t *pgd; + + /* + * Allocate the domain and initialise some of its data structures. + * We can't really do anything meaningful until we've added a + * master. + */ + smmu_domain = kzalloc(sizeof(*smmu_domain), GFP_KERNEL); + if (!smmu_domain) + return -ENOMEM; + + pgd = kcalloc(PTRS_PER_PGD, sizeof(pgd_t), GFP_KERNEL); + if (!pgd) + goto out_free_domain; + smmu_domain->cfg.pgd = pgd; + + spin_lock_init(&smmu_domain->lock); + domain->priv = smmu_domain; + return 0; + +out_free_domain: + kfree(smmu_domain); + return -ENOMEM; +} + +static void arm_smmu_free_ptes(pmd_t *pmd) +{ + pgtable_t table = pmd_pgtable(*pmd); + + __free_page(table); +} + +static void arm_smmu_free_pmds(pud_t *pud) +{ + int i; + pmd_t *pmd, *pmd_base = pmd_offset(pud, 0); + + pmd = pmd_base; + for (i = 0; i < PTRS_PER_PMD; ++i) { + if (pmd_none(*pmd)) + continue; + + arm_smmu_free_ptes(pmd); + pmd++; + } + + pmd_free(NULL, pmd_base); +} + +static void arm_smmu_free_puds(pgd_t *pgd) +{ + int i; + pud_t *pud, *pud_base = pud_offset(pgd, 0); + + pud = pud_base; + for (i = 0; i < PTRS_PER_PUD; ++i) { + if (pud_none(*pud)) + continue; + + arm_smmu_free_pmds(pud); + pud++; + } + + pud_free(NULL, pud_base); +} + +static void arm_smmu_free_pgtables(struct arm_smmu_domain *smmu_domain) +{ + int i; + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; + pgd_t *pgd, *pgd_base = cfg->pgd; + + /* + * Recursively free the page tables for this domain. We don't + * care about speculative TLB filling because the tables should + * not be active in any context bank at this point (SCTLR.M is 0). + */ + pgd = pgd_base; + for (i = 0; i < PTRS_PER_PGD; ++i) { + if (pgd_none(*pgd)) + continue; + arm_smmu_free_puds(pgd); + pgd++; + } + + kfree(pgd_base); +} + +static void arm_smmu_domain_destroy(struct iommu_domain *domain) +{ + struct arm_smmu_domain *smmu_domain = domain->priv; + + /* + * Free the domain resources. We assume that all devices have + * already been detached. + */ + arm_smmu_destroy_domain_context(domain); + arm_smmu_free_pgtables(smmu_domain); + kfree(smmu_domain); +} + +static int arm_smmu_master_configure_smrs(struct arm_smmu_device *smmu, + struct arm_smmu_master_cfg *cfg) +{ + int i; + struct arm_smmu_smr *smrs; + void __iomem *gr0_base = ARM_SMMU_GR0(smmu); + + if (!(smmu->features & ARM_SMMU_FEAT_STREAM_MATCH)) + return 0; + + if (cfg->smrs) + return -EEXIST; + + smrs = kmalloc_array(cfg->num_streamids, sizeof(*smrs), GFP_KERNEL); + if (!smrs) { + dev_err(smmu->dev, "failed to allocate %d SMRs\n", + cfg->num_streamids); + return -ENOMEM; + } + + /* Allocate the SMRs on the SMMU */ + for (i = 0; i < cfg->num_streamids; ++i) { + int idx = __arm_smmu_alloc_bitmap(smmu->smr_map, 0, + smmu->num_mapping_groups); + if (IS_ERR_VALUE(idx)) { + dev_err(smmu->dev, "failed to allocate free SMR\n"); + goto err_free_smrs; + } + + smrs[i] = (struct arm_smmu_smr) { + .idx = idx, + .mask = 0, /* We don't currently share SMRs */ + .id = cfg->streamids[i], + }; + } + + /* It worked! Now, poke the actual hardware */ + for (i = 0; i < cfg->num_streamids; ++i) { + u32 reg = SMR_VALID | smrs[i].id << SMR_ID_SHIFT | + smrs[i].mask << SMR_MASK_SHIFT; + writel_relaxed(reg, gr0_base + ARM_SMMU_GR0_SMR(smrs[i].idx)); + } + + cfg->smrs = smrs; + return 0; + +err_free_smrs: + while (--i >= 0) + __arm_smmu_free_bitmap(smmu->smr_map, smrs[i].idx); + kfree(smrs); + return -ENOSPC; +} + +static void arm_smmu_master_free_smrs(struct arm_smmu_device *smmu, + struct arm_smmu_master_cfg *cfg) +{ + int i; + void __iomem *gr0_base = ARM_SMMU_GR0(smmu); + struct arm_smmu_smr *smrs = cfg->smrs; + + if (!smrs) + return; + + /* Invalidate the SMRs before freeing back to the allocator */ + for (i = 0; i < cfg->num_streamids; ++i) { + u8 idx = smrs[i].idx; + + writel_relaxed(~SMR_VALID, gr0_base + ARM_SMMU_GR0_SMR(idx)); + __arm_smmu_free_bitmap(smmu->smr_map, idx); + } + + cfg->smrs = NULL; + kfree(smrs); +} + +static int arm_smmu_domain_add_master(struct arm_smmu_domain *smmu_domain, + struct arm_smmu_master_cfg *cfg) +{ + int i, ret; + struct arm_smmu_device *smmu = smmu_domain->smmu; + void __iomem *gr0_base = ARM_SMMU_GR0(smmu); + + /* Devices in an IOMMU group may already be configured */ + ret = arm_smmu_master_configure_smrs(smmu, cfg); + if (ret) + return ret == -EEXIST ? 0 : ret; + + for (i = 0; i < cfg->num_streamids; ++i) { + u32 idx, s2cr; + + idx = cfg->smrs ? cfg->smrs[i].idx : cfg->streamids[i]; + s2cr = S2CR_TYPE_TRANS | + (smmu_domain->cfg.cbndx << S2CR_CBNDX_SHIFT); + writel_relaxed(s2cr, gr0_base + ARM_SMMU_GR0_S2CR(idx)); + } + + return 0; +} + +static void arm_smmu_domain_remove_master(struct arm_smmu_domain *smmu_domain, + struct arm_smmu_master_cfg *cfg) +{ + int i; + struct arm_smmu_device *smmu = smmu_domain->smmu; + void __iomem *gr0_base = ARM_SMMU_GR0(smmu); + + /* An IOMMU group is torn down by the first device to be removed */ + if ((smmu->features & ARM_SMMU_FEAT_STREAM_MATCH) && !cfg->smrs) + return; + + /* + * We *must* clear the S2CR first, because freeing the SMR means + * that it can be re-allocated immediately. + */ + for (i = 0; i < cfg->num_streamids; ++i) { + u32 idx = cfg->smrs ? cfg->smrs[i].idx : cfg->streamids[i]; + + writel_relaxed(S2CR_TYPE_BYPASS, + gr0_base + ARM_SMMU_GR0_S2CR(idx)); + } + + arm_smmu_master_free_smrs(smmu, cfg); +} + +static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) +{ + int ret; + struct arm_smmu_domain *smmu_domain = domain->priv; + struct arm_smmu_device *smmu, *dom_smmu; + struct arm_smmu_master_cfg *cfg; + + smmu = find_smmu_for_device(dev); + if (!smmu) { + dev_err(dev, "cannot attach to SMMU, is it on the same bus?\n"); + return -ENXIO; + } + + if (dev->archdata.iommu) { + dev_err(dev, "already attached to IOMMU domain\n"); + return -EEXIST; + } + + /* + * Sanity check the domain. We don't support domains across + * different SMMUs. + */ + dom_smmu = ACCESS_ONCE(smmu_domain->smmu); + if (!dom_smmu) { + /* Now that we have a master, we can finalise the domain */ + ret = arm_smmu_init_domain_context(domain, smmu); + if (IS_ERR_VALUE(ret)) + return ret; + + dom_smmu = smmu_domain->smmu; + } + + if (dom_smmu != smmu) { + dev_err(dev, + "cannot attach to SMMU %s whilst already attached to domain on SMMU %s\n", + dev_name(smmu_domain->smmu->dev), dev_name(smmu->dev)); + return -EINVAL; + } + + /* Looks ok, so add the device to the domain */ + cfg = find_smmu_master_cfg(dev); + if (!cfg) + return -ENODEV; + + ret = arm_smmu_domain_add_master(smmu_domain, cfg); + if (!ret) + dev->archdata.iommu = domain; + return ret; +} + +static void arm_smmu_detach_dev(struct iommu_domain *domain, struct device *dev) +{ + struct arm_smmu_domain *smmu_domain = domain->priv; + struct arm_smmu_master_cfg *cfg; + + cfg = find_smmu_master_cfg(dev); + if (!cfg) + return; + + dev->archdata.iommu = NULL; + arm_smmu_domain_remove_master(smmu_domain, cfg); +} + +static bool arm_smmu_pte_is_contiguous_range(unsigned long addr, + unsigned long end) +{ + return !(addr & ~ARM_SMMU_PTE_CONT_MASK) && + (addr + ARM_SMMU_PTE_CONT_SIZE <= end); +} + +static int arm_smmu_alloc_init_pte(struct arm_smmu_device *smmu, pmd_t *pmd, + unsigned long addr, unsigned long end, + unsigned long pfn, int prot, int stage) +{ + pte_t *pte, *start; + pteval_t pteval = ARM_SMMU_PTE_PAGE | ARM_SMMU_PTE_AF; + + if (pmd_none(*pmd)) { + /* Allocate a new set of tables */ + pgtable_t table = alloc_page(GFP_ATOMIC|__GFP_ZERO); + + if (!table) + return -ENOMEM; + + arm_smmu_flush_pgtable(smmu, page_address(table), PAGE_SIZE); + pmd_populate(NULL, pmd, table); + arm_smmu_flush_pgtable(smmu, pmd, sizeof(*pmd)); + } + + if (stage == 1) { + pteval |= ARM_SMMU_PTE_AP_UNPRIV | ARM_SMMU_PTE_nG; + if (!(prot & IOMMU_WRITE) && (prot & IOMMU_READ)) + pteval |= ARM_SMMU_PTE_AP_RDONLY; + + if (prot & IOMMU_CACHE) + pteval |= (MAIR_ATTR_IDX_CACHE << + ARM_SMMU_PTE_ATTRINDX_SHIFT); + } else { + pteval |= ARM_SMMU_PTE_HAP_FAULT; + if (prot & IOMMU_READ) + pteval |= ARM_SMMU_PTE_HAP_READ; + if (prot & IOMMU_WRITE) + pteval |= ARM_SMMU_PTE_HAP_WRITE; + if (prot & IOMMU_CACHE) + pteval |= ARM_SMMU_PTE_MEMATTR_OIWB; + else + pteval |= ARM_SMMU_PTE_MEMATTR_NC; + } + + if (prot & IOMMU_NOEXEC) + pteval |= ARM_SMMU_PTE_XN; + + /* If no access, create a faulting entry to avoid TLB fills */ + if (!(prot & (IOMMU_READ | IOMMU_WRITE))) + pteval &= ~ARM_SMMU_PTE_PAGE; + + pteval |= ARM_SMMU_PTE_SH_IS; + start = pmd_page_vaddr(*pmd) + pte_index(addr); + pte = start; + + /* + * Install the page table entries. This is fairly complicated + * since we attempt to make use of the contiguous hint in the + * ptes where possible. The contiguous hint indicates a series + * of ARM_SMMU_PTE_CONT_ENTRIES ptes mapping a physically + * contiguous region with the following constraints: + * + * - The region start is aligned to ARM_SMMU_PTE_CONT_SIZE + * - Each pte in the region has the contiguous hint bit set + * + * This complicates unmapping (also handled by this code, when + * neither IOMMU_READ or IOMMU_WRITE are set) because it is + * possible, yet highly unlikely, that a client may unmap only + * part of a contiguous range. This requires clearing of the + * contiguous hint bits in the range before installing the new + * faulting entries. + * + * Note that re-mapping an address range without first unmapping + * it is not supported, so TLB invalidation is not required here + * and is instead performed at unmap and domain-init time. + */ + do { + int i = 1; + + pteval &= ~ARM_SMMU_PTE_CONT; + + if (arm_smmu_pte_is_contiguous_range(addr, end)) { + i = ARM_SMMU_PTE_CONT_ENTRIES; + pteval |= ARM_SMMU_PTE_CONT; + } else if (pte_val(*pte) & + (ARM_SMMU_PTE_CONT | ARM_SMMU_PTE_PAGE)) { + int j; + pte_t *cont_start; + unsigned long idx = pte_index(addr); + + idx &= ~(ARM_SMMU_PTE_CONT_ENTRIES - 1); + cont_start = pmd_page_vaddr(*pmd) + idx; + for (j = 0; j < ARM_SMMU_PTE_CONT_ENTRIES; ++j) + pte_val(*(cont_start + j)) &= + ~ARM_SMMU_PTE_CONT; + + arm_smmu_flush_pgtable(smmu, cont_start, + sizeof(*pte) * + ARM_SMMU_PTE_CONT_ENTRIES); + } + + do { + *pte = pfn_pte(pfn, __pgprot(pteval)); + } while (pte++, pfn++, addr += PAGE_SIZE, --i); + } while (addr != end); + + arm_smmu_flush_pgtable(smmu, start, sizeof(*pte) * (pte - start)); + return 0; +} + +static int arm_smmu_alloc_init_pmd(struct arm_smmu_device *smmu, pud_t *pud, + unsigned long addr, unsigned long end, + phys_addr_t phys, int prot, int stage) +{ + int ret; + pmd_t *pmd; + unsigned long next, pfn = __phys_to_pfn(phys); + +#ifndef __PAGETABLE_PMD_FOLDED + if (pud_none(*pud)) { + pmd = (pmd_t *)get_zeroed_page(GFP_ATOMIC); + if (!pmd) + return -ENOMEM; + + arm_smmu_flush_pgtable(smmu, pmd, PAGE_SIZE); + pud_populate(NULL, pud, pmd); + arm_smmu_flush_pgtable(smmu, pud, sizeof(*pud)); + + pmd += pmd_index(addr); + } else +#endif + pmd = pmd_offset(pud, addr); + + do { + next = pmd_addr_end(addr, end); + ret = arm_smmu_alloc_init_pte(smmu, pmd, addr, next, pfn, + prot, stage); + phys += next - addr; + pfn = __phys_to_pfn(phys); + } while (pmd++, addr = next, addr < end); + + return ret; +} + +static int arm_smmu_alloc_init_pud(struct arm_smmu_device *smmu, pgd_t *pgd, + unsigned long addr, unsigned long end, + phys_addr_t phys, int prot, int stage) +{ + int ret = 0; + pud_t *pud; + unsigned long next; + +#ifndef __PAGETABLE_PUD_FOLDED + if (pgd_none(*pgd)) { + pud = (pud_t *)get_zeroed_page(GFP_ATOMIC); + if (!pud) + return -ENOMEM; + + arm_smmu_flush_pgtable(smmu, pud, PAGE_SIZE); + pgd_populate(NULL, pgd, pud); + arm_smmu_flush_pgtable(smmu, pgd, sizeof(*pgd)); + + pud += pud_index(addr); + } else +#endif + pud = pud_offset(pgd, addr); + + do { + next = pud_addr_end(addr, end); + ret = arm_smmu_alloc_init_pmd(smmu, pud, addr, next, phys, + prot, stage); + phys += next - addr; + } while (pud++, addr = next, addr < end); + + return ret; +} + +static int arm_smmu_handle_mapping(struct arm_smmu_domain *smmu_domain, + unsigned long iova, phys_addr_t paddr, + size_t size, int prot) +{ + int ret, stage; + unsigned long end; + phys_addr_t input_mask, output_mask; + struct arm_smmu_device *smmu = smmu_domain->smmu; + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; + pgd_t *pgd = cfg->pgd; + unsigned long flags; + + if (cfg->cbar == CBAR_TYPE_S2_TRANS) { + stage = 2; + input_mask = (1ULL << smmu->s2_input_size) - 1; + output_mask = (1ULL << smmu->s2_output_size) - 1; + } else { + stage = 1; + input_mask = (1ULL << smmu->s1_input_size) - 1; + output_mask = (1ULL << smmu->s1_output_size) - 1; + } + + if (!pgd) + return -EINVAL; + + if (size & ~PAGE_MASK) + return -EINVAL; + + if ((phys_addr_t)iova & ~input_mask) + return -ERANGE; + + if (paddr & ~output_mask) + return -ERANGE; + + spin_lock_irqsave(&smmu_domain->lock, flags); + pgd += pgd_index(iova); + end = iova + size; + do { + unsigned long next = pgd_addr_end(iova, end); + + ret = arm_smmu_alloc_init_pud(smmu, pgd, iova, next, paddr, + prot, stage); + if (ret) + goto out_unlock; + + paddr += next - iova; + iova = next; + } while (pgd++, iova != end); + +out_unlock: + spin_unlock_irqrestore(&smmu_domain->lock, flags); + + return ret; +} + +static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova, + phys_addr_t paddr, size_t size, int prot) +{ + struct arm_smmu_domain *smmu_domain = domain->priv; + + if (!smmu_domain) + return -ENODEV; + + return arm_smmu_handle_mapping(smmu_domain, iova, paddr, size, prot); +} + +static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova, + size_t size) +{ + int ret; + struct arm_smmu_domain *smmu_domain = domain->priv; + + ret = arm_smmu_handle_mapping(smmu_domain, iova, 0, size, 0); + arm_smmu_tlb_inv_context(smmu_domain); + return ret ? 0 : size; +} + +static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain, + dma_addr_t iova) +{ + pgd_t *pgdp, pgd; + pud_t pud; + pmd_t pmd; + pte_t pte; + struct arm_smmu_domain *smmu_domain = domain->priv; + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; + + pgdp = cfg->pgd; + if (!pgdp) + return 0; + + pgd = *(pgdp + pgd_index(iova)); + if (pgd_none(pgd)) + return 0; + + pud = *pud_offset(&pgd, iova); + if (pud_none(pud)) + return 0; + + pmd = *pmd_offset(&pud, iova); + if (pmd_none(pmd)) + return 0; + + pte = *(pmd_page_vaddr(pmd) + pte_index(iova)); + if (pte_none(pte)) + return 0; + + return __pfn_to_phys(pte_pfn(pte)) | (iova & ~PAGE_MASK); +} + +static bool arm_smmu_capable(enum iommu_cap cap) +{ + switch (cap) { + case IOMMU_CAP_CACHE_COHERENCY: + /* + * Return true here as the SMMU can always send out coherent + * requests. + */ + return true; + case IOMMU_CAP_INTR_REMAP: + return true; /* MSIs are just memory writes */ + case IOMMU_CAP_NOEXEC: + return true; + default: + return false; + } +} + +static int __arm_smmu_get_pci_sid(struct pci_dev *pdev, u16 alias, void *data) +{ + *((u16 *)data) = alias; + return 0; /* Continue walking */ +} + +static void __arm_smmu_release_pci_iommudata(void *data) +{ + kfree(data); +} + +static int arm_smmu_add_device(struct device *dev) +{ + struct arm_smmu_device *smmu; + struct arm_smmu_master_cfg *cfg; + struct iommu_group *group; + void (*releasefn)(void *) = NULL; + int ret; + + smmu = find_smmu_for_device(dev); + if (!smmu) + return -ENODEV; + + group = iommu_group_alloc(); + if (IS_ERR(group)) { + dev_err(dev, "Failed to allocate IOMMU group\n"); + return PTR_ERR(group); + } + + if (dev_is_pci(dev)) { + struct pci_dev *pdev = to_pci_dev(dev); + + cfg = kzalloc(sizeof(*cfg), GFP_KERNEL); + if (!cfg) { + ret = -ENOMEM; + goto out_put_group; + } + + cfg->num_streamids = 1; + /* + * Assume Stream ID == Requester ID for now. + * We need a way to describe the ID mappings in FDT. + */ + pci_for_each_dma_alias(pdev, __arm_smmu_get_pci_sid, + &cfg->streamids[0]); + releasefn = __arm_smmu_release_pci_iommudata; + } else { + struct arm_smmu_master *master; + + master = find_smmu_master(smmu, dev->of_node); + if (!master) { + ret = -ENODEV; + goto out_put_group; + } + + cfg = &master->cfg; + } + + iommu_group_set_iommudata(group, cfg, releasefn); + ret = iommu_group_add_device(group, dev); + +out_put_group: + iommu_group_put(group); + return ret; +} + +static void arm_smmu_remove_device(struct device *dev) +{ + iommu_group_remove_device(dev); +} + +static int arm_smmu_domain_get_attr(struct iommu_domain *domain, + enum iommu_attr attr, void *data) +{ + struct arm_smmu_domain *smmu_domain = domain->priv; + + switch (attr) { + case DOMAIN_ATTR_NESTING: + *(int *)data = (smmu_domain->stage == ARM_SMMU_DOMAIN_NESTED); + return 0; + default: + return -ENODEV; + } +} + +static int arm_smmu_domain_set_attr(struct iommu_domain *domain, + enum iommu_attr attr, void *data) +{ + struct arm_smmu_domain *smmu_domain = domain->priv; + + switch (attr) { + case DOMAIN_ATTR_NESTING: + if (smmu_domain->smmu) + return -EPERM; + if (*(int *)data) + smmu_domain->stage = ARM_SMMU_DOMAIN_NESTED; + else + smmu_domain->stage = ARM_SMMU_DOMAIN_S1; + + return 0; + default: + return -ENODEV; + } +} + +static const struct iommu_ops arm_smmu_ops = { + .capable = arm_smmu_capable, + .domain_init = arm_smmu_domain_init, + .domain_destroy = arm_smmu_domain_destroy, + .attach_dev = arm_smmu_attach_dev, + .detach_dev = arm_smmu_detach_dev, + .map = arm_smmu_map, + .unmap = arm_smmu_unmap, + .map_sg = default_iommu_map_sg, + .iova_to_phys = arm_smmu_iova_to_phys, + .add_device = arm_smmu_add_device, + .remove_device = arm_smmu_remove_device, + .domain_get_attr = arm_smmu_domain_get_attr, + .domain_set_attr = arm_smmu_domain_set_attr, + .pgsize_bitmap = (SECTION_SIZE | + ARM_SMMU_PTE_CONT_SIZE | + PAGE_SIZE), +}; + +static void arm_smmu_device_reset(struct arm_smmu_device *smmu) +{ + void __iomem *gr0_base = ARM_SMMU_GR0(smmu); + void __iomem *cb_base; + int i = 0; + u32 reg; + + /* clear global FSR */ + reg = readl_relaxed(ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sGFSR); + writel(reg, ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sGFSR); + + /* Mark all SMRn as invalid and all S2CRn as bypass */ + for (i = 0; i < smmu->num_mapping_groups; ++i) { + writel_relaxed(0, gr0_base + ARM_SMMU_GR0_SMR(i)); + writel_relaxed(S2CR_TYPE_BYPASS, + gr0_base + ARM_SMMU_GR0_S2CR(i)); + } + + /* Make sure all context banks are disabled and clear CB_FSR */ + for (i = 0; i < smmu->num_context_banks; ++i) { + cb_base = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB(smmu, i); + writel_relaxed(0, cb_base + ARM_SMMU_CB_SCTLR); + writel_relaxed(FSR_FAULT, cb_base + ARM_SMMU_CB_FSR); + } + + /* Invalidate the TLB, just in case */ + writel_relaxed(0, gr0_base + ARM_SMMU_GR0_STLBIALL); + writel_relaxed(0, gr0_base + ARM_SMMU_GR0_TLBIALLH); + writel_relaxed(0, gr0_base + ARM_SMMU_GR0_TLBIALLNSNH); + + reg = readl_relaxed(ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sCR0); + + /* Enable fault reporting */ + reg |= (sCR0_GFRE | sCR0_GFIE | sCR0_GCFGFRE | sCR0_GCFGFIE); + + /* Disable TLB broadcasting. */ + reg |= (sCR0_VMIDPNE | sCR0_PTM); + + /* Enable client access, but bypass when no mapping is found */ + reg &= ~(sCR0_CLIENTPD | sCR0_USFCFG); + + /* Disable forced broadcasting */ + reg &= ~sCR0_FB; + + /* Don't upgrade barriers */ + reg &= ~(sCR0_BSU_MASK << sCR0_BSU_SHIFT); + + /* Push the button */ + arm_smmu_tlb_sync(smmu); + writel(reg, ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sCR0); +} + +static int arm_smmu_id_size_to_bits(int size) +{ + switch (size) { + case 0: + return 32; + case 1: + return 36; + case 2: + return 40; + case 3: + return 42; + case 4: + return 44; + case 5: + default: + return 48; + } +} + +static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) +{ + unsigned long size; + void __iomem *gr0_base = ARM_SMMU_GR0(smmu); + u32 id; + + dev_notice(smmu->dev, "probing hardware configuration...\n"); + dev_notice(smmu->dev, "SMMUv%d with:\n", smmu->version); + + /* ID0 */ + id = readl_relaxed(gr0_base + ARM_SMMU_GR0_ID0); +#ifndef CONFIG_64BIT + if (((id >> ID0_PTFS_SHIFT) & ID0_PTFS_MASK) == ID0_PTFS_V8_ONLY) { + dev_err(smmu->dev, "\tno v7 descriptor support!\n"); + return -ENODEV; + } +#endif + + /* Restrict available stages based on module parameter */ + if (force_stage == 1) + id &= ~(ID0_S2TS | ID0_NTS); + else if (force_stage == 2) + id &= ~(ID0_S1TS | ID0_NTS); + + if (id & ID0_S1TS) { + smmu->features |= ARM_SMMU_FEAT_TRANS_S1; + dev_notice(smmu->dev, "\tstage 1 translation\n"); + } + + if (id & ID0_S2TS) { + smmu->features |= ARM_SMMU_FEAT_TRANS_S2; + dev_notice(smmu->dev, "\tstage 2 translation\n"); + } + + if (id & ID0_NTS) { + smmu->features |= ARM_SMMU_FEAT_TRANS_NESTED; + dev_notice(smmu->dev, "\tnested translation\n"); + } + + if (!(smmu->features & + (ARM_SMMU_FEAT_TRANS_S1 | ARM_SMMU_FEAT_TRANS_S2))) { + dev_err(smmu->dev, "\tno translation support!\n"); + return -ENODEV; + } + + if (id & ID0_CTTW) { + smmu->features |= ARM_SMMU_FEAT_COHERENT_WALK; + dev_notice(smmu->dev, "\tcoherent table walk\n"); + } + + if (id & ID0_SMS) { + u32 smr, sid, mask; + + smmu->features |= ARM_SMMU_FEAT_STREAM_MATCH; + smmu->num_mapping_groups = (id >> ID0_NUMSMRG_SHIFT) & + ID0_NUMSMRG_MASK; + if (smmu->num_mapping_groups == 0) { + dev_err(smmu->dev, + "stream-matching supported, but no SMRs present!\n"); + return -ENODEV; + } + + smr = SMR_MASK_MASK << SMR_MASK_SHIFT; + smr |= (SMR_ID_MASK << SMR_ID_SHIFT); + writel_relaxed(smr, gr0_base + ARM_SMMU_GR0_SMR(0)); + smr = readl_relaxed(gr0_base + ARM_SMMU_GR0_SMR(0)); + + mask = (smr >> SMR_MASK_SHIFT) & SMR_MASK_MASK; + sid = (smr >> SMR_ID_SHIFT) & SMR_ID_MASK; + if ((mask & sid) != sid) { + dev_err(smmu->dev, + "SMR mask bits (0x%x) insufficient for ID field (0x%x)\n", + mask, sid); + return -ENODEV; + } + + dev_notice(smmu->dev, + "\tstream matching with %u register groups, mask 0x%x", + smmu->num_mapping_groups, mask); + } else { + smmu->num_mapping_groups = (id >> ID0_NUMSIDB_SHIFT) & + ID0_NUMSIDB_MASK; + } + + /* ID1 */ + id = readl_relaxed(gr0_base + ARM_SMMU_GR0_ID1); + smmu->pgshift = (id & ID1_PAGESIZE) ? 16 : 12; + + /* Check for size mismatch of SMMU address space from mapped region */ + size = 1 << + (((id >> ID1_NUMPAGENDXB_SHIFT) & ID1_NUMPAGENDXB_MASK) + 1); + size *= 2 << smmu->pgshift; + if (smmu->size != size) + dev_warn(smmu->dev, + "SMMU address space size (0x%lx) differs from mapped region size (0x%lx)!\n", + size, smmu->size); + + smmu->num_s2_context_banks = (id >> ID1_NUMS2CB_SHIFT) & + ID1_NUMS2CB_MASK; + smmu->num_context_banks = (id >> ID1_NUMCB_SHIFT) & ID1_NUMCB_MASK; + if (smmu->num_s2_context_banks > smmu->num_context_banks) { + dev_err(smmu->dev, "impossible number of S2 context banks!\n"); + return -ENODEV; + } + dev_notice(smmu->dev, "\t%u context banks (%u stage-2 only)\n", + smmu->num_context_banks, smmu->num_s2_context_banks); + + /* ID2 */ + id = readl_relaxed(gr0_base + ARM_SMMU_GR0_ID2); + 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); + + /* Stage-2 input size limited due to pgd allocation (PTRS_PER_PGD) */ +#ifdef CONFIG_64BIT + smmu->s2_input_size = min_t(unsigned long, VA_BITS, size); +#else + smmu->s2_input_size = min(32UL, size); +#endif + + /* The stage-2 output mask is also applied for bypass */ + size = arm_smmu_id_size_to_bits((id >> ID2_OAS_SHIFT) & ID2_OAS_MASK); + smmu->s2_output_size = min_t(unsigned long, PHYS_MASK_SHIFT, size); + + if (smmu->version == ARM_SMMU_V1) { + smmu->s1_input_size = 32; + } else { +#ifdef CONFIG_64BIT + size = (id >> ID2_UBS_SHIFT) & ID2_UBS_MASK; + size = min(VA_BITS, arm_smmu_id_size_to_bits(size)); +#else + size = 32; +#endif + smmu->s1_input_size = size; + + if ((PAGE_SIZE == SZ_4K && !(id & ID2_PTFS_4K)) || + (PAGE_SIZE == SZ_64K && !(id & ID2_PTFS_64K)) || + (PAGE_SIZE != SZ_4K && PAGE_SIZE != SZ_64K)) { + dev_err(smmu->dev, "CPU page size 0x%lx unsupported\n", + PAGE_SIZE); + return -ENODEV; + } + } + + if (smmu->features & ARM_SMMU_FEAT_TRANS_S1) + dev_notice(smmu->dev, "\tStage-1: %lu-bit VA -> %lu-bit IPA\n", + smmu->s1_input_size, smmu->s1_output_size); + + if (smmu->features & ARM_SMMU_FEAT_TRANS_S2) + dev_notice(smmu->dev, "\tStage-2: %lu-bit IPA -> %lu-bit PA\n", + smmu->s2_input_size, smmu->s2_output_size); + + return 0; +} + +static const struct of_device_id arm_smmu_of_match[] = { + { .compatible = "arm,smmu-v1", .data = (void *)ARM_SMMU_V1 }, + { .compatible = "arm,smmu-v2", .data = (void *)ARM_SMMU_V2 }, + { .compatible = "arm,mmu-400", .data = (void *)ARM_SMMU_V1 }, + { .compatible = "arm,mmu-401", .data = (void *)ARM_SMMU_V1 }, + { .compatible = "arm,mmu-500", .data = (void *)ARM_SMMU_V2 }, + { }, +}; +MODULE_DEVICE_TABLE(of, arm_smmu_of_match); + +static int arm_smmu_device_dt_probe(struct platform_device *pdev) +{ + const struct of_device_id *of_id; + struct resource *res; + struct arm_smmu_device *smmu; + struct device *dev = &pdev->dev; + struct rb_node *node; + struct of_phandle_args masterspec; + int num_irqs, i, err; + + smmu = devm_kzalloc(dev, sizeof(*smmu), GFP_KERNEL); + if (!smmu) { + dev_err(dev, "failed to allocate arm_smmu_device\n"); + return -ENOMEM; + } + smmu->dev = dev; + + of_id = of_match_node(arm_smmu_of_match, dev->of_node); + smmu->version = (enum arm_smmu_arch_version)of_id->data; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + smmu->base = devm_ioremap_resource(dev, res); + if (IS_ERR(smmu->base)) + return PTR_ERR(smmu->base); + smmu->size = resource_size(res); + + if (of_property_read_u32(dev->of_node, "#global-interrupts", + &smmu->num_global_irqs)) { + dev_err(dev, "missing #global-interrupts property\n"); + return -ENODEV; + } + + num_irqs = 0; + while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, num_irqs))) { + num_irqs++; + if (num_irqs > smmu->num_global_irqs) + smmu->num_context_irqs++; + } + + if (!smmu->num_context_irqs) { + dev_err(dev, "found %d interrupts but expected at least %d\n", + num_irqs, smmu->num_global_irqs + 1); + return -ENODEV; + } + + smmu->irqs = devm_kzalloc(dev, sizeof(*smmu->irqs) * num_irqs, + GFP_KERNEL); + if (!smmu->irqs) { + dev_err(dev, "failed to allocate %d irqs\n", num_irqs); + return -ENOMEM; + } + + for (i = 0; i < num_irqs; ++i) { + int irq = platform_get_irq(pdev, i); + + if (irq < 0) { + dev_err(dev, "failed to get irq index %d\n", i); + return -ENODEV; + } + smmu->irqs[i] = irq; + } + + err = arm_smmu_device_cfg_probe(smmu); + if (err) + return err; + + i = 0; + smmu->masters = RB_ROOT; + while (!of_parse_phandle_with_args(dev->of_node, "mmu-masters", + "#stream-id-cells", i, + &masterspec)) { + err = register_smmu_master(smmu, dev, &masterspec); + if (err) { + dev_err(dev, "failed to add master %s\n", + masterspec.np->name); + goto out_put_masters; + } + + i++; + } + dev_notice(dev, "registered %d master devices\n", i); + + parse_driver_options(smmu); + + if (smmu->version > ARM_SMMU_V1 && + smmu->num_context_banks != smmu->num_context_irqs) { + dev_err(dev, + "found only %d context interrupt(s) but %d required\n", + smmu->num_context_irqs, smmu->num_context_banks); + err = -ENODEV; + goto out_put_masters; + } + + for (i = 0; i < smmu->num_global_irqs; ++i) { + err = request_irq(smmu->irqs[i], + arm_smmu_global_fault, + IRQF_SHARED, + "arm-smmu global fault", + smmu); + if (err) { + dev_err(dev, "failed to request global IRQ %d (%u)\n", + i, smmu->irqs[i]); + goto out_free_irqs; + } + } + + INIT_LIST_HEAD(&smmu->list); + spin_lock(&arm_smmu_devices_lock); + list_add(&smmu->list, &arm_smmu_devices); + spin_unlock(&arm_smmu_devices_lock); + + arm_smmu_device_reset(smmu); + return 0; + +out_free_irqs: + while (i--) + free_irq(smmu->irqs[i], smmu); + +out_put_masters: + for (node = rb_first(&smmu->masters); node; node = rb_next(node)) { + struct arm_smmu_master *master + = container_of(node, struct arm_smmu_master, node); + of_node_put(master->of_node); + } + + return err; +} + +static int arm_smmu_device_remove(struct platform_device *pdev) +{ + int i; + struct device *dev = &pdev->dev; + struct arm_smmu_device *curr, *smmu = NULL; + struct rb_node *node; + + spin_lock(&arm_smmu_devices_lock); + list_for_each_entry(curr, &arm_smmu_devices, list) { + if (curr->dev == dev) { + smmu = curr; + list_del(&smmu->list); + break; + } + } + spin_unlock(&arm_smmu_devices_lock); + + if (!smmu) + return -ENODEV; + + for (node = rb_first(&smmu->masters); node; node = rb_next(node)) { + struct arm_smmu_master *master + = container_of(node, struct arm_smmu_master, node); + of_node_put(master->of_node); + } + + if (!bitmap_empty(smmu->context_map, ARM_SMMU_MAX_CBS)) + dev_err(dev, "removing device with active domains!\n"); + + for (i = 0; i < smmu->num_global_irqs; ++i) + free_irq(smmu->irqs[i], smmu); + + /* Turn the thing off */ + writel(sCR0_CLIENTPD, ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sCR0); + return 0; +} + +static struct platform_driver arm_smmu_driver = { + .driver = { + .name = "arm-smmu", + .of_match_table = of_match_ptr(arm_smmu_of_match), + }, + .probe = arm_smmu_device_dt_probe, + .remove = arm_smmu_device_remove, +}; + +static int __init arm_smmu_init(void) +{ + struct device_node *np; + int ret; + + /* + * Play nice with systems that don't have an ARM SMMU by checking that + * an ARM SMMU exists in the system before proceeding with the driver + * and IOMMU bus operation registration. + */ + np = of_find_matching_node(NULL, arm_smmu_of_match); + if (!np) + return 0; + + of_node_put(np); + + ret = platform_driver_register(&arm_smmu_driver); + if (ret) + return ret; + + /* Oh, for a proper bus abstraction */ + if (!iommu_present(&platform_bus_type)) + bus_set_iommu(&platform_bus_type, &arm_smmu_ops); + +#ifdef CONFIG_ARM_AMBA + if (!iommu_present(&amba_bustype)) + bus_set_iommu(&amba_bustype, &arm_smmu_ops); +#endif + +#ifdef CONFIG_PCI + if (!iommu_present(&pci_bus_type)) + bus_set_iommu(&pci_bus_type, &arm_smmu_ops); +#endif + + return 0; +} + +static void __exit arm_smmu_exit(void) +{ + return platform_driver_unregister(&arm_smmu_driver); +} + +subsys_initcall(arm_smmu_init); +module_exit(arm_smmu_exit); + +MODULE_DESCRIPTION("IOMMU API for ARM architected SMMU implementations"); +MODULE_AUTHOR("Will Deacon "); +MODULE_LICENSE("GPL v2"); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:18:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:18: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 1YTqGg-0002OB-Uq; Fri, 06 Mar 2015 11:18:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGf-0002Nt-DJ for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:09 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id FA/5B-02991-0FC89F45; Fri, 06 Mar 2015 11:18:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1425640685!8110363!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13547 invoked from network); 6 Mar 2015 11:18:06 -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; 6 Mar 2015 11:18:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGb-0006Dj-Ip for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqGb-0001m3-Gc for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:05 +0000 Date: Fri, 06 Mar 2015 11:18:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/iommu: smmu: Add Xen specific code to be able to use the driver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 355d4b488e4be70210ea454f50396c1ee399b991 Author: Julien Grall AuthorDate: Wed Feb 25 18:52:59 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 13:56:11 2015 +0000 xen/iommu: smmu: Add Xen specific code to be able to use the driver The main goal is to modify as little the Linux code to be able to port easily new feature added in Linux repo for the driver. To achieve that we: - Add helpers to Linux function not implemented on Xen - Add callbacks used by Xen to do our own stuff and call Linux ones - Only modify when required the code which comes from Linux. If so a comment has been added with /* Xen: ... */ explaining why it's necessary. The support for PCI has been commented because it's not yet supported by Xen ARM and therefore won't compile. Signed-off-by: Julien Grall Acked-by: Ian Campbell [ ijc -- fix a couple of typos in comments ] --- xen/drivers/passthrough/arm/Makefile | 1 + xen/drivers/passthrough/arm/smmu.c | 661 +++++++++++++++++++++++++++++++--- 2 files changed, 617 insertions(+), 45 deletions(-) diff --git a/xen/drivers/passthrough/arm/Makefile b/xen/drivers/passthrough/arm/Makefile index 0484b79..f4cd26e 100644 --- a/xen/drivers/passthrough/arm/Makefile +++ b/xen/drivers/passthrough/arm/Makefile @@ -1 +1,2 @@ obj-y += iommu.o +obj-y += smmu.o diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index 6cd47b7..7675767 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -18,6 +18,13 @@ * * Author: Will Deacon * + * Based on Linux drivers/iommu/arm-smmu.c + * => commit e6b5be2be4e30037eb551e0ed09dd97bd00d85d3 + * + * Xen modification: + * Julien Grall + * Copyright (C) 2014 Linaro Limited. + * * This driver currently supports: * - SMMUv1 and v2 implementations * - Stream-matching and stream-indexing @@ -28,25 +35,287 @@ * - Context fault reporting */ -#define pr_fmt(fmt) "arm-smmu: " fmt -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Xen: The below defines are redefined within the file. Undef it */ +#undef SCTLR_AFE +#undef SCTLR_TRE +#undef SCTLR_M +#undef TTBCR_EAE + +/* Alias to Xen device tree helpers */ +#define device_node dt_device_node +#define of_phandle_args dt_phandle_args +#define of_device_id dt_device_match +#define of_match_node dt_match_node +#define of_property_read_u32(np, pname, out) (!dt_property_read_u32(np, pname, out)) +#define of_property_read_bool dt_property_read_bool +#define of_parse_phandle_with_args dt_parse_phandle_with_args + +/* Xen: Helpers to get device MMIO and IRQs */ +struct resource +{ + u64 addr; + u64 size; + unsigned int type; +}; + +#define resource_size(res) (res)->size; + +#define platform_device dt_device_node + +#define IORESOURCE_MEM 0 +#define IORESOURCE_IRQ 1 + +static struct resource *platform_get_resource(struct platform_device *pdev, + unsigned int type, + unsigned int num) +{ + /* + * The resource is only used between 2 calls of platform_get_resource. + * It's quite ugly but it's avoid to add too much code in the part + * imported from Linux + */ + static struct resource res; + int ret = 0; + + res.type = type; + + switch (type) { + case IORESOURCE_MEM: + ret = dt_device_get_address(pdev, num, &res.addr, &res.size); + + return ((ret) ? NULL : &res); + + case IORESOURCE_IRQ: + ret = platform_get_irq(pdev, num); + if (ret < 0) + return NULL; + + res.addr = ret; + res.size = 1; + + return &res; + + default: + return NULL; + } +} + +/* Xen: Helpers for IRQ functions */ +#define request_irq(irq, func, flags, name, dev) request_irq(irq, flags, func, name, dev) +#define free_irq release_irq + +enum irqreturn { + IRQ_NONE = (0 << 0), + IRQ_HANDLED = (1 << 0), +}; + +typedef enum irqreturn irqreturn_t; + +/* Device logger functions + * TODO: Handle PCI + */ +#define dev_print(dev, lvl, fmt, ...) \ + printk(lvl "smmu: %s: " fmt, dt_node_full_name(dev_to_dt(dev)), ## __VA_ARGS__) + +#define dev_dbg(dev, fmt, ...) dev_print(dev, XENLOG_DEBUG, fmt, ## __VA_ARGS__) +#define dev_notice(dev, fmt, ...) dev_print(dev, XENLOG_INFO, fmt, ## __VA_ARGS__) +#define dev_warn(dev, fmt, ...) dev_print(dev, XENLOG_WARNING, fmt, ## __VA_ARGS__) +#define dev_err(dev, fmt, ...) dev_print(dev, XENLOG_ERR, fmt, ## __VA_ARGS__) + +#define dev_err_ratelimited(dev, fmt, ...) \ + dev_print(dev, XENLOG_ERR, fmt, ## __VA_ARGS__) + +#define dev_name(dev) dt_node_full_name(dev_to_dt(dev)) + +/* Alias to Xen allocation helpers */ +#define kfree xfree +#define kmalloc(size, flags) _xmalloc(size, sizeof(void *)) +#define kzalloc(size, flags) _xzalloc(size, sizeof(void *)) +#define devm_kzalloc(dev, size, flags) _xzalloc(size, sizeof(void *)) +#define kmalloc_array(size, n, flags) _xmalloc_array(size, sizeof(void *), n) + +static void __iomem *devm_ioremap_resource(struct device *dev, + struct resource *res) +{ + void __iomem *ptr; + + if (!res || res->type != IORESOURCE_MEM) { + dev_err(dev, "Invalid resource\n"); + return ERR_PTR(-EINVAL); + } + + ptr = ioremap_nocache(res->addr, res->size); + if (!ptr) { + dev_err(dev, + "ioremap failed (addr 0x%"PRIx64" size 0x%"PRIx64")\n", + res->addr, res->size); + return ERR_PTR(-ENOMEM); + } + + return ptr; +} + +/* Xen doesn't handle IOMMU fault */ +#define report_iommu_fault(...) 1 + +#define IOMMU_FAULT_READ 0 +#define IOMMU_FAULT_WRITE 1 + +/* + * Xen: PCI functions + * TODO: It should be implemented when PCI will be supported + */ +#define to_pci_dev(dev) (NULL) +static inline int pci_for_each_dma_alias(struct pci_dev *pdev, + int (*fn) (struct pci_dev *pdev, + u16 alias, void *data), + void *data) +{ + BUG(); + return 0; +} + +/* Xen: misc */ +#define PHYS_MASK_SHIFT PADDR_BITS +typedef paddr_t phys_addr_t; + +#ifdef CONFIG_ARM_64 +# define CONFIG_64BIT +#endif + +#define VA_BITS 0 /* Only used for configuring stage-1 input size */ + +/* The macro ACCESS_ONCE start to be replaced in Linux in favor of + * {READ, WRITE}_ONCE. Rather than introducing in the common code, keep a + * version here. We will have to drop it when the SMMU code in Linux will + * switch to {READ, WRITE}_ONCE. + */ +#define __ACCESS_ONCE(x) ({ \ + __maybe_unused typeof(x) __var = 0; \ + (volatile typeof(x) *)&(x); }) +#define ACCESS_ONCE(x) (*__ACCESS_ONCE(x)) + +#define MODULE_DEVICE_TABLE(type, name) +#define module_param_named(name, value, type, perm) +#define MODULE_PARM_DESC(_parm, desc) + +/* Xen: Dummy iommu_domain */ +struct iommu_domain +{ + /* Runtime SMMU configuration for this iommu_domain */ + struct arm_smmu_domain *priv; + + /* Used to link iommu_domain contexts for a same domain. + * There is at least one per-SMMU to used by the domain. + * */ + struct list_head list; +}; + +/* Xen: Describes informations required for a Xen domain */ +struct arm_smmu_xen_domain { + spinlock_t lock; + /* List of context (i.e iommu_domain) associated to this domain */ + struct list_head contexts; +}; + +/* + * Xen: Information about each device stored in dev->archdata.iommu + * + * Initially dev->archdata.iommu only stores the iommu_domain (runtime + * configuration of the SMMU) but, on Xen, we also have to store the + * iommu_group (list of streamIDs associated to the device). + * + * This is because Linux has a field iommu_group in the struct device. On Xen, + * that would require to move some hackery (dummy iommu_group) in a more generic + * place. + * */ +struct arm_smmu_xen_device { + struct iommu_domain *domain; + struct iommu_group *group; +}; + +#define dev_archdata(dev) ((struct arm_smmu_xen_device *)dev->archdata.iommu) +#define dev_iommu_domain(dev) (dev_archdata(dev)->domain) +#define dev_iommu_group(dev) (dev_archdata(dev)->group) + +/* Xen: Dummy iommu_group */ +struct iommu_group +{ + /* Streamids of the device */ + struct arm_smmu_master_cfg *cfg; + + atomic_t ref; +}; + +static struct iommu_group *iommu_group_alloc(void) +{ + struct iommu_group *group = xzalloc(struct iommu_group); + + if (!group) + return ERR_PTR(-ENOMEM); -#include + atomic_set(&group->ref, 1); -#include + return group; +} + +static void iommu_group_put(struct iommu_group *group) +{ + if (atomic_dec_and_test(&group->ref)) + xfree(group); +} + +static void iommu_group_set_iommudata(struct iommu_group *group, + struct arm_smmu_master_cfg *cfg, + void (*releasefn)(void *)) +{ + /* TODO: Store the releasefn for the PCI */ + ASSERT(releasefn == NULL); + + group->cfg = cfg; +} + +static int iommu_group_add_device(struct iommu_group *group, + struct device *dev) +{ + dev_iommu_group(dev) = group; + + atomic_inc(&group->ref); + + return 0; +} + +static struct iommu_group *iommu_group_get(struct device *dev) +{ + struct iommu_group *group = dev_iommu_group(dev); + + if (group) + atomic_inc(&group->ref); + + return group; +} + +#define iommu_group_get_iommudata(group) (group)->cfg + +/***** Start of Linux SMMU code *****/ /* Maximum number of stream IDs assigned to a single device */ #define MAX_MASTER_STREAMIDS MAX_PHANDLE_ARGS @@ -397,7 +666,9 @@ struct arm_smmu_cfg { u8 cbndx; u8 irptndx; u32 cbar; - pgd_t *pgd; + + /* Xen: Domain associated to this configuration */ + struct domain *domain; }; #define INVALID_IRPTNDX 0xff @@ -446,6 +717,7 @@ static void parse_driver_options(struct arm_smmu_device *smmu) static struct device_node *dev_get_dev_node(struct device *dev) { +#if 0 /* Xen: TODO: Add support for PCI */ if (dev_is_pci(dev)) { struct pci_bus *bus = to_pci_dev(dev)->bus; @@ -453,6 +725,7 @@ static struct device_node *dev_get_dev_node(struct device *dev) bus = bus->parent; return bus->bridge->parent->of_node; } +#endif return dev->of_node; } @@ -546,6 +819,9 @@ static int register_smmu_master(struct arm_smmu_device *smmu, master->of_node = masterspec->np; master->cfg.num_streamids = masterspec->args_count; + /* Xen: Let Xen know that the device is protected by an SMMU */ + dt_device_set_protected(masterspec->np); + for (i = 0; i < master->cfg.num_streamids; ++i) { u16 streamid = masterspec->args[i]; @@ -712,6 +988,24 @@ static irqreturn_t arm_smmu_global_fault(int irq, void *dev) return IRQ_HANDLED; } +/* Xen: Interrupt handlers wrapper */ +static void arm_smmu_context_fault_xen(int irq, void *dev, + struct cpu_user_regs *regs) +{ + arm_smmu_context_fault(irq, dev); +} + +#define arm_smmu_context_fault arm_smmu_context_fault_xen + +static void arm_smmu_global_fault_xen(int irq, void *dev, + struct cpu_user_regs *regs) +{ + arm_smmu_global_fault(irq, dev); +} + +#define arm_smmu_global_fault arm_smmu_global_fault_xen + +#if 0 /* Xen: Page tables are shared with the processor */ static void arm_smmu_flush_pgtable(struct arm_smmu_device *smmu, void *addr, size_t size) { @@ -733,6 +1027,7 @@ static void arm_smmu_flush_pgtable(struct arm_smmu_device *smmu, void *addr, DMA_TO_DEVICE); } } +#endif static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain) { @@ -741,6 +1036,7 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain) struct arm_smmu_cfg *cfg = &smmu_domain->cfg; struct arm_smmu_device *smmu = smmu_domain->smmu; void __iomem *cb_base, *gr0_base, *gr1_base; + paddr_t p2maddr; gr0_base = ARM_SMMU_GR0(smmu); gr1_base = ARM_SMMU_GR1(smmu); @@ -824,11 +1120,16 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain) } /* TTBR0 */ - arm_smmu_flush_pgtable(smmu, cfg->pgd, - PTRS_PER_PGD * sizeof(pgd_t)); - reg = __pa(cfg->pgd); + /* Xen: The page table is shared with the P2M code */ + ASSERT(smmu_domain->cfg.domain != NULL); + p2maddr = page_to_maddr(smmu_domain->cfg.domain->arch.p2m.root); + + dev_notice(smmu->dev, "d%u: p2maddr 0x%"PRIpaddr"\n", + smmu_domain->cfg.domain->domain_id, p2maddr); + + reg = (p2maddr & ((1ULL << 32) - 1)); writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBR0_LO); - reg = (phys_addr_t)__pa(cfg->pgd) >> 32; + reg = (p2maddr >> 32); if (stage1) reg |= ARM_SMMU_CB_ASID(cfg) << TTBRn_HI_ASID_SHIFT; writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBR0_HI); @@ -873,6 +1174,9 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain) reg = 0; } + /* Xen: The attributes to walk the page table should be the same as + * VTCR_EL2. Currently doesn't differ from Linux ones. + */ reg |= TTBCR_EAE | (TTBCR_SH_IS << TTBCR_SH0_SHIFT) | (TTBCR_RGN_WBWA << TTBCR_ORGN0_SHIFT) | @@ -1015,7 +1319,6 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain) static int arm_smmu_domain_init(struct iommu_domain *domain) { struct arm_smmu_domain *smmu_domain; - pgd_t *pgd; /* * Allocate the domain and initialise some of its data structures. @@ -1026,20 +1329,12 @@ static int arm_smmu_domain_init(struct iommu_domain *domain) if (!smmu_domain) return -ENOMEM; - pgd = kcalloc(PTRS_PER_PGD, sizeof(pgd_t), GFP_KERNEL); - if (!pgd) - goto out_free_domain; - smmu_domain->cfg.pgd = pgd; - spin_lock_init(&smmu_domain->lock); domain->priv = smmu_domain; return 0; - -out_free_domain: - kfree(smmu_domain); - return -ENOMEM; } +#if 0 /* Xen: Page tables are shared with the processor */ static void arm_smmu_free_ptes(pmd_t *pmd) { pgtable_t table = pmd_pgtable(*pmd); @@ -1102,6 +1397,7 @@ static void arm_smmu_free_pgtables(struct arm_smmu_domain *smmu_domain) kfree(pgd_base); } +#endif static void arm_smmu_domain_destroy(struct iommu_domain *domain) { @@ -1112,7 +1408,6 @@ static void arm_smmu_domain_destroy(struct iommu_domain *domain) * already been detached. */ arm_smmu_destroy_domain_context(domain); - arm_smmu_free_pgtables(smmu_domain); kfree(smmu_domain); } @@ -1229,11 +1524,12 @@ static void arm_smmu_domain_remove_master(struct arm_smmu_domain *smmu_domain, /* * We *must* clear the S2CR first, because freeing the SMR means * that it can be re-allocated immediately. + * Xen: Unlike Linux, any access to non-configured stream will fault. */ for (i = 0; i < cfg->num_streamids; ++i) { u32 idx = cfg->smrs ? cfg->smrs[i].idx : cfg->streamids[i]; - writel_relaxed(S2CR_TYPE_BYPASS, + writel_relaxed(S2CR_TYPE_FAULT, gr0_base + ARM_SMMU_GR0_S2CR(idx)); } @@ -1253,7 +1549,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) return -ENXIO; } - if (dev->archdata.iommu) { + if (dev_iommu_domain(dev)) { dev_err(dev, "already attached to IOMMU domain\n"); return -EEXIST; } @@ -1285,8 +1581,9 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) return -ENODEV; ret = arm_smmu_domain_add_master(smmu_domain, cfg); + if (!ret) - dev->archdata.iommu = domain; + dev_iommu_domain(dev) = domain; return ret; } @@ -1299,10 +1596,14 @@ static void arm_smmu_detach_dev(struct iommu_domain *domain, struct device *dev) if (!cfg) return; - dev->archdata.iommu = NULL; + dev_iommu_domain(dev) = NULL; arm_smmu_domain_remove_master(smmu_domain, cfg); } +#if 0 /* + * Xen: The page table is shared with the processor, therefore + * helpers to implement separate is not necessary. + */ static bool arm_smmu_pte_is_contiguous_range(unsigned long addr, unsigned long end) { @@ -1591,7 +1892,9 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain, return __pfn_to_phys(pte_pfn(pte)) | (iova & ~PAGE_MASK); } +#endif +#if 0 /* Xen: arm_smmu_capable is not used at the moment */ static bool arm_smmu_capable(enum iommu_cap cap) { switch (cap) { @@ -1609,6 +1912,7 @@ static bool arm_smmu_capable(enum iommu_cap cap) return false; } } +#endif static int __arm_smmu_get_pci_sid(struct pci_dev *pdev, u16 alias, void *data) { @@ -1676,6 +1980,7 @@ out_put_group: return ret; } +#if 0 /* Xen: We don't support remove device for now. Will be useful for PCI */ static void arm_smmu_remove_device(struct device *dev) { iommu_group_remove_device(dev); @@ -1733,6 +2038,7 @@ static const struct iommu_ops arm_smmu_ops = { ARM_SMMU_PTE_CONT_SIZE | PAGE_SIZE), }; +#endif static void arm_smmu_device_reset(struct arm_smmu_device *smmu) { @@ -1748,7 +2054,11 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu) /* Mark all SMRn as invalid and all S2CRn as bypass */ for (i = 0; i < smmu->num_mapping_groups; ++i) { writel_relaxed(0, gr0_base + ARM_SMMU_GR0_SMR(i)); - writel_relaxed(S2CR_TYPE_BYPASS, + /* + * Xen: Unlike Linux, any access to a non-configure stream + * will fault by default. + */ + writel_relaxed(S2CR_TYPE_FAULT, gr0_base + ARM_SMMU_GR0_S2CR(i)); } @@ -1774,6 +2084,8 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu) /* Enable client access, but bypass when no mapping is found */ reg &= ~(sCR0_CLIENTPD | sCR0_USFCFG); + /* Xen: Unlike Linux, generate a fault when no mapping is found */ + reg |= sCR0_USFCFG; /* Disable forced broadcasting */ reg &= ~sCR0_FB; @@ -1882,7 +2194,7 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) } dev_notice(smmu->dev, - "\tstream matching with %u register groups, mask 0x%x", + "\tstream matching with %u register groups, mask 0x%x\n", smmu->num_mapping_groups, mask); } else { smmu->num_mapping_groups = (id >> ID0_NUMSIDB_SHIFT) & @@ -1917,12 +2229,16 @@ 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; +#if 0 /* Stage-2 input size limited due to pgd allocation (PTRS_PER_PGD) */ #ifdef CONFIG_64BIT smmu->s2_input_size = min_t(unsigned long, VA_BITS, size); #else smmu->s2_input_size = min(32UL, size); #endif +#endif /* The stage-2 output mask is also applied for bypass */ size = arm_smmu_id_size_to_bits((id >> ID2_OAS_SHIFT) & ID2_OAS_MASK); @@ -1969,6 +2285,10 @@ static const struct of_device_id arm_smmu_of_match[] = { }; MODULE_DEVICE_TABLE(of, arm_smmu_of_match); +/* + * Xen: We don't have refcount for allocated memory so manually free memory + * when an error occured. + */ static int arm_smmu_device_dt_probe(struct platform_device *pdev) { const struct of_device_id *of_id; @@ -1991,14 +2311,17 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); smmu->base = devm_ioremap_resource(dev, res); - if (IS_ERR(smmu->base)) - return PTR_ERR(smmu->base); + if (IS_ERR(smmu->base)) { + err = PTR_ERR(smmu->base); + goto out_free; + } smmu->size = resource_size(res); if (of_property_read_u32(dev->of_node, "#global-interrupts", &smmu->num_global_irqs)) { dev_err(dev, "missing #global-interrupts property\n"); - return -ENODEV; + err = -ENODEV; + goto out_free; } num_irqs = 0; @@ -2011,14 +2334,16 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) if (!smmu->num_context_irqs) { dev_err(dev, "found %d interrupts but expected at least %d\n", num_irqs, smmu->num_global_irqs + 1); - return -ENODEV; + err = -ENODEV; + goto out_free; } smmu->irqs = devm_kzalloc(dev, sizeof(*smmu->irqs) * num_irqs, GFP_KERNEL); if (!smmu->irqs) { dev_err(dev, "failed to allocate %d irqs\n", num_irqs); - return -ENOMEM; + err = -ENOMEM; + goto out_free; } for (i = 0; i < num_irqs; ++i) { @@ -2026,7 +2351,8 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) if (irq < 0) { dev_err(dev, "failed to get irq index %d\n", i); - return -ENODEV; + err = -ENODEV; + goto out_free; } smmu->irqs[i] = irq; } @@ -2091,12 +2417,19 @@ out_put_masters: for (node = rb_first(&smmu->masters); node; node = rb_next(node)) { struct arm_smmu_master *master = container_of(node, struct arm_smmu_master, node); - of_node_put(master->of_node); + kfree(master); } +out_free: + kfree(smmu->irqs); + if (!IS_ERR(smmu->base)) + iounmap(smmu->base); + kfree(smmu); + return err; } +#if 0 /* Xen: We never remove SMMU */ static int arm_smmu_device_remove(struct platform_device *pdev) { int i; @@ -2191,3 +2524,241 @@ module_exit(arm_smmu_exit); MODULE_DESCRIPTION("IOMMU API for ARM architected SMMU implementations"); MODULE_AUTHOR("Will Deacon "); MODULE_LICENSE("GPL v2"); +#endif + +/***** Start of Xen specific code *****/ + +/* Xen only supports stage-2 translation, so force the value to 2. */ +static int force_stage = 2; + +static void arm_smmu_iotlb_flush_all(struct domain *d) +{ + struct arm_smmu_xen_domain *smmu_domain = domain_hvm_iommu(d)->arch.priv; + struct iommu_domain *cfg; + + spin_lock(&smmu_domain->lock); + list_for_each_entry(cfg, &smmu_domain->contexts, list) { + /* + * Only invalidate the context when SMMU is present. + * This is because the context initialization is delayed + * until a master has been added. + */ + if (unlikely(!ACCESS_ONCE(cfg->priv->smmu))) + continue; + arm_smmu_tlb_inv_context(cfg->priv); + } + spin_unlock(&smmu_domain->lock); +} + +static void arm_smmu_iotlb_flush(struct domain *d, unsigned long gfn, + unsigned int page_count) +{ + /* ARM SMMU v1 doesn't have flush by VMA and VMID */ + arm_smmu_iotlb_flush_all(d); +} + +static int arm_smmu_assign_dev(struct domain *d, u8 devfn, + struct device *dev) +{ + struct iommu_domain *domain; + struct arm_smmu_xen_domain *xen_domain; + int ret; + + xen_domain = domain_hvm_iommu(d)->arch.priv; + + if (!dev->archdata.iommu) { + dev->archdata.iommu = xzalloc(struct arm_smmu_xen_device); + if (!dev->archdata.iommu) + return -ENOMEM; + } + + if (!dev_iommu_group(dev)) { + ret = arm_smmu_add_device(dev); + if (ret) + return ret; + } + + /* + * TODO: Share the context bank (i.e iommu_domain) when the device is + * under the same SMMU as another device assigned to this domain. + * Would it useful for PCI + */ + domain = xzalloc(struct iommu_domain); + if (!domain) + return -ENOMEM; + + ret = arm_smmu_domain_init(domain); + if (ret) + goto err_dom_init; + + domain->priv->cfg.domain = d; + + ret = arm_smmu_attach_dev(domain, dev); + if (ret) + goto err_attach_dev; + + spin_lock(&xen_domain->lock); + /* Chain the new context to the domain */ + list_add(&domain->list, &xen_domain->contexts); + spin_unlock(&xen_domain->lock); + + return 0; + +err_attach_dev: + arm_smmu_domain_destroy(domain); +err_dom_init: + xfree(domain); + + return ret; +} + +static int arm_smmu_deassign_dev(struct domain *d, struct device *dev) +{ + struct iommu_domain *domain = dev_iommu_domain(dev); + struct arm_smmu_xen_domain *xen_domain; + + xen_domain = domain_hvm_iommu(d)->arch.priv; + + if (!domain || domain->priv->cfg.domain != d) { + dev_err(dev, " not attached to domain %d\n", d->domain_id); + return -ESRCH; + } + + arm_smmu_detach_dev(domain, dev); + + spin_lock(&xen_domain->lock); + list_del(&domain->list); + spin_unlock(&xen_domain->lock); + + arm_smmu_domain_destroy(domain); + xfree(domain); + + return 0; +} + +static int arm_smmu_reassign_dev(struct domain *s, struct domain *t, + u8 devfn, struct device *dev) +{ + int ret = 0; + + /* Don't allow remapping on other domain than hwdom */ + if (t != hardware_domain) + return -EPERM; + + if (t == s) + return 0; + + ret = arm_smmu_deassign_dev(s, dev); + if (ret) + return ret; + + return 0; +} + +static int arm_smmu_iommu_domain_init(struct domain *d) +{ + struct arm_smmu_xen_domain *xen_domain; + + xen_domain = xzalloc(struct arm_smmu_xen_domain); + if ( !xen_domain ) + return -ENOMEM; + + spin_lock_init(&xen_domain->lock); + INIT_LIST_HEAD(&xen_domain->contexts); + + domain_hvm_iommu(d)->arch.priv = xen_domain; + + return 0; +} + +static void __hwdom_init arm_smmu_iommu_hwdom_init(struct domain *d) +{ +} + +static void arm_smmu_iommu_domain_teardown(struct domain *d) +{ + struct arm_smmu_xen_domain *xen_domain = domain_hvm_iommu(d)->arch.priv; + + ASSERT(list_empty(&xen_domain->contexts)); + xfree(xen_domain); +} + +static int arm_smmu_map_page(struct domain *d, unsigned long gfn, + unsigned long mfn, unsigned int flags) +{ + p2m_type_t t; + + /* + * Grant mappings can be used for DMA requests. The dev_bus_addr + * returned by the hypercall is the MFN (not the IPA). For device + * protected by an IOMMU, Xen needs to add a 1:1 mapping in the domain + * p2m to allow DMA request to work. + * This is only valid when the domain is directed mapped. Hence this + * function should only be used by gnttab code with gfn == mfn. + */ + BUG_ON(!is_domain_direct_mapped(d)); + BUG_ON(mfn != gfn); + + /* We only support readable and writable flags */ + if (!(flags & (IOMMUF_readable | IOMMUF_writable))) + return -EINVAL; + + t = (flags & IOMMUF_writable) ? p2m_iommu_map_rw : p2m_iommu_map_ro; + + /* + * The function guest_physmap_add_entry replaces the current mapping + * if there is already one... + */ + return guest_physmap_add_entry(d, gfn, mfn, 0, t); +} + +static int arm_smmu_unmap_page(struct domain *d, unsigned long gfn) +{ + /* + * This function should only be used by gnttab code when the domain + * is direct mapped + */ + if ( !is_domain_direct_mapped(d) ) + return -EINVAL; + + guest_physmap_remove_page(d, gfn, gfn, 0); + + return 0; +} + +static const struct iommu_ops arm_smmu_iommu_ops = { + .init = arm_smmu_iommu_domain_init, + .hwdom_init = arm_smmu_iommu_hwdom_init, + .teardown = arm_smmu_iommu_domain_teardown, + .iotlb_flush = arm_smmu_iotlb_flush, + .iotlb_flush_all = arm_smmu_iotlb_flush_all, + .assign_device = arm_smmu_assign_dev, + .reassign_device = arm_smmu_reassign_dev, + .map_page = arm_smmu_map_page, + .unmap_page = arm_smmu_unmap_page, +}; + +static __init int arm_smmu_dt_init(struct dt_device_node *dev, + const void *data) +{ + int rc; + + /* + * Even if the device can't be initialized, we don't want to + * give the SMMU device to dom0. + */ + dt_device_set_used_by(dev, DOMID_XEN); + + rc = arm_smmu_device_dt_probe(dev); + if (rc) + return rc; + + iommu_set_ops(&arm_smmu_iommu_ops); + + return 0; +} + +DT_DEVICE_START(smmu, "ARM SMMU", DEVICE_IOMMU) + .dt_match = arm_smmu_of_match, + .init = arm_smmu_dt_init, +DT_DEVICE_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 Fri Mar 06 11:18:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:18: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 1YTqGg-0002OB-Uq; Fri, 06 Mar 2015 11:18:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGf-0002Nt-DJ for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:09 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id FA/5B-02991-0FC89F45; Fri, 06 Mar 2015 11:18:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1425640685!8110363!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13547 invoked from network); 6 Mar 2015 11:18:06 -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; 6 Mar 2015 11:18:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGb-0006Dj-Ip for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqGb-0001m3-Gc for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:05 +0000 Date: Fri, 06 Mar 2015 11:18:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/iommu: smmu: Add Xen specific code to be able to use the driver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 355d4b488e4be70210ea454f50396c1ee399b991 Author: Julien Grall AuthorDate: Wed Feb 25 18:52:59 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 13:56:11 2015 +0000 xen/iommu: smmu: Add Xen specific code to be able to use the driver The main goal is to modify as little the Linux code to be able to port easily new feature added in Linux repo for the driver. To achieve that we: - Add helpers to Linux function not implemented on Xen - Add callbacks used by Xen to do our own stuff and call Linux ones - Only modify when required the code which comes from Linux. If so a comment has been added with /* Xen: ... */ explaining why it's necessary. The support for PCI has been commented because it's not yet supported by Xen ARM and therefore won't compile. Signed-off-by: Julien Grall Acked-by: Ian Campbell [ ijc -- fix a couple of typos in comments ] --- xen/drivers/passthrough/arm/Makefile | 1 + xen/drivers/passthrough/arm/smmu.c | 661 +++++++++++++++++++++++++++++++--- 2 files changed, 617 insertions(+), 45 deletions(-) diff --git a/xen/drivers/passthrough/arm/Makefile b/xen/drivers/passthrough/arm/Makefile index 0484b79..f4cd26e 100644 --- a/xen/drivers/passthrough/arm/Makefile +++ b/xen/drivers/passthrough/arm/Makefile @@ -1 +1,2 @@ obj-y += iommu.o +obj-y += smmu.o diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index 6cd47b7..7675767 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -18,6 +18,13 @@ * * Author: Will Deacon * + * Based on Linux drivers/iommu/arm-smmu.c + * => commit e6b5be2be4e30037eb551e0ed09dd97bd00d85d3 + * + * Xen modification: + * Julien Grall + * Copyright (C) 2014 Linaro Limited. + * * This driver currently supports: * - SMMUv1 and v2 implementations * - Stream-matching and stream-indexing @@ -28,25 +35,287 @@ * - Context fault reporting */ -#define pr_fmt(fmt) "arm-smmu: " fmt -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Xen: The below defines are redefined within the file. Undef it */ +#undef SCTLR_AFE +#undef SCTLR_TRE +#undef SCTLR_M +#undef TTBCR_EAE + +/* Alias to Xen device tree helpers */ +#define device_node dt_device_node +#define of_phandle_args dt_phandle_args +#define of_device_id dt_device_match +#define of_match_node dt_match_node +#define of_property_read_u32(np, pname, out) (!dt_property_read_u32(np, pname, out)) +#define of_property_read_bool dt_property_read_bool +#define of_parse_phandle_with_args dt_parse_phandle_with_args + +/* Xen: Helpers to get device MMIO and IRQs */ +struct resource +{ + u64 addr; + u64 size; + unsigned int type; +}; + +#define resource_size(res) (res)->size; + +#define platform_device dt_device_node + +#define IORESOURCE_MEM 0 +#define IORESOURCE_IRQ 1 + +static struct resource *platform_get_resource(struct platform_device *pdev, + unsigned int type, + unsigned int num) +{ + /* + * The resource is only used between 2 calls of platform_get_resource. + * It's quite ugly but it's avoid to add too much code in the part + * imported from Linux + */ + static struct resource res; + int ret = 0; + + res.type = type; + + switch (type) { + case IORESOURCE_MEM: + ret = dt_device_get_address(pdev, num, &res.addr, &res.size); + + return ((ret) ? NULL : &res); + + case IORESOURCE_IRQ: + ret = platform_get_irq(pdev, num); + if (ret < 0) + return NULL; + + res.addr = ret; + res.size = 1; + + return &res; + + default: + return NULL; + } +} + +/* Xen: Helpers for IRQ functions */ +#define request_irq(irq, func, flags, name, dev) request_irq(irq, flags, func, name, dev) +#define free_irq release_irq + +enum irqreturn { + IRQ_NONE = (0 << 0), + IRQ_HANDLED = (1 << 0), +}; + +typedef enum irqreturn irqreturn_t; + +/* Device logger functions + * TODO: Handle PCI + */ +#define dev_print(dev, lvl, fmt, ...) \ + printk(lvl "smmu: %s: " fmt, dt_node_full_name(dev_to_dt(dev)), ## __VA_ARGS__) + +#define dev_dbg(dev, fmt, ...) dev_print(dev, XENLOG_DEBUG, fmt, ## __VA_ARGS__) +#define dev_notice(dev, fmt, ...) dev_print(dev, XENLOG_INFO, fmt, ## __VA_ARGS__) +#define dev_warn(dev, fmt, ...) dev_print(dev, XENLOG_WARNING, fmt, ## __VA_ARGS__) +#define dev_err(dev, fmt, ...) dev_print(dev, XENLOG_ERR, fmt, ## __VA_ARGS__) + +#define dev_err_ratelimited(dev, fmt, ...) \ + dev_print(dev, XENLOG_ERR, fmt, ## __VA_ARGS__) + +#define dev_name(dev) dt_node_full_name(dev_to_dt(dev)) + +/* Alias to Xen allocation helpers */ +#define kfree xfree +#define kmalloc(size, flags) _xmalloc(size, sizeof(void *)) +#define kzalloc(size, flags) _xzalloc(size, sizeof(void *)) +#define devm_kzalloc(dev, size, flags) _xzalloc(size, sizeof(void *)) +#define kmalloc_array(size, n, flags) _xmalloc_array(size, sizeof(void *), n) + +static void __iomem *devm_ioremap_resource(struct device *dev, + struct resource *res) +{ + void __iomem *ptr; + + if (!res || res->type != IORESOURCE_MEM) { + dev_err(dev, "Invalid resource\n"); + return ERR_PTR(-EINVAL); + } + + ptr = ioremap_nocache(res->addr, res->size); + if (!ptr) { + dev_err(dev, + "ioremap failed (addr 0x%"PRIx64" size 0x%"PRIx64")\n", + res->addr, res->size); + return ERR_PTR(-ENOMEM); + } + + return ptr; +} + +/* Xen doesn't handle IOMMU fault */ +#define report_iommu_fault(...) 1 + +#define IOMMU_FAULT_READ 0 +#define IOMMU_FAULT_WRITE 1 + +/* + * Xen: PCI functions + * TODO: It should be implemented when PCI will be supported + */ +#define to_pci_dev(dev) (NULL) +static inline int pci_for_each_dma_alias(struct pci_dev *pdev, + int (*fn) (struct pci_dev *pdev, + u16 alias, void *data), + void *data) +{ + BUG(); + return 0; +} + +/* Xen: misc */ +#define PHYS_MASK_SHIFT PADDR_BITS +typedef paddr_t phys_addr_t; + +#ifdef CONFIG_ARM_64 +# define CONFIG_64BIT +#endif + +#define VA_BITS 0 /* Only used for configuring stage-1 input size */ + +/* The macro ACCESS_ONCE start to be replaced in Linux in favor of + * {READ, WRITE}_ONCE. Rather than introducing in the common code, keep a + * version here. We will have to drop it when the SMMU code in Linux will + * switch to {READ, WRITE}_ONCE. + */ +#define __ACCESS_ONCE(x) ({ \ + __maybe_unused typeof(x) __var = 0; \ + (volatile typeof(x) *)&(x); }) +#define ACCESS_ONCE(x) (*__ACCESS_ONCE(x)) + +#define MODULE_DEVICE_TABLE(type, name) +#define module_param_named(name, value, type, perm) +#define MODULE_PARM_DESC(_parm, desc) + +/* Xen: Dummy iommu_domain */ +struct iommu_domain +{ + /* Runtime SMMU configuration for this iommu_domain */ + struct arm_smmu_domain *priv; + + /* Used to link iommu_domain contexts for a same domain. + * There is at least one per-SMMU to used by the domain. + * */ + struct list_head list; +}; + +/* Xen: Describes informations required for a Xen domain */ +struct arm_smmu_xen_domain { + spinlock_t lock; + /* List of context (i.e iommu_domain) associated to this domain */ + struct list_head contexts; +}; + +/* + * Xen: Information about each device stored in dev->archdata.iommu + * + * Initially dev->archdata.iommu only stores the iommu_domain (runtime + * configuration of the SMMU) but, on Xen, we also have to store the + * iommu_group (list of streamIDs associated to the device). + * + * This is because Linux has a field iommu_group in the struct device. On Xen, + * that would require to move some hackery (dummy iommu_group) in a more generic + * place. + * */ +struct arm_smmu_xen_device { + struct iommu_domain *domain; + struct iommu_group *group; +}; + +#define dev_archdata(dev) ((struct arm_smmu_xen_device *)dev->archdata.iommu) +#define dev_iommu_domain(dev) (dev_archdata(dev)->domain) +#define dev_iommu_group(dev) (dev_archdata(dev)->group) + +/* Xen: Dummy iommu_group */ +struct iommu_group +{ + /* Streamids of the device */ + struct arm_smmu_master_cfg *cfg; + + atomic_t ref; +}; + +static struct iommu_group *iommu_group_alloc(void) +{ + struct iommu_group *group = xzalloc(struct iommu_group); + + if (!group) + return ERR_PTR(-ENOMEM); -#include + atomic_set(&group->ref, 1); -#include + return group; +} + +static void iommu_group_put(struct iommu_group *group) +{ + if (atomic_dec_and_test(&group->ref)) + xfree(group); +} + +static void iommu_group_set_iommudata(struct iommu_group *group, + struct arm_smmu_master_cfg *cfg, + void (*releasefn)(void *)) +{ + /* TODO: Store the releasefn for the PCI */ + ASSERT(releasefn == NULL); + + group->cfg = cfg; +} + +static int iommu_group_add_device(struct iommu_group *group, + struct device *dev) +{ + dev_iommu_group(dev) = group; + + atomic_inc(&group->ref); + + return 0; +} + +static struct iommu_group *iommu_group_get(struct device *dev) +{ + struct iommu_group *group = dev_iommu_group(dev); + + if (group) + atomic_inc(&group->ref); + + return group; +} + +#define iommu_group_get_iommudata(group) (group)->cfg + +/***** Start of Linux SMMU code *****/ /* Maximum number of stream IDs assigned to a single device */ #define MAX_MASTER_STREAMIDS MAX_PHANDLE_ARGS @@ -397,7 +666,9 @@ struct arm_smmu_cfg { u8 cbndx; u8 irptndx; u32 cbar; - pgd_t *pgd; + + /* Xen: Domain associated to this configuration */ + struct domain *domain; }; #define INVALID_IRPTNDX 0xff @@ -446,6 +717,7 @@ static void parse_driver_options(struct arm_smmu_device *smmu) static struct device_node *dev_get_dev_node(struct device *dev) { +#if 0 /* Xen: TODO: Add support for PCI */ if (dev_is_pci(dev)) { struct pci_bus *bus = to_pci_dev(dev)->bus; @@ -453,6 +725,7 @@ static struct device_node *dev_get_dev_node(struct device *dev) bus = bus->parent; return bus->bridge->parent->of_node; } +#endif return dev->of_node; } @@ -546,6 +819,9 @@ static int register_smmu_master(struct arm_smmu_device *smmu, master->of_node = masterspec->np; master->cfg.num_streamids = masterspec->args_count; + /* Xen: Let Xen know that the device is protected by an SMMU */ + dt_device_set_protected(masterspec->np); + for (i = 0; i < master->cfg.num_streamids; ++i) { u16 streamid = masterspec->args[i]; @@ -712,6 +988,24 @@ static irqreturn_t arm_smmu_global_fault(int irq, void *dev) return IRQ_HANDLED; } +/* Xen: Interrupt handlers wrapper */ +static void arm_smmu_context_fault_xen(int irq, void *dev, + struct cpu_user_regs *regs) +{ + arm_smmu_context_fault(irq, dev); +} + +#define arm_smmu_context_fault arm_smmu_context_fault_xen + +static void arm_smmu_global_fault_xen(int irq, void *dev, + struct cpu_user_regs *regs) +{ + arm_smmu_global_fault(irq, dev); +} + +#define arm_smmu_global_fault arm_smmu_global_fault_xen + +#if 0 /* Xen: Page tables are shared with the processor */ static void arm_smmu_flush_pgtable(struct arm_smmu_device *smmu, void *addr, size_t size) { @@ -733,6 +1027,7 @@ static void arm_smmu_flush_pgtable(struct arm_smmu_device *smmu, void *addr, DMA_TO_DEVICE); } } +#endif static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain) { @@ -741,6 +1036,7 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain) struct arm_smmu_cfg *cfg = &smmu_domain->cfg; struct arm_smmu_device *smmu = smmu_domain->smmu; void __iomem *cb_base, *gr0_base, *gr1_base; + paddr_t p2maddr; gr0_base = ARM_SMMU_GR0(smmu); gr1_base = ARM_SMMU_GR1(smmu); @@ -824,11 +1120,16 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain) } /* TTBR0 */ - arm_smmu_flush_pgtable(smmu, cfg->pgd, - PTRS_PER_PGD * sizeof(pgd_t)); - reg = __pa(cfg->pgd); + /* Xen: The page table is shared with the P2M code */ + ASSERT(smmu_domain->cfg.domain != NULL); + p2maddr = page_to_maddr(smmu_domain->cfg.domain->arch.p2m.root); + + dev_notice(smmu->dev, "d%u: p2maddr 0x%"PRIpaddr"\n", + smmu_domain->cfg.domain->domain_id, p2maddr); + + reg = (p2maddr & ((1ULL << 32) - 1)); writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBR0_LO); - reg = (phys_addr_t)__pa(cfg->pgd) >> 32; + reg = (p2maddr >> 32); if (stage1) reg |= ARM_SMMU_CB_ASID(cfg) << TTBRn_HI_ASID_SHIFT; writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBR0_HI); @@ -873,6 +1174,9 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain) reg = 0; } + /* Xen: The attributes to walk the page table should be the same as + * VTCR_EL2. Currently doesn't differ from Linux ones. + */ reg |= TTBCR_EAE | (TTBCR_SH_IS << TTBCR_SH0_SHIFT) | (TTBCR_RGN_WBWA << TTBCR_ORGN0_SHIFT) | @@ -1015,7 +1319,6 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain) static int arm_smmu_domain_init(struct iommu_domain *domain) { struct arm_smmu_domain *smmu_domain; - pgd_t *pgd; /* * Allocate the domain and initialise some of its data structures. @@ -1026,20 +1329,12 @@ static int arm_smmu_domain_init(struct iommu_domain *domain) if (!smmu_domain) return -ENOMEM; - pgd = kcalloc(PTRS_PER_PGD, sizeof(pgd_t), GFP_KERNEL); - if (!pgd) - goto out_free_domain; - smmu_domain->cfg.pgd = pgd; - spin_lock_init(&smmu_domain->lock); domain->priv = smmu_domain; return 0; - -out_free_domain: - kfree(smmu_domain); - return -ENOMEM; } +#if 0 /* Xen: Page tables are shared with the processor */ static void arm_smmu_free_ptes(pmd_t *pmd) { pgtable_t table = pmd_pgtable(*pmd); @@ -1102,6 +1397,7 @@ static void arm_smmu_free_pgtables(struct arm_smmu_domain *smmu_domain) kfree(pgd_base); } +#endif static void arm_smmu_domain_destroy(struct iommu_domain *domain) { @@ -1112,7 +1408,6 @@ static void arm_smmu_domain_destroy(struct iommu_domain *domain) * already been detached. */ arm_smmu_destroy_domain_context(domain); - arm_smmu_free_pgtables(smmu_domain); kfree(smmu_domain); } @@ -1229,11 +1524,12 @@ static void arm_smmu_domain_remove_master(struct arm_smmu_domain *smmu_domain, /* * We *must* clear the S2CR first, because freeing the SMR means * that it can be re-allocated immediately. + * Xen: Unlike Linux, any access to non-configured stream will fault. */ for (i = 0; i < cfg->num_streamids; ++i) { u32 idx = cfg->smrs ? cfg->smrs[i].idx : cfg->streamids[i]; - writel_relaxed(S2CR_TYPE_BYPASS, + writel_relaxed(S2CR_TYPE_FAULT, gr0_base + ARM_SMMU_GR0_S2CR(idx)); } @@ -1253,7 +1549,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) return -ENXIO; } - if (dev->archdata.iommu) { + if (dev_iommu_domain(dev)) { dev_err(dev, "already attached to IOMMU domain\n"); return -EEXIST; } @@ -1285,8 +1581,9 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) return -ENODEV; ret = arm_smmu_domain_add_master(smmu_domain, cfg); + if (!ret) - dev->archdata.iommu = domain; + dev_iommu_domain(dev) = domain; return ret; } @@ -1299,10 +1596,14 @@ static void arm_smmu_detach_dev(struct iommu_domain *domain, struct device *dev) if (!cfg) return; - dev->archdata.iommu = NULL; + dev_iommu_domain(dev) = NULL; arm_smmu_domain_remove_master(smmu_domain, cfg); } +#if 0 /* + * Xen: The page table is shared with the processor, therefore + * helpers to implement separate is not necessary. + */ static bool arm_smmu_pte_is_contiguous_range(unsigned long addr, unsigned long end) { @@ -1591,7 +1892,9 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain, return __pfn_to_phys(pte_pfn(pte)) | (iova & ~PAGE_MASK); } +#endif +#if 0 /* Xen: arm_smmu_capable is not used at the moment */ static bool arm_smmu_capable(enum iommu_cap cap) { switch (cap) { @@ -1609,6 +1912,7 @@ static bool arm_smmu_capable(enum iommu_cap cap) return false; } } +#endif static int __arm_smmu_get_pci_sid(struct pci_dev *pdev, u16 alias, void *data) { @@ -1676,6 +1980,7 @@ out_put_group: return ret; } +#if 0 /* Xen: We don't support remove device for now. Will be useful for PCI */ static void arm_smmu_remove_device(struct device *dev) { iommu_group_remove_device(dev); @@ -1733,6 +2038,7 @@ static const struct iommu_ops arm_smmu_ops = { ARM_SMMU_PTE_CONT_SIZE | PAGE_SIZE), }; +#endif static void arm_smmu_device_reset(struct arm_smmu_device *smmu) { @@ -1748,7 +2054,11 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu) /* Mark all SMRn as invalid and all S2CRn as bypass */ for (i = 0; i < smmu->num_mapping_groups; ++i) { writel_relaxed(0, gr0_base + ARM_SMMU_GR0_SMR(i)); - writel_relaxed(S2CR_TYPE_BYPASS, + /* + * Xen: Unlike Linux, any access to a non-configure stream + * will fault by default. + */ + writel_relaxed(S2CR_TYPE_FAULT, gr0_base + ARM_SMMU_GR0_S2CR(i)); } @@ -1774,6 +2084,8 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu) /* Enable client access, but bypass when no mapping is found */ reg &= ~(sCR0_CLIENTPD | sCR0_USFCFG); + /* Xen: Unlike Linux, generate a fault when no mapping is found */ + reg |= sCR0_USFCFG; /* Disable forced broadcasting */ reg &= ~sCR0_FB; @@ -1882,7 +2194,7 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) } dev_notice(smmu->dev, - "\tstream matching with %u register groups, mask 0x%x", + "\tstream matching with %u register groups, mask 0x%x\n", smmu->num_mapping_groups, mask); } else { smmu->num_mapping_groups = (id >> ID0_NUMSIDB_SHIFT) & @@ -1917,12 +2229,16 @@ 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; +#if 0 /* Stage-2 input size limited due to pgd allocation (PTRS_PER_PGD) */ #ifdef CONFIG_64BIT smmu->s2_input_size = min_t(unsigned long, VA_BITS, size); #else smmu->s2_input_size = min(32UL, size); #endif +#endif /* The stage-2 output mask is also applied for bypass */ size = arm_smmu_id_size_to_bits((id >> ID2_OAS_SHIFT) & ID2_OAS_MASK); @@ -1969,6 +2285,10 @@ static const struct of_device_id arm_smmu_of_match[] = { }; MODULE_DEVICE_TABLE(of, arm_smmu_of_match); +/* + * Xen: We don't have refcount for allocated memory so manually free memory + * when an error occured. + */ static int arm_smmu_device_dt_probe(struct platform_device *pdev) { const struct of_device_id *of_id; @@ -1991,14 +2311,17 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); smmu->base = devm_ioremap_resource(dev, res); - if (IS_ERR(smmu->base)) - return PTR_ERR(smmu->base); + if (IS_ERR(smmu->base)) { + err = PTR_ERR(smmu->base); + goto out_free; + } smmu->size = resource_size(res); if (of_property_read_u32(dev->of_node, "#global-interrupts", &smmu->num_global_irqs)) { dev_err(dev, "missing #global-interrupts property\n"); - return -ENODEV; + err = -ENODEV; + goto out_free; } num_irqs = 0; @@ -2011,14 +2334,16 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) if (!smmu->num_context_irqs) { dev_err(dev, "found %d interrupts but expected at least %d\n", num_irqs, smmu->num_global_irqs + 1); - return -ENODEV; + err = -ENODEV; + goto out_free; } smmu->irqs = devm_kzalloc(dev, sizeof(*smmu->irqs) * num_irqs, GFP_KERNEL); if (!smmu->irqs) { dev_err(dev, "failed to allocate %d irqs\n", num_irqs); - return -ENOMEM; + err = -ENOMEM; + goto out_free; } for (i = 0; i < num_irqs; ++i) { @@ -2026,7 +2351,8 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) if (irq < 0) { dev_err(dev, "failed to get irq index %d\n", i); - return -ENODEV; + err = -ENODEV; + goto out_free; } smmu->irqs[i] = irq; } @@ -2091,12 +2417,19 @@ out_put_masters: for (node = rb_first(&smmu->masters); node; node = rb_next(node)) { struct arm_smmu_master *master = container_of(node, struct arm_smmu_master, node); - of_node_put(master->of_node); + kfree(master); } +out_free: + kfree(smmu->irqs); + if (!IS_ERR(smmu->base)) + iounmap(smmu->base); + kfree(smmu); + return err; } +#if 0 /* Xen: We never remove SMMU */ static int arm_smmu_device_remove(struct platform_device *pdev) { int i; @@ -2191,3 +2524,241 @@ module_exit(arm_smmu_exit); MODULE_DESCRIPTION("IOMMU API for ARM architected SMMU implementations"); MODULE_AUTHOR("Will Deacon "); MODULE_LICENSE("GPL v2"); +#endif + +/***** Start of Xen specific code *****/ + +/* Xen only supports stage-2 translation, so force the value to 2. */ +static int force_stage = 2; + +static void arm_smmu_iotlb_flush_all(struct domain *d) +{ + struct arm_smmu_xen_domain *smmu_domain = domain_hvm_iommu(d)->arch.priv; + struct iommu_domain *cfg; + + spin_lock(&smmu_domain->lock); + list_for_each_entry(cfg, &smmu_domain->contexts, list) { + /* + * Only invalidate the context when SMMU is present. + * This is because the context initialization is delayed + * until a master has been added. + */ + if (unlikely(!ACCESS_ONCE(cfg->priv->smmu))) + continue; + arm_smmu_tlb_inv_context(cfg->priv); + } + spin_unlock(&smmu_domain->lock); +} + +static void arm_smmu_iotlb_flush(struct domain *d, unsigned long gfn, + unsigned int page_count) +{ + /* ARM SMMU v1 doesn't have flush by VMA and VMID */ + arm_smmu_iotlb_flush_all(d); +} + +static int arm_smmu_assign_dev(struct domain *d, u8 devfn, + struct device *dev) +{ + struct iommu_domain *domain; + struct arm_smmu_xen_domain *xen_domain; + int ret; + + xen_domain = domain_hvm_iommu(d)->arch.priv; + + if (!dev->archdata.iommu) { + dev->archdata.iommu = xzalloc(struct arm_smmu_xen_device); + if (!dev->archdata.iommu) + return -ENOMEM; + } + + if (!dev_iommu_group(dev)) { + ret = arm_smmu_add_device(dev); + if (ret) + return ret; + } + + /* + * TODO: Share the context bank (i.e iommu_domain) when the device is + * under the same SMMU as another device assigned to this domain. + * Would it useful for PCI + */ + domain = xzalloc(struct iommu_domain); + if (!domain) + return -ENOMEM; + + ret = arm_smmu_domain_init(domain); + if (ret) + goto err_dom_init; + + domain->priv->cfg.domain = d; + + ret = arm_smmu_attach_dev(domain, dev); + if (ret) + goto err_attach_dev; + + spin_lock(&xen_domain->lock); + /* Chain the new context to the domain */ + list_add(&domain->list, &xen_domain->contexts); + spin_unlock(&xen_domain->lock); + + return 0; + +err_attach_dev: + arm_smmu_domain_destroy(domain); +err_dom_init: + xfree(domain); + + return ret; +} + +static int arm_smmu_deassign_dev(struct domain *d, struct device *dev) +{ + struct iommu_domain *domain = dev_iommu_domain(dev); + struct arm_smmu_xen_domain *xen_domain; + + xen_domain = domain_hvm_iommu(d)->arch.priv; + + if (!domain || domain->priv->cfg.domain != d) { + dev_err(dev, " not attached to domain %d\n", d->domain_id); + return -ESRCH; + } + + arm_smmu_detach_dev(domain, dev); + + spin_lock(&xen_domain->lock); + list_del(&domain->list); + spin_unlock(&xen_domain->lock); + + arm_smmu_domain_destroy(domain); + xfree(domain); + + return 0; +} + +static int arm_smmu_reassign_dev(struct domain *s, struct domain *t, + u8 devfn, struct device *dev) +{ + int ret = 0; + + /* Don't allow remapping on other domain than hwdom */ + if (t != hardware_domain) + return -EPERM; + + if (t == s) + return 0; + + ret = arm_smmu_deassign_dev(s, dev); + if (ret) + return ret; + + return 0; +} + +static int arm_smmu_iommu_domain_init(struct domain *d) +{ + struct arm_smmu_xen_domain *xen_domain; + + xen_domain = xzalloc(struct arm_smmu_xen_domain); + if ( !xen_domain ) + return -ENOMEM; + + spin_lock_init(&xen_domain->lock); + INIT_LIST_HEAD(&xen_domain->contexts); + + domain_hvm_iommu(d)->arch.priv = xen_domain; + + return 0; +} + +static void __hwdom_init arm_smmu_iommu_hwdom_init(struct domain *d) +{ +} + +static void arm_smmu_iommu_domain_teardown(struct domain *d) +{ + struct arm_smmu_xen_domain *xen_domain = domain_hvm_iommu(d)->arch.priv; + + ASSERT(list_empty(&xen_domain->contexts)); + xfree(xen_domain); +} + +static int arm_smmu_map_page(struct domain *d, unsigned long gfn, + unsigned long mfn, unsigned int flags) +{ + p2m_type_t t; + + /* + * Grant mappings can be used for DMA requests. The dev_bus_addr + * returned by the hypercall is the MFN (not the IPA). For device + * protected by an IOMMU, Xen needs to add a 1:1 mapping in the domain + * p2m to allow DMA request to work. + * This is only valid when the domain is directed mapped. Hence this + * function should only be used by gnttab code with gfn == mfn. + */ + BUG_ON(!is_domain_direct_mapped(d)); + BUG_ON(mfn != gfn); + + /* We only support readable and writable flags */ + if (!(flags & (IOMMUF_readable | IOMMUF_writable))) + return -EINVAL; + + t = (flags & IOMMUF_writable) ? p2m_iommu_map_rw : p2m_iommu_map_ro; + + /* + * The function guest_physmap_add_entry replaces the current mapping + * if there is already one... + */ + return guest_physmap_add_entry(d, gfn, mfn, 0, t); +} + +static int arm_smmu_unmap_page(struct domain *d, unsigned long gfn) +{ + /* + * This function should only be used by gnttab code when the domain + * is direct mapped + */ + if ( !is_domain_direct_mapped(d) ) + return -EINVAL; + + guest_physmap_remove_page(d, gfn, gfn, 0); + + return 0; +} + +static const struct iommu_ops arm_smmu_iommu_ops = { + .init = arm_smmu_iommu_domain_init, + .hwdom_init = arm_smmu_iommu_hwdom_init, + .teardown = arm_smmu_iommu_domain_teardown, + .iotlb_flush = arm_smmu_iotlb_flush, + .iotlb_flush_all = arm_smmu_iotlb_flush_all, + .assign_device = arm_smmu_assign_dev, + .reassign_device = arm_smmu_reassign_dev, + .map_page = arm_smmu_map_page, + .unmap_page = arm_smmu_unmap_page, +}; + +static __init int arm_smmu_dt_init(struct dt_device_node *dev, + const void *data) +{ + int rc; + + /* + * Even if the device can't be initialized, we don't want to + * give the SMMU device to dom0. + */ + dt_device_set_used_by(dev, DOMID_XEN); + + rc = arm_smmu_device_dt_probe(dev); + if (rc) + return rc; + + iommu_set_ops(&arm_smmu_iommu_ops); + + return 0; +} + +DT_DEVICE_START(smmu, "ARM SMMU", DEVICE_IOMMU) + .dt_match = arm_smmu_of_match, + .init = arm_smmu_dt_init, +DT_DEVICE_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 Fri Mar 06 11:18:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:18: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 1YTqGq-0002PY-1S; Fri, 06 Mar 2015 11:18:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGo-0002PI-LN for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:18 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 5D/9E-02991-9FC89F45; Fri, 06 Mar 2015 11:18:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425640695!13637434!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4633 invoked from network); 6 Mar 2015 11:18:16 -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; 6 Mar 2015 11:18:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGl-0006Dt-Oc for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqGl-0001nE-Mq for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:15 +0000 Date: Fri, 06 Mar 2015 11:18:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: correct coding style for psr X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 30d34a0e8dd4ecf294ab6bf89483aa3b32136c0e Author: Chao Peng AuthorDate: Thu Feb 26 16:45:36 2015 +0800 Commit: Ian Campbell CommitDate: Mon Mar 2 13:56:57 2015 +0000 tools: correct coding style for psr - space: remove space after '(' or before ')' in 'if' condition; - indention: align function definition/call arguments; Signed-off-by: Chao Peng Acked-by: Wei Liu --- tools/libxc/include/xenctrl.h | 10 +++++----- tools/libxc/xc_psr.c | 10 +++++----- tools/libxl/libxl.h | 11 +++++++---- tools/libxl/libxl_psr.c | 11 +++++++---- tools/libxl/xl_cmdimpl.c | 11 ++++++----- 5 files changed, 30 insertions(+), 23 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 790db53..09d819f 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2693,14 +2693,14 @@ typedef enum xc_psr_cmt_type xc_psr_cmt_type; int xc_psr_cmt_attach(xc_interface *xch, uint32_t domid); int xc_psr_cmt_detach(xc_interface *xch, uint32_t domid); int xc_psr_cmt_get_domain_rmid(xc_interface *xch, uint32_t domid, - uint32_t *rmid); + uint32_t *rmid); int xc_psr_cmt_get_total_rmid(xc_interface *xch, uint32_t *total_rmid); int xc_psr_cmt_get_l3_upscaling_factor(xc_interface *xch, - uint32_t *upscaling_factor); + uint32_t *upscaling_factor); int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu, - uint32_t *l3_cache_size); -int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, - uint32_t cpu, uint32_t psr_cmt_type, uint64_t *monitor_data); + uint32_t *l3_cache_size); +int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, + uint32_t psr_cmt_type, uint64_t *monitor_data); int xc_psr_cmt_enabled(xc_interface *xch); #endif diff --git a/tools/libxc/xc_psr.c b/tools/libxc/xc_psr.c index 872e6dc..cfae172 100644 --- a/tools/libxc/xc_psr.c +++ b/tools/libxc/xc_psr.c @@ -47,7 +47,7 @@ int xc_psr_cmt_detach(xc_interface *xch, uint32_t domid) } int xc_psr_cmt_get_domain_rmid(xc_interface *xch, uint32_t domid, - uint32_t *rmid) + uint32_t *rmid) { int rc; DECLARE_DOMCTL; @@ -88,7 +88,7 @@ int xc_psr_cmt_get_total_rmid(xc_interface *xch, uint32_t *total_rmid) } int xc_psr_cmt_get_l3_upscaling_factor(xc_interface *xch, - uint32_t *upscaling_factor) + uint32_t *upscaling_factor) { static int val = 0; int rc; @@ -113,7 +113,7 @@ int xc_psr_cmt_get_l3_upscaling_factor(xc_interface *xch, } int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu, - uint32_t *l3_cache_size) + uint32_t *l3_cache_size) { static int val = 0; int rc; @@ -138,8 +138,8 @@ int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu, return rc; } -int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, - uint32_t cpu, xc_psr_cmt_type type, uint64_t *monitor_data) +int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, + xc_psr_cmt_type type, uint64_t *monitor_data) { xc_resource_op_t op; xc_resource_entry_t entries[2]; diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index c219f59..f784df5 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1476,10 +1476,13 @@ int libxl_psr_cmt_detach(libxl_ctx *ctx, uint32_t domid); int libxl_psr_cmt_domain_attached(libxl_ctx *ctx, uint32_t domid); int libxl_psr_cmt_enabled(libxl_ctx *ctx); int libxl_psr_cmt_get_total_rmid(libxl_ctx *ctx, uint32_t *total_rmid); -int libxl_psr_cmt_get_l3_cache_size(libxl_ctx *ctx, uint32_t socketid, - uint32_t *l3_cache_size); -int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, uint32_t domid, - uint32_t socketid, uint32_t *l3_cache_occupancy); +int libxl_psr_cmt_get_l3_cache_size(libxl_ctx *ctx, + uint32_t socketid, + uint32_t *l3_cache_size); +int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, + uint32_t domid, + uint32_t socketid, + uint32_t *l3_cache_occupancy); #endif /* misc */ diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c index 0437465..ec3b6e9 100644 --- a/tools/libxl/libxl_psr.c +++ b/tools/libxl/libxl_psr.c @@ -135,8 +135,9 @@ int libxl_psr_cmt_get_total_rmid(libxl_ctx *ctx, uint32_t *total_rmid) return rc; } -int libxl_psr_cmt_get_l3_cache_size(libxl_ctx *ctx, uint32_t socketid, - uint32_t *l3_cache_size) +int libxl_psr_cmt_get_l3_cache_size(libxl_ctx *ctx, + uint32_t socketid, + uint32_t *l3_cache_size) { GC_INIT(ctx); @@ -160,8 +161,10 @@ out: return rc; } -int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, uint32_t domid, - uint32_t socketid, uint32_t *l3_cache_occupancy) +int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, + uint32_t domid, + uint32_t socketid, + uint32_t *l3_cache_occupancy) { GC_INIT(ctx); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 53c16eb..f9f8776 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7826,7 +7826,7 @@ out: #ifdef LIBXL_HAVE_PSR_CMT static void psr_cmt_print_domain_cache_occupancy(libxl_dominfo *dominfo, - uint32_t nr_sockets) + uint32_t nr_sockets) { char *domain_name; uint32_t socketid; @@ -7840,8 +7840,8 @@ static void psr_cmt_print_domain_cache_occupancy(libxl_dominfo *dominfo, free(domain_name); for (socketid = 0; socketid < nr_sockets; socketid++) { - if ( !libxl_psr_cmt_get_cache_occupancy(ctx, dominfo->domid, - socketid, &l3_cache_occupancy) ) + if (!libxl_psr_cmt_get_cache_occupancy(ctx, dominfo->domid, socketid, + &l3_cache_occupancy)) printf("%13u KB", l3_cache_occupancy); } @@ -7889,8 +7889,9 @@ static int psr_cmt_show_cache_occupancy(uint32_t domid) for (socketid = 0; socketid < nr_sockets; socketid++) { rc = libxl_psr_cmt_get_l3_cache_size(ctx, socketid, &l3_cache_size); if (rc < 0) { - fprintf(stderr, "Failed to get system l3 cache size for socket:%d\n", - socketid); + fprintf(stderr, + "Failed to get system l3 cache size for socket:%d\n", + socketid); return -1; } printf("%13u KB", l3_cache_size); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:18:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:18: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 1YTqGq-0002PY-1S; Fri, 06 Mar 2015 11:18:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGo-0002PI-LN for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:18 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 5D/9E-02991-9FC89F45; Fri, 06 Mar 2015 11:18:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425640695!13637434!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4633 invoked from network); 6 Mar 2015 11:18:16 -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; 6 Mar 2015 11:18:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGl-0006Dt-Oc for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqGl-0001nE-Mq for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:15 +0000 Date: Fri, 06 Mar 2015 11:18:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: correct coding style for psr X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 30d34a0e8dd4ecf294ab6bf89483aa3b32136c0e Author: Chao Peng AuthorDate: Thu Feb 26 16:45:36 2015 +0800 Commit: Ian Campbell CommitDate: Mon Mar 2 13:56:57 2015 +0000 tools: correct coding style for psr - space: remove space after '(' or before ')' in 'if' condition; - indention: align function definition/call arguments; Signed-off-by: Chao Peng Acked-by: Wei Liu --- tools/libxc/include/xenctrl.h | 10 +++++----- tools/libxc/xc_psr.c | 10 +++++----- tools/libxl/libxl.h | 11 +++++++---- tools/libxl/libxl_psr.c | 11 +++++++---- tools/libxl/xl_cmdimpl.c | 11 ++++++----- 5 files changed, 30 insertions(+), 23 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 790db53..09d819f 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2693,14 +2693,14 @@ typedef enum xc_psr_cmt_type xc_psr_cmt_type; int xc_psr_cmt_attach(xc_interface *xch, uint32_t domid); int xc_psr_cmt_detach(xc_interface *xch, uint32_t domid); int xc_psr_cmt_get_domain_rmid(xc_interface *xch, uint32_t domid, - uint32_t *rmid); + uint32_t *rmid); int xc_psr_cmt_get_total_rmid(xc_interface *xch, uint32_t *total_rmid); int xc_psr_cmt_get_l3_upscaling_factor(xc_interface *xch, - uint32_t *upscaling_factor); + uint32_t *upscaling_factor); int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu, - uint32_t *l3_cache_size); -int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, - uint32_t cpu, uint32_t psr_cmt_type, uint64_t *monitor_data); + uint32_t *l3_cache_size); +int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, + uint32_t psr_cmt_type, uint64_t *monitor_data); int xc_psr_cmt_enabled(xc_interface *xch); #endif diff --git a/tools/libxc/xc_psr.c b/tools/libxc/xc_psr.c index 872e6dc..cfae172 100644 --- a/tools/libxc/xc_psr.c +++ b/tools/libxc/xc_psr.c @@ -47,7 +47,7 @@ int xc_psr_cmt_detach(xc_interface *xch, uint32_t domid) } int xc_psr_cmt_get_domain_rmid(xc_interface *xch, uint32_t domid, - uint32_t *rmid) + uint32_t *rmid) { int rc; DECLARE_DOMCTL; @@ -88,7 +88,7 @@ int xc_psr_cmt_get_total_rmid(xc_interface *xch, uint32_t *total_rmid) } int xc_psr_cmt_get_l3_upscaling_factor(xc_interface *xch, - uint32_t *upscaling_factor) + uint32_t *upscaling_factor) { static int val = 0; int rc; @@ -113,7 +113,7 @@ int xc_psr_cmt_get_l3_upscaling_factor(xc_interface *xch, } int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu, - uint32_t *l3_cache_size) + uint32_t *l3_cache_size) { static int val = 0; int rc; @@ -138,8 +138,8 @@ int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu, return rc; } -int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, - uint32_t cpu, xc_psr_cmt_type type, uint64_t *monitor_data) +int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, + xc_psr_cmt_type type, uint64_t *monitor_data) { xc_resource_op_t op; xc_resource_entry_t entries[2]; diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index c219f59..f784df5 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1476,10 +1476,13 @@ int libxl_psr_cmt_detach(libxl_ctx *ctx, uint32_t domid); int libxl_psr_cmt_domain_attached(libxl_ctx *ctx, uint32_t domid); int libxl_psr_cmt_enabled(libxl_ctx *ctx); int libxl_psr_cmt_get_total_rmid(libxl_ctx *ctx, uint32_t *total_rmid); -int libxl_psr_cmt_get_l3_cache_size(libxl_ctx *ctx, uint32_t socketid, - uint32_t *l3_cache_size); -int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, uint32_t domid, - uint32_t socketid, uint32_t *l3_cache_occupancy); +int libxl_psr_cmt_get_l3_cache_size(libxl_ctx *ctx, + uint32_t socketid, + uint32_t *l3_cache_size); +int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, + uint32_t domid, + uint32_t socketid, + uint32_t *l3_cache_occupancy); #endif /* misc */ diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c index 0437465..ec3b6e9 100644 --- a/tools/libxl/libxl_psr.c +++ b/tools/libxl/libxl_psr.c @@ -135,8 +135,9 @@ int libxl_psr_cmt_get_total_rmid(libxl_ctx *ctx, uint32_t *total_rmid) return rc; } -int libxl_psr_cmt_get_l3_cache_size(libxl_ctx *ctx, uint32_t socketid, - uint32_t *l3_cache_size) +int libxl_psr_cmt_get_l3_cache_size(libxl_ctx *ctx, + uint32_t socketid, + uint32_t *l3_cache_size) { GC_INIT(ctx); @@ -160,8 +161,10 @@ out: return rc; } -int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, uint32_t domid, - uint32_t socketid, uint32_t *l3_cache_occupancy) +int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, + uint32_t domid, + uint32_t socketid, + uint32_t *l3_cache_occupancy) { GC_INIT(ctx); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 53c16eb..f9f8776 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7826,7 +7826,7 @@ out: #ifdef LIBXL_HAVE_PSR_CMT static void psr_cmt_print_domain_cache_occupancy(libxl_dominfo *dominfo, - uint32_t nr_sockets) + uint32_t nr_sockets) { char *domain_name; uint32_t socketid; @@ -7840,8 +7840,8 @@ static void psr_cmt_print_domain_cache_occupancy(libxl_dominfo *dominfo, free(domain_name); for (socketid = 0; socketid < nr_sockets; socketid++) { - if ( !libxl_psr_cmt_get_cache_occupancy(ctx, dominfo->domid, - socketid, &l3_cache_occupancy) ) + if (!libxl_psr_cmt_get_cache_occupancy(ctx, dominfo->domid, socketid, + &l3_cache_occupancy)) printf("%13u KB", l3_cache_occupancy); } @@ -7889,8 +7889,9 @@ static int psr_cmt_show_cache_occupancy(uint32_t domid) for (socketid = 0; socketid < nr_sockets; socketid++) { rc = libxl_psr_cmt_get_l3_cache_size(ctx, socketid, &l3_cache_size); if (rc < 0) { - fprintf(stderr, "Failed to get system l3 cache size for socket:%d\n", - socketid); + fprintf(stderr, + "Failed to get system l3 cache size for socket:%d\n", + socketid); return -1; } printf("%13u KB", l3_cache_size); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:18:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:18: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 1YTqGz-0002RZ-71; Fri, 06 Mar 2015 11:18:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGy-0002RH-89 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:28 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 01/66-02777-30D89F45; Fri, 06 Mar 2015 11:18:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1425640706!15208507!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23260 invoked from network); 6 Mar 2015 11:18:26 -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; 6 Mar 2015 11:18:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGv-0006Dz-Te for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqGv-0001na-Sn for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:25 +0000 Date: Fri, 06 Mar 2015 11:18:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: code refactoring in xc_psr_cmt_get_data X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 637027cdf0fe0a9fc1333754ffc2399723868086 Author: Chao Peng AuthorDate: Thu Feb 26 16:45:37 2015 +0800 Commit: Ian Campbell CommitDate: Mon Mar 2 13:57:24 2015 +0000 tools/libxc: code refactoring in xc_psr_cmt_get_data Use calculated array index instead of hardcoded array index. No functional change involved. Signed-off-by: Chao Peng Acked-by: Ian Campbell --- tools/libxc/xc_psr.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/libxc/xc_psr.c b/tools/libxc/xc_psr.c index cfae172..70d9067 100644 --- a/tools/libxc/xc_psr.c +++ b/tools/libxc/xc_psr.c @@ -143,7 +143,7 @@ int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, { xc_resource_op_t op; xc_resource_entry_t entries[2]; - uint32_t evtid; + uint32_t evtid, nr = 0; int rc; switch ( type ) @@ -155,25 +155,27 @@ int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, return -1; } - entries[0].u.cmd = XEN_RESOURCE_OP_MSR_WRITE; - entries[0].idx = MSR_IA32_CMT_EVTSEL; - entries[0].val = (uint64_t)rmid << 32 | evtid; - entries[0].rsvd = 0; + entries[nr].u.cmd = XEN_RESOURCE_OP_MSR_WRITE; + entries[nr].idx = MSR_IA32_CMT_EVTSEL; + entries[nr].val = (uint64_t)rmid << 32 | evtid; + entries[nr].rsvd = 0; + nr++; - entries[1].u.cmd = XEN_RESOURCE_OP_MSR_READ; - entries[1].idx = MSR_IA32_CMT_CTR; - entries[1].val = 0; - entries[1].rsvd = 0; + entries[nr].u.cmd = XEN_RESOURCE_OP_MSR_READ; + entries[nr].idx = MSR_IA32_CMT_CTR; + entries[nr].val = 0; + entries[nr].rsvd = 0; + nr++; op.cpu = cpu; - op.nr_entries = 2; + op.nr_entries = nr; op.entries = entries; rc = xc_resource_op(xch, 1, &op); if ( rc < 0 ) return rc; - if ( op.result !=2 || entries[1].val & IA32_CMT_CTR_ERROR_MASK ) + if ( op.result != nr || entries[1].val & IA32_CMT_CTR_ERROR_MASK ) return -1; *monitor_data = entries[1].val; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:18:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:18: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 1YTqGz-0002RZ-71; Fri, 06 Mar 2015 11:18:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGy-0002RH-89 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:28 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 01/66-02777-30D89F45; Fri, 06 Mar 2015 11:18:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1425640706!15208507!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23260 invoked from network); 6 Mar 2015 11:18:26 -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; 6 Mar 2015 11:18:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqGv-0006Dz-Te for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqGv-0001na-Sn for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:25 +0000 Date: Fri, 06 Mar 2015 11:18:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: code refactoring in xc_psr_cmt_get_data X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 637027cdf0fe0a9fc1333754ffc2399723868086 Author: Chao Peng AuthorDate: Thu Feb 26 16:45:37 2015 +0800 Commit: Ian Campbell CommitDate: Mon Mar 2 13:57:24 2015 +0000 tools/libxc: code refactoring in xc_psr_cmt_get_data Use calculated array index instead of hardcoded array index. No functional change involved. Signed-off-by: Chao Peng Acked-by: Ian Campbell --- tools/libxc/xc_psr.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/libxc/xc_psr.c b/tools/libxc/xc_psr.c index cfae172..70d9067 100644 --- a/tools/libxc/xc_psr.c +++ b/tools/libxc/xc_psr.c @@ -143,7 +143,7 @@ int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, { xc_resource_op_t op; xc_resource_entry_t entries[2]; - uint32_t evtid; + uint32_t evtid, nr = 0; int rc; switch ( type ) @@ -155,25 +155,27 @@ int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, return -1; } - entries[0].u.cmd = XEN_RESOURCE_OP_MSR_WRITE; - entries[0].idx = MSR_IA32_CMT_EVTSEL; - entries[0].val = (uint64_t)rmid << 32 | evtid; - entries[0].rsvd = 0; + entries[nr].u.cmd = XEN_RESOURCE_OP_MSR_WRITE; + entries[nr].idx = MSR_IA32_CMT_EVTSEL; + entries[nr].val = (uint64_t)rmid << 32 | evtid; + entries[nr].rsvd = 0; + nr++; - entries[1].u.cmd = XEN_RESOURCE_OP_MSR_READ; - entries[1].idx = MSR_IA32_CMT_CTR; - entries[1].val = 0; - entries[1].rsvd = 0; + entries[nr].u.cmd = XEN_RESOURCE_OP_MSR_READ; + entries[nr].idx = MSR_IA32_CMT_CTR; + entries[nr].val = 0; + entries[nr].rsvd = 0; + nr++; op.cpu = cpu; - op.nr_entries = 2; + op.nr_entries = nr; op.entries = entries; rc = xc_resource_op(xch, 1, &op); if ( rc < 0 ) return rc; - if ( op.result !=2 || entries[1].val & IA32_CMT_CTR_ERROR_MASK ) + if ( op.result != nr || entries[1].val & IA32_CMT_CTR_ERROR_MASK ) return -1; *monitor_data = entries[1].val; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:18:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:18: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 1YTqH9-0002Tl-TQ; Fri, 06 Mar 2015 11:18:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqH8-0002TU-GW for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:38 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id D6/B6-02635-D0D89F45; Fri, 06 Mar 2015 11:18:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1425640716!9844372!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28987 invoked from network); 6 Mar 2015 11:18:37 -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; 6 Mar 2015 11:18:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqH6-0006E7-2V for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqH6-0001o0-1c for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:36 +0000 Date: Fri, 06 Mar 2015 11:18:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: code refactoring for MBM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 63696ce2d528d51f98def5dc793017042e54688d Author: Chao Peng AuthorDate: Thu Feb 26 16:45:38 2015 +0800 Commit: Ian Campbell CommitDate: Mon Mar 2 13:57:32 2015 +0000 tools/libxl: code refactoring for MBM Make some internal routines common so that total/local memory bandwidth monitoring in the next patch can make use of them. Signed-off-by: Chao Peng Acked-by: Wei Liu --- tools/libxl/xl_cmdimpl.c | 54 ++++++++++++++++++++++++++++----------------- 1 files changed, 33 insertions(+), 21 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index f9f8776..e41f633 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7825,8 +7825,9 @@ out: } #ifdef LIBXL_HAVE_PSR_CMT -static void psr_cmt_print_domain_cache_occupancy(libxl_dominfo *dominfo, - uint32_t nr_sockets) +static void psr_cmt_print_domain_info(libxl_dominfo *dominfo, + libxl_psr_cmt_type type, + uint32_t nr_sockets) { char *domain_name; uint32_t socketid; @@ -7840,15 +7841,23 @@ static void psr_cmt_print_domain_cache_occupancy(libxl_dominfo *dominfo, free(domain_name); for (socketid = 0; socketid < nr_sockets; socketid++) { - if (!libxl_psr_cmt_get_cache_occupancy(ctx, dominfo->domid, socketid, - &l3_cache_occupancy)) - printf("%13u KB", l3_cache_occupancy); + switch (type) { + case LIBXL_PSR_CMT_TYPE_CACHE_OCCUPANCY: + if (!libxl_psr_cmt_get_cache_occupancy(ctx, + dominfo->domid, + socketid, + &l3_cache_occupancy)) + printf("%13u KB", l3_cache_occupancy); + break; + default: + return; + } } printf("\n"); } -static int psr_cmt_show_cache_occupancy(uint32_t domid) +static int psr_cmt_show(libxl_psr_cmt_type type, uint32_t domid) { uint32_t i, socketid, nr_sockets, total_rmid; uint32_t l3_cache_size; @@ -7884,19 +7893,22 @@ static int psr_cmt_show_cache_occupancy(uint32_t domid) printf("%14s %d", "Socket", socketid); printf("\n"); - /* Total L3 cache size */ - printf("%-46s", "Total L3 Cache Size"); - for (socketid = 0; socketid < nr_sockets; socketid++) { - rc = libxl_psr_cmt_get_l3_cache_size(ctx, socketid, &l3_cache_size); - if (rc < 0) { - fprintf(stderr, - "Failed to get system l3 cache size for socket:%d\n", - socketid); - return -1; - } - printf("%13u KB", l3_cache_size); + if (type == LIBXL_PSR_CMT_TYPE_CACHE_OCCUPANCY) { + /* Total L3 cache size */ + printf("%-46s", "Total L3 Cache Size"); + for (socketid = 0; socketid < nr_sockets; socketid++) { + rc = libxl_psr_cmt_get_l3_cache_size(ctx, socketid, + &l3_cache_size); + if (rc < 0) { + fprintf(stderr, + "Failed to get system l3 cache size for socket:%d\n", + socketid); + return -1; + } + printf("%13u KB", l3_cache_size); + } + printf("\n"); } - printf("\n"); /* Each domain */ if (domid != INVALID_DOMID) { @@ -7905,7 +7917,7 @@ static int psr_cmt_show_cache_occupancy(uint32_t domid) fprintf(stderr, "Failed to get domain info for %d\n", domid); return -1; } - psr_cmt_print_domain_cache_occupancy(&dominfo, nr_sockets); + psr_cmt_print_domain_info(&dominfo, type, nr_sockets); } else { @@ -7915,7 +7927,7 @@ static int psr_cmt_show_cache_occupancy(uint32_t domid) return -1; } for (i = 0; i < nr_domains; i++) - psr_cmt_print_domain_cache_occupancy(list + i, nr_sockets); + psr_cmt_print_domain_info(list + i, type, nr_sockets); libxl_dominfo_list_free(list, nr_domains); } return 0; @@ -7974,7 +7986,7 @@ int main_psr_cmt_show(int argc, char **argv) switch (type) { case LIBXL_PSR_CMT_TYPE_CACHE_OCCUPANCY: - ret = psr_cmt_show_cache_occupancy(domid); + ret = psr_cmt_show(type, domid); break; default: help("psr-cmt-show"); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:18:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:18: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 1YTqH9-0002Tl-TQ; Fri, 06 Mar 2015 11:18:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqH8-0002TU-GW for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:38 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id D6/B6-02635-D0D89F45; Fri, 06 Mar 2015 11:18:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1425640716!9844372!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28987 invoked from network); 6 Mar 2015 11:18:37 -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; 6 Mar 2015 11:18:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqH6-0006E7-2V for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqH6-0001o0-1c for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:36 +0000 Date: Fri, 06 Mar 2015 11:18:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: code refactoring for MBM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 63696ce2d528d51f98def5dc793017042e54688d Author: Chao Peng AuthorDate: Thu Feb 26 16:45:38 2015 +0800 Commit: Ian Campbell CommitDate: Mon Mar 2 13:57:32 2015 +0000 tools/libxl: code refactoring for MBM Make some internal routines common so that total/local memory bandwidth monitoring in the next patch can make use of them. Signed-off-by: Chao Peng Acked-by: Wei Liu --- tools/libxl/xl_cmdimpl.c | 54 ++++++++++++++++++++++++++++----------------- 1 files changed, 33 insertions(+), 21 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index f9f8776..e41f633 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7825,8 +7825,9 @@ out: } #ifdef LIBXL_HAVE_PSR_CMT -static void psr_cmt_print_domain_cache_occupancy(libxl_dominfo *dominfo, - uint32_t nr_sockets) +static void psr_cmt_print_domain_info(libxl_dominfo *dominfo, + libxl_psr_cmt_type type, + uint32_t nr_sockets) { char *domain_name; uint32_t socketid; @@ -7840,15 +7841,23 @@ static void psr_cmt_print_domain_cache_occupancy(libxl_dominfo *dominfo, free(domain_name); for (socketid = 0; socketid < nr_sockets; socketid++) { - if (!libxl_psr_cmt_get_cache_occupancy(ctx, dominfo->domid, socketid, - &l3_cache_occupancy)) - printf("%13u KB", l3_cache_occupancy); + switch (type) { + case LIBXL_PSR_CMT_TYPE_CACHE_OCCUPANCY: + if (!libxl_psr_cmt_get_cache_occupancy(ctx, + dominfo->domid, + socketid, + &l3_cache_occupancy)) + printf("%13u KB", l3_cache_occupancy); + break; + default: + return; + } } printf("\n"); } -static int psr_cmt_show_cache_occupancy(uint32_t domid) +static int psr_cmt_show(libxl_psr_cmt_type type, uint32_t domid) { uint32_t i, socketid, nr_sockets, total_rmid; uint32_t l3_cache_size; @@ -7884,19 +7893,22 @@ static int psr_cmt_show_cache_occupancy(uint32_t domid) printf("%14s %d", "Socket", socketid); printf("\n"); - /* Total L3 cache size */ - printf("%-46s", "Total L3 Cache Size"); - for (socketid = 0; socketid < nr_sockets; socketid++) { - rc = libxl_psr_cmt_get_l3_cache_size(ctx, socketid, &l3_cache_size); - if (rc < 0) { - fprintf(stderr, - "Failed to get system l3 cache size for socket:%d\n", - socketid); - return -1; - } - printf("%13u KB", l3_cache_size); + if (type == LIBXL_PSR_CMT_TYPE_CACHE_OCCUPANCY) { + /* Total L3 cache size */ + printf("%-46s", "Total L3 Cache Size"); + for (socketid = 0; socketid < nr_sockets; socketid++) { + rc = libxl_psr_cmt_get_l3_cache_size(ctx, socketid, + &l3_cache_size); + if (rc < 0) { + fprintf(stderr, + "Failed to get system l3 cache size for socket:%d\n", + socketid); + return -1; + } + printf("%13u KB", l3_cache_size); + } + printf("\n"); } - printf("\n"); /* Each domain */ if (domid != INVALID_DOMID) { @@ -7905,7 +7917,7 @@ static int psr_cmt_show_cache_occupancy(uint32_t domid) fprintf(stderr, "Failed to get domain info for %d\n", domid); return -1; } - psr_cmt_print_domain_cache_occupancy(&dominfo, nr_sockets); + psr_cmt_print_domain_info(&dominfo, type, nr_sockets); } else { @@ -7915,7 +7927,7 @@ static int psr_cmt_show_cache_occupancy(uint32_t domid) return -1; } for (i = 0; i < nr_domains; i++) - psr_cmt_print_domain_cache_occupancy(list + i, nr_sockets); + psr_cmt_print_domain_info(list + i, type, nr_sockets); libxl_dominfo_list_free(list, nr_domains); } return 0; @@ -7974,7 +7986,7 @@ int main_psr_cmt_show(int argc, char **argv) switch (type) { case LIBXL_PSR_CMT_TYPE_CACHE_OCCUPANCY: - ret = psr_cmt_show_cache_occupancy(domid); + ret = psr_cmt_show(type, domid); break; default: help("psr-cmt-show"); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:18:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:18: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 1YTqHK-0002WF-0I; Fri, 06 Mar 2015 11:18:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHJ-0002Vs-26 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:49 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 3F/C5-03165-81D89F45; Fri, 06 Mar 2015 11:18:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1425640726!13505339!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21510 invoked from network); 6 Mar 2015 11:18:47 -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; 6 Mar 2015 11:18:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHG-0006ED-8E for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqHG-0001oP-6v for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:46 +0000 Date: Fri, 06 Mar 2015 11:18:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: remove freemem_slack X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c26f92b8fce3c9df17f7ef035b54d97cbe931c7a Author: Stefano Stabellini AuthorDate: Wed Feb 25 15:07:25 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 14:00:15 2015 +0000 libxl: remove freemem_slack freemem_slack accounts for the amount of memory to be left free in the system because empirical experiments seem to demonstrate that is needed for "stability reasons". As we don't have any actual data on these stability issues, remove it. Signed-off-by: Stefano Stabellini CC: mlatimer@suse.com CC: ian.campbell@citrix.com Acked-by: Mike Latimer Acked-by: Ian Campbell --- tools/libxl/libxl.c | 59 +++----------------------------------------------- 1 files changed, 4 insertions(+), 55 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index b9a1941..a68f6ef 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4592,13 +4592,11 @@ static int libxl__fill_dom0_memory_info(libxl__gc *gc, uint32_t *target_memkb, int rc; libxl_dominfo info; libxl_physinfo physinfo; - char *target = NULL, *staticmax = NULL, *freememslack = NULL, *endptr = NULL; + char *target = NULL, *staticmax = NULL, *endptr = NULL; char *target_path = "/local/domain/0/memory/target"; char *max_path = "/local/domain/0/memory/static-max"; - char *free_mem_slack_path = "/local/domain/0/memory/freemem-slack"; xs_transaction_t t; libxl_ctx *ctx = libxl__gc_owner(gc); - uint32_t free_mem_slack_kb = 0; libxl_dominfo_init(&info); @@ -4607,8 +4605,7 @@ retry_transaction: target = libxl__xs_read(gc, t, target_path); staticmax = libxl__xs_read(gc, t, max_path); - freememslack = libxl__xs_read(gc, t, free_mem_slack_path); - if (target && staticmax && freememslack) { + if (target && staticmax) { rc = 0; goto out; } @@ -4655,15 +4652,6 @@ retry_transaction: *max_memkb = (uint32_t) info.max_memkb; } - if (freememslack == NULL) { - free_mem_slack_kb = (uint32_t) (PAGE_TO_MEMKB(physinfo.total_pages) - - info.current_memkb); - /* From empirical measurements the free_mem_slack shouldn't be more - * than 15% of the total memory present on the system. */ - if (free_mem_slack_kb > PAGE_TO_MEMKB(physinfo.total_pages) * 0.15) - free_mem_slack_kb = PAGE_TO_MEMKB(physinfo.total_pages) * 0.15; - libxl__xs_write(gc, t, free_mem_slack_path, "%"PRIu32, free_mem_slack_kb); - } rc = 0; out: @@ -4678,33 +4666,6 @@ out: return rc; } -/* returns how much memory should be left free in the system */ -static int libxl__get_free_memory_slack(libxl__gc *gc, uint32_t *free_mem_slack) -{ - int rc; - char *free_mem_slack_path = "/local/domain/0/memory/freemem-slack"; - char *free_mem_slack_s, *endptr; - uint32_t target_memkb, max_memkb; - -retry: - free_mem_slack_s = libxl__xs_read(gc, XBT_NULL, free_mem_slack_path); - if (!free_mem_slack_s) { - rc = libxl__fill_dom0_memory_info(gc, &target_memkb, &max_memkb); - if (rc < 0) - return rc; - goto retry; - } else { - *free_mem_slack = strtoul(free_mem_slack_s, &endptr, 10); - if (*endptr != '\0') { - LIBXL__LOG_ERRNO(gc->owner, LIBXL__LOG_ERROR, - "invalid free_mem_slack %s from %s\n", - free_mem_slack_s, free_mem_slack_path); - return ERROR_FAIL; - } - } - return 0; -} - int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, int32_t target_memkb, int relative, int enforce) { @@ -4953,20 +4914,13 @@ int libxl_get_free_memory(libxl_ctx *ctx, uint32_t *memkb) { int rc = 0; libxl_physinfo info; - uint32_t freemem_slack; GC_INIT(ctx); rc = libxl_get_physinfo(ctx, &info); if (rc < 0) goto out; - rc = libxl__get_free_memory_slack(gc, &freemem_slack); - if (rc < 0) - goto out; - if ((info.free_pages + info.scrub_pages) * 4 > freemem_slack) - *memkb = (info.free_pages + info.scrub_pages) * 4 - freemem_slack; - else - *memkb = 0; + *memkb = (info.free_pages + info.scrub_pages) * 4; out: GC_FREE; @@ -4978,18 +4932,13 @@ int libxl_wait_for_free_memory(libxl_ctx *ctx, uint32_t domid, uint32_t { int rc = 0; libxl_physinfo info; - uint32_t freemem_slack; GC_INIT(ctx); - rc = libxl__get_free_memory_slack(gc, &freemem_slack); - if (rc < 0) - goto out; while (wait_secs > 0) { rc = libxl_get_physinfo(ctx, &info); if (rc < 0) goto out; - if (info.free_pages * 4 >= freemem_slack && - info.free_pages * 4 - freemem_slack >= memory_kb) { + if (info.free_pages * 4 >= memory_kb) { rc = 0; 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 Mar 06 11:18:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:18: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 1YTqHK-0002WF-0I; Fri, 06 Mar 2015 11:18:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHJ-0002Vs-26 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:49 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 3F/C5-03165-81D89F45; Fri, 06 Mar 2015 11:18:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1425640726!13505339!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21510 invoked from network); 6 Mar 2015 11:18:47 -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; 6 Mar 2015 11:18:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHG-0006ED-8E for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqHG-0001oP-6v for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:46 +0000 Date: Fri, 06 Mar 2015 11:18:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: remove freemem_slack X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c26f92b8fce3c9df17f7ef035b54d97cbe931c7a Author: Stefano Stabellini AuthorDate: Wed Feb 25 15:07:25 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 14:00:15 2015 +0000 libxl: remove freemem_slack freemem_slack accounts for the amount of memory to be left free in the system because empirical experiments seem to demonstrate that is needed for "stability reasons". As we don't have any actual data on these stability issues, remove it. Signed-off-by: Stefano Stabellini CC: mlatimer@suse.com CC: ian.campbell@citrix.com Acked-by: Mike Latimer Acked-by: Ian Campbell --- tools/libxl/libxl.c | 59 +++----------------------------------------------- 1 files changed, 4 insertions(+), 55 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index b9a1941..a68f6ef 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4592,13 +4592,11 @@ static int libxl__fill_dom0_memory_info(libxl__gc *gc, uint32_t *target_memkb, int rc; libxl_dominfo info; libxl_physinfo physinfo; - char *target = NULL, *staticmax = NULL, *freememslack = NULL, *endptr = NULL; + char *target = NULL, *staticmax = NULL, *endptr = NULL; char *target_path = "/local/domain/0/memory/target"; char *max_path = "/local/domain/0/memory/static-max"; - char *free_mem_slack_path = "/local/domain/0/memory/freemem-slack"; xs_transaction_t t; libxl_ctx *ctx = libxl__gc_owner(gc); - uint32_t free_mem_slack_kb = 0; libxl_dominfo_init(&info); @@ -4607,8 +4605,7 @@ retry_transaction: target = libxl__xs_read(gc, t, target_path); staticmax = libxl__xs_read(gc, t, max_path); - freememslack = libxl__xs_read(gc, t, free_mem_slack_path); - if (target && staticmax && freememslack) { + if (target && staticmax) { rc = 0; goto out; } @@ -4655,15 +4652,6 @@ retry_transaction: *max_memkb = (uint32_t) info.max_memkb; } - if (freememslack == NULL) { - free_mem_slack_kb = (uint32_t) (PAGE_TO_MEMKB(physinfo.total_pages) - - info.current_memkb); - /* From empirical measurements the free_mem_slack shouldn't be more - * than 15% of the total memory present on the system. */ - if (free_mem_slack_kb > PAGE_TO_MEMKB(physinfo.total_pages) * 0.15) - free_mem_slack_kb = PAGE_TO_MEMKB(physinfo.total_pages) * 0.15; - libxl__xs_write(gc, t, free_mem_slack_path, "%"PRIu32, free_mem_slack_kb); - } rc = 0; out: @@ -4678,33 +4666,6 @@ out: return rc; } -/* returns how much memory should be left free in the system */ -static int libxl__get_free_memory_slack(libxl__gc *gc, uint32_t *free_mem_slack) -{ - int rc; - char *free_mem_slack_path = "/local/domain/0/memory/freemem-slack"; - char *free_mem_slack_s, *endptr; - uint32_t target_memkb, max_memkb; - -retry: - free_mem_slack_s = libxl__xs_read(gc, XBT_NULL, free_mem_slack_path); - if (!free_mem_slack_s) { - rc = libxl__fill_dom0_memory_info(gc, &target_memkb, &max_memkb); - if (rc < 0) - return rc; - goto retry; - } else { - *free_mem_slack = strtoul(free_mem_slack_s, &endptr, 10); - if (*endptr != '\0') { - LIBXL__LOG_ERRNO(gc->owner, LIBXL__LOG_ERROR, - "invalid free_mem_slack %s from %s\n", - free_mem_slack_s, free_mem_slack_path); - return ERROR_FAIL; - } - } - return 0; -} - int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, int32_t target_memkb, int relative, int enforce) { @@ -4953,20 +4914,13 @@ int libxl_get_free_memory(libxl_ctx *ctx, uint32_t *memkb) { int rc = 0; libxl_physinfo info; - uint32_t freemem_slack; GC_INIT(ctx); rc = libxl_get_physinfo(ctx, &info); if (rc < 0) goto out; - rc = libxl__get_free_memory_slack(gc, &freemem_slack); - if (rc < 0) - goto out; - if ((info.free_pages + info.scrub_pages) * 4 > freemem_slack) - *memkb = (info.free_pages + info.scrub_pages) * 4 - freemem_slack; - else - *memkb = 0; + *memkb = (info.free_pages + info.scrub_pages) * 4; out: GC_FREE; @@ -4978,18 +4932,13 @@ int libxl_wait_for_free_memory(libxl_ctx *ctx, uint32_t domid, uint32_t { int rc = 0; libxl_physinfo info; - uint32_t freemem_slack; GC_INIT(ctx); - rc = libxl__get_free_memory_slack(gc, &freemem_slack); - if (rc < 0) - goto out; while (wait_secs > 0) { rc = libxl_get_physinfo(ctx, &info); if (rc < 0) goto out; - if (info.free_pages * 4 >= freemem_slack && - info.free_pages * 4 - freemem_slack >= memory_kb) { + if (info.free_pages * 4 >= memory_kb) { rc = 0; 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 Mar 06 11:19:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:19: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 1YTqHX-0002YQ-3I; Fri, 06 Mar 2015 11:19:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHV-0002YE-St for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:02 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id D9/7D-02991-52D89F45; Fri, 06 Mar 2015 11:19:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1425640736!13496525!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14705 invoked from network); 6 Mar 2015 11:19:00 -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; 6 Mar 2015 11:19:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHQ-0006EN-De for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqHQ-0001on-Co for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:56 +0000 Date: Fri, 06 Mar 2015 11:18:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Handle translated addresses for hardware domains in GICv2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5009babad9bfac9c88706e366bed3f2fdf4ed3ca Author: Frediano Ziglio AuthorDate: Fri Feb 27 14:08:06 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 14:07:39 2015 +0000 xen/arm: Handle translated addresses for hardware domains in GICv2 Translated addresses (in d->arch.vgic.{c,d}base) are bus addresses which are not always correct in the context of a subnode in the DTB exposed to domain 0 since they would then be subject to retranslation. Copy the original addresses from DT directly to get the original untranslated reg property which will give same d->arch.vgic.{c,d}base values once translated again by the guest. Signed-off-by: Frediano Ziglio Acked-by: Ian Campbell [ ijc -- attempt to clarify the commit message ] --- xen/arch/arm/gic-v2.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index e551549..3e141c4 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -604,7 +604,7 @@ static int gicv2_make_dt_node(const struct domain *d, const struct dt_device_node *gic = dt_interrupt_controller; const void *compatible = NULL; u32 len; - __be32 *new_cells, *tmp; + const __be32 *regs; int res = 0; compatible = dt_get_property(gic, "compatible", &len); @@ -631,18 +631,22 @@ static int gicv2_make_dt_node(const struct domain *d, if ( res ) return res; - len = dt_cells_to_size(dt_n_addr_cells(node) + dt_n_size_cells(node)); - len *= 2; /* GIC has two memory regions: Distributor + CPU interface */ - new_cells = xzalloc_bytes(len); - if ( new_cells == NULL ) - return -FDT_ERR_XEN(ENOMEM); + /* + * DTB provides up to 4 regions to handle virtualization + * (in order GICD, GICC, GICH and GICV interfaces) + * however dom0 just needs GICD and GICC provided by Xen. + */ + regs = dt_get_property(gic, "reg", &len); + if ( !regs ) + { + dprintk(XENLOG_ERR, "Can't find reg property for the gic node\n"); + return -FDT_ERR_XEN(ENOENT); + } - tmp = new_cells; - dt_set_range(&tmp, node, d->arch.vgic.dbase, PAGE_SIZE); - dt_set_range(&tmp, node, d->arch.vgic.cbase, PAGE_SIZE * 2); + len = dt_cells_to_size(dt_n_addr_cells(node) + dt_n_size_cells(node)); + len *= 2; - res = fdt_property(fdt, "reg", new_cells, len); - xfree(new_cells); + res = fdt_property(fdt, "reg", regs, len); return res; } -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:19:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:19: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 1YTqHX-0002YQ-3I; Fri, 06 Mar 2015 11:19:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHV-0002YE-St for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:02 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id D9/7D-02991-52D89F45; Fri, 06 Mar 2015 11:19:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1425640736!13496525!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14705 invoked from network); 6 Mar 2015 11:19:00 -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; 6 Mar 2015 11:19:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHQ-0006EN-De for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqHQ-0001on-Co for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:18:56 +0000 Date: Fri, 06 Mar 2015 11:18:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Handle translated addresses for hardware domains in GICv2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5009babad9bfac9c88706e366bed3f2fdf4ed3ca Author: Frediano Ziglio AuthorDate: Fri Feb 27 14:08:06 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 14:07:39 2015 +0000 xen/arm: Handle translated addresses for hardware domains in GICv2 Translated addresses (in d->arch.vgic.{c,d}base) are bus addresses which are not always correct in the context of a subnode in the DTB exposed to domain 0 since they would then be subject to retranslation. Copy the original addresses from DT directly to get the original untranslated reg property which will give same d->arch.vgic.{c,d}base values once translated again by the guest. Signed-off-by: Frediano Ziglio Acked-by: Ian Campbell [ ijc -- attempt to clarify the commit message ] --- xen/arch/arm/gic-v2.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index e551549..3e141c4 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -604,7 +604,7 @@ static int gicv2_make_dt_node(const struct domain *d, const struct dt_device_node *gic = dt_interrupt_controller; const void *compatible = NULL; u32 len; - __be32 *new_cells, *tmp; + const __be32 *regs; int res = 0; compatible = dt_get_property(gic, "compatible", &len); @@ -631,18 +631,22 @@ static int gicv2_make_dt_node(const struct domain *d, if ( res ) return res; - len = dt_cells_to_size(dt_n_addr_cells(node) + dt_n_size_cells(node)); - len *= 2; /* GIC has two memory regions: Distributor + CPU interface */ - new_cells = xzalloc_bytes(len); - if ( new_cells == NULL ) - return -FDT_ERR_XEN(ENOMEM); + /* + * DTB provides up to 4 regions to handle virtualization + * (in order GICD, GICC, GICH and GICV interfaces) + * however dom0 just needs GICD and GICC provided by Xen. + */ + regs = dt_get_property(gic, "reg", &len); + if ( !regs ) + { + dprintk(XENLOG_ERR, "Can't find reg property for the gic node\n"); + return -FDT_ERR_XEN(ENOENT); + } - tmp = new_cells; - dt_set_range(&tmp, node, d->arch.vgic.dbase, PAGE_SIZE); - dt_set_range(&tmp, node, d->arch.vgic.cbase, PAGE_SIZE * 2); + len = dt_cells_to_size(dt_n_addr_cells(node) + dt_n_size_cells(node)); + len *= 2; - res = fdt_property(fdt, "reg", new_cells, len); - xfree(new_cells); + res = fdt_property(fdt, "reg", regs, len); return res; } -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:19:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:19: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 1YTqHf-0002aO-61; Fri, 06 Mar 2015 11:19:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHe-0002Zp-2I for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:10 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 79/7F-02994-C2D89F45; Fri, 06 Mar 2015 11:19:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1425640746!10163732!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9700 invoked from network); 6 Mar 2015 11:19:07 -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; 6 Mar 2015 11:19:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHa-0006Ev-IT for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqHa-0001pK-HU for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:06 +0000 Date: Fri, 06 Mar 2015 11:19:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/pygrub: Add example from Ubuntu 14.04 LTS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fed6379944b5fac79f8e6560e6f10f71c4aac0cf Author: Ian Jackson AuthorDate: Fri Feb 27 15:22:30 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 14:10:34 2015 +0000 tools/pygrub: Add example from Ubuntu 14.04 LTS (This grub.cfg does not work with Xen 4.4.1's pygrub, but does work with the extra 4 patches which are in Xen 4.5.0.) Contributed-by: Owen Dunn Signed-off-by: Ian Jackson CC: Owen Dunn Acked-by: Ian Campbell --- tools/pygrub/examples/ubuntu-14.04-lts.grub2 | 234 ++++++++++++++++++++++++++ 1 files changed, 234 insertions(+), 0 deletions(-) diff --git a/tools/pygrub/examples/ubuntu-14.04-lts.grub2 b/tools/pygrub/examples/ubuntu-14.04-lts.grub2 new file mode 100644 index 0000000..a14c8df --- /dev/null +++ b/tools/pygrub/examples/ubuntu-14.04-lts.grub2 @@ -0,0 +1,234 @@ +# +# DO NOT EDIT THIS FILE +# +# It is automatically generated by grub-mkconfig using templates +# from /etc/grub.d and settings from /etc/default/grub +# + +### BEGIN /etc/grub.d/00_header ### +if [ -s $prefix/grubenv ]; then + set have_grubenv=true + load_env +fi +if [ "${next_entry}" ] ; then + set default="${next_entry}" + set next_entry= + save_env next_entry + set boot_once=true +else + set default="0" +fi + +if [ x"${feature_menuentry_id}" = xy ]; then + menuentry_id_option="--id" +else + menuentry_id_option="" +fi + +export menuentry_id_option + +if [ "${prev_saved_entry}" ]; then + set saved_entry="${prev_saved_entry}" + save_env saved_entry + set prev_saved_entry= + save_env prev_saved_entry + set boot_once=true +fi + +function savedefault { + if [ -z "${boot_once}" ]; then + saved_entry="${chosen}" + save_env saved_entry + fi +} +function recordfail { + set recordfail=1 + if [ -n "${have_grubenv}" ]; then if [ -z "${boot_once}" ]; then save_env recordfail; fi; fi +} +function load_video { + if [ x$feature_all_video_module = xy ]; then + insmod all_video + else + insmod efi_gop + insmod efi_uga + insmod ieee1275_fb + insmod vbe + insmod vga + insmod video_bochs + insmod video_cirrus + fi +} + +if [ x$feature_default_font_path = xy ] ; then + font=unicode +else +insmod part_msdos +insmod lvm +insmod ext2 +set root='lvmid/VFRfK8-JAgW-a2Rt-svO9-f06E-Frur-fzowWw/2zIHcW-s2DX-h7hm-V32p-6nz5-bH1A-fNVEWg' +if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint='lvmid/VFRfK8-JAgW-a2Rt-svO9-f06E-Frur-fzowWw/2zIHcW-s2DX-h7hm-V32p-6nz5-bH1A-fNVEWg' c7a4b4ca-71da-4d03-b374-a6b76ebcfc90 +else + search --no-floppy --fs-uuid --set=root c7a4b4ca-71da-4d03-b374-a6b76ebcfc90 +fi + font="/usr/share/grub/unicode.pf2" +fi + +if loadfont $font ; then + set gfxmode=auto + load_video + insmod gfxterm +fi +terminal_output gfxterm +if [ "${recordfail}" = 1 ] ; then + set timeout=-1 +else + if [ x$feature_timeout_style = xy ] ; then + set timeout_style=menu + set timeout=5 + # Fallback normal timeout code in case the timeout_style feature is + # unavailable. + else + set timeout=5 + fi +fi +### END /etc/grub.d/00_header ### + +### BEGIN /etc/grub.d/05_debian_theme ### +set menu_color_normal=white/black +set menu_color_highlight=black/light-gray +### END /etc/grub.d/05_debian_theme ### + +### BEGIN /etc/grub.d/10_linux ### +function gfxmode { + set gfxpayload="${1}" + if [ "${1}" = "keep" ]; then + set vt_handoff=vt.handoff=7 + else + set vt_handoff= + fi +} +if [ "${recordfail}" != 1 ]; then + if [ -e ${prefix}/gfxblacklist.txt ]; then + if hwmatch ${prefix}/gfxblacklist.txt 3; then + if [ ${match} = 0 ]; then + set linux_gfx_mode=keep + else + set linux_gfx_mode=text + fi + else + set linux_gfx_mode=text + fi + else + set linux_gfx_mode=keep + fi +else + set linux_gfx_mode=text +fi +export linux_gfx_mode +menuentry 'Ubuntu' --class ubuntu --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-simple-c7a4b4ca-71da-4d03-b374-a6b76ebcfc90' { + load_video + gfxmode $linux_gfx_mode + insmod gzio + insmod part_msdos + insmod ext2 + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + else + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + fi + linux /vmlinuz-3.13.0-44-generic root=/dev/mapper/BoxenSys00-root ro biosdevname=0 quiet + initrd /initrd.img-3.13.0-44-generic +} +submenu 'Advanced options for Ubuntu' --unrestricted $menuentry_id_option 'gnulinux-advanced-c7a4b4ca-71da-4d03-b374-a6b76ebcfc90' { + menuentry 'Ubuntu, with Linux 3.13.0-44-generic' --class ubuntu --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-3.13.0-44-generic-advanced-c7a4b4ca-71da-4d03-b374-a6b76ebcfc90' { + load_video + gfxmode $linux_gfx_mode + insmod gzio + insmod part_msdos + insmod ext2 + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + else + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + fi + echo 'Loading Linux 3.13.0-44-generic ...' + linux /vmlinuz-3.13.0-44-generic root=/dev/mapper/BoxenSys00-root ro biosdevname=0 quiet + echo 'Loading initial ramdisk ...' + initrd /initrd.img-3.13.0-44-generic + } + menuentry 'Ubuntu, with Linux 3.13.0-44-generic (recovery mode)' --class ubuntu --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-3.13.0-44-generic-recovery-c7a4b4ca-71da-4d03-b374-a6b76ebcfc90' { + load_video + insmod gzio + insmod part_msdos + insmod ext2 + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + else + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + fi + echo 'Loading Linux 3.13.0-44-generic ...' + linux /vmlinuz-3.13.0-44-generic root=/dev/mapper/BoxenSys00-root ro recovery nomodeset biosdevname=0 + echo 'Loading initial ramdisk ...' + initrd /initrd.img-3.13.0-44-generic + } +} + +### END /etc/grub.d/10_linux ### + +### BEGIN /etc/grub.d/20_linux_xen ### + +### END /etc/grub.d/20_linux_xen ### + +### BEGIN /etc/grub.d/20_memtest86+ ### +menuentry 'Memory test (memtest86+)' { + insmod part_msdos + insmod ext2 + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + else + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + fi + knetbsd /memtest86+.elf +} +menuentry 'Memory test (memtest86+, serial console 115200)' { + insmod part_msdos + insmod ext2 + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + else + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + fi + linux16 /memtest86+.bin console=ttyS0,115200n8 +} +### END /etc/grub.d/20_memtest86+ ### + +### BEGIN /etc/grub.d/30_os-prober ### +### END /etc/grub.d/30_os-prober ### + +### BEGIN /etc/grub.d/30_uefi-firmware ### +### END /etc/grub.d/30_uefi-firmware ### + +### BEGIN /etc/grub.d/40_custom ### +# This file provides an easy way to add custom menu entries. Simply type the +# menu entries you want to add after this comment. Be careful not to change +# the 'exec tail' line above. +set superusers="root" +password_pbkdf2 root grub.pbkdf2.sha512. +### END /etc/grub.d/40_custom ### + +### BEGIN /etc/grub.d/40_custom.bakPW ### +# This file provides an easy way to add custom menu entries. Simply type the +# menu entries you want to add after this comment. Be careful not to change +# the 'exec tail' line above. +set superusers="root" +password_pbkdf2 root dummy +### END /etc/grub.d/40_custom.bakPW ### + +### BEGIN /etc/grub.d/41_custom ### +if [ -f ${config_directory}/custom.cfg ]; then + source ${config_directory}/custom.cfg +elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then + source $prefix/custom.cfg; +fi +### END /etc/grub.d/41_custom ### -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:19:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:19: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 1YTqHf-0002aO-61; Fri, 06 Mar 2015 11:19:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHe-0002Zp-2I for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:10 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 79/7F-02994-C2D89F45; Fri, 06 Mar 2015 11:19:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1425640746!10163732!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9700 invoked from network); 6 Mar 2015 11:19:07 -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; 6 Mar 2015 11:19:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHa-0006Ev-IT for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqHa-0001pK-HU for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:06 +0000 Date: Fri, 06 Mar 2015 11:19:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/pygrub: Add example from Ubuntu 14.04 LTS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fed6379944b5fac79f8e6560e6f10f71c4aac0cf Author: Ian Jackson AuthorDate: Fri Feb 27 15:22:30 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 14:10:34 2015 +0000 tools/pygrub: Add example from Ubuntu 14.04 LTS (This grub.cfg does not work with Xen 4.4.1's pygrub, but does work with the extra 4 patches which are in Xen 4.5.0.) Contributed-by: Owen Dunn Signed-off-by: Ian Jackson CC: Owen Dunn Acked-by: Ian Campbell --- tools/pygrub/examples/ubuntu-14.04-lts.grub2 | 234 ++++++++++++++++++++++++++ 1 files changed, 234 insertions(+), 0 deletions(-) diff --git a/tools/pygrub/examples/ubuntu-14.04-lts.grub2 b/tools/pygrub/examples/ubuntu-14.04-lts.grub2 new file mode 100644 index 0000000..a14c8df --- /dev/null +++ b/tools/pygrub/examples/ubuntu-14.04-lts.grub2 @@ -0,0 +1,234 @@ +# +# DO NOT EDIT THIS FILE +# +# It is automatically generated by grub-mkconfig using templates +# from /etc/grub.d and settings from /etc/default/grub +# + +### BEGIN /etc/grub.d/00_header ### +if [ -s $prefix/grubenv ]; then + set have_grubenv=true + load_env +fi +if [ "${next_entry}" ] ; then + set default="${next_entry}" + set next_entry= + save_env next_entry + set boot_once=true +else + set default="0" +fi + +if [ x"${feature_menuentry_id}" = xy ]; then + menuentry_id_option="--id" +else + menuentry_id_option="" +fi + +export menuentry_id_option + +if [ "${prev_saved_entry}" ]; then + set saved_entry="${prev_saved_entry}" + save_env saved_entry + set prev_saved_entry= + save_env prev_saved_entry + set boot_once=true +fi + +function savedefault { + if [ -z "${boot_once}" ]; then + saved_entry="${chosen}" + save_env saved_entry + fi +} +function recordfail { + set recordfail=1 + if [ -n "${have_grubenv}" ]; then if [ -z "${boot_once}" ]; then save_env recordfail; fi; fi +} +function load_video { + if [ x$feature_all_video_module = xy ]; then + insmod all_video + else + insmod efi_gop + insmod efi_uga + insmod ieee1275_fb + insmod vbe + insmod vga + insmod video_bochs + insmod video_cirrus + fi +} + +if [ x$feature_default_font_path = xy ] ; then + font=unicode +else +insmod part_msdos +insmod lvm +insmod ext2 +set root='lvmid/VFRfK8-JAgW-a2Rt-svO9-f06E-Frur-fzowWw/2zIHcW-s2DX-h7hm-V32p-6nz5-bH1A-fNVEWg' +if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint='lvmid/VFRfK8-JAgW-a2Rt-svO9-f06E-Frur-fzowWw/2zIHcW-s2DX-h7hm-V32p-6nz5-bH1A-fNVEWg' c7a4b4ca-71da-4d03-b374-a6b76ebcfc90 +else + search --no-floppy --fs-uuid --set=root c7a4b4ca-71da-4d03-b374-a6b76ebcfc90 +fi + font="/usr/share/grub/unicode.pf2" +fi + +if loadfont $font ; then + set gfxmode=auto + load_video + insmod gfxterm +fi +terminal_output gfxterm +if [ "${recordfail}" = 1 ] ; then + set timeout=-1 +else + if [ x$feature_timeout_style = xy ] ; then + set timeout_style=menu + set timeout=5 + # Fallback normal timeout code in case the timeout_style feature is + # unavailable. + else + set timeout=5 + fi +fi +### END /etc/grub.d/00_header ### + +### BEGIN /etc/grub.d/05_debian_theme ### +set menu_color_normal=white/black +set menu_color_highlight=black/light-gray +### END /etc/grub.d/05_debian_theme ### + +### BEGIN /etc/grub.d/10_linux ### +function gfxmode { + set gfxpayload="${1}" + if [ "${1}" = "keep" ]; then + set vt_handoff=vt.handoff=7 + else + set vt_handoff= + fi +} +if [ "${recordfail}" != 1 ]; then + if [ -e ${prefix}/gfxblacklist.txt ]; then + if hwmatch ${prefix}/gfxblacklist.txt 3; then + if [ ${match} = 0 ]; then + set linux_gfx_mode=keep + else + set linux_gfx_mode=text + fi + else + set linux_gfx_mode=text + fi + else + set linux_gfx_mode=keep + fi +else + set linux_gfx_mode=text +fi +export linux_gfx_mode +menuentry 'Ubuntu' --class ubuntu --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-simple-c7a4b4ca-71da-4d03-b374-a6b76ebcfc90' { + load_video + gfxmode $linux_gfx_mode + insmod gzio + insmod part_msdos + insmod ext2 + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + else + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + fi + linux /vmlinuz-3.13.0-44-generic root=/dev/mapper/BoxenSys00-root ro biosdevname=0 quiet + initrd /initrd.img-3.13.0-44-generic +} +submenu 'Advanced options for Ubuntu' --unrestricted $menuentry_id_option 'gnulinux-advanced-c7a4b4ca-71da-4d03-b374-a6b76ebcfc90' { + menuentry 'Ubuntu, with Linux 3.13.0-44-generic' --class ubuntu --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-3.13.0-44-generic-advanced-c7a4b4ca-71da-4d03-b374-a6b76ebcfc90' { + load_video + gfxmode $linux_gfx_mode + insmod gzio + insmod part_msdos + insmod ext2 + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + else + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + fi + echo 'Loading Linux 3.13.0-44-generic ...' + linux /vmlinuz-3.13.0-44-generic root=/dev/mapper/BoxenSys00-root ro biosdevname=0 quiet + echo 'Loading initial ramdisk ...' + initrd /initrd.img-3.13.0-44-generic + } + menuentry 'Ubuntu, with Linux 3.13.0-44-generic (recovery mode)' --class ubuntu --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-3.13.0-44-generic-recovery-c7a4b4ca-71da-4d03-b374-a6b76ebcfc90' { + load_video + insmod gzio + insmod part_msdos + insmod ext2 + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + else + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + fi + echo 'Loading Linux 3.13.0-44-generic ...' + linux /vmlinuz-3.13.0-44-generic root=/dev/mapper/BoxenSys00-root ro recovery nomodeset biosdevname=0 + echo 'Loading initial ramdisk ...' + initrd /initrd.img-3.13.0-44-generic + } +} + +### END /etc/grub.d/10_linux ### + +### BEGIN /etc/grub.d/20_linux_xen ### + +### END /etc/grub.d/20_linux_xen ### + +### BEGIN /etc/grub.d/20_memtest86+ ### +menuentry 'Memory test (memtest86+)' { + insmod part_msdos + insmod ext2 + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + else + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + fi + knetbsd /memtest86+.elf +} +menuentry 'Memory test (memtest86+, serial console 115200)' { + insmod part_msdos + insmod ext2 + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + else + search --no-floppy --fs-uuid --set=root 86ba9198-4319-4809-908d-6dbe6938b19a + fi + linux16 /memtest86+.bin console=ttyS0,115200n8 +} +### END /etc/grub.d/20_memtest86+ ### + +### BEGIN /etc/grub.d/30_os-prober ### +### END /etc/grub.d/30_os-prober ### + +### BEGIN /etc/grub.d/30_uefi-firmware ### +### END /etc/grub.d/30_uefi-firmware ### + +### BEGIN /etc/grub.d/40_custom ### +# This file provides an easy way to add custom menu entries. Simply type the +# menu entries you want to add after this comment. Be careful not to change +# the 'exec tail' line above. +set superusers="root" +password_pbkdf2 root grub.pbkdf2.sha512. +### END /etc/grub.d/40_custom ### + +### BEGIN /etc/grub.d/40_custom.bakPW ### +# This file provides an easy way to add custom menu entries. Simply type the +# menu entries you want to add after this comment. Be careful not to change +# the 'exec tail' line above. +set superusers="root" +password_pbkdf2 root dummy +### END /etc/grub.d/40_custom.bakPW ### + +### BEGIN /etc/grub.d/41_custom ### +if [ -f ${config_directory}/custom.cfg ]; then + source ${config_directory}/custom.cfg +elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then + source $prefix/custom.cfg; +fi +### END /etc/grub.d/41_custom ### -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:19:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:19: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 1YTqHo-0002cY-B1; Fri, 06 Mar 2015 11:19:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHn-0002cK-5f for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:19 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 9B/B1-02885-63D89F45; Fri, 06 Mar 2015 11:19:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1425640756!13739144!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7388 invoked from network); 6 Mar 2015 11:19:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:19:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHk-0006F2-NJ for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqHk-0001qF-Lw for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:16 +0000 Date: Fri, 06 Mar 2015 11:19:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: Add OVMF maintainers. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 713559895bd0b5bf8734c0cb59558966155621e1 Author: Anthony PERARD AuthorDate: Fri Feb 27 16:49:18 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 14:11:08 2015 +0000 MAINTAINERS: Add OVMF maintainers. Signed-off-by: Anthony PERARD Acked-by: Wei Liu Acked-by: Ian Campbell --- MAINTAINERS | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 3ca757d..0f04742 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -237,6 +237,12 @@ M: David Scott S: Supported F: tools/ocaml/ +OVMF UPSTREAM +M: Anthony PERARD +M: Wei Liu +S: Supported +T: git git://xenbits.xen.org/ovmf.git + POWER MANAGEMENT M: Jan Beulich M: Liu Jinsong -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:19:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:19: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 1YTqHo-0002cY-B1; Fri, 06 Mar 2015 11:19:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHn-0002cK-5f for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:19 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 9B/B1-02885-63D89F45; Fri, 06 Mar 2015 11:19:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1425640756!13739144!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7388 invoked from network); 6 Mar 2015 11:19:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:19:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHk-0006F2-NJ for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqHk-0001qF-Lw for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:16 +0000 Date: Fri, 06 Mar 2015 11:19:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: Add OVMF maintainers. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 713559895bd0b5bf8734c0cb59558966155621e1 Author: Anthony PERARD AuthorDate: Fri Feb 27 16:49:18 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 14:11:08 2015 +0000 MAINTAINERS: Add OVMF maintainers. Signed-off-by: Anthony PERARD Acked-by: Wei Liu Acked-by: Ian Campbell --- MAINTAINERS | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 3ca757d..0f04742 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -237,6 +237,12 @@ M: David Scott S: Supported F: tools/ocaml/ +OVMF UPSTREAM +M: Anthony PERARD +M: Wei Liu +S: Supported +T: git git://xenbits.xen.org/ovmf.git + POWER MANAGEMENT M: Jan Beulich M: Liu Jinsong -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:19:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:19: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 1YTqHy-0002eX-Dy; Fri, 06 Mar 2015 11:19:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHx-0002eH-HH for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:29 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id A2/11-03710-04D89F45; Fri, 06 Mar 2015 11:19:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1425640767!13739220!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9141 invoked from network); 6 Mar 2015 11:19:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:19:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHu-0006F8-RI for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqHu-0001qe-QS for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:26 +0000 Date: Fri, 06 Mar 2015 11:19:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xenconsoled: Increase file descriptor limit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 588df84c0d702e835e526ecef3af6c5444857558 Author: Andrew Cooper AuthorDate: Mon Mar 2 15:04:37 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 16:26:47 2015 +0000 tools/xenconsoled: Increase file descriptor limit XenServer's VM density testing uncovered a regression when moving from sysvinit to systemd where the file descriptor limit dropped from 4096 to 1024. (XenServer had previously inserted a ulimit statement into its initscripts.) One solution is to use LimitNOFILE=4096 in xenconsoled.service to match the lost ulimit, but that is only a stopgap solution. As Xenconsoled genuinely needs a large number of file descriptors if a large number of domains are running, attempt to increase the limit. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- tools/console/daemon/main.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c index 92d2fc4..11de5c9 100644 --- a/tools/console/daemon/main.c +++ b/tools/console/daemon/main.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "xenctrl.h" @@ -55,6 +56,41 @@ static void version(char *name) printf("Xen Console Daemon 3.0\n"); } +static void increase_fd_limit(void) +{ + /* + * We require many file descriptors: + * - per domain: pty master, pty slave, logfile and evtchn + * - misc extra: hypervisor log, privcmd, gntdev, std... + * + * Allow a generous 1000 for misc, and calculate the maximum possible + * number of fds which could be used. + */ + unsigned min_fds = (DOMID_FIRST_RESERVED * 4) + 1000; + struct rlimit lim, new = { min_fds, min_fds }; + + if (getrlimit(RLIMIT_NOFILE, &lim) < 0) { + fprintf(stderr, "Failed to obtain fd limit: %s\n", + strerror(errno)); + exit(1); + } + + /* Do we already have sufficient? Great! */ + if (lim.rlim_cur >= min_fds) + return; + + /* Try to increase our limit. */ + if (setrlimit(RLIMIT_NOFILE, &new) < 0) + syslog(LOG_WARNING, + "Unable to increase fd limit from {%llu, %llu} to " + "{%llu, %llu}: (%s) - May run out with lots of domains", + (unsigned long long)lim.rlim_cur, + (unsigned long long)lim.rlim_max, + (unsigned long long)new.rlim_cur, + (unsigned long long)new.rlim_max, + strerror(errno)); +} + int main(int argc, char **argv) { const char *sopts = "hVvit:o:"; @@ -154,6 +190,8 @@ int main(int argc, char **argv) openlog("xenconsoled", syslog_option, LOG_DAEMON); setlogmask(syslog_mask); + increase_fd_limit(); + if (!is_interactive) { daemonize(pidfile ? pidfile : "/var/run/xenconsoled.pid"); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:19:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:19: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 1YTqHy-0002eX-Dy; Fri, 06 Mar 2015 11:19:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHx-0002eH-HH for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:29 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id A2/11-03710-04D89F45; Fri, 06 Mar 2015 11:19:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1425640767!13739220!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9141 invoked from network); 6 Mar 2015 11:19:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:19:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqHu-0006F8-RI for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqHu-0001qe-QS for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:26 +0000 Date: Fri, 06 Mar 2015 11:19:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xenconsoled: Increase file descriptor limit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 588df84c0d702e835e526ecef3af6c5444857558 Author: Andrew Cooper AuthorDate: Mon Mar 2 15:04:37 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 16:26:47 2015 +0000 tools/xenconsoled: Increase file descriptor limit XenServer's VM density testing uncovered a regression when moving from sysvinit to systemd where the file descriptor limit dropped from 4096 to 1024. (XenServer had previously inserted a ulimit statement into its initscripts.) One solution is to use LimitNOFILE=4096 in xenconsoled.service to match the lost ulimit, but that is only a stopgap solution. As Xenconsoled genuinely needs a large number of file descriptors if a large number of domains are running, attempt to increase the limit. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- tools/console/daemon/main.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c index 92d2fc4..11de5c9 100644 --- a/tools/console/daemon/main.c +++ b/tools/console/daemon/main.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "xenctrl.h" @@ -55,6 +56,41 @@ static void version(char *name) printf("Xen Console Daemon 3.0\n"); } +static void increase_fd_limit(void) +{ + /* + * We require many file descriptors: + * - per domain: pty master, pty slave, logfile and evtchn + * - misc extra: hypervisor log, privcmd, gntdev, std... + * + * Allow a generous 1000 for misc, and calculate the maximum possible + * number of fds which could be used. + */ + unsigned min_fds = (DOMID_FIRST_RESERVED * 4) + 1000; + struct rlimit lim, new = { min_fds, min_fds }; + + if (getrlimit(RLIMIT_NOFILE, &lim) < 0) { + fprintf(stderr, "Failed to obtain fd limit: %s\n", + strerror(errno)); + exit(1); + } + + /* Do we already have sufficient? Great! */ + if (lim.rlim_cur >= min_fds) + return; + + /* Try to increase our limit. */ + if (setrlimit(RLIMIT_NOFILE, &new) < 0) + syslog(LOG_WARNING, + "Unable to increase fd limit from {%llu, %llu} to " + "{%llu, %llu}: (%s) - May run out with lots of domains", + (unsigned long long)lim.rlim_cur, + (unsigned long long)lim.rlim_max, + (unsigned long long)new.rlim_cur, + (unsigned long long)new.rlim_max, + strerror(errno)); +} + int main(int argc, char **argv) { const char *sopts = "hVvit:o:"; @@ -154,6 +190,8 @@ int main(int argc, char **argv) openlog("xenconsoled", syslog_option, LOG_DAEMON); setlogmask(syslog_mask); + increase_fd_limit(); + if (!is_interactive) { daemonize(pidfile ? pidfile : "/var/run/xenconsoled.pid"); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:19:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:19: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 1YTqI8-0002gt-HK; Fri, 06 Mar 2015 11:19:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqI7-0002gV-BX for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:39 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 7F/48-02809-A4D89F45; Fri, 06 Mar 2015 11:19:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1425640777!10637373!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2432 invoked from network); 6 Mar 2015 11:19:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:19:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqI5-0006FG-0C for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqI4-0001rA-VB for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:36 +0000 Date: Fri, 06 Mar 2015 11:19:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] stubdom: fix make clean and distclean on a freshly cloned tree X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed6dd1db77960c59780399e0b305c1b50ca6f02c Author: Wei Liu AuthorDate: Mon Mar 2 15:05:43 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 16:27:38 2015 +0000 stubdom: fix make clean and distclean on a freshly cloned tree Clean and distclean targets need not depend on existence of the mini-os tree. Don't check for mini-os and don't try to blindly include mini-os's Config.mk when doing clean and distclean. Note that one subtle issue is that $(XEN_ROOT)/Config.mk tries to include $(XEN_ROOT)/config/$(XEN_OS).mk. In stubdom's case XEN_OS is "MiniOS". Then $(XEN_ROOT)/config/MiniOS.mk tries to include mini-os's Config.mk. Since clean and distclean don't enforce existence of mini-os tree, don't include $(XEN_ROOT)/Config.mk to avoid getting error due to the aforementioned issue. Reported-by: Sander Eikelenboom Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Stefano Stabellini Cc: Samuel Thibault Acked-by: Ian Campbell --- stubdom/Makefile | 13 ++++++++----- stubdom/c/Makefile | 2 ++ stubdom/caml/Makefile | 2 ++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index 1a1f263..f339b20 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -1,15 +1,18 @@ XEN_ROOT = $(CURDIR)/.. MINI_OS = $(XEN_ROOT)/extras/mini-os -ifeq ($(wildcard $(MINI_OS)/Config.mk),) -$(error Please run `make mini-os-dir' in top-level directory) -endif - export XEN_OS=MiniOS export stubdom=y export debug=y -include $(XEN_ROOT)/Config.mk + +ifeq (,$(findstring clean,$(MAKECMDGOALS))) + ifeq ($(wildcard $(MINI_OS)/Config.mk),) + $(error Please run `make mini-os-dir' in top-level directory) + endif + include $(XEN_ROOT)/Config.mk +endif + -include $(XEN_ROOT)/config/Stubdom.mk GNU_TARGET_ARCH:=$(XEN_TARGET_ARCH) diff --git a/stubdom/c/Makefile b/stubdom/c/Makefile index c646c26..b252dca 100644 --- a/stubdom/c/Makefile +++ b/stubdom/c/Makefile @@ -1,6 +1,8 @@ XEN_ROOT = $(CURDIR)/../.. +ifeq (,$(findstring clean,$(MAKECMDGOALS))) include $(XEN_ROOT)/Config.mk +endif all: main.a diff --git a/stubdom/caml/Makefile b/stubdom/caml/Makefile index e79c98d..f550de1 100644 --- a/stubdom/caml/Makefile +++ b/stubdom/caml/Makefile @@ -1,6 +1,8 @@ XEN_ROOT = $(CURDIR)/../.. +ifeq (,$(findstring clean,$(MAKECMDGOALS))) include $(XEN_ROOT)/Config.mk +endif CAMLLIB = $(shell $(OCAMLC_CROSS_PREFIX)ocamlc -where) DEF_CPPFLAGS += -I$(CAMLLIB) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:19:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:19: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 1YTqI8-0002gt-HK; Fri, 06 Mar 2015 11:19:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqI7-0002gV-BX for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:39 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 7F/48-02809-A4D89F45; Fri, 06 Mar 2015 11:19:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1425640777!10637373!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2432 invoked from network); 6 Mar 2015 11:19:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:19:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqI5-0006FG-0C for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqI4-0001rA-VB for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:36 +0000 Date: Fri, 06 Mar 2015 11:19:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] stubdom: fix make clean and distclean on a freshly cloned tree X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed6dd1db77960c59780399e0b305c1b50ca6f02c Author: Wei Liu AuthorDate: Mon Mar 2 15:05:43 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 16:27:38 2015 +0000 stubdom: fix make clean and distclean on a freshly cloned tree Clean and distclean targets need not depend on existence of the mini-os tree. Don't check for mini-os and don't try to blindly include mini-os's Config.mk when doing clean and distclean. Note that one subtle issue is that $(XEN_ROOT)/Config.mk tries to include $(XEN_ROOT)/config/$(XEN_OS).mk. In stubdom's case XEN_OS is "MiniOS". Then $(XEN_ROOT)/config/MiniOS.mk tries to include mini-os's Config.mk. Since clean and distclean don't enforce existence of mini-os tree, don't include $(XEN_ROOT)/Config.mk to avoid getting error due to the aforementioned issue. Reported-by: Sander Eikelenboom Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Stefano Stabellini Cc: Samuel Thibault Acked-by: Ian Campbell --- stubdom/Makefile | 13 ++++++++----- stubdom/c/Makefile | 2 ++ stubdom/caml/Makefile | 2 ++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index 1a1f263..f339b20 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -1,15 +1,18 @@ XEN_ROOT = $(CURDIR)/.. MINI_OS = $(XEN_ROOT)/extras/mini-os -ifeq ($(wildcard $(MINI_OS)/Config.mk),) -$(error Please run `make mini-os-dir' in top-level directory) -endif - export XEN_OS=MiniOS export stubdom=y export debug=y -include $(XEN_ROOT)/Config.mk + +ifeq (,$(findstring clean,$(MAKECMDGOALS))) + ifeq ($(wildcard $(MINI_OS)/Config.mk),) + $(error Please run `make mini-os-dir' in top-level directory) + endif + include $(XEN_ROOT)/Config.mk +endif + -include $(XEN_ROOT)/config/Stubdom.mk GNU_TARGET_ARCH:=$(XEN_TARGET_ARCH) diff --git a/stubdom/c/Makefile b/stubdom/c/Makefile index c646c26..b252dca 100644 --- a/stubdom/c/Makefile +++ b/stubdom/c/Makefile @@ -1,6 +1,8 @@ XEN_ROOT = $(CURDIR)/../.. +ifeq (,$(findstring clean,$(MAKECMDGOALS))) include $(XEN_ROOT)/Config.mk +endif all: main.a diff --git a/stubdom/caml/Makefile b/stubdom/caml/Makefile index e79c98d..f550de1 100644 --- a/stubdom/caml/Makefile +++ b/stubdom/caml/Makefile @@ -1,6 +1,8 @@ XEN_ROOT = $(CURDIR)/../.. +ifeq (,$(findstring clean,$(MAKECMDGOALS))) include $(XEN_ROOT)/Config.mk +endif CAMLLIB = $(shell $(OCAMLC_CROSS_PREFIX)ocamlc -where) DEF_CPPFLAGS += -I$(CAMLLIB) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:19:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:19: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 1YTqIJ-0002iy-K5; Fri, 06 Mar 2015 11:19:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIH-0002ih-St for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:49 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id D3/10-02753-55D89F45; Fri, 06 Mar 2015 11:19:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1425640787!15214415!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3595 invoked from network); 6 Mar 2015 11:19:48 -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; 6 Mar 2015 11:19:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIF-0006FM-4z for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqIF-0001rW-3g for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:47 +0000 Date: Fri, 06 Mar 2015 11:19:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl_set_memory_target: retain the same maxmem offset on top of the current target X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0c029c4da2169159064568ef4fea862a5d2cd84a Author: Stefano Stabellini AuthorDate: Mon Mar 2 15:35:15 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 16:28:23 2015 +0000 libxl_set_memory_target: retain the same maxmem offset on top of the current target In libxl_set_memory_target when setting the new maxmem, retain the same offset on top of the current target. In the future the offset will include memory allocated by QEMU for rom files. Signed-off-by: Stefano Stabellini Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index a68f6ef..a085621 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4676,11 +4676,16 @@ int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, uint32_t current_max_memkb = 0; char *memmax, *endptr, *videoram_s = NULL, *target = NULL; char *dompath = libxl__xs_get_dompath(gc, domid); - xc_domaininfo_t info; libxl_dominfo ptr; char *uuid; xs_transaction_t t; + libxl_dominfo_init(&ptr); + if (libxl_domain_info(ctx, &ptr, domid) < 0) + goto out_no_transaction; + + uuid = libxl__uuid2string(gc, ptr.uuid); + retry_transaction: t = xs_transaction_start(ctx->xsh); @@ -4756,13 +4761,12 @@ retry_transaction: } if (enforce) { - memorykb = new_target_memkb + videoram; - rc = xc_domain_setmaxmem(ctx->xch, domid, memorykb + - LIBXL_MAXMEM_CONSTANT); + memorykb = ptr.max_memkb - current_target_memkb + new_target_memkb; + 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 " - "rc=%d\n", domid, memorykb + LIBXL_MAXMEM_CONSTANT, rc); + "rc=%d\n", domid, memorykb, rc); abort_transaction = 1; goto out; } @@ -4781,18 +4785,9 @@ retry_transaction: libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/memory/target", dompath), "%"PRIu32, new_target_memkb); - rc = xc_domain_getinfolist(ctx->xch, domid, 1, &info); - if (rc != 1 || info.domain != domid) { - abort_transaction = 1; - goto out; - } - libxl_dominfo_init(&ptr); - xcinfo2xlinfo(ctx, &info, &ptr); - uuid = libxl__uuid2string(gc, ptr.uuid); libxl__xs_write(gc, t, libxl__sprintf(gc, "/vm/%s/memory", uuid), "%"PRIu32, new_target_memkb / 1024); - libxl_dominfo_dispose(&ptr); out: if (!xs_transaction_end(ctx->xsh, t, abort_transaction) @@ -4801,6 +4796,7 @@ out: goto retry_transaction; out_no_transaction: + libxl_dominfo_dispose(&ptr); GC_FREE; return 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 Mar 06 11:19:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:19: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 1YTqIJ-0002iy-K5; Fri, 06 Mar 2015 11:19:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIH-0002ih-St for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:49 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id D3/10-02753-55D89F45; Fri, 06 Mar 2015 11:19:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1425640787!15214415!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3595 invoked from network); 6 Mar 2015 11:19:48 -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; 6 Mar 2015 11:19:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIF-0006FM-4z for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqIF-0001rW-3g for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:47 +0000 Date: Fri, 06 Mar 2015 11:19:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl_set_memory_target: retain the same maxmem offset on top of the current target X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0c029c4da2169159064568ef4fea862a5d2cd84a Author: Stefano Stabellini AuthorDate: Mon Mar 2 15:35:15 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 16:28:23 2015 +0000 libxl_set_memory_target: retain the same maxmem offset on top of the current target In libxl_set_memory_target when setting the new maxmem, retain the same offset on top of the current target. In the future the offset will include memory allocated by QEMU for rom files. Signed-off-by: Stefano Stabellini Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index a68f6ef..a085621 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4676,11 +4676,16 @@ int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, uint32_t current_max_memkb = 0; char *memmax, *endptr, *videoram_s = NULL, *target = NULL; char *dompath = libxl__xs_get_dompath(gc, domid); - xc_domaininfo_t info; libxl_dominfo ptr; char *uuid; xs_transaction_t t; + libxl_dominfo_init(&ptr); + if (libxl_domain_info(ctx, &ptr, domid) < 0) + goto out_no_transaction; + + uuid = libxl__uuid2string(gc, ptr.uuid); + retry_transaction: t = xs_transaction_start(ctx->xsh); @@ -4756,13 +4761,12 @@ retry_transaction: } if (enforce) { - memorykb = new_target_memkb + videoram; - rc = xc_domain_setmaxmem(ctx->xch, domid, memorykb + - LIBXL_MAXMEM_CONSTANT); + memorykb = ptr.max_memkb - current_target_memkb + new_target_memkb; + 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 " - "rc=%d\n", domid, memorykb + LIBXL_MAXMEM_CONSTANT, rc); + "rc=%d\n", domid, memorykb, rc); abort_transaction = 1; goto out; } @@ -4781,18 +4785,9 @@ retry_transaction: libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/memory/target", dompath), "%"PRIu32, new_target_memkb); - rc = xc_domain_getinfolist(ctx->xch, domid, 1, &info); - if (rc != 1 || info.domain != domid) { - abort_transaction = 1; - goto out; - } - libxl_dominfo_init(&ptr); - xcinfo2xlinfo(ctx, &info, &ptr); - uuid = libxl__uuid2string(gc, ptr.uuid); libxl__xs_write(gc, t, libxl__sprintf(gc, "/vm/%s/memory", uuid), "%"PRIu32, new_target_memkb / 1024); - libxl_dominfo_dispose(&ptr); out: if (!xs_transaction_end(ctx->xsh, t, abort_transaction) @@ -4801,6 +4796,7 @@ out: goto retry_transaction; out_no_transaction: + libxl_dominfo_dispose(&ptr); GC_FREE; return 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 Mar 06 11:20:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:20: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 1YTqIS-0002ku-Mn; Fri, 06 Mar 2015 11:20:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIR-0002kg-JN for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:59 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 17/7E-03172-E5D89F45; Fri, 06 Mar 2015 11:19:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1425640797!15261020!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24262 invoked from network); 6 Mar 2015 11:19:58 -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; 6 Mar 2015 11:19:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIP-0006FV-AB for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqIP-0001rs-9N for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:57 +0000 Date: Fri, 06 Mar 2015 11:19:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Assume level triggered means high, not low. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3bcf563fec26378f7f4cf1e2ad0d4d5b3f341919 Author: Ian Campbell AuthorDate: Mon Mar 2 11:09:35 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 16:30:02 2015 +0000 xen: arm: Assume level triggered means high, not low. When reading back the ICFG register we cannot know the polarity of the configuration, just that it is level or edge. Since falling edge and low level are invalid for SPIs we should assume rising edge and high level (we have no better information for PPIs, so it'll have to do). We already assumed rising edge, switch to high level as well. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/gic-v2.c | 2 +- xen/arch/arm/gic-v3.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 3e141c4..20cdbc9 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -240,7 +240,7 @@ static void gicv2_set_irq_properties(struct irq_desc *desc, actual & edgebit ? "Edge" : "Level"); desc->arch.type = actual & edgebit ? DT_IRQ_TYPE_EDGE_RISING : - DT_IRQ_TYPE_LEVEL_LOW; + DT_IRQ_TYPE_LEVEL_HIGH; } /* Set target CPU mask (RAZ/WI on uniprocessor) */ diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 66cc2a2..ab80670 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -504,7 +504,7 @@ static void gicv3_set_irq_properties(struct irq_desc *desc, actual & edgebit ? "Edge" : "Level"); desc->arch.type = actual & edgebit ? DT_IRQ_TYPE_EDGE_RISING : - DT_IRQ_TYPE_LEVEL_LOW; + DT_IRQ_TYPE_LEVEL_HIGH; } affinity = gicv3_mpidr_to_affinity(cpu); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:20:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:20: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 1YTqIS-0002ku-Mn; Fri, 06 Mar 2015 11:20:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIR-0002kg-JN for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:59 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 17/7E-03172-E5D89F45; Fri, 06 Mar 2015 11:19:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1425640797!15261020!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24262 invoked from network); 6 Mar 2015 11:19:58 -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; 6 Mar 2015 11:19:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIP-0006FV-AB for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqIP-0001rs-9N for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:19:57 +0000 Date: Fri, 06 Mar 2015 11:19:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Assume level triggered means high, not low. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3bcf563fec26378f7f4cf1e2ad0d4d5b3f341919 Author: Ian Campbell AuthorDate: Mon Mar 2 11:09:35 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 16:30:02 2015 +0000 xen: arm: Assume level triggered means high, not low. When reading back the ICFG register we cannot know the polarity of the configuration, just that it is level or edge. Since falling edge and low level are invalid for SPIs we should assume rising edge and high level (we have no better information for PPIs, so it'll have to do). We already assumed rising edge, switch to high level as well. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/gic-v2.c | 2 +- xen/arch/arm/gic-v3.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 3e141c4..20cdbc9 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -240,7 +240,7 @@ static void gicv2_set_irq_properties(struct irq_desc *desc, actual & edgebit ? "Edge" : "Level"); desc->arch.type = actual & edgebit ? DT_IRQ_TYPE_EDGE_RISING : - DT_IRQ_TYPE_LEVEL_LOW; + DT_IRQ_TYPE_LEVEL_HIGH; } /* Set target CPU mask (RAZ/WI on uniprocessor) */ diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 66cc2a2..ab80670 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -504,7 +504,7 @@ static void gicv3_set_irq_properties(struct irq_desc *desc, actual & edgebit ? "Edge" : "Level"); desc->arch.type = actual & edgebit ? DT_IRQ_TYPE_EDGE_RISING : - DT_IRQ_TYPE_LEVEL_LOW; + DT_IRQ_TYPE_LEVEL_HIGH; } affinity = gicv3_mpidr_to_affinity(cpu); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:20:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:20: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 1YTqId-0002n6-PO; Fri, 06 Mar 2015 11:20:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIc-0002mk-9e for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:10 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 65/B1-02994-96D89F45; Fri, 06 Mar 2015 11:20:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1425640807!13496914!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24872 invoked from network); 6 Mar 2015 11:20:08 -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; 6 Mar 2015 11:20:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIZ-0006G1-ER for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqIZ-0001t3-DX for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:07 +0000 Date: Fri, 06 Mar 2015 11:20:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/iommu: smmu: Advertise when the SMMU support coherent table walk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 080dcb781e1bc3bb22f55a9dfdecb830ccbabe88 Author: Julien Grall AuthorDate: Mon Mar 2 15:42:43 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 16:42:56 2015 +0000 xen/iommu: smmu: Advertise when the SMMU support coherent table walk When SMMU doesn't support coherent table walk, Xen may need to clean updated PT (see commit 4c5f4cb "xen/arm: p2m: Clean cache PT when the IOMMU doesn't support coherent walk"). If one SMMU of the platform doesn't support coherent table walk, the feature is disabled for the whole platform. This is because device is assigned to a domain after the page table are populated. This could impact performance on domain which doesn't use device passthrough. But, as the spec strongly recommends the support of this feature for mainstream platform, I expect server will always have SMMUs supporting coherent table walk. If not, we may need to enable this feature per-domain. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/drivers/passthrough/arm/smmu.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index 7675767..a7a7da9 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -2531,6 +2531,13 @@ MODULE_LICENSE("GPL v2"); /* Xen only supports stage-2 translation, so force the value to 2. */ static int force_stage = 2; +/* + * Platform features. It indicates the list of features supported by all + * SMMUs. + * Actually we only care about coherent table walk. + */ +static u32 platform_features = ARM_SMMU_FEAT_COHERENT_WALK; + static void arm_smmu_iotlb_flush_all(struct domain *d) { struct arm_smmu_xen_domain *smmu_domain = domain_hvm_iommu(d)->arch.priv; @@ -2668,6 +2675,10 @@ static int arm_smmu_iommu_domain_init(struct domain *d) domain_hvm_iommu(d)->arch.priv = xen_domain; + /* Coherent walk can be enabled only when all SMMUs support it. */ + if (platform_features & ARM_SMMU_FEAT_COHERENT_WALK) + iommu_set_feature(d, IOMMU_FEAT_COHERENT_WALK); + return 0; } @@ -2738,10 +2749,28 @@ static const struct iommu_ops arm_smmu_iommu_ops = { .unmap_page = arm_smmu_unmap_page, }; +static __init const struct arm_smmu_device *find_smmu(const struct device *dev) +{ + struct arm_smmu_device *smmu; + bool found = false; + + spin_lock(&arm_smmu_devices_lock); + list_for_each_entry(smmu, &arm_smmu_devices, list) { + if (smmu->dev == dev) { + found = true; + break; + } + } + spin_unlock(&arm_smmu_devices_lock); + + return (found) ? smmu : NULL; +} + static __init int arm_smmu_dt_init(struct dt_device_node *dev, const void *data) { int rc; + const struct arm_smmu_device *smmu; /* * Even if the device can't be initialized, we don't want to @@ -2755,6 +2784,12 @@ static __init int arm_smmu_dt_init(struct dt_device_node *dev, iommu_set_ops(&arm_smmu_iommu_ops); + /* Find the last SMMU added and retrieve its features. */ + smmu = find_smmu(dt_to_dev(dev)); + BUG_ON(smmu == NULL); + + platform_features &= smmu->features; + 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 Fri Mar 06 11:20:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:20: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 1YTqId-0002n6-PO; Fri, 06 Mar 2015 11:20:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIc-0002mk-9e for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:10 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 65/B1-02994-96D89F45; Fri, 06 Mar 2015 11:20:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1425640807!13496914!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24872 invoked from network); 6 Mar 2015 11:20:08 -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; 6 Mar 2015 11:20:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIZ-0006G1-ER for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqIZ-0001t3-DX for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:07 +0000 Date: Fri, 06 Mar 2015 11:20:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/iommu: smmu: Advertise when the SMMU support coherent table walk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 080dcb781e1bc3bb22f55a9dfdecb830ccbabe88 Author: Julien Grall AuthorDate: Mon Mar 2 15:42:43 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 16:42:56 2015 +0000 xen/iommu: smmu: Advertise when the SMMU support coherent table walk When SMMU doesn't support coherent table walk, Xen may need to clean updated PT (see commit 4c5f4cb "xen/arm: p2m: Clean cache PT when the IOMMU doesn't support coherent walk"). If one SMMU of the platform doesn't support coherent table walk, the feature is disabled for the whole platform. This is because device is assigned to a domain after the page table are populated. This could impact performance on domain which doesn't use device passthrough. But, as the spec strongly recommends the support of this feature for mainstream platform, I expect server will always have SMMUs supporting coherent table walk. If not, we may need to enable this feature per-domain. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/drivers/passthrough/arm/smmu.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index 7675767..a7a7da9 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -2531,6 +2531,13 @@ MODULE_LICENSE("GPL v2"); /* Xen only supports stage-2 translation, so force the value to 2. */ static int force_stage = 2; +/* + * Platform features. It indicates the list of features supported by all + * SMMUs. + * Actually we only care about coherent table walk. + */ +static u32 platform_features = ARM_SMMU_FEAT_COHERENT_WALK; + static void arm_smmu_iotlb_flush_all(struct domain *d) { struct arm_smmu_xen_domain *smmu_domain = domain_hvm_iommu(d)->arch.priv; @@ -2668,6 +2675,10 @@ static int arm_smmu_iommu_domain_init(struct domain *d) domain_hvm_iommu(d)->arch.priv = xen_domain; + /* Coherent walk can be enabled only when all SMMUs support it. */ + if (platform_features & ARM_SMMU_FEAT_COHERENT_WALK) + iommu_set_feature(d, IOMMU_FEAT_COHERENT_WALK); + return 0; } @@ -2738,10 +2749,28 @@ static const struct iommu_ops arm_smmu_iommu_ops = { .unmap_page = arm_smmu_unmap_page, }; +static __init const struct arm_smmu_device *find_smmu(const struct device *dev) +{ + struct arm_smmu_device *smmu; + bool found = false; + + spin_lock(&arm_smmu_devices_lock); + list_for_each_entry(smmu, &arm_smmu_devices, list) { + if (smmu->dev == dev) { + found = true; + break; + } + } + spin_unlock(&arm_smmu_devices_lock); + + return (found) ? smmu : NULL; +} + static __init int arm_smmu_dt_init(struct dt_device_node *dev, const void *data) { int rc; + const struct arm_smmu_device *smmu; /* * Even if the device can't be initialized, we don't want to @@ -2755,6 +2784,12 @@ static __init int arm_smmu_dt_init(struct dt_device_node *dev, iommu_set_ops(&arm_smmu_iommu_ops); + /* Find the last SMMU added and retrieve its features. */ + smmu = find_smmu(dt_to_dev(dev)); + BUG_ON(smmu == NULL); + + platform_features &= smmu->features; + 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 Fri Mar 06 11:20:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:20: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 1YTqIn-0002p3-S0; Fri, 06 Mar 2015 11:20:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIl-0002oc-Te for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:20 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 1A/FD-03168-37D89F45; Fri, 06 Mar 2015 11:20:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1425640817!15217482!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2606 invoked from network); 6 Mar 2015 11:20:18 -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; 6 Mar 2015 11:20:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIj-0006GA-K1 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqIj-0001uK-Ia for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:17 +0000 Date: Fri, 06 Mar 2015 11:20:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: timer: Don't warn if the timer interrupts are high-level X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d4b67cfd8433fa5c515fe9134737c1348758a222 Author: Julien Grall AuthorDate: Mon Mar 2 15:54:57 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 17:02:12 2015 +0000 xen/arm: timer: Don't warn if the timer interrupts are high-level The commit 61d6a84 "xen: arm: Warn if timer interrupts are not level triggered" added a check to ensure the timer interrupts are level. Although, the check is only done on low-level interrupts. This will result to a strange warning on platform using high-level ("WARNING [..] IRQ is not level triggered"). As high-level interrupt is valid, don't warn on both high-level and low-level interrupt. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 8977cce..352e25e 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -217,7 +217,7 @@ static void check_timer_irq_cfg(unsigned int irq, const char *which) * The interrupt controller driver will update desc->arch.type with * the actual type which ended up configured in the hardware. */ - if ( desc->arch.type & DT_IRQ_TYPE_LEVEL_LOW ) + if ( desc->arch.type & DT_IRQ_TYPE_LEVEL_MASK ) return; printk(XENLOG_WARNING -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:20:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:20: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 1YTqIn-0002p3-S0; Fri, 06 Mar 2015 11:20:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIl-0002oc-Te for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:20 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 1A/FD-03168-37D89F45; Fri, 06 Mar 2015 11:20:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1425640817!15217482!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2606 invoked from network); 6 Mar 2015 11:20:18 -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; 6 Mar 2015 11:20:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIj-0006GA-K1 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqIj-0001uK-Ia for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:17 +0000 Date: Fri, 06 Mar 2015 11:20:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: timer: Don't warn if the timer interrupts are high-level X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d4b67cfd8433fa5c515fe9134737c1348758a222 Author: Julien Grall AuthorDate: Mon Mar 2 15:54:57 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 17:02:12 2015 +0000 xen/arm: timer: Don't warn if the timer interrupts are high-level The commit 61d6a84 "xen: arm: Warn if timer interrupts are not level triggered" added a check to ensure the timer interrupts are level. Although, the check is only done on low-level interrupts. This will result to a strange warning on platform using high-level ("WARNING [..] IRQ is not level triggered"). As high-level interrupt is valid, don't warn on both high-level and low-level interrupt. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 8977cce..352e25e 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -217,7 +217,7 @@ static void check_timer_irq_cfg(unsigned int irq, const char *which) * The interrupt controller driver will update desc->arch.type with * the actual type which ended up configured in the hardware. */ - if ( desc->arch.type & DT_IRQ_TYPE_LEVEL_LOW ) + if ( desc->arch.type & DT_IRQ_TYPE_LEVEL_MASK ) return; printk(XENLOG_WARNING -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:20:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:20: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 1YTqIz-0002rZ-13; Fri, 06 Mar 2015 11:20:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIx-0002rF-0x for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:31 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 0B/53-03710-E7D89F45; Fri, 06 Mar 2015 11:20:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425640827!13765857!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2716 invoked from network); 6 Mar 2015 11:20:29 -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; 6 Mar 2015 11:20:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIt-0006GI-Os for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqIt-0001us-NX for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:27 +0000 Date: Fri, 06 Mar 2015 11:20:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix off-by-one error in JSON parser X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1391ca3bfa6555deefa3df620e1aa824652329f5 Author: Wei Liu AuthorDate: Wed Feb 25 14:56:00 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 17:05:02 2015 +0000 libxl: fix off-by-one error in JSON parser We need a sentinel slot in the generated libxl_key_value_list. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_json.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c index ceb014a..98335b0 100644 --- a/tools/libxl/libxl_json.c +++ b/tools/libxl/libxl_json.c @@ -247,7 +247,7 @@ int libxl__key_value_list_parse_json(libxl__gc *gc, const libxl__json_object *o, maps = libxl__json_object_get_map(o); size = maps->count * 2; - kvl = *p = libxl__calloc(NOGC, size, sizeof(char *)); + kvl = *p = libxl__calloc(NOGC, size+1, sizeof(char *)); for (i = 0; i < maps->count; i++) { int idx = i * 2; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:20:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:20: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 1YTqIz-0002rZ-13; Fri, 06 Mar 2015 11:20:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIx-0002rF-0x for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:31 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 0B/53-03710-E7D89F45; Fri, 06 Mar 2015 11:20:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425640827!13765857!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2716 invoked from network); 6 Mar 2015 11:20:29 -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; 6 Mar 2015 11:20:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqIt-0006GI-Os for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqIt-0001us-NX for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:27 +0000 Date: Fri, 06 Mar 2015 11:20:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix off-by-one error in JSON parser X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1391ca3bfa6555deefa3df620e1aa824652329f5 Author: Wei Liu AuthorDate: Wed Feb 25 14:56:00 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 17:05:02 2015 +0000 libxl: fix off-by-one error in JSON parser We need a sentinel slot in the generated libxl_key_value_list. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_json.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c index ceb014a..98335b0 100644 --- a/tools/libxl/libxl_json.c +++ b/tools/libxl/libxl_json.c @@ -247,7 +247,7 @@ int libxl__key_value_list_parse_json(libxl__gc *gc, const libxl__json_object *o, maps = libxl__json_object_get_map(o); size = maps->count * 2; - kvl = *p = libxl__calloc(NOGC, size, sizeof(char *)); + kvl = *p = libxl__calloc(NOGC, size+1, sizeof(char *)); for (i = 0; i < maps->count; i++) { int idx = i * 2; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:20:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:20: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 1YTqJ8-0002tT-3h; Fri, 06 Mar 2015 11:20:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJ6-0002t5-RE for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:40 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 8D/59-02896-88D89F45; Fri, 06 Mar 2015 11:20:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1425640838!13708420!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19933 invoked from network); 6 Mar 2015 11:20:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:20:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJ3-0006GO-Td for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqJ3-0001vI-ST for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:37 +0000 Date: Fri, 06 Mar 2015 11:20:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gentest: make testidl valgrind clean X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6d8261111b1c8836b6ce98df205ffc3334340fd7 Author: Wei Liu AuthorDate: Wed Feb 25 14:56:01 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 17:05:03 2015 +0000 gentest: make testidl valgrind clean Free the JSON string after use to avoid memory leak. With this change testidl is valgrind clean. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/gentest.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/libxl/gentest.py b/tools/libxl/gentest.py index 95323d1..849bfc7 100644 --- a/tools/libxl/gentest.py +++ b/tools/libxl/gentest.py @@ -229,7 +229,7 @@ int main(int argc, char **argv) (ty.typename, ty.typename, ty.typename)) f.write(""" int rc; - char *s, *new_s; + char *s, *new_s, *json_string; xentoollog_logger_stdiostream *logger; libxl_ctx *ctx; @@ -323,9 +323,13 @@ int main(int argc, char **argv) f.write(" printf(\"%s -- to JSON:\\n\");\n" % (ty.typename)) for v in ty.values: + f.write(" json_string = %s_to_json(ctx, %s);\n" % \ + (ty.typename, v.name)) f.write(" printf(\"\\t%s = %%d = %%s\", " \ - "%s, %s_to_json(ctx, %s));\n" %\ - (v.valuename, v.name, ty.typename, v.name)) + "%s, json_string);\n" %\ + (v.valuename, v.name)) + f.write(" free(json_string);\n"); + f.write(" json_string = NULL;\n"); f.write("\n") f.write(" printf(\"%s -- from string:\\n\");\n" % (ty.typename)) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:20:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:20: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 1YTqJ8-0002tT-3h; Fri, 06 Mar 2015 11:20:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJ6-0002t5-RE for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:40 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 8D/59-02896-88D89F45; Fri, 06 Mar 2015 11:20:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1425640838!13708420!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19933 invoked from network); 6 Mar 2015 11:20:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Mar 2015 11:20:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJ3-0006GO-Td for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqJ3-0001vI-ST for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:37 +0000 Date: Fri, 06 Mar 2015 11:20:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gentest: make testidl valgrind clean X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6d8261111b1c8836b6ce98df205ffc3334340fd7 Author: Wei Liu AuthorDate: Wed Feb 25 14:56:01 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 17:05:03 2015 +0000 gentest: make testidl valgrind clean Free the JSON string after use to avoid memory leak. With this change testidl is valgrind clean. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/gentest.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/libxl/gentest.py b/tools/libxl/gentest.py index 95323d1..849bfc7 100644 --- a/tools/libxl/gentest.py +++ b/tools/libxl/gentest.py @@ -229,7 +229,7 @@ int main(int argc, char **argv) (ty.typename, ty.typename, ty.typename)) f.write(""" int rc; - char *s, *new_s; + char *s, *new_s, *json_string; xentoollog_logger_stdiostream *logger; libxl_ctx *ctx; @@ -323,9 +323,13 @@ int main(int argc, char **argv) f.write(" printf(\"%s -- to JSON:\\n\");\n" % (ty.typename)) for v in ty.values: + f.write(" json_string = %s_to_json(ctx, %s);\n" % \ + (ty.typename, v.name)) f.write(" printf(\"\\t%s = %%d = %%s\", " \ - "%s, %s_to_json(ctx, %s));\n" %\ - (v.valuename, v.name, ty.typename, v.name)) + "%s, json_string);\n" %\ + (v.valuename, v.name)) + f.write(" free(json_string);\n"); + f.write(" json_string = NULL;\n"); f.write("\n") f.write(" printf(\"%s -- from string:\\n\");\n" % (ty.typename)) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:20:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:20: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 1YTqJH-0002y9-68; Fri, 06 Mar 2015 11:20:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJG-0002wg-JT for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:50 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 7B/83-03712-19D89F45; Fri, 06 Mar 2015 11:20:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1425640848!13515571!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16554 invoked from network); 6 Mar 2015 11:20:49 -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; 6 Mar 2015 11:20:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJE-0006GU-4D for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqJE-0001ve-2i for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:48 +0000 Date: Fri, 06 Mar 2015 11:20:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: make some _dispose functions idempotent and tolerate NULL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ea68f1a82ef94b3cc644fa70307c5151f356baf Author: Wei Liu AuthorDate: Wed Feb 25 14:56:02 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 17:05:35 2015 +0000 libxl: make some _dispose functions idempotent and tolerate NULL These functions are not generated, so we need to do it by hand. Functions list: libxl_bitmap_dispose libxl_string_list_dispose libxl_key_value_list_dipose libxl_cpuid_dispose Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.c | 11 +++++++++-- tools/libxl/libxl_cpuid.c | 5 ++++- tools/libxl/libxl_utils.c | 5 +++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index a085621..088786e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -214,9 +214,12 @@ void libxl_string_list_dispose(libxl_string_list *psl) if (!sl) return; - for (i = 0; sl[i] != NULL; i++) + for (i = 0; sl[i] != NULL; i++) { free(sl[i]); + sl[i] = NULL; + } free(sl); + *psl = NULL; } void libxl_string_list_copy(libxl_ctx *ctx, @@ -276,10 +279,14 @@ void libxl_key_value_list_dispose(libxl_key_value_list *pkvl) for (i = 0; kvl[i] != NULL; i += 2) { free(kvl[i]); - if (kvl[i + 1]) + kvl[i] = NULL; + if (kvl[i + 1]) { free(kvl[i + 1]); + kvl[i+1] = NULL; + } } free(kvl); + *pkvl = NULL; } void libxl_key_value_list_copy(libxl_ctx *ctx, diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c index 7cfa6b7..b0bdc9d 100644 --- a/tools/libxl/libxl_cpuid.c +++ b/tools/libxl/libxl_cpuid.c @@ -28,10 +28,13 @@ void libxl_cpuid_dispose(libxl_cpuid_policy_list *p_cpuid_list) return; for (i = 0; cpuid_list[i].input[0] != XEN_CPUID_INPUT_UNUSED; i++) { for (j = 0; j < 4; j++) - if (cpuid_list[i].policy[j] != NULL) + if (cpuid_list[i].policy[j] != NULL) { free(cpuid_list[i].policy[j]); + cpuid_list[i].policy[j] = NULL; + } } free(cpuid_list); + *p_cpuid_list = NULL; return; } diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 7095b58..9053b27 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -604,7 +604,12 @@ void libxl_bitmap_init(libxl_bitmap *map) void libxl_bitmap_dispose(libxl_bitmap *map) { + if (!map) + return; + free(map->map); + map->map = NULL; + map->size = 0; } void libxl_bitmap_copy(libxl_ctx *ctx, libxl_bitmap *dptr, -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:20:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:20: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 1YTqJH-0002y9-68; Fri, 06 Mar 2015 11:20:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJG-0002wg-JT for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:50 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 7B/83-03712-19D89F45; Fri, 06 Mar 2015 11:20:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1425640848!13515571!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16554 invoked from network); 6 Mar 2015 11:20:49 -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; 6 Mar 2015 11:20:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJE-0006GU-4D for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqJE-0001ve-2i for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:48 +0000 Date: Fri, 06 Mar 2015 11:20:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: make some _dispose functions idempotent and tolerate NULL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ea68f1a82ef94b3cc644fa70307c5151f356baf Author: Wei Liu AuthorDate: Wed Feb 25 14:56:02 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 17:05:35 2015 +0000 libxl: make some _dispose functions idempotent and tolerate NULL These functions are not generated, so we need to do it by hand. Functions list: libxl_bitmap_dispose libxl_string_list_dispose libxl_key_value_list_dipose libxl_cpuid_dispose Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.c | 11 +++++++++-- tools/libxl/libxl_cpuid.c | 5 ++++- tools/libxl/libxl_utils.c | 5 +++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index a085621..088786e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -214,9 +214,12 @@ void libxl_string_list_dispose(libxl_string_list *psl) if (!sl) return; - for (i = 0; sl[i] != NULL; i++) + for (i = 0; sl[i] != NULL; i++) { free(sl[i]); + sl[i] = NULL; + } free(sl); + *psl = NULL; } void libxl_string_list_copy(libxl_ctx *ctx, @@ -276,10 +279,14 @@ void libxl_key_value_list_dispose(libxl_key_value_list *pkvl) for (i = 0; kvl[i] != NULL; i += 2) { free(kvl[i]); - if (kvl[i + 1]) + kvl[i] = NULL; + if (kvl[i + 1]) { free(kvl[i + 1]); + kvl[i+1] = NULL; + } } free(kvl); + *pkvl = NULL; } void libxl_key_value_list_copy(libxl_ctx *ctx, diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c index 7cfa6b7..b0bdc9d 100644 --- a/tools/libxl/libxl_cpuid.c +++ b/tools/libxl/libxl_cpuid.c @@ -28,10 +28,13 @@ void libxl_cpuid_dispose(libxl_cpuid_policy_list *p_cpuid_list) return; for (i = 0; cpuid_list[i].input[0] != XEN_CPUID_INPUT_UNUSED; i++) { for (j = 0; j < 4; j++) - if (cpuid_list[i].policy[j] != NULL) + if (cpuid_list[i].policy[j] != NULL) { free(cpuid_list[i].policy[j]); + cpuid_list[i].policy[j] = NULL; + } } free(cpuid_list); + *p_cpuid_list = NULL; return; } diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 7095b58..9053b27 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -604,7 +604,12 @@ void libxl_bitmap_init(libxl_bitmap *map) void libxl_bitmap_dispose(libxl_bitmap *map) { + if (!map) + return; + free(map->map); + map->map = NULL; + map->size = 0; } void libxl_bitmap_copy(libxl_ctx *ctx, libxl_bitmap *dptr, -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:21:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:21: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 1YTqJS-00032G-9M; Fri, 06 Mar 2015 11:21:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJR-00031D-16 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:01 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 15/51-25903-C9D89F45; Fri, 06 Mar 2015 11:21:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1425640858!5933927!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25050 invoked from network); 6 Mar 2015 11:20:59 -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; 6 Mar 2015 11:20:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJO-0006Gd-CG for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqJO-0001w1-8z for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:58 +0000 Date: Fri, 06 Mar 2015 11:20:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gentypes: zero out structure in _dispose function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0b80baa985b516fb08ca206c69c5905e816cceb Author: Wei Liu AuthorDate: Wed Feb 25 14:56:03 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 17:05:39 2015 +0000 gentypes: zero out structure in _dispose function Original the structure was memset to a poison value. That prevented _dispose to be made idempotent. We should stop doing so. Memseting the structure to 0 makes all pointers in structure become NULL, which can be handled by free(). Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/gentypes.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py index d9e14fd..afd4eea 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -636,7 +636,6 @@ if __name__ == '__main__': #include "libxl_internal.h" -#define LIBXL_DTOR_POISON 0xa5 """ % " ".join(sys.argv)) @@ -644,7 +643,7 @@ if __name__ == '__main__': f.write("void %s(%s)\n" % (ty.dispose_fn, ty.make_arg("p"))) f.write("{\n") f.write(libxl_C_type_dispose(ty, "p")) - f.write(" memset(p, LIBXL_DTOR_POISON, sizeof(*p));\n") + f.write(" memset(p, 0, sizeof(*p));\n") f.write("}\n") f.write("\n") -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:21:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:21: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 1YTqJS-00032G-9M; Fri, 06 Mar 2015 11:21:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJR-00031D-16 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:01 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 15/51-25903-C9D89F45; Fri, 06 Mar 2015 11:21:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1425640858!5933927!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25050 invoked from network); 6 Mar 2015 11:20:59 -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; 6 Mar 2015 11:20:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJO-0006Gd-CG for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqJO-0001w1-8z for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:20:58 +0000 Date: Fri, 06 Mar 2015 11:20:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gentypes: zero out structure in _dispose function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0b80baa985b516fb08ca206c69c5905e816cceb Author: Wei Liu AuthorDate: Wed Feb 25 14:56:03 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 17:05:39 2015 +0000 gentypes: zero out structure in _dispose function Original the structure was memset to a poison value. That prevented _dispose to be made idempotent. We should stop doing so. Memseting the structure to 0 makes all pointers in structure become NULL, which can be handled by free(). Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/gentypes.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py index d9e14fd..afd4eea 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -636,7 +636,6 @@ if __name__ == '__main__': #include "libxl_internal.h" -#define LIBXL_DTOR_POISON 0xa5 """ % " ".join(sys.argv)) @@ -644,7 +643,7 @@ if __name__ == '__main__': f.write("void %s(%s)\n" % (ty.dispose_fn, ty.make_arg("p"))) f.write("{\n") f.write(libxl_C_type_dispose(ty, "p")) - f.write(" memset(p, LIBXL_DTOR_POISON, sizeof(*p));\n") + f.write(" memset(p, 0, sizeof(*p));\n") f.write("}\n") f.write("\n") -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:21:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:21: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 1YTqJe-0003AE-CG; Fri, 06 Mar 2015 11:21:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJd-00038f-6S for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:13 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 41/BB-03164-8AD89F45; Fri, 06 Mar 2015 11:21:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1425640868!13692971!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16965 invoked from network); 6 Mar 2015 11:21:10 -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; 6 Mar 2015 11:21:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJY-0006HC-J4 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqJY-0001wk-Gz for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:08 +0000 Date: Fri, 06 Mar 2015 11:21:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gentypes: make dispose function tolerate NULL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a5dfa16ba4acf1d8994f462b2b8c9ab4c4f147d2 Author: Wei Liu AuthorDate: Wed Feb 25 14:56:04 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 17:05:39 2015 +0000 gentypes: make dispose function tolerate NULL Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/gentypes.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py index afd4eea..00816c0 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -642,6 +642,7 @@ if __name__ == '__main__': for ty in [t for t in types if t.dispose_fn is not None and t.autogenerate_dispose_fn]: f.write("void %s(%s)\n" % (ty.dispose_fn, ty.make_arg("p"))) f.write("{\n") + f.write(" if (!p) return;\n") f.write(libxl_C_type_dispose(ty, "p")) f.write(" memset(p, 0, sizeof(*p));\n") f.write("}\n") -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:21:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:21: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 1YTqJe-0003AE-CG; Fri, 06 Mar 2015 11:21:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJd-00038f-6S for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:13 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 41/BB-03164-8AD89F45; Fri, 06 Mar 2015 11:21:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1425640868!13692971!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16965 invoked from network); 6 Mar 2015 11:21:10 -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; 6 Mar 2015 11:21:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJY-0006HC-J4 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqJY-0001wk-Gz for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:08 +0000 Date: Fri, 06 Mar 2015 11:21:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gentypes: make dispose function tolerate NULL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a5dfa16ba4acf1d8994f462b2b8c9ab4c4f147d2 Author: Wei Liu AuthorDate: Wed Feb 25 14:56:04 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 17:05:39 2015 +0000 gentypes: make dispose function tolerate NULL Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/gentypes.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py index afd4eea..00816c0 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -642,6 +642,7 @@ if __name__ == '__main__': for ty in [t for t in types if t.dispose_fn is not None and t.autogenerate_dispose_fn]: f.write("void %s(%s)\n" % (ty.dispose_fn, ty.make_arg("p"))) f.write("{\n") + f.write(" if (!p) return;\n") f.write(libxl_C_type_dispose(ty, "p")) f.write(" memset(p, 0, sizeof(*p));\n") f.write("}\n") -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:21:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:21: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 1YTqJm-0003E0-F1; Fri, 06 Mar 2015 11:21:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJm-0003Do-0A for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:22 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id A3/5A-02995-1BD89F45; Fri, 06 Mar 2015 11:21:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425640878!13638721!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2676 invoked from network); 6 Mar 2015 11:21:20 -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; 6 Mar 2015 11:21:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJi-0006HI-OW for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqJi-0001xh-N3 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:18 +0000 Date: Fri, 06 Mar 2015 11:21:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] testidl: call _init and _dispose several times X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f8fab14f2b396b8b9cb95432bdc7df2dd2efb60 Author: Wei Liu AuthorDate: Wed Feb 25 14:56:05 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 17:05:40 2015 +0000 testidl: call _init and _dispose several times Call _init and _dispose between 1 to 10 times on a type to test if _init and _dispose are idempotent. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/gentest.py | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/libxl/gentest.py b/tools/libxl/gentest.py index 849bfc7..7621a1e 100644 --- a/tools/libxl/gentest.py +++ b/tools/libxl/gentest.py @@ -249,8 +249,11 @@ int main(int argc, char **argv) f.write(" %s_rand_init(%s);\n" % (ty.typename, \ ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) if not isinstance(ty, idl.Enumeration): - f.write(" %s_init(%s_new);\n" % (ty.typename, \ - ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) + iters = random.randrange(1,10) + while iters > 0: + f.write(" %s_init(%s_new);\n" % (ty.typename, \ + ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) + iters -= 1 f.write(" s = %s_to_json(ctx, %s);\n" % \ (ty.typename, ty.pass_arg(arg, isref=False))) f.write(" printf(\"%%s: %%s\\n\", \"%s\", s);\n" % ty.typename) @@ -269,8 +272,11 @@ int main(int argc, char **argv) f.write(" free(s);\n") f.write(" free(new_s);\n") if ty.dispose_fn is not None: + iters = random.randrange(1,10) f.write(" %s(&%s_val);\n" % (ty.dispose_fn, ty.typename)) - f.write(" %s(&%s_val_new);\n" % (ty.dispose_fn, ty.typename)) + while iters > 0: + f.write(" %s(&%s_val_new);\n" % (ty.dispose_fn, ty.typename)) + iters -= 1 f.write("\n") f.write(" printf(\"Testing TYPE_copy()\\n\");\n") -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:21:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:21: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 1YTqJm-0003E0-F1; Fri, 06 Mar 2015 11:21:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJm-0003Do-0A for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:22 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id A3/5A-02995-1BD89F45; Fri, 06 Mar 2015 11:21:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425640878!13638721!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2676 invoked from network); 6 Mar 2015 11:21:20 -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; 6 Mar 2015 11:21:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJi-0006HI-OW for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqJi-0001xh-N3 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:18 +0000 Date: Fri, 06 Mar 2015 11:21:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] testidl: call _init and _dispose several times X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f8fab14f2b396b8b9cb95432bdc7df2dd2efb60 Author: Wei Liu AuthorDate: Wed Feb 25 14:56:05 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 17:05:40 2015 +0000 testidl: call _init and _dispose several times Call _init and _dispose between 1 to 10 times on a type to test if _init and _dispose are idempotent. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/gentest.py | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/libxl/gentest.py b/tools/libxl/gentest.py index 849bfc7..7621a1e 100644 --- a/tools/libxl/gentest.py +++ b/tools/libxl/gentest.py @@ -249,8 +249,11 @@ int main(int argc, char **argv) f.write(" %s_rand_init(%s);\n" % (ty.typename, \ ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) if not isinstance(ty, idl.Enumeration): - f.write(" %s_init(%s_new);\n" % (ty.typename, \ - ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) + iters = random.randrange(1,10) + while iters > 0: + f.write(" %s_init(%s_new);\n" % (ty.typename, \ + ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) + iters -= 1 f.write(" s = %s_to_json(ctx, %s);\n" % \ (ty.typename, ty.pass_arg(arg, isref=False))) f.write(" printf(\"%%s: %%s\\n\", \"%s\", s);\n" % ty.typename) @@ -269,8 +272,11 @@ int main(int argc, char **argv) f.write(" free(s);\n") f.write(" free(new_s);\n") if ty.dispose_fn is not None: + iters = random.randrange(1,10) f.write(" %s(&%s_val);\n" % (ty.dispose_fn, ty.typename)) - f.write(" %s(&%s_val_new);\n" % (ty.dispose_fn, ty.typename)) + while iters > 0: + f.write(" %s(&%s_val_new);\n" % (ty.dispose_fn, ty.typename)) + iters -= 1 f.write("\n") f.write(" printf(\"Testing TYPE_copy()\\n\");\n") -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:21:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:21: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 1YTqJw-0003Fc-Hk; Fri, 06 Mar 2015 11:21:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJv-0003FP-Gn for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:31 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id B0/95-03710-ABD89F45; Fri, 06 Mar 2015 11:21:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425640889!13638786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3869 invoked from network); 6 Mar 2015 11:21:30 -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; 6 Mar 2015 11:21:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJs-0006HR-U1 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqJs-0001y4-Sh for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:28 +0000 Date: Fri, 06 Mar 2015 11:21:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: update libxl.h to say _dispose is idempotent X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f3d370b016cfc82dbda0a800a1c9382a2bcc30f8 Author: Wei Liu AuthorDate: Wed Feb 25 14:56:06 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 17:05:40 2015 +0000 libxl: update libxl.h to say _dispose is idempotent Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index f784df5..e3d2ae8 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -308,8 +308,7 @@ * once afterwards, to clean up, regardless of whether operations on * this object succeeded or failed. See the xl code for examples. * - * "init" is idempotent. We intend that "dispose" will become - * idempotent, but this is not currently the case. + * "init" and "dispose" are idempotent. * * void libxl__init( *p): * -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:21:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:21: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 1YTqJw-0003Fc-Hk; Fri, 06 Mar 2015 11:21:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJv-0003FP-Gn for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:31 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id B0/95-03710-ABD89F45; Fri, 06 Mar 2015 11:21:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425640889!13638786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3869 invoked from network); 6 Mar 2015 11:21:30 -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; 6 Mar 2015 11:21:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqJs-0006HR-U1 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqJs-0001y4-Sh for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:28 +0000 Date: Fri, 06 Mar 2015 11:21:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: update libxl.h to say _dispose is idempotent X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f3d370b016cfc82dbda0a800a1c9382a2bcc30f8 Author: Wei Liu AuthorDate: Wed Feb 25 14:56:06 2015 +0000 Commit: Ian Campbell CommitDate: Mon Mar 2 17:05:40 2015 +0000 libxl: update libxl.h to say _dispose is idempotent Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index f784df5..e3d2ae8 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -308,8 +308,7 @@ * once afterwards, to clean up, regardless of whether operations on * this object succeeded or failed. See the xl code for examples. * - * "init" is idempotent. We intend that "dispose" will become - * idempotent, but this is not currently the case. + * "init" and "dispose" are idempotent. * * void libxl__init( *p): * -- generated by git-patchbot for /home/xen/git/xen.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 Mar 06 11:21:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:21: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 1YTqK7-0003HQ-Kj; Fri, 06 Mar 2015 11:21:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqK6-0003H3-3b for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:42 +0000 Content-Length: 8375 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 1A/D0-03168-5CD89F45; Fri, 06 Mar 2015 11:21:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1425640899!15131485!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10900 invoked from network); 6 Mar 2015 11:21:40 -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; 6 Mar 2015 11:21:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqK3-0006HX-39 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqK3-0001yn-24 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:39 +0000 Date: Fri, 06 Mar 2015 11:21:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] netif.h: describe request/response structures in terms of binary layout X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0666172908447571294==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0666172908447571294== Content-Length: 8136 Content-Transfer-Encoding: quoted-printable commit f0ffd6032f679ec4b9a39d526cdbcdaf692e2f03 Author: Ian Campbell AuthorDate: Wed Feb 25 13:39:48 2015 +0000 Commit: Ian Campbell CommitDate: Tue Mar 3 11:26:24 2015 +0000 netif.h: describe request/response structures in terms of binary layout In RFC style, rather than relying on the implicit assumptions of a particular C ABI. I have also confirmed, using the Python gdb extension technique in [0], that the struct offsets (in a Linux binary at least) are the same as described here. I took the opportunity to also confirm that x86_32, x86_64, arm32 and arm64 are all the same. This highlighted that struct netif_rx_request was missing some explicit padding, which is added here. Lastly, fixup some struct names to allow the generated docs to properly hyperlink, mainly by adding the _t to type names where appropriate, but also s/netif_tx_extra/netif_extra_info_t/. [0] http://stackoverflow.com/questions/9788679/how-to-get-the-relative-adress-of-a-field-in-a-structure-dump-c Signed-off-by: Ian Campbell Cc: Roger Pau Monn=C3=A9 Acked-by: Wei Liu --- xen/include/public/io/netif.h | 137 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 127 insertions(+), 10 deletions(-) diff --git a/xen/include/public/io/netif.h b/xen/include/public/io/netif.h index 61e9aea..353eab7 100644 --- a/xen/include/public/io/netif.h +++ b/xen/include/public/io/netif.h @@ -137,13 +137,129 @@ /* * This is the 'wire' format for packets: - * Request 1: netif_tx_request -- NETTXF_* (any flags) - * [Request 2: netif_tx_extra] (only if request 1 has NETTXF_extra_info) - * [Request 3: netif_tx_extra] (only if request 2 has XEN_NETIF_EXTRA_MORE) - * Request 4: netif_tx_request -- NETTXF_more_data - * Request 5: netif_tx_request -- NETTXF_more_data + * Request 1: netif_tx_request_t -- NETTXF_* (any flags) + * [Request 2: netif_extra_info_t] (only if request 1 has NETTXF_extra_info) + * [Request 3: netif_extra_info_t] (only if request 2 has XEN_NETIF_EXTRA_MORE) + * Request 4: netif_tx_request_t -- NETTXF_more_data + * Request 5: netif_tx_request_t -- NETTXF_more_data * ... - * Request N: netif_tx_request -- 0 + * Request N: netif_tx_request_t -- 0 + */ + +/* + * Guest transmit + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + * + * Ring slot size is 12 octets, however not all request/response + * structs use the full size. + * + * tx request data (netif_tx_request_t) + * ------------------------------------ + * + * 0 1 2 3 4 5 6 7 octet + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * | grant ref | offset | flags | + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * | id | size | + * +-----+-----+-----+-----+ + * + * grant ref: Reference to buffer page. + * offset: Offset within buffer page. + * flags: NETTXF_*. + * id: request identifier, echoed in response. + * size: packet size in bytes. + * + * tx response (netif_tx_response_t) + * --------------------------------- + * + * 0 1 2 3 4 5 6 7 octet + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * | id | status | unused | + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * | unused | + * +-----+-----+-----+-----+ + * + * id: reflects id in transmit request + * status: NETIF_RSP_* + * + * Guest receive + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + * + * Ring slot size is 8 octets. + * + * rx request (netif_rx_request_t) + * ------------------------------- + * + * 0 1 2 3 4 5 6 7 octet + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * | id | pad | gref | + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * + * id: request identifier, echoed in response. + * gref: reference to incoming granted frame. + * + * rx response (netif_rx_response_t) + * --------------------------------- + * + * 0 1 2 3 4 5 6 7 octet + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * | id | offset | flags | status | + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * + * id: reflects id in receive request + * offset: offset in page of start of received packet + * flags: NETRXF_* + * status: -ve: NETIF_RSP_*; +ve: Rx'ed pkt size. + * + * Extra Info + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + * + * Can be present if initial request has NET{T,R}XF_extra_info, or + * previous extra request has XEN_NETIF_EXTRA_MORE. + * + * The struct therefore needs to fit into either a tx or rx slot and + * is therefore limited to 8 octets. + * + * extra info (netif_extra_info_t) + * ------------------------------- + * + * General format: + * + * 0 1 2 3 4 5 6 7 octet + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * |type |flags| type specfic data | + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * | padding for tx | + * +-----+-----+-----+-----+ + * + * type: XEN_NETIF_EXTRA_TYPE_* + * flags: XEN_NETIF_EXTRA_FLAG_* + * padding for tx: present only in the tx case due to 8 octet limit + * from rx case. Not shown in type specific entries below. + * + * XEN_NETIF_EXTRA_TYPE_GSO: + * + * 0 1 2 3 4 5 6 7 octet + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * |type |flags| size |type | pad | features | + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * + * type: Must be XEN_NETIF_EXTRA_TYPE_GSO + * flags: XEN_NETIF_EXTRA_FLAG_* + * size: Maximum payload size of each segment. + * type: XEN_NETIF_GSO_TYPE_* + * features: EN_NETIF_GSO_FEAT_* + * + * XEN_NETIF_EXTRA_TYPE_MCAST_{ADD,DEL}: + * + * 0 1 2 3 4 5 6 7 octet + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * |type |flags| addr | + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * + * type: Must be XEN_NETIF_EXTRA_TYPE_MCAST_{ADD,DEL} + * flags: XEN_NETIF_EXTRA_FLAG_* + * addr: address to add/remove */ /* Protocol checksum field is blank in the packet (hardware offload)=3F */ @@ -179,7 +295,7 @@ typedef struct netif_tx_request netif_tx_request_t; #define XEN_NETIF_EXTRA_TYPE_MCAST_DEL (3) /* u.mcast */ #define XEN_NETIF_EXTRA_TYPE_MAX (4) -/* netif_extra_info flags. */ +/* netif_extra_info_t flags. */ #define _XEN_NETIF_EXTRA_FLAG_MORE (0) #define XEN_NETIF_EXTRA_FLAG_MORE (1U<<_XEN_NETIF_EXTRA_FLAG_MORE) @@ -189,8 +305,8 @@ typedef struct netif_tx_request netif_tx_request_t; #define XEN_NETIF_GSO_TYPE_TCPV6 (2) /* - * This structure needs to fit within both netif_tx_request and - * netif_rx_response for compatibility. + * This structure needs to fit within both netif_tx_request_t and + * netif_rx_response_t for compatibility. */ struct netif_extra_info { uint8_t type; /* XEN_NETIF_EXTRA_TYPE_* */ @@ -251,6 +367,7 @@ typedef struct netif_tx_response netif_tx_response_t; struct netif_rx_request { uint16_t id; /* Echoed in response message. */ + uint16_t pad; grant_ref_t gref; /* Reference to incoming granted frame */ }; typedef struct netif_rx_request netif_rx_request_t; @@ -289,7 +406,7 @@ DEFINE_RING_TYPES(netif_rx, struct netif_rx_request, struct netif_rx_response); #define NETIF_RSP_DROPPED -2 #define NETIF_RSP_ERROR -1 #define NETIF_RSP_OKAY 0 -/* No response: used for auxiliary requests (e.g., netif_tx_extra). */ +/* No response: used for auxiliary requests (e.g., netif_extra_info_t). */ #define NETIF_RSP_NULL 1 #endif -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0666172908447571294== 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 --===============0666172908447571294==-- From xen-changelog-bounces@lists.xen.org Fri Mar 06 11:21:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2015 11:21: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 1YTqK7-0003HQ-Kj; Fri, 06 Mar 2015 11:21:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqK6-0003H3-3b for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:42 +0000 Content-Length: 8375 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 1A/D0-03168-5CD89F45; Fri, 06 Mar 2015 11:21:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1425640899!15131485!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10900 invoked from network); 6 Mar 2015 11:21:40 -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; 6 Mar 2015 11:21:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTqK3-0006HX-39 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YTqK3-0001yn-24 for xen-changelog@lists.xensource.com; Fri, 06 Mar 2015 11:21:39 +0000 Date: Fri, 06 Mar 2015 11:21:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] netif.h: describe request/response structures in terms of binary layout X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0666172908447571294==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0666172908447571294== Content-Length: 8136 Content-Transfer-Encoding: quoted-printable commit f0ffd6032f679ec4b9a39d526cdbcdaf692e2f03 Author: Ian Campbell AuthorDate: Wed Feb 25 13:39:48 2015 +0000 Commit: Ian Campbell CommitDate: Tue Mar 3 11:26:24 2015 +0000 netif.h: describe request/response structures in terms of binary layout In RFC style, rather than relying on the implicit assumptions of a particular C ABI. I have also confirmed, using the Python gdb extension technique in [0], that the struct offsets (in a Linux binary at least) are the same as described here. I took the opportunity to also confirm that x86_32, x86_64, arm32 and arm64 are all the same. This highlighted that struct netif_rx_request was missing some explicit padding, which is added here. Lastly, fixup some struct names to allow the generated docs to properly hyperlink, mainly by adding the _t to type names where appropriate, but also s/netif_tx_extra/netif_extra_info_t/. [0] http://stackoverflow.com/questions/9788679/how-to-get-the-relative-adress-of-a-field-in-a-structure-dump-c Signed-off-by: Ian Campbell Cc: Roger Pau Monn=C3=A9 Acked-by: Wei Liu --- xen/include/public/io/netif.h | 137 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 127 insertions(+), 10 deletions(-) diff --git a/xen/include/public/io/netif.h b/xen/include/public/io/netif.h index 61e9aea..353eab7 100644 --- a/xen/include/public/io/netif.h +++ b/xen/include/public/io/netif.h @@ -137,13 +137,129 @@ /* * This is the 'wire' format for packets: - * Request 1: netif_tx_request -- NETTXF_* (any flags) - * [Request 2: netif_tx_extra] (only if request 1 has NETTXF_extra_info) - * [Request 3: netif_tx_extra] (only if request 2 has XEN_NETIF_EXTRA_MORE) - * Request 4: netif_tx_request -- NETTXF_more_data - * Request 5: netif_tx_request -- NETTXF_more_data + * Request 1: netif_tx_request_t -- NETTXF_* (any flags) + * [Request 2: netif_extra_info_t] (only if request 1 has NETTXF_extra_info) + * [Request 3: netif_extra_info_t] (only if request 2 has XEN_NETIF_EXTRA_MORE) + * Request 4: netif_tx_request_t -- NETTXF_more_data + * Request 5: netif_tx_request_t -- NETTXF_more_data * ... - * Request N: netif_tx_request -- 0 + * Request N: netif_tx_request_t -- 0 + */ + +/* + * Guest transmit + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + * + * Ring slot size is 12 octets, however not all request/response + * structs use the full size. + * + * tx request data (netif_tx_request_t) + * ------------------------------------ + * + * 0 1 2 3 4 5 6 7 octet + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * | grant ref | offset | flags | + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * | id | size | + * +-----+-----+-----+-----+ + * + * grant ref: Reference to buffer page. + * offset: Offset within buffer page. + * flags: NETTXF_*. + * id: request identifier, echoed in response. + * size: packet size in bytes. + * + * tx response (netif_tx_response_t) + * --------------------------------- + * + * 0 1 2 3 4 5 6 7 octet + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * | id | status | unused | + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * | unused | + * +-----+-----+-----+-----+ + * + * id: reflects id in transmit request + * status: NETIF_RSP_* + * + * Guest receive + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + * + * Ring slot size is 8 octets. + * + * rx request (netif_rx_request_t) + * ------------------------------- + * + * 0 1 2 3 4 5 6 7 octet + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * | id | pad | gref | + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * + * id: request identifier, echoed in response. + * gref: reference to incoming granted frame. + * + * rx response (netif_rx_response_t) + * --------------------------------- + * + * 0 1 2 3 4 5 6 7 octet + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * | id | offset | flags | status | + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * + * id: reflects id in receive request + * offset: offset in page of start of received packet + * flags: NETRXF_* + * status: -ve: NETIF_RSP_*; +ve: Rx'ed pkt size. + * + * Extra Info + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + * + * Can be present if initial request has NET{T,R}XF_extra_info, or + * previous extra request has XEN_NETIF_EXTRA_MORE. + * + * The struct therefore needs to fit into either a tx or rx slot and + * is therefore limited to 8 octets. + * + * extra info (netif_extra_info_t) + * ------------------------------- + * + * General format: + * + * 0 1 2 3 4 5 6 7 octet + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * |type |flags| type specfic data | + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * | padding for tx | + * +-----+-----+-----+-----+ + * + * type: XEN_NETIF_EXTRA_TYPE_* + * flags: XEN_NETIF_EXTRA_FLAG_* + * padding for tx: present only in the tx case due to 8 octet limit + * from rx case. Not shown in type specific entries below. + * + * XEN_NETIF_EXTRA_TYPE_GSO: + * + * 0 1 2 3 4 5 6 7 octet + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * |type |flags| size |type | pad | features | + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * + * type: Must be XEN_NETIF_EXTRA_TYPE_GSO + * flags: XEN_NETIF_EXTRA_FLAG_* + * size: Maximum payload size of each segment. + * type: XEN_NETIF_GSO_TYPE_* + * features: EN_NETIF_GSO_FEAT_* + * + * XEN_NETIF_EXTRA_TYPE_MCAST_{ADD,DEL}: + * + * 0 1 2 3 4 5 6 7 octet + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * |type |flags| addr | + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * + * type: Must be XEN_NETIF_EXTRA_TYPE_MCAST_{ADD,DEL} + * flags: XEN_NETIF_EXTRA_FLAG_* + * addr: address to add/remove */ /* Protocol checksum field is blank in the packet (hardware offload)=3F */ @@ -179,7 +295,7 @@ typedef struct netif_tx_request netif_tx_request_t; #define XEN_NETIF_EXTRA_TYPE_MCAST_DEL (3) /* u.mcast */ #define XEN_NETIF_EXTRA_TYPE_MAX (4) -/* netif_extra_info flags. */ +/* netif_extra_info_t flags. */ #define _XEN_NETIF_EXTRA_FLAG_MORE (0) #define XEN_NETIF_EXTRA_FLAG_MORE (1U<<_XEN_NETIF_EXTRA_FLAG_MORE) @@ -189,8 +305,8 @@ typedef struct netif_tx_request netif_tx_request_t; #define XEN_NETIF_GSO_TYPE_TCPV6 (2) /* - * This structure needs to fit within both netif_tx_request and - * netif_rx_response for compatibility. + * This structure needs to fit within both netif_tx_request_t and + * netif_rx_response_t for compatibility. */ struct netif_extra_info { uint8_t type; /* XEN_NETIF_EXTRA_TYPE_* */ @@ -251,6 +367,7 @@ typedef struct netif_tx_response netif_tx_response_t; struct netif_rx_request { uint16_t id; /* Echoed in response message. */ + uint16_t pad; grant_ref_t gref; /* Reference to incoming granted frame */ }; typedef struct netif_rx_request netif_rx_request_t; @@ -289,7 +406,7 @@ DEFINE_RING_TYPES(netif_rx, struct netif_rx_request, struct netif_rx_response); #define NETIF_RSP_DROPPED -2 #define NETIF_RSP_ERROR -1 #define NETIF_RSP_OKAY 0 -/* No response: used for auxiliary requests (e.g., netif_tx_extra). */ +/* No response: used for auxiliary requests (e.g., netif_extra_info_t). */ #define NETIF_RSP_NULL 1 #endif -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0666172908447571294== 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 --===============0666172908447571294==-- From xen-changelog-bounces@lists.xen.org Sat Mar 07 12:22:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Mar 2015 12:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUDk6-0000Ep-MG; Sat, 07 Mar 2015 12:22:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUDk5-0000Ah-Cj for xen-changelog@lists.xensource.com; Sat, 07 Mar 2015 12:22:05 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 45/A1-03511-C6DEAF45; Sat, 07 Mar 2015 12:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1425730923!8325517!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17015 invoked from network); 7 Mar 2015 12:22:04 -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; 7 Mar 2015 12:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUDk2-0005i1-To for xen-changelog@lists.xensource.com; Sat, 07 Mar 2015 12:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUDk2-0004oZ-DJ for xen-changelog@lists.xensource.com; Sat, 07 Mar 2015 12:22:02 +0000 Date: Sat, 07 Mar 2015 12:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] update Xen version to 4.4.2-rc2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 24ecb0be82825e366edd559af29562bca0e07d95 Author: Jan Beulich AuthorDate: Tue Mar 3 17:58:24 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 3 17:58:24 2015 +0100 update Xen version to 4.4.2-rc2 --- Config.mk | 2 +- xen/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index bcfaa25..4918a74 100644 --- a/Config.mk +++ b/Config.mk @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= e052bfcd0f2b0776f1f39f8282446ba8601bde82 +QEMU_TAG ?= xen-4.4.2-rc2 # Mon Feb 2 16:49:59 2015 +0000 # cirrus: fix an uninitialized variable diff --git a/xen/Makefile b/xen/Makefile index 21f6fb4..7947de8 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= .2-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2-rc2$(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.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 07 12:22:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Mar 2015 12:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUDk6-0000Ep-MG; Sat, 07 Mar 2015 12:22:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUDk5-0000Ah-Cj for xen-changelog@lists.xensource.com; Sat, 07 Mar 2015 12:22:05 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 45/A1-03511-C6DEAF45; Sat, 07 Mar 2015 12:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1425730923!8325517!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17015 invoked from network); 7 Mar 2015 12:22:04 -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; 7 Mar 2015 12:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUDk2-0005i1-To for xen-changelog@lists.xensource.com; Sat, 07 Mar 2015 12:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUDk2-0004oZ-DJ for xen-changelog@lists.xensource.com; Sat, 07 Mar 2015 12:22:02 +0000 Date: Sat, 07 Mar 2015 12:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] update Xen version to 4.4.2-rc2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 24ecb0be82825e366edd559af29562bca0e07d95 Author: Jan Beulich AuthorDate: Tue Mar 3 17:58:24 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 3 17:58:24 2015 +0100 update Xen version to 4.4.2-rc2 --- Config.mk | 2 +- xen/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index bcfaa25..4918a74 100644 --- a/Config.mk +++ b/Config.mk @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= e052bfcd0f2b0776f1f39f8282446ba8601bde82 +QEMU_TAG ?= xen-4.4.2-rc2 # Mon Feb 2 16:49:59 2015 +0000 # cirrus: fix an uninitialized variable diff --git a/xen/Makefile b/xen/Makefile index 21f6fb4..7947de8 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= .2-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2-rc2$(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.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:44:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6S-0001SK-QC; Mon, 09 Mar 2015 11: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 1YUw6Q-0001S4-NL for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:06 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 24/4A-03219-6878DF45; Mon, 09 Mar 2015 11:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1425901444!9926524!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6720 invoked from network); 9 Mar 2015 11:44:05 -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; 9 Mar 2015 11:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6N-0002UQ-Ux for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw6N-00085J-HQ for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:03 +0000 Date: Mon, 09 Mar 2015 11:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/tboot: invalidate FIX_TBOOT_MAP_ADDRESS mapping after use X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 375a09cffacff820e025c65d0cdfbd403ecb30cc Author: Jan Beulich AuthorDate: Wed Mar 4 09:59:47 2015 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 09:59:47 2015 +0100 x86/tboot: invalidate FIX_TBOOT_MAP_ADDRESS mapping after use In order for commit cbeeaa7d ("x86/nmi: fix shootdown of pcpus running in VMX non-root mode")'s re-use of that fixmap entry to not cause undesirable (in crash context) cross-CPU TLB flushes, invalidate the fixmap entry right after use. Signed-off-by: Jan Beulich --- xen/arch/x86/tboot.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index a8fb3a0..ca4839e 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -138,6 +138,7 @@ void __init tboot_probe(void) TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_BASE); tboot_copy_memory((unsigned char *)&sinit_size, sizeof(sinit_size), TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_SIZE); + __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); } /* definitions from xen/drivers/passthrough/vtd/iommu.h @@ -476,6 +477,8 @@ int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler) dmar_table_raw = xmalloc_array(unsigned char, dmar_table_length); tboot_copy_memory(dmar_table_raw, dmar_table_length, pa); dmar_table = (struct acpi_table_header *)dmar_table_raw; + __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); + rc = dmar_handler(dmar_table); xfree(dmar_table_raw); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:44:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6S-0001SK-QC; Mon, 09 Mar 2015 11: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 1YUw6Q-0001S4-NL for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:06 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 24/4A-03219-6878DF45; Mon, 09 Mar 2015 11:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1425901444!9926524!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6720 invoked from network); 9 Mar 2015 11:44:05 -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; 9 Mar 2015 11:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6N-0002UQ-Ux for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw6N-00085J-HQ for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:03 +0000 Date: Mon, 09 Mar 2015 11:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/tboot: invalidate FIX_TBOOT_MAP_ADDRESS mapping after use X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 375a09cffacff820e025c65d0cdfbd403ecb30cc Author: Jan Beulich AuthorDate: Wed Mar 4 09:59:47 2015 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 09:59:47 2015 +0100 x86/tboot: invalidate FIX_TBOOT_MAP_ADDRESS mapping after use In order for commit cbeeaa7d ("x86/nmi: fix shootdown of pcpus running in VMX non-root mode")'s re-use of that fixmap entry to not cause undesirable (in crash context) cross-CPU TLB flushes, invalidate the fixmap entry right after use. Signed-off-by: Jan Beulich --- xen/arch/x86/tboot.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index a8fb3a0..ca4839e 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -138,6 +138,7 @@ void __init tboot_probe(void) TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_BASE); tboot_copy_memory((unsigned char *)&sinit_size, sizeof(sinit_size), TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_SIZE); + __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); } /* definitions from xen/drivers/passthrough/vtd/iommu.h @@ -476,6 +477,8 @@ int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler) dmar_table_raw = xmalloc_array(unsigned char, dmar_table_length); tboot_copy_memory(dmar_table_raw, dmar_table_length, pa); dmar_table = (struct acpi_table_header *)dmar_table_raw; + __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); + rc = dmar_handler(dmar_table); xfree(dmar_table_raw); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6c-0001TZ-SZ; Mon, 09 Mar 2015 11:44:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6b-0001TH-OZ for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:17 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id A1/E7-10942-0978DF45; Mon, 09 Mar 2015 11:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1425901454!10612368!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9785 invoked from network); 9 Mar 2015 11:44:15 -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; 9 Mar 2015 11:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6Y-0002UU-FS for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw6Y-00086F-7f for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:14 +0000 Date: Mon, 09 Mar 2015 11:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vNUMA: validate XEN_DOMCTL_setvnumainfo input X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 519205d2ade90f8402512521fab564a0a015d03c Author: Jan Beulich AuthorDate: Wed Mar 4 10:01:41 2015 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 10:01:41 2015 +0100 vNUMA: validate XEN_DOMCTL_setvnumainfo input As we get ready to use the information set for a domain here we should make sure it is actually valid: Both vNode and pNode numbers should be in range. Do a little bit of other cleanup so the code ends up looking reasonably consistent in style. Along with this goes that we don't need an array of unsigned int to store the pNode number - a nodeid_t one (a quarter the size) suffices. Signed-off-by: Jan Beulich Reviewed-by: Wei Liu Acked-by: Ian Campbell Reviewed-by: Andrew Cooper --- xen/common/domctl.c | 34 ++++++++++++++++++++++------------ xen/include/xen/domain.h | 3 ++- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 4a42c66..df68734 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -344,7 +344,7 @@ static struct vnuma_info *vnuma_alloc(unsigned int nr_vnodes, vnuma->vdistance = xmalloc_array(unsigned int, nr_vnodes * nr_vnodes); vnuma->vcpu_to_vnode = xmalloc_array(unsigned int, nr_vcpus); - vnuma->vnode_to_pnode = xmalloc_array(unsigned int, nr_vnodes); + vnuma->vnode_to_pnode = xmalloc_array(nodeid_t, nr_vnodes); vnuma->vmemrange = xmalloc_array(xen_vmemrange_t, nr_ranges); if ( vnuma->vdistance == NULL || vnuma->vmemrange == NULL || @@ -382,30 +382,40 @@ static struct vnuma_info *vnuma_init(const struct xen_domctl_vnuma *uinfo, nr_vnodes * nr_vnodes) ) goto vnuma_fail; + if ( copy_from_guest(info->vmemrange, uinfo->vmemrange, + uinfo->nr_vmemranges) ) + goto vnuma_fail; + if ( copy_from_guest(info->vcpu_to_vnode, uinfo->vcpu_to_vnode, d->max_vcpus) ) goto vnuma_fail; - if ( copy_from_guest(info->vnode_to_pnode, uinfo->vnode_to_pnode, - nr_vnodes) ) - goto vnuma_fail; + ret = -E2BIG; + for ( i = 0; i < d->max_vcpus; ++i ) + if ( info->vcpu_to_vnode[i] >= nr_vnodes ) + goto vnuma_fail; - if (copy_from_guest(info->vmemrange, uinfo->vmemrange, - uinfo->nr_vmemranges)) - goto vnuma_fail; + for ( i = 0; i < nr_vnodes; ++i ) + { + unsigned int pnode; + + ret = -EFAULT; + if ( copy_from_guest_offset(&pnode, uinfo->vnode_to_pnode, i, 1) ) + goto vnuma_fail; + ret = -E2BIG; + if ( pnode >= MAX_NUMNODES ) + goto vnuma_fail; + info->vnode_to_pnode[i] = pnode; + } info->nr_vnodes = nr_vnodes; info->nr_vmemranges = uinfo->nr_vmemranges; /* Check that vmemranges flags are zero. */ + ret = -EINVAL; for ( i = 0; i < info->nr_vmemranges; i++ ) - { if ( info->vmemrange[i].flags != 0 ) - { - ret = -EINVAL; goto vnuma_fail; - } - } return info; diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 72667da..920f524 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -4,6 +4,7 @@ #include #include +#include typedef union { struct vcpu_guest_context *nat; @@ -99,7 +100,7 @@ struct vnuma_info { unsigned int nr_vmemranges; unsigned int *vdistance; unsigned int *vcpu_to_vnode; - unsigned int *vnode_to_pnode; + nodeid_t *vnode_to_pnode; struct xen_vmemrange *vmemrange; }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6c-0001TZ-SZ; Mon, 09 Mar 2015 11:44:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6b-0001TH-OZ for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:17 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id A1/E7-10942-0978DF45; Mon, 09 Mar 2015 11:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1425901454!10612368!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9785 invoked from network); 9 Mar 2015 11:44:15 -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; 9 Mar 2015 11:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6Y-0002UU-FS for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw6Y-00086F-7f for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:14 +0000 Date: Mon, 09 Mar 2015 11:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vNUMA: validate XEN_DOMCTL_setvnumainfo input X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 519205d2ade90f8402512521fab564a0a015d03c Author: Jan Beulich AuthorDate: Wed Mar 4 10:01:41 2015 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 10:01:41 2015 +0100 vNUMA: validate XEN_DOMCTL_setvnumainfo input As we get ready to use the information set for a domain here we should make sure it is actually valid: Both vNode and pNode numbers should be in range. Do a little bit of other cleanup so the code ends up looking reasonably consistent in style. Along with this goes that we don't need an array of unsigned int to store the pNode number - a nodeid_t one (a quarter the size) suffices. Signed-off-by: Jan Beulich Reviewed-by: Wei Liu Acked-by: Ian Campbell Reviewed-by: Andrew Cooper --- xen/common/domctl.c | 34 ++++++++++++++++++++++------------ xen/include/xen/domain.h | 3 ++- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 4a42c66..df68734 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -344,7 +344,7 @@ static struct vnuma_info *vnuma_alloc(unsigned int nr_vnodes, vnuma->vdistance = xmalloc_array(unsigned int, nr_vnodes * nr_vnodes); vnuma->vcpu_to_vnode = xmalloc_array(unsigned int, nr_vcpus); - vnuma->vnode_to_pnode = xmalloc_array(unsigned int, nr_vnodes); + vnuma->vnode_to_pnode = xmalloc_array(nodeid_t, nr_vnodes); vnuma->vmemrange = xmalloc_array(xen_vmemrange_t, nr_ranges); if ( vnuma->vdistance == NULL || vnuma->vmemrange == NULL || @@ -382,30 +382,40 @@ static struct vnuma_info *vnuma_init(const struct xen_domctl_vnuma *uinfo, nr_vnodes * nr_vnodes) ) goto vnuma_fail; + if ( copy_from_guest(info->vmemrange, uinfo->vmemrange, + uinfo->nr_vmemranges) ) + goto vnuma_fail; + if ( copy_from_guest(info->vcpu_to_vnode, uinfo->vcpu_to_vnode, d->max_vcpus) ) goto vnuma_fail; - if ( copy_from_guest(info->vnode_to_pnode, uinfo->vnode_to_pnode, - nr_vnodes) ) - goto vnuma_fail; + ret = -E2BIG; + for ( i = 0; i < d->max_vcpus; ++i ) + if ( info->vcpu_to_vnode[i] >= nr_vnodes ) + goto vnuma_fail; - if (copy_from_guest(info->vmemrange, uinfo->vmemrange, - uinfo->nr_vmemranges)) - goto vnuma_fail; + for ( i = 0; i < nr_vnodes; ++i ) + { + unsigned int pnode; + + ret = -EFAULT; + if ( copy_from_guest_offset(&pnode, uinfo->vnode_to_pnode, i, 1) ) + goto vnuma_fail; + ret = -E2BIG; + if ( pnode >= MAX_NUMNODES ) + goto vnuma_fail; + info->vnode_to_pnode[i] = pnode; + } info->nr_vnodes = nr_vnodes; info->nr_vmemranges = uinfo->nr_vmemranges; /* Check that vmemranges flags are zero. */ + ret = -EINVAL; for ( i = 0; i < info->nr_vmemranges; i++ ) - { if ( info->vmemrange[i].flags != 0 ) - { - ret = -EINVAL; goto vnuma_fail; - } - } return info; diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 72667da..920f524 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -4,6 +4,7 @@ #include #include +#include typedef union { struct vcpu_guest_context *nat; @@ -99,7 +100,7 @@ struct vnuma_info { unsigned int nr_vmemranges; unsigned int *vdistance; unsigned int *vcpu_to_vnode; - unsigned int *vnode_to_pnode; + nodeid_t *vnode_to_pnode; struct xen_vmemrange *vmemrange; }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:44:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11: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 1YUw6m-0001Va-VH; Mon, 09 Mar 2015 11:44:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6l-0001VK-TM for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:28 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 9B/64-03164-B978DF45; Mon, 09 Mar 2015 11:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425901464!14405244!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11845 invoked from network); 9 Mar 2015 11:44:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Mar 2015 11:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6i-0002Uf-Jy for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw6i-00086d-Ie for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:24 +0000 Date: Mon, 09 Mar 2015 11:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] domctl: 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 5da92f7ea0136c412281275c0d282044b45e4872 Author: Jan Beulich AuthorDate: Wed Mar 4 10:02:50 2015 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 10:02:50 2015 +0100 domctl: cleanup - drop redundant "ret = 0" statements - drop unnecessary braces - eliminate a few single use local variables - move break statements inside case-specific braced scopes - eliminate trailing whitespace Signed-off-by: Jan Beulich Acked-by: Ian Campbell Reviewed-by: Andrew Cooper --- xen/common/domctl.c | 143 ++++++++++++++++++-------------------------------- 1 files changed, 52 insertions(+), 91 deletions(-) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index df68734..d396cc4 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -1,8 +1,8 @@ /****************************************************************************** * domctl.c - * + * * Domain management operations. For use by node control stack. - * + * * Copyright (c) 2002-2006, K A Fraser */ @@ -154,13 +154,13 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) u64 cpu_time = 0; int flags = XEN_DOMINF_blocked; struct vcpu_runstate_info runstate; - + info->domain = d->domain_id; info->max_vcpu_id = XEN_INVALID_MAX_VCPU_ID; info->nr_online_vcpus = 0; info->ssidref = 0; - - /* + + /* * - domain is marked as blocked only if all its vcpus are blocked * - domain is marked as running if any of its vcpus is running */ @@ -237,7 +237,7 @@ static unsigned int default_vcpu0_location(cpumask_t *online) } /* - * If we're on a HT system, we only auto-allocate to a non-primary HT. We + * If we're on a HT system, we only auto-allocate to a non-primary HT. We * favour high numbered CPUs in the event of a tie. */ cpumask_copy(&cpu_exclude_map, per_cpu(cpu_sibling_mask, 0)); @@ -517,8 +517,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) } free_vcpu_guest_context(c.nat); + break; } - break; case XEN_DOMCTL_pausedomain: ret = -EINVAL; @@ -531,11 +531,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; case XEN_DOMCTL_resumedomain: - { domain_resume(d); - ret = 0; - } - break; + break; case XEN_DOMCTL_createdomain: { @@ -608,8 +605,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) op->domain = d->domain_id; copyback = 1; d = NULL; + break; } - break; case XEN_DOMCTL_max_vcpus: { @@ -698,8 +695,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) maxvcpu_out_novcpulock: domain_unpause(d); + break; } - break; case XEN_DOMCTL_destroydomain: ret = domain_kill(d); @@ -716,14 +713,13 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) &op->u.nodeaffinity.nodemap); if ( !ret ) ret = domain_set_node_affinity(d, &new_affinity); + break; } - break; + case XEN_DOMCTL_getnodeaffinity: - { ret = nodemask_to_xenctl_bitmap(&op->u.nodeaffinity.nodemap, &d->node_affinity); - } - break; + break; case XEN_DOMCTL_setvcpuaffinity: case XEN_DOMCTL_getvcpuaffinity: @@ -832,18 +828,16 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) ret = cpumask_to_xenctl_bitmap(&vcpuaff->cpumap_soft, v->cpu_soft_affinity); } + break; } - break; case XEN_DOMCTL_scheduler_op: - { ret = sched_adjust(d, &op->u.scheduler_op); copyback = 1; - } - break; + break; case XEN_DOMCTL_getdomaininfo: - { + { domid_t dom = op->domain; rcu_read_lock(&domlist_read_lock); @@ -852,12 +846,9 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) if ( d->domain_id >= dom ) break; + ret = -ESRCH; if ( d == NULL ) - { - rcu_read_unlock(&domlist_read_lock); - ret = -ESRCH; - break; - } + goto getdomaininfo_out; ret = xsm_getdomaininfo(XSM_HOOK, d); if ( ret ) @@ -871,11 +862,11 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) getdomaininfo_out: rcu_read_unlock(&domlist_read_lock); d = NULL; + break; } - break; case XEN_DOMCTL_getvcpucontext: - { + { vcpu_guest_context_u c = { .nat = NULL }; struct vcpu *v; @@ -920,11 +911,11 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) getvcpucontext_out: xfree(c.nat); + break; } - break; case XEN_DOMCTL_getvcpuinfo: - { + { struct vcpu *v; struct vcpu_runstate_info runstate; @@ -945,15 +936,12 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) op->u.getvcpuinfo.cpu = v->processor; ret = 0; copyback = 1; + break; } - break; case XEN_DOMCTL_max_mem: { - unsigned long new_max; - - ret = -EINVAL; - new_max = op->u.max_mem.max_memkb >> (PAGE_SHIFT-10); + unsigned long new_max = op->u.max_mem.max_memkb >> (PAGE_SHIFT - 10); spin_lock(&d->page_alloc_lock); /* @@ -962,31 +950,25 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) * the meantime, while tot > max, all new allocations are disallowed. */ d->max_pages = new_max; - ret = 0; spin_unlock(&d->page_alloc_lock); + break; } - break; case XEN_DOMCTL_setdomainhandle: - { memcpy(d->handle, op->u.setdomainhandle.handle, sizeof(xen_domain_handle_t)); - ret = 0; - } - break; + break; case XEN_DOMCTL_setdebugging: - { - ret = -EINVAL; - if ( d == current->domain ) /* no domain_pause() */ - break; - - domain_pause(d); - d->debugger_attached = !!op->u.setdebugging.enable; - domain_unpause(d); /* causes guest to latch new status */ - ret = 0; - } - break; + if ( unlikely(d == current->domain) ) /* no domain_pause() */ + ret = -EINVAL; + else + { + domain_pause(d); + d->debugger_attached = !!op->u.setdebugging.enable; + domain_unpause(d); /* causes guest to latch new status */ + } + break; case XEN_DOMCTL_irq_permission: { @@ -1005,8 +987,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) ret = irq_permit_access(d, irq); else ret = irq_deny_access(d, irq); + break; } - break; case XEN_DOMCTL_iomem_permission: { @@ -1028,8 +1010,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) ret = iomem_deny_access(d, mfn, mfn + nr_mfns - 1); if ( !ret ) memory_type_changed(d); + break; } - break; case XEN_DOMCTL_memory_mapping: { @@ -1080,15 +1062,12 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) } /* Do this unconditionally to cover errors on above failure paths. */ memory_type_changed(d); + break; } - break; case XEN_DOMCTL_settimeoffset: - { domain_set_time_offset(d, op->u.settimeoffset.time_offset_seconds); - ret = 0; - } - break; + break; case XEN_DOMCTL_set_target: { @@ -1114,16 +1093,12 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) /* Hold reference on @e until we destroy @d. */ d->target = e; - - ret = 0; + break; } - break; case XEN_DOMCTL_subscribe: - { d->suspend_evtchn = op->u.subscribe.port; - } - break; + break; case XEN_DOMCTL_mem_event_op: ret = mem_event_domctl(d, &op->u.mem_event_op, @@ -1132,41 +1107,28 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; case XEN_DOMCTL_disable_migrate: - { d->disable_migrate = op->u.disable_migrate.disable; - } - break; + break; #ifdef HAS_MEM_ACCESS case XEN_DOMCTL_set_access_required: - { - struct p2m_domain* p2m; - - ret = -EPERM; - if ( current->domain == d ) - break; - - ret = 0; - p2m = p2m_get_hostp2m(d); - p2m->access_required = op->u.access_required.access_required; - } - break; + if ( unlikely(current->domain == d) ) + ret = -EPERM; + else + p2m_get_hostp2m(d)->access_required = + op->u.access_required.access_required; + break; #endif case XEN_DOMCTL_set_virq_handler: - { - uint32_t virq = op->u.set_virq_handler.virq; - ret = set_global_virq_handler(d, virq); - } - break; + ret = set_global_virq_handler(d, op->u.set_virq_handler.virq); + break; case XEN_DOMCTL_set_max_evtchn: - { d->max_evtchn_port = min_t(unsigned int, op->u.set_max_evtchn.max_port, INT_MAX); - } - break; + break; case XEN_DOMCTL_setvnumainfo: { @@ -1185,9 +1147,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) d->vnuma = vnuma; write_unlock(&d->vnuma_rwlock); - ret = 0; + break; } - break; default: ret = arch_do_domctl(op, d, u_domctl); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:44:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11: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 1YUw6m-0001Va-VH; Mon, 09 Mar 2015 11:44:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6l-0001VK-TM for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:28 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 9B/64-03164-B978DF45; Mon, 09 Mar 2015 11:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425901464!14405244!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11845 invoked from network); 9 Mar 2015 11:44:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Mar 2015 11:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6i-0002Uf-Jy for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw6i-00086d-Ie for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:24 +0000 Date: Mon, 09 Mar 2015 11:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] domctl: 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 5da92f7ea0136c412281275c0d282044b45e4872 Author: Jan Beulich AuthorDate: Wed Mar 4 10:02:50 2015 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 10:02:50 2015 +0100 domctl: cleanup - drop redundant "ret = 0" statements - drop unnecessary braces - eliminate a few single use local variables - move break statements inside case-specific braced scopes - eliminate trailing whitespace Signed-off-by: Jan Beulich Acked-by: Ian Campbell Reviewed-by: Andrew Cooper --- xen/common/domctl.c | 143 ++++++++++++++++++-------------------------------- 1 files changed, 52 insertions(+), 91 deletions(-) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index df68734..d396cc4 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -1,8 +1,8 @@ /****************************************************************************** * domctl.c - * + * * Domain management operations. For use by node control stack. - * + * * Copyright (c) 2002-2006, K A Fraser */ @@ -154,13 +154,13 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) u64 cpu_time = 0; int flags = XEN_DOMINF_blocked; struct vcpu_runstate_info runstate; - + info->domain = d->domain_id; info->max_vcpu_id = XEN_INVALID_MAX_VCPU_ID; info->nr_online_vcpus = 0; info->ssidref = 0; - - /* + + /* * - domain is marked as blocked only if all its vcpus are blocked * - domain is marked as running if any of its vcpus is running */ @@ -237,7 +237,7 @@ static unsigned int default_vcpu0_location(cpumask_t *online) } /* - * If we're on a HT system, we only auto-allocate to a non-primary HT. We + * If we're on a HT system, we only auto-allocate to a non-primary HT. We * favour high numbered CPUs in the event of a tie. */ cpumask_copy(&cpu_exclude_map, per_cpu(cpu_sibling_mask, 0)); @@ -517,8 +517,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) } free_vcpu_guest_context(c.nat); + break; } - break; case XEN_DOMCTL_pausedomain: ret = -EINVAL; @@ -531,11 +531,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; case XEN_DOMCTL_resumedomain: - { domain_resume(d); - ret = 0; - } - break; + break; case XEN_DOMCTL_createdomain: { @@ -608,8 +605,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) op->domain = d->domain_id; copyback = 1; d = NULL; + break; } - break; case XEN_DOMCTL_max_vcpus: { @@ -698,8 +695,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) maxvcpu_out_novcpulock: domain_unpause(d); + break; } - break; case XEN_DOMCTL_destroydomain: ret = domain_kill(d); @@ -716,14 +713,13 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) &op->u.nodeaffinity.nodemap); if ( !ret ) ret = domain_set_node_affinity(d, &new_affinity); + break; } - break; + case XEN_DOMCTL_getnodeaffinity: - { ret = nodemask_to_xenctl_bitmap(&op->u.nodeaffinity.nodemap, &d->node_affinity); - } - break; + break; case XEN_DOMCTL_setvcpuaffinity: case XEN_DOMCTL_getvcpuaffinity: @@ -832,18 +828,16 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) ret = cpumask_to_xenctl_bitmap(&vcpuaff->cpumap_soft, v->cpu_soft_affinity); } + break; } - break; case XEN_DOMCTL_scheduler_op: - { ret = sched_adjust(d, &op->u.scheduler_op); copyback = 1; - } - break; + break; case XEN_DOMCTL_getdomaininfo: - { + { domid_t dom = op->domain; rcu_read_lock(&domlist_read_lock); @@ -852,12 +846,9 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) if ( d->domain_id >= dom ) break; + ret = -ESRCH; if ( d == NULL ) - { - rcu_read_unlock(&domlist_read_lock); - ret = -ESRCH; - break; - } + goto getdomaininfo_out; ret = xsm_getdomaininfo(XSM_HOOK, d); if ( ret ) @@ -871,11 +862,11 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) getdomaininfo_out: rcu_read_unlock(&domlist_read_lock); d = NULL; + break; } - break; case XEN_DOMCTL_getvcpucontext: - { + { vcpu_guest_context_u c = { .nat = NULL }; struct vcpu *v; @@ -920,11 +911,11 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) getvcpucontext_out: xfree(c.nat); + break; } - break; case XEN_DOMCTL_getvcpuinfo: - { + { struct vcpu *v; struct vcpu_runstate_info runstate; @@ -945,15 +936,12 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) op->u.getvcpuinfo.cpu = v->processor; ret = 0; copyback = 1; + break; } - break; case XEN_DOMCTL_max_mem: { - unsigned long new_max; - - ret = -EINVAL; - new_max = op->u.max_mem.max_memkb >> (PAGE_SHIFT-10); + unsigned long new_max = op->u.max_mem.max_memkb >> (PAGE_SHIFT - 10); spin_lock(&d->page_alloc_lock); /* @@ -962,31 +950,25 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) * the meantime, while tot > max, all new allocations are disallowed. */ d->max_pages = new_max; - ret = 0; spin_unlock(&d->page_alloc_lock); + break; } - break; case XEN_DOMCTL_setdomainhandle: - { memcpy(d->handle, op->u.setdomainhandle.handle, sizeof(xen_domain_handle_t)); - ret = 0; - } - break; + break; case XEN_DOMCTL_setdebugging: - { - ret = -EINVAL; - if ( d == current->domain ) /* no domain_pause() */ - break; - - domain_pause(d); - d->debugger_attached = !!op->u.setdebugging.enable; - domain_unpause(d); /* causes guest to latch new status */ - ret = 0; - } - break; + if ( unlikely(d == current->domain) ) /* no domain_pause() */ + ret = -EINVAL; + else + { + domain_pause(d); + d->debugger_attached = !!op->u.setdebugging.enable; + domain_unpause(d); /* causes guest to latch new status */ + } + break; case XEN_DOMCTL_irq_permission: { @@ -1005,8 +987,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) ret = irq_permit_access(d, irq); else ret = irq_deny_access(d, irq); + break; } - break; case XEN_DOMCTL_iomem_permission: { @@ -1028,8 +1010,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) ret = iomem_deny_access(d, mfn, mfn + nr_mfns - 1); if ( !ret ) memory_type_changed(d); + break; } - break; case XEN_DOMCTL_memory_mapping: { @@ -1080,15 +1062,12 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) } /* Do this unconditionally to cover errors on above failure paths. */ memory_type_changed(d); + break; } - break; case XEN_DOMCTL_settimeoffset: - { domain_set_time_offset(d, op->u.settimeoffset.time_offset_seconds); - ret = 0; - } - break; + break; case XEN_DOMCTL_set_target: { @@ -1114,16 +1093,12 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) /* Hold reference on @e until we destroy @d. */ d->target = e; - - ret = 0; + break; } - break; case XEN_DOMCTL_subscribe: - { d->suspend_evtchn = op->u.subscribe.port; - } - break; + break; case XEN_DOMCTL_mem_event_op: ret = mem_event_domctl(d, &op->u.mem_event_op, @@ -1132,41 +1107,28 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; case XEN_DOMCTL_disable_migrate: - { d->disable_migrate = op->u.disable_migrate.disable; - } - break; + break; #ifdef HAS_MEM_ACCESS case XEN_DOMCTL_set_access_required: - { - struct p2m_domain* p2m; - - ret = -EPERM; - if ( current->domain == d ) - break; - - ret = 0; - p2m = p2m_get_hostp2m(d); - p2m->access_required = op->u.access_required.access_required; - } - break; + if ( unlikely(current->domain == d) ) + ret = -EPERM; + else + p2m_get_hostp2m(d)->access_required = + op->u.access_required.access_required; + break; #endif case XEN_DOMCTL_set_virq_handler: - { - uint32_t virq = op->u.set_virq_handler.virq; - ret = set_global_virq_handler(d, virq); - } - break; + ret = set_global_virq_handler(d, op->u.set_virq_handler.virq); + break; case XEN_DOMCTL_set_max_evtchn: - { d->max_evtchn_port = min_t(unsigned int, op->u.set_max_evtchn.max_port, INT_MAX); - } - break; + break; case XEN_DOMCTL_setvnumainfo: { @@ -1185,9 +1147,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) d->vnuma = vnuma; write_unlock(&d->vnuma_rwlock); - ret = 0; + break; } - break; default: ret = arch_do_domctl(op, d, u_domctl); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:44:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6w-0001X2-1x; Mon, 09 Mar 2015 11:44:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6v-0001Wr-Le for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:37 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 12/EB-02885-4A78DF45; Mon, 09 Mar 2015 11:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425901474!14405284!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13338 invoked from network); 9 Mar 2015 11:44:35 -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; 9 Mar 2015 11:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6s-0002Un-Of for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw6s-000879-Nh for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:34 +0000 Date: Mon, 09 Mar 2015 11:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: drop Joseph Cihula from TXT section X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ac455458de37ebd1400525563587d1b41b1b34f Author: Jan Beulich AuthorDate: Wed Mar 4 10:03:48 2015 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 10:03:48 2015 +0100 MAINTAINERS: drop Joseph Cihula from TXT section ... because of him indicating that he hasn't been working on it for the past 4+ years. Signed-off-by: Jan Beulich --- MAINTAINERS | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 0f04742..869c9a6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -180,7 +180,6 @@ S: Supported F: tools/debugger/kdd/ INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT) -M: Joseph Cihula M: Gang Wei M: Shane Wang S: Supported -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:44:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6w-0001X2-1x; Mon, 09 Mar 2015 11:44:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6v-0001Wr-Le for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:37 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 12/EB-02885-4A78DF45; Mon, 09 Mar 2015 11:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425901474!14405284!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13338 invoked from network); 9 Mar 2015 11:44:35 -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; 9 Mar 2015 11:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw6s-0002Un-Of for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw6s-000879-Nh for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:34 +0000 Date: Mon, 09 Mar 2015 11:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: drop Joseph Cihula from TXT section X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ac455458de37ebd1400525563587d1b41b1b34f Author: Jan Beulich AuthorDate: Wed Mar 4 10:03:48 2015 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 10:03:48 2015 +0100 MAINTAINERS: drop Joseph Cihula from TXT section ... because of him indicating that he hasn't been working on it for the past 4+ years. Signed-off-by: Jan Beulich --- MAINTAINERS | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 0f04742..869c9a6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -180,7 +180,6 @@ S: Supported F: tools/debugger/kdd/ INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT) -M: Joseph Cihula M: Gang Wei M: Shane Wang S: Supported -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:44:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:44:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw76-0001Z4-4X; Mon, 09 Mar 2015 11:44:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw75-0001Yr-Dn for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:47 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id B8/18-03170-EA78DF45; Mon, 09 Mar 2015 11:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1425901485!11190170!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10179 invoked from network); 9 Mar 2015 11:44:46 -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; 9 Mar 2015 11:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw72-0002Ut-UH for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw72-00087W-S3 for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:44 +0000 Date: Mon, 09 Mar 2015 11:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: return all ones on wrong-sized reads of system device I/O 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c9e57594e1ba5da9d705dee9f00aa4e7e925963d Author: Jan Beulich AuthorDate: Thu Mar 5 13:34:54 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:34:54 2015 +0100 x86/HVM: return all ones on wrong-sized reads of system device I/O ports So far the value presented to the guest remained uninitialized. This is CVE-2015-2044 / XSA-121. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/x86/hvm/i8254.c | 1 + xen/arch/x86/hvm/pmtimer.c | 1 + xen/arch/x86/hvm/rtc.c | 3 ++- xen/arch/x86/hvm/vpic.c | 1 + 4 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c index 3ec01c0..36a0a53 100644 --- a/xen/arch/x86/hvm/i8254.c +++ b/xen/arch/x86/hvm/i8254.c @@ -486,6 +486,7 @@ static int handle_pit_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 01ae31d..6ad2797 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -213,6 +213,7 @@ static int handle_pmt_io( if ( bytes != 4 ) { gdprintk(XENLOG_WARNING, "HVM_PMT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index 3fab660..3448971 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -703,7 +703,8 @@ static int handle_rtc_io( if ( bytes != 1 ) { - gdprintk(XENLOG_WARNING, "HVM_RTC bas access\n"); + gdprintk(XENLOG_WARNING, "HVM_RTC bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index d72b6ff..8eea061 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -331,6 +331,7 @@ static int vpic_intercept_pic_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIC_IO bad access size %d\n", bytes); + *val = ~0; return X86EMUL_OKAY; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:44:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:44:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw76-0001Z4-4X; Mon, 09 Mar 2015 11:44:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw75-0001Yr-Dn for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:47 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id B8/18-03170-EA78DF45; Mon, 09 Mar 2015 11:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1425901485!11190170!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10179 invoked from network); 9 Mar 2015 11:44:46 -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; 9 Mar 2015 11:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw72-0002Ut-UH for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw72-00087W-S3 for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:44 +0000 Date: Mon, 09 Mar 2015 11:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: return all ones on wrong-sized reads of system device I/O 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c9e57594e1ba5da9d705dee9f00aa4e7e925963d Author: Jan Beulich AuthorDate: Thu Mar 5 13:34:54 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:34:54 2015 +0100 x86/HVM: return all ones on wrong-sized reads of system device I/O ports So far the value presented to the guest remained uninitialized. This is CVE-2015-2044 / XSA-121. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/x86/hvm/i8254.c | 1 + xen/arch/x86/hvm/pmtimer.c | 1 + xen/arch/x86/hvm/rtc.c | 3 ++- xen/arch/x86/hvm/vpic.c | 1 + 4 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c index 3ec01c0..36a0a53 100644 --- a/xen/arch/x86/hvm/i8254.c +++ b/xen/arch/x86/hvm/i8254.c @@ -486,6 +486,7 @@ static int handle_pit_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 01ae31d..6ad2797 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -213,6 +213,7 @@ static int handle_pmt_io( if ( bytes != 4 ) { gdprintk(XENLOG_WARNING, "HVM_PMT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index 3fab660..3448971 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -703,7 +703,8 @@ static int handle_rtc_io( if ( bytes != 1 ) { - gdprintk(XENLOG_WARNING, "HVM_RTC bas access\n"); + gdprintk(XENLOG_WARNING, "HVM_RTC bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index d72b6ff..8eea061 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -331,6 +331,7 @@ static int vpic_intercept_pic_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIC_IO bad access size %d\n", bytes); + *val = ~0; return X86EMUL_OKAY; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:44:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:44:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7H-0001b2-79; Mon, 09 Mar 2015 11:44:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7G-0001al-3P for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:58 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id B1/EE-02810-9B78DF45; Mon, 09 Mar 2015 11:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1425901495!14049807!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21414 invoked from network); 9 Mar 2015 11:44:56 -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; 9 Mar 2015 11:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7D-0002V2-1d for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw7D-00087s-0k for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:55 +0000 Date: Mon, 09 Mar 2015 11:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pre-fill structures for certain HYPERVISOR_xen_version sub-ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fe2e079f642effb3d24a6e1a7096ef26e691d93e Author: Aaron Adams AuthorDate: Thu Mar 5 13:35:54 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:35:54 2015 +0100 pre-fill structures for certain HYPERVISOR_xen_version sub-ops ... avoiding to pass hypervisor stack contents back to the caller through space unused by the respective strings. This is CVE-2015-2045 / XSA-122. Signed-off-by: Aaron Adams Acked-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/kernel.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 0d9e519..8a04d8b 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -240,6 +240,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_extraversion: { xen_extraversion_t extraversion; + + memset(extraversion, 0, sizeof(extraversion)); safe_strcpy(extraversion, xen_extra_version()); if ( copy_to_guest(arg, extraversion, ARRAY_SIZE(extraversion)) ) return -EFAULT; @@ -249,6 +251,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_compile_info: { struct xen_compile_info info; + + memset(&info, 0, sizeof(info)); safe_strcpy(info.compiler, xen_compiler()); safe_strcpy(info.compile_by, xen_compile_by()); safe_strcpy(info.compile_domain, xen_compile_domain()); @@ -284,6 +288,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_changeset: { xen_changeset_info_t chgset; + + memset(chgset, 0, sizeof(chgset)); safe_strcpy(chgset, xen_changeset()); if ( copy_to_guest(arg, chgset, ARRAY_SIZE(chgset)) ) return -EFAULT; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:44:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:44:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7H-0001b2-79; Mon, 09 Mar 2015 11:44:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7G-0001al-3P for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:58 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id B1/EE-02810-9B78DF45; Mon, 09 Mar 2015 11:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1425901495!14049807!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21414 invoked from network); 9 Mar 2015 11:44:56 -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; 9 Mar 2015 11:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7D-0002V2-1d for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw7D-00087s-0k for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:44:55 +0000 Date: Mon, 09 Mar 2015 11:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pre-fill structures for certain HYPERVISOR_xen_version sub-ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fe2e079f642effb3d24a6e1a7096ef26e691d93e Author: Aaron Adams AuthorDate: Thu Mar 5 13:35:54 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:35:54 2015 +0100 pre-fill structures for certain HYPERVISOR_xen_version sub-ops ... avoiding to pass hypervisor stack contents back to the caller through space unused by the respective strings. This is CVE-2015-2045 / XSA-122. Signed-off-by: Aaron Adams Acked-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/kernel.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 0d9e519..8a04d8b 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -240,6 +240,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_extraversion: { xen_extraversion_t extraversion; + + memset(extraversion, 0, sizeof(extraversion)); safe_strcpy(extraversion, xen_extra_version()); if ( copy_to_guest(arg, extraversion, ARRAY_SIZE(extraversion)) ) return -EFAULT; @@ -249,6 +251,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_compile_info: { struct xen_compile_info info; + + memset(&info, 0, sizeof(info)); safe_strcpy(info.compiler, xen_compiler()); safe_strcpy(info.compile_by, xen_compile_by()); safe_strcpy(info.compile_domain, xen_compile_domain()); @@ -284,6 +288,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_changeset: { xen_changeset_info_t chgset; + + memset(chgset, 0, sizeof(chgset)); safe_strcpy(chgset, xen_changeset()); if ( copy_to_guest(arg, chgset, ARRAY_SIZE(chgset)) ) return -EFAULT; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:45:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:45: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 1YUw7W-0001dO-Bk; Mon, 09 Mar 2015 11:45:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7V-0001dD-93 for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:13 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 14/66-03164-8C78DF45; Mon, 09 Mar 2015 11:45:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1425901510!11927521!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27186 invoked from network); 9 Mar 2015 11:45:11 -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 Mar 2015 11:45:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7S-0002W3-Jj for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw7S-00088T-5s for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:10 +0000 Date: Mon, 09 Mar 2015 11:45:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: introduce clear_fixmap() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 071c4336ba517ef7659c9fd3ac7052183b570e57 Author: Jan Beulich AuthorDate: Thu Mar 5 13:37:04 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:37:04 2015 +0100 x86: introduce clear_fixmap() ... making more obvious what its so far open coded users intend. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 2 +- xen/arch/x86/io_apic.c | 2 +- xen/arch/x86/mpparse.c | 2 +- xen/arch/x86/msi.c | 2 +- xen/arch/x86/tboot.c | 4 ++-- xen/include/asm-x86/fixmap.h | 2 ++ 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index cfe7945..21f0766 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -310,7 +310,7 @@ void free_vcpu_guest_context(struct vcpu_guest_context *vgc) { if ( !per_cpu(vgc_pages[i], cpu) ) continue; - __set_fixmap(idx - i, 0, 0); + clear_fixmap(idx - i); free_domheap_page(per_cpu(vgc_pages[i], cpu)); per_cpu(vgc_pages[i], cpu) = NULL; } diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 01f816b..976c0c5 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2552,7 +2552,7 @@ void __init init_ioapic_mappings(void) if ( bad_ioapic_register(i) ) { - __set_fixmap(idx, 0, 0); + clear_fixmap(idx); continue; } diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index a38e016..003c56e 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -541,7 +541,7 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type) static __init void efi_unmap_mpf(void) { if (efi_enabled) - __set_fixmap(FIX_EFI_MPF, 0, 0); + clear_fixmap(FIX_EFI_MPF); } static struct intel_mp_floating *__initdata mpf_found; diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 14d37ec..39f3d68 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -112,7 +112,7 @@ static void msix_put_fixmap(struct arch_msix *msix, int idx) if ( --msix->table_refcnt[i] == 0 ) { - __set_fixmap(idx, 0, 0); + clear_fixmap(idx); msix_fixmap_free(idx); msix->table_idx[i] = 0; } diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index ca4839e..ea1eea0 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -138,7 +138,7 @@ void __init tboot_probe(void) TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_BASE); tboot_copy_memory((unsigned char *)&sinit_size, sizeof(sinit_size), TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_SIZE); - __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); + clear_fixmap(FIX_TBOOT_MAP_ADDRESS); } /* definitions from xen/drivers/passthrough/vtd/iommu.h @@ -477,7 +477,7 @@ int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler) dmar_table_raw = xmalloc_array(unsigned char, dmar_table_length); tboot_copy_memory(dmar_table_raw, dmar_table_length, pa); dmar_table = (struct acpi_table_header *)dmar_table_raw; - __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); + clear_fixmap(FIX_TBOOT_MAP_ADDRESS); rc = dmar_handler(dmar_table); xfree(dmar_table_raw); diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index ebb3207..70eadff 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -78,6 +78,8 @@ extern void __set_fixmap( #define set_fixmap_nocache(idx, phys) \ __set_fixmap(idx, (phys)>>PAGE_SHIFT, PAGE_HYPERVISOR_NOCACHE) +#define clear_fixmap(idx) __set_fixmap(idx, 0, 0) + #define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) #define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:45:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:45: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 1YUw7W-0001dO-Bk; Mon, 09 Mar 2015 11:45:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7V-0001dD-93 for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:13 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 14/66-03164-8C78DF45; Mon, 09 Mar 2015 11:45:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1425901510!11927521!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27186 invoked from network); 9 Mar 2015 11:45:11 -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 Mar 2015 11:45:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7S-0002W3-Jj for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw7S-00088T-5s for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:10 +0000 Date: Mon, 09 Mar 2015 11:45:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: introduce clear_fixmap() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 071c4336ba517ef7659c9fd3ac7052183b570e57 Author: Jan Beulich AuthorDate: Thu Mar 5 13:37:04 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:37:04 2015 +0100 x86: introduce clear_fixmap() ... making more obvious what its so far open coded users intend. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 2 +- xen/arch/x86/io_apic.c | 2 +- xen/arch/x86/mpparse.c | 2 +- xen/arch/x86/msi.c | 2 +- xen/arch/x86/tboot.c | 4 ++-- xen/include/asm-x86/fixmap.h | 2 ++ 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index cfe7945..21f0766 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -310,7 +310,7 @@ void free_vcpu_guest_context(struct vcpu_guest_context *vgc) { if ( !per_cpu(vgc_pages[i], cpu) ) continue; - __set_fixmap(idx - i, 0, 0); + clear_fixmap(idx - i); free_domheap_page(per_cpu(vgc_pages[i], cpu)); per_cpu(vgc_pages[i], cpu) = NULL; } diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 01f816b..976c0c5 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2552,7 +2552,7 @@ void __init init_ioapic_mappings(void) if ( bad_ioapic_register(i) ) { - __set_fixmap(idx, 0, 0); + clear_fixmap(idx); continue; } diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index a38e016..003c56e 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -541,7 +541,7 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type) static __init void efi_unmap_mpf(void) { if (efi_enabled) - __set_fixmap(FIX_EFI_MPF, 0, 0); + clear_fixmap(FIX_EFI_MPF); } static struct intel_mp_floating *__initdata mpf_found; diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 14d37ec..39f3d68 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -112,7 +112,7 @@ static void msix_put_fixmap(struct arch_msix *msix, int idx) if ( --msix->table_refcnt[i] == 0 ) { - __set_fixmap(idx, 0, 0); + clear_fixmap(idx); msix_fixmap_free(idx); msix->table_idx[i] = 0; } diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index ca4839e..ea1eea0 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -138,7 +138,7 @@ void __init tboot_probe(void) TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_BASE); tboot_copy_memory((unsigned char *)&sinit_size, sizeof(sinit_size), TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_SIZE); - __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); + clear_fixmap(FIX_TBOOT_MAP_ADDRESS); } /* definitions from xen/drivers/passthrough/vtd/iommu.h @@ -477,7 +477,7 @@ int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler) dmar_table_raw = xmalloc_array(unsigned char, dmar_table_length); tboot_copy_memory(dmar_table_raw, dmar_table_length, pa); dmar_table = (struct acpi_table_header *)dmar_table_raw; - __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); + clear_fixmap(FIX_TBOOT_MAP_ADDRESS); rc = dmar_handler(dmar_table); xfree(dmar_table_raw); diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index ebb3207..70eadff 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -78,6 +78,8 @@ extern void __set_fixmap( #define set_fixmap_nocache(idx, phys) \ __set_fixmap(idx, (phys)>>PAGE_SHIFT, PAGE_HYPERVISOR_NOCACHE) +#define clear_fixmap(idx) __set_fixmap(idx, 0, 0) + #define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) #define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:45:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:45: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 1YUw7g-0001gD-QE; Mon, 09 Mar 2015 11:45:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7f-0001fs-ED for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:23 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 7B/A2-02745-2D78DF45; Mon, 09 Mar 2015 11:45:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1425901520!14295629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24202 invoked from network); 9 Mar 2015 11:45: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; 9 Mar 2015 11:45:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7c-0002W9-P7 for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw7c-0008A3-NJ for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:20 +0000 Date: Mon, 09 Mar 2015 11:45:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/tboot: simplify DMAR table copying X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit acd60189e5401572d0a741ef104f3d55302ce7b5 Author: Jan Beulich AuthorDate: Thu Mar 5 13:38:25 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:38:25 2015 +0100 x86/tboot: simplify DMAR table copying There's no need for more than one variable, no need for casts, and no point in using the type-safe xmalloc_array() here. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: "Wei, Gang" --- xen/arch/x86/tboot.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index ea1eea0..7b95ad3 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -435,13 +435,12 @@ int __init tboot_protect_mem_regions(void) int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler) { - struct acpi_table_header *dmar_table; int rc; uint64_t size; uint32_t dmar_table_length; unsigned long pa; sinit_mle_data_t sinit_mle_data; - unsigned char *dmar_table_raw; + void *dmar_table; if ( !tboot_in_measured_env() ) return acpi_table_parse(ACPI_SIG_DMAR, dmar_handler); @@ -474,13 +473,12 @@ int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler) tboot_copy_memory((unsigned char *)&dmar_table_length, sizeof(dmar_table_length), pa + sizeof(char) * ACPI_NAME_SIZE); - dmar_table_raw = xmalloc_array(unsigned char, dmar_table_length); - tboot_copy_memory(dmar_table_raw, dmar_table_length, pa); - dmar_table = (struct acpi_table_header *)dmar_table_raw; + dmar_table = xmalloc_bytes(dmar_table_length); + tboot_copy_memory(dmar_table, dmar_table_length, pa); clear_fixmap(FIX_TBOOT_MAP_ADDRESS); rc = dmar_handler(dmar_table); - xfree(dmar_table_raw); + xfree(dmar_table); /* acpi_parse_dmar() zaps APCI DMAR signature in TXT heap table */ /* but dom0 will read real table, so must zap it there too */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:45:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:45: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 1YUw7g-0001gD-QE; Mon, 09 Mar 2015 11:45:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7f-0001fs-ED for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:23 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 7B/A2-02745-2D78DF45; Mon, 09 Mar 2015 11:45:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1425901520!14295629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24202 invoked from network); 9 Mar 2015 11:45: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; 9 Mar 2015 11:45:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7c-0002W9-P7 for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw7c-0008A3-NJ for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:20 +0000 Date: Mon, 09 Mar 2015 11:45:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/tboot: simplify DMAR table copying X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit acd60189e5401572d0a741ef104f3d55302ce7b5 Author: Jan Beulich AuthorDate: Thu Mar 5 13:38:25 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:38:25 2015 +0100 x86/tboot: simplify DMAR table copying There's no need for more than one variable, no need for casts, and no point in using the type-safe xmalloc_array() here. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: "Wei, Gang" --- xen/arch/x86/tboot.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index ea1eea0..7b95ad3 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -435,13 +435,12 @@ int __init tboot_protect_mem_regions(void) int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler) { - struct acpi_table_header *dmar_table; int rc; uint64_t size; uint32_t dmar_table_length; unsigned long pa; sinit_mle_data_t sinit_mle_data; - unsigned char *dmar_table_raw; + void *dmar_table; if ( !tboot_in_measured_env() ) return acpi_table_parse(ACPI_SIG_DMAR, dmar_handler); @@ -474,13 +473,12 @@ int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler) tboot_copy_memory((unsigned char *)&dmar_table_length, sizeof(dmar_table_length), pa + sizeof(char) * ACPI_NAME_SIZE); - dmar_table_raw = xmalloc_array(unsigned char, dmar_table_length); - tboot_copy_memory(dmar_table_raw, dmar_table_length, pa); - dmar_table = (struct acpi_table_header *)dmar_table_raw; + dmar_table = xmalloc_bytes(dmar_table_length); + tboot_copy_memory(dmar_table, dmar_table_length, pa); clear_fixmap(FIX_TBOOT_MAP_ADDRESS); rc = dmar_handler(dmar_table); - xfree(dmar_table_raw); + xfree(dmar_table); /* acpi_parse_dmar() zaps APCI DMAR signature in TXT heap table */ /* but dom0 will read real table, so must zap it there too */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:45:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:45: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 1YUw7r-0001iq-Sz; Mon, 09 Mar 2015 11:45:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7q-0001iS-JC for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:34 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 95/2E-02995-DD78DF45; Mon, 09 Mar 2015 11:45:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1425901531!14295718!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26884 invoked from network); 9 Mar 2015 11:45:32 -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; 9 Mar 2015 11:45:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7m-0002WI-WF for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw7m-0008AR-UV for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:30 +0000 Date: Mon, 09 Mar 2015 11:45:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools, docs: add total/local memory bandwith monitoring X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 089deb42df0030b3a3f1c17af54945ed6af4f7f2 Author: Chao Peng AuthorDate: Wed Mar 4 18:06:44 2015 +0800 Commit: Ian Campbell CommitDate: Thu Mar 5 16:27:49 2015 +0000 tools, docs: add total/local memory bandwith monitoring Add Memory Bandwidth Monitoring(MBM) for VMs. Two types of monitoring are supported: total and local memory bandwidth monitoring. To use it, CMT should be enabled in hypervisor. Signed-off-by: Chao Peng Acked-by: Ian Campbell --- docs/man/xl.pod.1 | 11 ++++- docs/misc/xen-command-line.markdown | 3 + tools/libxc/include/xenctrl.h | 6 ++- tools/libxc/xc_msr_x86.h | 1 + tools/libxc/xc_psr.c | 47 +++++++++++++++++- tools/libxl/libxl.h | 17 +++++++ tools/libxl/libxl_psr.c | 56 ++++++++++++++++++---- tools/libxl/libxl_types.idl | 2 + tools/libxl/xl_cmdimpl.c | 90 +++++++++++++++++++++++++++++------ tools/libxl/xl_cmdtable.c | 4 +- 10 files changed, 207 insertions(+), 30 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index 6b89ba8..cd80ffc 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -1461,6 +1461,13 @@ is domain level. To monitor a specific domain, just attach the domain id with the monitoring service. When the domain doesn't need to be monitored any more, detach the domain id from the monitoring service. +Intel Broadwell and later server platforms also offer total/local memory +bandwidth monitoring. Xen supports per-domain monitoring for these two +additional monitoring types. Both memory bandwidth monitoring and L3 cache +occupancy monitoring share the same set of underlying monitoring service. Once +a domain is attached to the monitoring service, monitoring data can be showed +for any of these monitoring types. + =over 4 =item B [I] @@ -1475,7 +1482,9 @@ detach: Detach the platform shared resource monitoring service from a domain. Show monitoring data for a certain domain or all domains. Current supported monitor types are: - - "cache-occupancy": showing the L3 cache occupancy. + - "cache-occupancy": showing the L3 cache occupancy(KB). + - "total-mem-bandwidth": showing the total memory bandwidth(KB/s). + - "local-mem-bandwidth": showing the local memory bandwidth(KB/s). =back diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 9b458e1..63871cb 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1108,6 +1108,9 @@ The following resources are available: L3 cache occupancy. * `cmt` instructs Xen to enable/disable Cache Monitoring Technology. * `rmid_max` indicates the max value for rmid. +* Memory Bandwidth Monitoring (Broadwell and later). Information regarding the + total/local memory bandwidth. Follow the same options with Cache Monitoring + Technology. ### reboot > `= t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old]` diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 09d819f..df18292 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2688,6 +2688,8 @@ int xc_resource_op(xc_interface *xch, uint32_t nr_ops, xc_resource_op_t *ops); #if defined(__i386__) || defined(__x86_64__) enum xc_psr_cmt_type { XC_PSR_CMT_L3_OCCUPANCY, + XC_PSR_CMT_TOTAL_MEM_COUNT, + XC_PSR_CMT_LOCAL_MEM_COUNT, }; typedef enum xc_psr_cmt_type xc_psr_cmt_type; int xc_psr_cmt_attach(xc_interface *xch, uint32_t domid); @@ -2697,10 +2699,12 @@ int xc_psr_cmt_get_domain_rmid(xc_interface *xch, uint32_t domid, int xc_psr_cmt_get_total_rmid(xc_interface *xch, uint32_t *total_rmid); int xc_psr_cmt_get_l3_upscaling_factor(xc_interface *xch, uint32_t *upscaling_factor); +int xc_psr_cmt_get_l3_event_mask(xc_interface *xch, uint32_t *event_mask); int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu, uint32_t *l3_cache_size); int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, - uint32_t psr_cmt_type, uint64_t *monitor_data); + uint32_t psr_cmt_type, uint64_t *monitor_data, + uint64_t *tsc); int xc_psr_cmt_enabled(xc_interface *xch); #endif diff --git a/tools/libxc/xc_msr_x86.h b/tools/libxc/xc_msr_x86.h index 7c3e1a3..7f100e7 100644 --- a/tools/libxc/xc_msr_x86.h +++ b/tools/libxc/xc_msr_x86.h @@ -20,6 +20,7 @@ #ifndef XC_MSR_X86_H #define XC_MSR_X86_H +#define MSR_IA32_TSC 0x00000010 #define MSR_IA32_CMT_EVTSEL 0x00000c8d #define MSR_IA32_CMT_CTR 0x00000c8e diff --git a/tools/libxc/xc_psr.c b/tools/libxc/xc_psr.c index 70d9067..e367a80 100644 --- a/tools/libxc/xc_psr.c +++ b/tools/libxc/xc_psr.c @@ -17,12 +17,15 @@ * GNU Lesser General Public License for more details. */ +#include #include "xc_private.h" #include "xc_msr_x86.h" #define IA32_CMT_CTR_ERROR_MASK (0x3ull << 62) #define EVTID_L3_OCCUPANCY 0x1 +#define EVTID_TOTAL_MEM_COUNT 0x2 +#define EVTID_LOCAL_MEM_COUNT 0x3 int xc_psr_cmt_attach(xc_interface *xch, uint32_t domid) { @@ -112,6 +115,23 @@ int xc_psr_cmt_get_l3_upscaling_factor(xc_interface *xch, return rc; } +int xc_psr_cmt_get_l3_event_mask(xc_interface *xch, uint32_t *event_mask) +{ + int rc; + DECLARE_SYSCTL; + + sysctl.cmd = XEN_SYSCTL_psr_cmt_op; + sysctl.u.psr_cmt_op.cmd = + XEN_SYSCTL_PSR_CMT_get_l3_event_mask; + sysctl.u.psr_cmt_op.flags = 0; + + rc = xc_sysctl(xch, &sysctl); + if ( !rc ) + *event_mask = sysctl.u.psr_cmt_op.u.data; + + return rc; +} + int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu, uint32_t *l3_cache_size) { @@ -139,10 +159,12 @@ int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu, } int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, - xc_psr_cmt_type type, uint64_t *monitor_data) + xc_psr_cmt_type type, uint64_t *monitor_data, + uint64_t *tsc) { xc_resource_op_t op; - xc_resource_entry_t entries[2]; + xc_resource_entry_t entries[3]; + xc_resource_entry_t *tsc_entry = NULL; uint32_t evtid, nr = 0; int rc; @@ -151,6 +173,12 @@ int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, case XC_PSR_CMT_L3_OCCUPANCY: evtid = EVTID_L3_OCCUPANCY; break; + case XC_PSR_CMT_TOTAL_MEM_COUNT: + evtid = EVTID_TOTAL_MEM_COUNT; + break; + case XC_PSR_CMT_LOCAL_MEM_COUNT: + evtid = EVTID_LOCAL_MEM_COUNT; + break; default: return -1; } @@ -167,6 +195,18 @@ int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, entries[nr].rsvd = 0; nr++; + if ( tsc != NULL ) + { + tsc_entry = &entries[nr]; + entries[nr].u.cmd = XEN_RESOURCE_OP_MSR_READ; + entries[nr].idx = MSR_IA32_TSC; + entries[nr].val = 0; + entries[nr].rsvd = 0; + nr++; + } + + assert(nr <= ARRAY_SIZE(entries)); + op.cpu = cpu; op.nr_entries = nr; op.entries = entries; @@ -180,6 +220,9 @@ int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, *monitor_data = entries[1].val; + if ( tsc_entry != NULL ) + *tsc = tsc_entry->val; + return 0; } diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index e3d2ae8..6bbc52d 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -711,6 +711,13 @@ void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, libxl_mac *src); * If this is defined, the Cache Monitoring Technology feature is supported. */ #define LIBXL_HAVE_PSR_CMT 1 + +/* + * LIBXL_HAVE_PSR_MBM + * + * If this is defined, the Memory Bandwidth Monitoring feature is supported. + */ +#define LIBXL_HAVE_PSR_MBM 1 #endif typedef char **libxl_string_list; @@ -1484,6 +1491,16 @@ int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, uint32_t *l3_cache_occupancy); #endif +#ifdef LIBXL_HAVE_PSR_MBM +int libxl_psr_cmt_type_supported(libxl_ctx *ctx, libxl_psr_cmt_type type); +int libxl_psr_cmt_get_sample(libxl_ctx *ctx, + uint32_t domid, + libxl_psr_cmt_type type, + uint64_t scope, + uint64_t *sample_r, + uint64_t *tsc_r); +#endif + /* misc */ /* Each of these sets or clears the flag according to whether the diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c index ec3b6e9..3e1c792 100644 --- a/tools/libxl/libxl_psr.c +++ b/tools/libxl/libxl_psr.c @@ -161,18 +161,36 @@ out: return rc; } -int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, - uint32_t domid, - uint32_t socketid, - uint32_t *l3_cache_occupancy) +int libxl_psr_cmt_type_supported(libxl_ctx *ctx, libxl_psr_cmt_type type) { GC_INIT(ctx); + uint32_t event_mask; + int rc; + rc = xc_psr_cmt_get_l3_event_mask(ctx->xch, &event_mask); + if (rc < 0) { + libxl__psr_cmt_log_err_msg(gc, errno); + rc = 0; + } else { + rc = event_mask & (1 << (type - 1)); + } + + GC_FREE; + return rc; +} + +int libxl_psr_cmt_get_sample(libxl_ctx *ctx, + uint32_t domid, + libxl_psr_cmt_type type, + uint64_t scope, + uint64_t *sample_r, + uint64_t *tsc_r) +{ + GC_INIT(ctx); unsigned int rmid; uint32_t upscaling_factor; uint64_t monitor_data; int cpu, rc; - xc_psr_cmt_type type; rc = xc_psr_cmt_get_domain_rmid(ctx->xch, domid, &rmid); if (rc < 0 || rmid == 0) { @@ -182,15 +200,15 @@ int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, goto out; } - cpu = libxl__pick_socket_cpu(gc, socketid); + cpu = libxl__pick_socket_cpu(gc, scope); if (cpu < 0) { LOGE(ERROR, "failed to get socket cpu"); rc = ERROR_FAIL; goto out; } - type = XC_PSR_CMT_L3_OCCUPANCY; - rc = xc_psr_cmt_get_data(ctx->xch, rmid, cpu, type, &monitor_data); + rc = xc_psr_cmt_get_data(ctx->xch, rmid, cpu, type - 1, + &monitor_data, tsc_r); if (rc < 0) { LOGE(ERROR, "failed to get monitoring data"); rc = ERROR_FAIL; @@ -204,13 +222,31 @@ int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, goto out; } - *l3_cache_occupancy = upscaling_factor * monitor_data / 1024; - rc = 0; + *sample_r = monitor_data * upscaling_factor; out: GC_FREE; return rc; } +int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, + uint32_t domid, + uint32_t socketid, + uint32_t *l3_cache_occupancy) +{ + uint64_t data; + int rc; + + rc = libxl_psr_cmt_get_sample(ctx, domid, + LIBXL_PSR_CMT_TYPE_CACHE_OCCUPANCY, + socketid, &data, NULL); + if (rc < 0) + goto out; + + *l3_cache_occupancy = data / 1024; +out: + return rc; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 02be466..47af340 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -696,4 +696,6 @@ libxl_event = Struct("event",[ libxl_psr_cmt_type = Enumeration("psr_cmt_type", [ (1, "CACHE_OCCUPANCY"), + (2, "TOTAL_MEM_COUNT"), + (3, "LOCAL_MEM_COUNT"), ]) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index e41f633..5c40e84 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7825,13 +7825,61 @@ out: } #ifdef LIBXL_HAVE_PSR_CMT + +#define MBM_SAMPLE_RETRY_MAX 4 +static int psr_cmt_get_mem_bandwidth(uint32_t domid, + libxl_psr_cmt_type type, + uint32_t socketid, + uint64_t *bandwidth_r) +{ + uint64_t sample1, sample2; + uint64_t tsc1, tsc2; + int retry_attempts = 0; + int rc; + + while (1) { + rc = libxl_psr_cmt_get_sample(ctx, domid, type, socketid, + &sample1, &tsc1); + if (rc < 0) + return rc; + + usleep(10000); + + rc = libxl_psr_cmt_get_sample(ctx, domid, type, socketid, + &sample2, &tsc2); + if (rc < 0) + return rc; + + if (tsc2 <= tsc1) + return -1; + + /* + * Hardware guarantees at most 1 overflow can happen if the duration + * between two samples is less than 1 second. Note that tsc returned + * from hypervisor is already-scaled time(ns). + */ + if (tsc2 - tsc1 < 1000000000 && sample2 >= sample1) + break; + + if (retry_attempts < MBM_SAMPLE_RETRY_MAX) { + retry_attempts++; + } else { + fprintf(stderr, "event counter overflowed\n"); + return -1; + } + } + + *bandwidth_r = (sample2 - sample1) * 1000000000 / (tsc2 - tsc1) / 1024; + return 0; +} + static void psr_cmt_print_domain_info(libxl_dominfo *dominfo, libxl_psr_cmt_type type, uint32_t nr_sockets) { char *domain_name; uint32_t socketid; - uint32_t l3_cache_occupancy; + uint64_t monitor_data; if (!libxl_psr_cmt_domain_attached(ctx, dominfo->domid)) return; @@ -7843,11 +7891,15 @@ static void psr_cmt_print_domain_info(libxl_dominfo *dominfo, for (socketid = 0; socketid < nr_sockets; socketid++) { switch (type) { case LIBXL_PSR_CMT_TYPE_CACHE_OCCUPANCY: - if (!libxl_psr_cmt_get_cache_occupancy(ctx, - dominfo->domid, - socketid, - &l3_cache_occupancy)) - printf("%13u KB", l3_cache_occupancy); + if (!libxl_psr_cmt_get_sample(ctx, dominfo->domid, type, socketid, + &monitor_data, NULL)) + printf("%13"PRIu64" KB", monitor_data / 1024); + break; + case LIBXL_PSR_CMT_TYPE_TOTAL_MEM_COUNT: + case LIBXL_PSR_CMT_TYPE_LOCAL_MEM_COUNT: + if (!psr_cmt_get_mem_bandwidth(dominfo->domid, type, socketid, + &monitor_data)) + printf("%11"PRIu64" KB/s", monitor_data); break; default: return; @@ -7869,6 +7921,12 @@ static int psr_cmt_show(libxl_psr_cmt_type type, uint32_t domid) return -1; } + if (!libxl_psr_cmt_type_supported(ctx, type)) { + fprintf(stderr, "Monitor type '%s' is not supported in the system\n", + libxl_psr_cmt_type_to_string(type)); + return -1; + } + libxl_physinfo_init(&info); rc = libxl_get_physinfo(ctx, &info); if (rc < 0) { @@ -7973,7 +8031,16 @@ int main_psr_cmt_show(int argc, char **argv) /* No options */ } - libxl_psr_cmt_type_from_string(argv[optind], &type); + if (!strcmp(argv[optind], "cache_occupancy")) + type = LIBXL_PSR_CMT_TYPE_CACHE_OCCUPANCY; + else if (!strcmp(argv[optind], "total_mem_bandwidth")) + type = LIBXL_PSR_CMT_TYPE_TOTAL_MEM_COUNT; + else if (!strcmp(argv[optind], "local_mem_bandwidth")) + type = LIBXL_PSR_CMT_TYPE_LOCAL_MEM_COUNT; + else { + help("psr-cmt-show"); + return 2; + } if (optind + 1 >= argc) domid = INVALID_DOMID; @@ -7984,14 +8051,7 @@ int main_psr_cmt_show(int argc, char **argv) return 2; } - switch (type) { - case LIBXL_PSR_CMT_TYPE_CACHE_OCCUPANCY: - ret = psr_cmt_show(type, domid); - break; - default: - help("psr-cmt-show"); - return 2; - } + ret = psr_cmt_show(type, domid); return ret; } diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index 4b30d3d..22ab63b 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -538,7 +538,9 @@ struct cmd_spec cmd_table[] = { "Show Cache Monitoring Technology information", " ", "Available monitor types:\n" - "\"cache_occupancy\": Show L3 cache occupancy\n", + "\"cache_occupancy\": Show L3 cache occupancy(KB)\n" + "\"total_mem_bandwidth\": Show total memory bandwidth(KB/s)\n" + "\"local_mem_bandwidth\": Show local memory bandwidth(KB/s)\n", }, #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 Mon Mar 09 11:45:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:45: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 1YUw7r-0001iq-Sz; Mon, 09 Mar 2015 11:45:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7q-0001iS-JC for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:34 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 95/2E-02995-DD78DF45; Mon, 09 Mar 2015 11:45:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1425901531!14295718!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26884 invoked from network); 9 Mar 2015 11:45:32 -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; 9 Mar 2015 11:45:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7m-0002WI-WF for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw7m-0008AR-UV for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:30 +0000 Date: Mon, 09 Mar 2015 11:45:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools, docs: add total/local memory bandwith monitoring X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 089deb42df0030b3a3f1c17af54945ed6af4f7f2 Author: Chao Peng AuthorDate: Wed Mar 4 18:06:44 2015 +0800 Commit: Ian Campbell CommitDate: Thu Mar 5 16:27:49 2015 +0000 tools, docs: add total/local memory bandwith monitoring Add Memory Bandwidth Monitoring(MBM) for VMs. Two types of monitoring are supported: total and local memory bandwidth monitoring. To use it, CMT should be enabled in hypervisor. Signed-off-by: Chao Peng Acked-by: Ian Campbell --- docs/man/xl.pod.1 | 11 ++++- docs/misc/xen-command-line.markdown | 3 + tools/libxc/include/xenctrl.h | 6 ++- tools/libxc/xc_msr_x86.h | 1 + tools/libxc/xc_psr.c | 47 +++++++++++++++++- tools/libxl/libxl.h | 17 +++++++ tools/libxl/libxl_psr.c | 56 ++++++++++++++++++---- tools/libxl/libxl_types.idl | 2 + tools/libxl/xl_cmdimpl.c | 90 +++++++++++++++++++++++++++++------ tools/libxl/xl_cmdtable.c | 4 +- 10 files changed, 207 insertions(+), 30 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index 6b89ba8..cd80ffc 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -1461,6 +1461,13 @@ is domain level. To monitor a specific domain, just attach the domain id with the monitoring service. When the domain doesn't need to be monitored any more, detach the domain id from the monitoring service. +Intel Broadwell and later server platforms also offer total/local memory +bandwidth monitoring. Xen supports per-domain monitoring for these two +additional monitoring types. Both memory bandwidth monitoring and L3 cache +occupancy monitoring share the same set of underlying monitoring service. Once +a domain is attached to the monitoring service, monitoring data can be showed +for any of these monitoring types. + =over 4 =item B [I] @@ -1475,7 +1482,9 @@ detach: Detach the platform shared resource monitoring service from a domain. Show monitoring data for a certain domain or all domains. Current supported monitor types are: - - "cache-occupancy": showing the L3 cache occupancy. + - "cache-occupancy": showing the L3 cache occupancy(KB). + - "total-mem-bandwidth": showing the total memory bandwidth(KB/s). + - "local-mem-bandwidth": showing the local memory bandwidth(KB/s). =back diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 9b458e1..63871cb 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1108,6 +1108,9 @@ The following resources are available: L3 cache occupancy. * `cmt` instructs Xen to enable/disable Cache Monitoring Technology. * `rmid_max` indicates the max value for rmid. +* Memory Bandwidth Monitoring (Broadwell and later). Information regarding the + total/local memory bandwidth. Follow the same options with Cache Monitoring + Technology. ### reboot > `= t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old]` diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 09d819f..df18292 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2688,6 +2688,8 @@ int xc_resource_op(xc_interface *xch, uint32_t nr_ops, xc_resource_op_t *ops); #if defined(__i386__) || defined(__x86_64__) enum xc_psr_cmt_type { XC_PSR_CMT_L3_OCCUPANCY, + XC_PSR_CMT_TOTAL_MEM_COUNT, + XC_PSR_CMT_LOCAL_MEM_COUNT, }; typedef enum xc_psr_cmt_type xc_psr_cmt_type; int xc_psr_cmt_attach(xc_interface *xch, uint32_t domid); @@ -2697,10 +2699,12 @@ int xc_psr_cmt_get_domain_rmid(xc_interface *xch, uint32_t domid, int xc_psr_cmt_get_total_rmid(xc_interface *xch, uint32_t *total_rmid); int xc_psr_cmt_get_l3_upscaling_factor(xc_interface *xch, uint32_t *upscaling_factor); +int xc_psr_cmt_get_l3_event_mask(xc_interface *xch, uint32_t *event_mask); int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu, uint32_t *l3_cache_size); int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, - uint32_t psr_cmt_type, uint64_t *monitor_data); + uint32_t psr_cmt_type, uint64_t *monitor_data, + uint64_t *tsc); int xc_psr_cmt_enabled(xc_interface *xch); #endif diff --git a/tools/libxc/xc_msr_x86.h b/tools/libxc/xc_msr_x86.h index 7c3e1a3..7f100e7 100644 --- a/tools/libxc/xc_msr_x86.h +++ b/tools/libxc/xc_msr_x86.h @@ -20,6 +20,7 @@ #ifndef XC_MSR_X86_H #define XC_MSR_X86_H +#define MSR_IA32_TSC 0x00000010 #define MSR_IA32_CMT_EVTSEL 0x00000c8d #define MSR_IA32_CMT_CTR 0x00000c8e diff --git a/tools/libxc/xc_psr.c b/tools/libxc/xc_psr.c index 70d9067..e367a80 100644 --- a/tools/libxc/xc_psr.c +++ b/tools/libxc/xc_psr.c @@ -17,12 +17,15 @@ * GNU Lesser General Public License for more details. */ +#include #include "xc_private.h" #include "xc_msr_x86.h" #define IA32_CMT_CTR_ERROR_MASK (0x3ull << 62) #define EVTID_L3_OCCUPANCY 0x1 +#define EVTID_TOTAL_MEM_COUNT 0x2 +#define EVTID_LOCAL_MEM_COUNT 0x3 int xc_psr_cmt_attach(xc_interface *xch, uint32_t domid) { @@ -112,6 +115,23 @@ int xc_psr_cmt_get_l3_upscaling_factor(xc_interface *xch, return rc; } +int xc_psr_cmt_get_l3_event_mask(xc_interface *xch, uint32_t *event_mask) +{ + int rc; + DECLARE_SYSCTL; + + sysctl.cmd = XEN_SYSCTL_psr_cmt_op; + sysctl.u.psr_cmt_op.cmd = + XEN_SYSCTL_PSR_CMT_get_l3_event_mask; + sysctl.u.psr_cmt_op.flags = 0; + + rc = xc_sysctl(xch, &sysctl); + if ( !rc ) + *event_mask = sysctl.u.psr_cmt_op.u.data; + + return rc; +} + int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu, uint32_t *l3_cache_size) { @@ -139,10 +159,12 @@ int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu, } int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, - xc_psr_cmt_type type, uint64_t *monitor_data) + xc_psr_cmt_type type, uint64_t *monitor_data, + uint64_t *tsc) { xc_resource_op_t op; - xc_resource_entry_t entries[2]; + xc_resource_entry_t entries[3]; + xc_resource_entry_t *tsc_entry = NULL; uint32_t evtid, nr = 0; int rc; @@ -151,6 +173,12 @@ int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, case XC_PSR_CMT_L3_OCCUPANCY: evtid = EVTID_L3_OCCUPANCY; break; + case XC_PSR_CMT_TOTAL_MEM_COUNT: + evtid = EVTID_TOTAL_MEM_COUNT; + break; + case XC_PSR_CMT_LOCAL_MEM_COUNT: + evtid = EVTID_LOCAL_MEM_COUNT; + break; default: return -1; } @@ -167,6 +195,18 @@ int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, entries[nr].rsvd = 0; nr++; + if ( tsc != NULL ) + { + tsc_entry = &entries[nr]; + entries[nr].u.cmd = XEN_RESOURCE_OP_MSR_READ; + entries[nr].idx = MSR_IA32_TSC; + entries[nr].val = 0; + entries[nr].rsvd = 0; + nr++; + } + + assert(nr <= ARRAY_SIZE(entries)); + op.cpu = cpu; op.nr_entries = nr; op.entries = entries; @@ -180,6 +220,9 @@ int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, *monitor_data = entries[1].val; + if ( tsc_entry != NULL ) + *tsc = tsc_entry->val; + return 0; } diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index e3d2ae8..6bbc52d 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -711,6 +711,13 @@ void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, libxl_mac *src); * If this is defined, the Cache Monitoring Technology feature is supported. */ #define LIBXL_HAVE_PSR_CMT 1 + +/* + * LIBXL_HAVE_PSR_MBM + * + * If this is defined, the Memory Bandwidth Monitoring feature is supported. + */ +#define LIBXL_HAVE_PSR_MBM 1 #endif typedef char **libxl_string_list; @@ -1484,6 +1491,16 @@ int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, uint32_t *l3_cache_occupancy); #endif +#ifdef LIBXL_HAVE_PSR_MBM +int libxl_psr_cmt_type_supported(libxl_ctx *ctx, libxl_psr_cmt_type type); +int libxl_psr_cmt_get_sample(libxl_ctx *ctx, + uint32_t domid, + libxl_psr_cmt_type type, + uint64_t scope, + uint64_t *sample_r, + uint64_t *tsc_r); +#endif + /* misc */ /* Each of these sets or clears the flag according to whether the diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c index ec3b6e9..3e1c792 100644 --- a/tools/libxl/libxl_psr.c +++ b/tools/libxl/libxl_psr.c @@ -161,18 +161,36 @@ out: return rc; } -int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, - uint32_t domid, - uint32_t socketid, - uint32_t *l3_cache_occupancy) +int libxl_psr_cmt_type_supported(libxl_ctx *ctx, libxl_psr_cmt_type type) { GC_INIT(ctx); + uint32_t event_mask; + int rc; + rc = xc_psr_cmt_get_l3_event_mask(ctx->xch, &event_mask); + if (rc < 0) { + libxl__psr_cmt_log_err_msg(gc, errno); + rc = 0; + } else { + rc = event_mask & (1 << (type - 1)); + } + + GC_FREE; + return rc; +} + +int libxl_psr_cmt_get_sample(libxl_ctx *ctx, + uint32_t domid, + libxl_psr_cmt_type type, + uint64_t scope, + uint64_t *sample_r, + uint64_t *tsc_r) +{ + GC_INIT(ctx); unsigned int rmid; uint32_t upscaling_factor; uint64_t monitor_data; int cpu, rc; - xc_psr_cmt_type type; rc = xc_psr_cmt_get_domain_rmid(ctx->xch, domid, &rmid); if (rc < 0 || rmid == 0) { @@ -182,15 +200,15 @@ int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, goto out; } - cpu = libxl__pick_socket_cpu(gc, socketid); + cpu = libxl__pick_socket_cpu(gc, scope); if (cpu < 0) { LOGE(ERROR, "failed to get socket cpu"); rc = ERROR_FAIL; goto out; } - type = XC_PSR_CMT_L3_OCCUPANCY; - rc = xc_psr_cmt_get_data(ctx->xch, rmid, cpu, type, &monitor_data); + rc = xc_psr_cmt_get_data(ctx->xch, rmid, cpu, type - 1, + &monitor_data, tsc_r); if (rc < 0) { LOGE(ERROR, "failed to get monitoring data"); rc = ERROR_FAIL; @@ -204,13 +222,31 @@ int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, goto out; } - *l3_cache_occupancy = upscaling_factor * monitor_data / 1024; - rc = 0; + *sample_r = monitor_data * upscaling_factor; out: GC_FREE; return rc; } +int libxl_psr_cmt_get_cache_occupancy(libxl_ctx *ctx, + uint32_t domid, + uint32_t socketid, + uint32_t *l3_cache_occupancy) +{ + uint64_t data; + int rc; + + rc = libxl_psr_cmt_get_sample(ctx, domid, + LIBXL_PSR_CMT_TYPE_CACHE_OCCUPANCY, + socketid, &data, NULL); + if (rc < 0) + goto out; + + *l3_cache_occupancy = data / 1024; +out: + return rc; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 02be466..47af340 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -696,4 +696,6 @@ libxl_event = Struct("event",[ libxl_psr_cmt_type = Enumeration("psr_cmt_type", [ (1, "CACHE_OCCUPANCY"), + (2, "TOTAL_MEM_COUNT"), + (3, "LOCAL_MEM_COUNT"), ]) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index e41f633..5c40e84 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7825,13 +7825,61 @@ out: } #ifdef LIBXL_HAVE_PSR_CMT + +#define MBM_SAMPLE_RETRY_MAX 4 +static int psr_cmt_get_mem_bandwidth(uint32_t domid, + libxl_psr_cmt_type type, + uint32_t socketid, + uint64_t *bandwidth_r) +{ + uint64_t sample1, sample2; + uint64_t tsc1, tsc2; + int retry_attempts = 0; + int rc; + + while (1) { + rc = libxl_psr_cmt_get_sample(ctx, domid, type, socketid, + &sample1, &tsc1); + if (rc < 0) + return rc; + + usleep(10000); + + rc = libxl_psr_cmt_get_sample(ctx, domid, type, socketid, + &sample2, &tsc2); + if (rc < 0) + return rc; + + if (tsc2 <= tsc1) + return -1; + + /* + * Hardware guarantees at most 1 overflow can happen if the duration + * between two samples is less than 1 second. Note that tsc returned + * from hypervisor is already-scaled time(ns). + */ + if (tsc2 - tsc1 < 1000000000 && sample2 >= sample1) + break; + + if (retry_attempts < MBM_SAMPLE_RETRY_MAX) { + retry_attempts++; + } else { + fprintf(stderr, "event counter overflowed\n"); + return -1; + } + } + + *bandwidth_r = (sample2 - sample1) * 1000000000 / (tsc2 - tsc1) / 1024; + return 0; +} + static void psr_cmt_print_domain_info(libxl_dominfo *dominfo, libxl_psr_cmt_type type, uint32_t nr_sockets) { char *domain_name; uint32_t socketid; - uint32_t l3_cache_occupancy; + uint64_t monitor_data; if (!libxl_psr_cmt_domain_attached(ctx, dominfo->domid)) return; @@ -7843,11 +7891,15 @@ static void psr_cmt_print_domain_info(libxl_dominfo *dominfo, for (socketid = 0; socketid < nr_sockets; socketid++) { switch (type) { case LIBXL_PSR_CMT_TYPE_CACHE_OCCUPANCY: - if (!libxl_psr_cmt_get_cache_occupancy(ctx, - dominfo->domid, - socketid, - &l3_cache_occupancy)) - printf("%13u KB", l3_cache_occupancy); + if (!libxl_psr_cmt_get_sample(ctx, dominfo->domid, type, socketid, + &monitor_data, NULL)) + printf("%13"PRIu64" KB", monitor_data / 1024); + break; + case LIBXL_PSR_CMT_TYPE_TOTAL_MEM_COUNT: + case LIBXL_PSR_CMT_TYPE_LOCAL_MEM_COUNT: + if (!psr_cmt_get_mem_bandwidth(dominfo->domid, type, socketid, + &monitor_data)) + printf("%11"PRIu64" KB/s", monitor_data); break; default: return; @@ -7869,6 +7921,12 @@ static int psr_cmt_show(libxl_psr_cmt_type type, uint32_t domid) return -1; } + if (!libxl_psr_cmt_type_supported(ctx, type)) { + fprintf(stderr, "Monitor type '%s' is not supported in the system\n", + libxl_psr_cmt_type_to_string(type)); + return -1; + } + libxl_physinfo_init(&info); rc = libxl_get_physinfo(ctx, &info); if (rc < 0) { @@ -7973,7 +8031,16 @@ int main_psr_cmt_show(int argc, char **argv) /* No options */ } - libxl_psr_cmt_type_from_string(argv[optind], &type); + if (!strcmp(argv[optind], "cache_occupancy")) + type = LIBXL_PSR_CMT_TYPE_CACHE_OCCUPANCY; + else if (!strcmp(argv[optind], "total_mem_bandwidth")) + type = LIBXL_PSR_CMT_TYPE_TOTAL_MEM_COUNT; + else if (!strcmp(argv[optind], "local_mem_bandwidth")) + type = LIBXL_PSR_CMT_TYPE_LOCAL_MEM_COUNT; + else { + help("psr-cmt-show"); + return 2; + } if (optind + 1 >= argc) domid = INVALID_DOMID; @@ -7984,14 +8051,7 @@ int main_psr_cmt_show(int argc, char **argv) return 2; } - switch (type) { - case LIBXL_PSR_CMT_TYPE_CACHE_OCCUPANCY: - ret = psr_cmt_show(type, domid); - break; - default: - help("psr-cmt-show"); - return 2; - } + ret = psr_cmt_show(type, domid); return ret; } diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index 4b30d3d..22ab63b 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -538,7 +538,9 @@ struct cmd_spec cmd_table[] = { "Show Cache Monitoring Technology information", " ", "Available monitor types:\n" - "\"cache_occupancy\": Show L3 cache occupancy\n", + "\"cache_occupancy\": Show L3 cache occupancy(KB)\n" + "\"total_mem_bandwidth\": Show total memory bandwidth(KB/s)\n" + "\"local_mem_bandwidth\": Show local memory bandwidth(KB/s)\n", }, #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 Mon Mar 09 11:45:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:45:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw83-0001l6-W0; Mon, 09 Mar 2015 11:45:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw82-0001kr-Eg for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:46 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 60/83-02745-9E78DF45; Mon, 09 Mar 2015 11:45:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1425901541!14353551!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9571 invoked from network); 9 Mar 2015 11:45:42 -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; 9 Mar 2015 11:45:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7x-0002WO-5Q for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw7x-0008Ar-41 for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:41 +0000 Date: Mon, 09 Mar 2015 11:45:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Duplicate gic-v2.c file to support hip04 platform version X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 612aa4abf3edc51075ff8c89e839ac40d5f0d159 Author: Frediano Ziglio AuthorDate: Tue Mar 3 15:41:12 2015 +0000 Commit: Ian Campbell CommitDate: Thu Mar 5 16:37:33 2015 +0000 xen/arm: Duplicate gic-v2.c file to support hip04 platform version HiSilison Hip04 platform use a slightly different version. This is just a verbatim copy of the file to workaround git not fully supporting copy operation. Signed-off-by: Frediano Ziglio Acked-by: Ian Campbell --- xen/arch/arm/gic-hip04.c | 801 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 801 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/gic-hip04.c b/xen/arch/arm/gic-hip04.c new file mode 100644 index 0000000..20cdbc9 --- /dev/null +++ b/xen/arch/arm/gic-hip04.c @@ -0,0 +1,801 @@ +/* + * xen/arch/arm/gic-v2.c + * + * ARM Generic Interrupt Controller support v2 + * + * Tim Deegan + * Copyright (c) 2011 Citrix Systems. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +/* + * LR register definitions are GIC v2 specific. + * Moved these definitions from header file to here + */ +#define GICH_V2_LR_VIRTUAL_MASK 0x3ff +#define GICH_V2_LR_VIRTUAL_SHIFT 0 +#define GICH_V2_LR_PHYSICAL_MASK 0x3ff +#define GICH_V2_LR_PHYSICAL_SHIFT 10 +#define GICH_V2_LR_STATE_MASK 0x3 +#define GICH_V2_LR_STATE_SHIFT 28 +#define GICH_V2_LR_PRIORITY_SHIFT 23 +#define GICH_V2_LR_PRIORITY_MASK 0x1f +#define GICH_V2_LR_HW_SHIFT 31 +#define GICH_V2_LR_HW_MASK 0x1 +#define GICH_V2_LR_GRP_SHIFT 30 +#define GICH_V2_LR_GRP_MASK 0x1 +#define GICH_V2_LR_MAINTENANCE_IRQ (1<<19) +#define GICH_V2_LR_GRP1 (1<<30) +#define GICH_V2_LR_HW (1<<31) +#define GICH_V2_LR_CPUID_SHIFT 9 +#define GICH_V2_VTR_NRLRGS 0x3f + +#define GICH_V2_VMCR_PRIORITY_MASK 0x1f +#define GICH_V2_VMCR_PRIORITY_SHIFT 27 + +/* Global state */ +static struct { + paddr_t dbase; /* Address of distributor registers */ + void __iomem * map_dbase; /* IO mapped Address of distributor registers */ + paddr_t cbase; /* Address of CPU interface registers */ + void __iomem * map_cbase[2]; /* IO mapped Address of CPU interface registers */ + paddr_t hbase; /* Address of virtual interface registers */ + void __iomem * map_hbase; /* IO Address of virtual interface registers */ + paddr_t vbase; /* Address of virtual cpu interface registers */ + spinlock_t lock; +} gicv2; + +static struct gic_info gicv2_info; + +/* The GIC mapping of CPU interfaces does not necessarily match the + * logical CPU numbering. Let's use mapping as returned by the GIC + * itself + */ +static DEFINE_PER_CPU(u8, gic_cpu_id); + +/* Maximum cpu interface per GIC */ +#define NR_GIC_CPU_IF 8 + +static inline void writeb_gicd(uint8_t val, unsigned int offset) +{ + writeb_relaxed(val, gicv2.map_dbase + offset); +} + +static inline void writel_gicd(uint32_t val, unsigned int offset) +{ + writel_relaxed(val, gicv2.map_dbase + offset); +} + +static inline uint32_t readl_gicd(unsigned int offset) +{ + return readl_relaxed(gicv2.map_dbase + offset); +} + +static inline void writel_gicc(uint32_t val, unsigned int offset) +{ + unsigned int page = offset >> PAGE_SHIFT; + offset &= ~PAGE_MASK; + writel_relaxed(val, gicv2.map_cbase[page] + offset); +} + +static inline uint32_t readl_gicc(unsigned int offset) +{ + unsigned int page = offset >> PAGE_SHIFT; + offset &= ~PAGE_MASK; + return readl_relaxed(gicv2.map_cbase[page] + offset); +} + +static inline void writel_gich(uint32_t val, unsigned int offset) +{ + writel_relaxed(val, gicv2.map_hbase + offset); +} + +static inline uint32_t readl_gich(int unsigned offset) +{ + return readl_relaxed(gicv2.map_hbase + offset); +} + +static unsigned int gicv2_cpu_mask(const cpumask_t *cpumask) +{ + unsigned int cpu; + unsigned int mask = 0; + cpumask_t possible_mask; + + cpumask_and(&possible_mask, cpumask, &cpu_possible_map); + for_each_cpu( cpu, &possible_mask ) + { + ASSERT(cpu < NR_GIC_CPU_IF); + mask |= per_cpu(gic_cpu_id, cpu); + } + + return mask; +} + +static void gicv2_save_state(struct vcpu *v) +{ + int i; + + /* No need for spinlocks here because interrupts are disabled around + * this call and it only accesses struct vcpu fields that cannot be + * accessed simultaneously by another pCPU. + */ + for ( i = 0; i < gicv2_info.nr_lrs; i++ ) + v->arch.gic.v2.lr[i] = readl_gich(GICH_LR + i * 4); + + v->arch.gic.v2.apr = readl_gich(GICH_APR); + v->arch.gic.v2.vmcr = readl_gich(GICH_VMCR); + /* Disable until next VCPU scheduled */ + writel_gich(0, GICH_HCR); +} + +static void gicv2_restore_state(const struct vcpu *v) +{ + int i; + + for ( i = 0; i < gicv2_info.nr_lrs; i++ ) + writel_gich(v->arch.gic.v2.lr[i], GICH_LR + i * 4); + + writel_gich(v->arch.gic.v2.apr, GICH_APR); + writel_gich(v->arch.gic.v2.vmcr, GICH_VMCR); + writel_gich(GICH_HCR_EN, GICH_HCR); +} + +static void gicv2_dump_state(const struct vcpu *v) +{ + int i; + + if ( v == current ) + { + for ( i = 0; i < gicv2_info.nr_lrs; i++ ) + printk(" HW_LR[%d]=%x\n", i, + readl_gich(GICH_LR + i * 4)); + } + else + { + for ( i = 0; i < gicv2_info.nr_lrs; i++ ) + printk(" VCPU_LR[%d]=%x\n", i, v->arch.gic.v2.lr[i]); + } +} + +static void gicv2_eoi_irq(struct irq_desc *irqd) +{ + int irq = irqd->irq; + /* Lower the priority */ + writel_gicc(irq, GICC_EOIR); +} + +static void gicv2_dir_irq(struct irq_desc *irqd) +{ + /* Deactivate */ + writel_gicc(irqd->irq, GICC_DIR); +} + +static unsigned int gicv2_read_irq(void) +{ + return (readl_gicc(GICC_IAR) & GICC_IA_IRQ); +} + +/* + * needs to be called with a valid cpu_mask, ie each cpu in the mask has + * already called gic_cpu_init + */ +static void gicv2_set_irq_properties(struct irq_desc *desc, + const cpumask_t *cpu_mask, + unsigned int priority) +{ + uint32_t cfg, actual, edgebit; + unsigned int mask = gicv2_cpu_mask(cpu_mask); + unsigned int irq = desc->irq; + unsigned int type = desc->arch.type; + + ASSERT(type != DT_IRQ_TYPE_INVALID); + ASSERT(spin_is_locked(&desc->lock)); + + spin_lock(&gicv2.lock); + /* Set edge / level */ + cfg = readl_gicd(GICD_ICFGR + (irq / 16) * 4); + edgebit = 2u << (2 * (irq % 16)); + if ( type & DT_IRQ_TYPE_LEVEL_MASK ) + cfg &= ~edgebit; + else if ( type & DT_IRQ_TYPE_EDGE_BOTH ) + cfg |= edgebit; + writel_gicd(cfg, GICD_ICFGR + (irq / 16) * 4); + + actual = readl_gicd(GICD_ICFGR + (irq / 16) * 4); + if ( ( cfg & edgebit ) ^ ( actual & edgebit ) ) + { + printk(XENLOG_WARNING "GICv2: WARNING: " + "CPU%d: Failed to configure IRQ%u as %s-triggered. " + "H/w forces to %s-triggered.\n", + smp_processor_id(), desc->irq, + cfg & edgebit ? "Edge" : "Level", + actual & edgebit ? "Edge" : "Level"); + desc->arch.type = actual & edgebit ? + DT_IRQ_TYPE_EDGE_RISING : + DT_IRQ_TYPE_LEVEL_HIGH; + } + + /* Set target CPU mask (RAZ/WI on uniprocessor) */ + writeb_gicd(mask, GICD_ITARGETSR + irq); + /* Set priority */ + writeb_gicd(priority, GICD_IPRIORITYR + irq); + + spin_unlock(&gicv2.lock); +} + +static void __init gicv2_dist_init(void) +{ + uint32_t type; + uint32_t cpumask; + uint32_t gic_cpus; + int i; + + cpumask = readl_gicd(GICD_ITARGETSR) & 0xff; + cpumask |= cpumask << 8; + cpumask |= cpumask << 16; + + /* Disable the distributor */ + writel_gicd(0, GICD_CTLR); + + type = readl_gicd(GICD_TYPER); + gicv2_info.nr_lines = 32 * ((type & GICD_TYPE_LINES) + 1); + gic_cpus = 1 + ((type & GICD_TYPE_CPUS) >> 5); + printk("GICv2: %d lines, %d cpu%s%s (IID %8.8x).\n", + gicv2_info.nr_lines, gic_cpus, (gic_cpus == 1) ? "" : "s", + (type & GICD_TYPE_SEC) ? ", secure" : "", + readl_gicd(GICD_IIDR)); + + /* Default all global IRQs to level, active low */ + for ( i = 32; i < gicv2_info.nr_lines; i += 16 ) + writel_gicd(0x0, GICD_ICFGR + (i / 16) * 4); + + /* Route all global IRQs to this CPU */ + for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) + writel_gicd(cpumask, GICD_ITARGETSR + (i / 4) * 4); + + /* Default priority for global interrupts */ + for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) + writel_gicd(GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, + GICD_IPRIORITYR + (i / 4) * 4); + + /* Disable all global interrupts */ + for ( i = 32; i < gicv2_info.nr_lines; i += 32 ) + writel_gicd(~0x0, GICD_ICENABLER + (i / 32) * 4); + + /* Turn on the distributor */ + writel_gicd(GICD_CTL_ENABLE, GICD_CTLR); +} + +static void __cpuinit gicv2_cpu_init(void) +{ + int i; + + this_cpu(gic_cpu_id) = readl_gicd(GICD_ITARGETSR) & 0xff; + + /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so + * even though they are controlled with GICD registers, they must + * be set up here with the other per-cpu state. */ + writel_gicd(0xffff0000, GICD_ICENABLER); /* Disable all PPI */ + writel_gicd(0x0000ffff, GICD_ISENABLER); /* Enable all SGI */ + + /* Set SGI priorities */ + for ( i = 0; i < 16; i += 4 ) + writel_gicd(GIC_PRI_IPI << 24 | GIC_PRI_IPI << 16 | + GIC_PRI_IPI << 8 | GIC_PRI_IPI, + GICD_IPRIORITYR + (i / 4) * 4); + + /* Set PPI priorities */ + for ( i = 16; i < 32; i += 4 ) + writel_gicd(GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, + GICD_IPRIORITYR + (i / 4) * 4); + + /* Local settings: interface controller */ + /* Don't mask by priority */ + writel_gicc(0xff, GICC_PMR); + /* Finest granularity of priority */ + writel_gicc(0x0, GICC_BPR); + /* Turn on delivery */ + writel_gicc(GICC_CTL_ENABLE|GICC_CTL_EOI, GICC_CTLR); +} + +static void gicv2_cpu_disable(void) +{ + writel_gicc(0x0, GICC_CTLR); +} + +static void __cpuinit gicv2_hyp_init(void) +{ + uint32_t vtr; + uint8_t nr_lrs; + + vtr = readl_gich(GICH_VTR); + nr_lrs = (vtr & GICH_V2_VTR_NRLRGS) + 1; + gicv2_info.nr_lrs = nr_lrs; + + writel_gich(GICH_MISR_EOI, GICH_MISR); +} + +static void __cpuinit gicv2_hyp_disable(void) +{ + writel_gich(0, GICH_HCR); +} + +static int gicv2_secondary_cpu_init(void) +{ + spin_lock(&gicv2.lock); + + gicv2_cpu_init(); + gicv2_hyp_init(); + + spin_unlock(&gicv2.lock); + + return 0; +} + +static void gicv2_send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, + const cpumask_t *cpu_mask) +{ + unsigned int mask = 0; + cpumask_t online_mask; + + switch ( irqmode ) + { + case SGI_TARGET_OTHERS: + writel_gicd(GICD_SGI_TARGET_OTHERS | sgi, GICD_SGIR); + break; + case SGI_TARGET_SELF: + writel_gicd(GICD_SGI_TARGET_SELF | sgi, GICD_SGIR); + break; + case SGI_TARGET_LIST: + cpumask_and(&online_mask, cpu_mask, &cpu_online_map); + mask = gicv2_cpu_mask(&online_mask); + writel_gicd(GICD_SGI_TARGET_LIST | + (mask << GICD_SGI_TARGET_SHIFT) | sgi, + GICD_SGIR); + break; + default: + BUG(); + } +} + +/* Shut down the per-CPU GIC interface */ +static void gicv2_disable_interface(void) +{ + spin_lock(&gicv2.lock); + gicv2_cpu_disable(); + gicv2_hyp_disable(); + spin_unlock(&gicv2.lock); +} + +static void gicv2_update_lr(int lr, const struct pending_irq *p, + unsigned int state) +{ + uint32_t lr_reg; + + BUG_ON(lr >= gicv2_info.nr_lrs); + BUG_ON(lr < 0); + + lr_reg = (((state & GICH_V2_LR_STATE_MASK) << GICH_V2_LR_STATE_SHIFT) | + ((GIC_PRI_TO_GUEST(p->priority) & GICH_V2_LR_PRIORITY_MASK) + << GICH_V2_LR_PRIORITY_SHIFT) | + ((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); + } + + writel_gich(lr_reg, GICH_LR + lr * 4); +} + +static void gicv2_clear_lr(int lr) +{ + writel_gich(0, GICH_LR + lr * 4); +} + +static int gicv2v_setup(struct domain *d) +{ + int ret; + + /* + * The hardware domain gets the hardware address. + * Guests get the virtual platform layout. + */ + if ( is_hardware_domain(d) ) + { + d->arch.vgic.dbase = gicv2.dbase; + d->arch.vgic.cbase = gicv2.cbase; + } + else + { + d->arch.vgic.dbase = GUEST_GICD_BASE; + d->arch.vgic.cbase = GUEST_GICC_BASE; + } + + /* + * Map the gic virtual cpu interface in the gic cpu interface + * region of the guest. + * + * The second page is always mapped at +4K irrespective of the + * GIC_64K_STRIDE quirk. The DTB passed to the guest reflects this. + */ + ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase), 1, + paddr_to_pfn(gicv2.vbase)); + if ( ret ) + return ret; + + if ( !platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) + ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), + 2, paddr_to_pfn(gicv2.vbase + PAGE_SIZE)); + else + ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), + 2, paddr_to_pfn(gicv2.vbase + 16*PAGE_SIZE)); + + return ret; +} + +static void gicv2_read_lr(int lr, struct gic_lr *lr_reg) +{ + uint32_t lrv; + + lrv = readl_gich(GICH_LR + lr * 4); + lr_reg->pirq = (lrv >> GICH_V2_LR_PHYSICAL_SHIFT) & GICH_V2_LR_PHYSICAL_MASK; + lr_reg->virq = (lrv >> GICH_V2_LR_VIRTUAL_SHIFT) & GICH_V2_LR_VIRTUAL_MASK; + lr_reg->priority = (lrv >> GICH_V2_LR_PRIORITY_SHIFT) & GICH_V2_LR_PRIORITY_MASK; + lr_reg->state = (lrv >> GICH_V2_LR_STATE_SHIFT) & GICH_V2_LR_STATE_MASK; + lr_reg->hw_status = (lrv >> GICH_V2_LR_HW_SHIFT) & GICH_V2_LR_HW_MASK; + lr_reg->grp = (lrv >> GICH_V2_LR_GRP_SHIFT) & GICH_V2_LR_GRP_MASK; +} + +static void gicv2_write_lr(int lr, const struct gic_lr *lr_reg) +{ + uint32_t lrv = 0; + + lrv = ( ((lr_reg->pirq & GICH_V2_LR_PHYSICAL_MASK) << GICH_V2_LR_PHYSICAL_SHIFT) | + ((lr_reg->virq & GICH_V2_LR_VIRTUAL_MASK) << GICH_V2_LR_VIRTUAL_SHIFT) | + ((uint32_t)(lr_reg->priority & GICH_V2_LR_PRIORITY_MASK) + << GICH_V2_LR_PRIORITY_SHIFT) | + ((uint32_t)(lr_reg->state & GICH_V2_LR_STATE_MASK) + << GICH_V2_LR_STATE_SHIFT) | + ((uint32_t)(lr_reg->hw_status & GICH_V2_LR_HW_MASK) + << GICH_V2_LR_HW_SHIFT) | + ((uint32_t)(lr_reg->grp & GICH_V2_LR_GRP_MASK) << GICH_V2_LR_GRP_SHIFT) ); + + writel_gich(lrv, GICH_LR + lr * 4); +} + +static void gicv2_hcr_status(uint32_t flag, bool_t status) +{ + uint32_t hcr = readl_gich(GICH_HCR); + + if ( status ) + hcr |= flag; + else + hcr &= (~flag); + + writel_gich(hcr, GICH_HCR); +} + +static unsigned int gicv2_read_vmcr_priority(void) +{ + return ((readl_gich(GICH_VMCR) >> GICH_V2_VMCR_PRIORITY_SHIFT) + & GICH_V2_VMCR_PRIORITY_MASK); +} + +static unsigned int gicv2_read_apr(int apr_reg) +{ + return readl_gich(GICH_APR); +} + +static void gicv2_irq_enable(struct irq_desc *desc) +{ + unsigned long flags; + int irq = desc->irq; + + ASSERT(spin_is_locked(&desc->lock)); + + spin_lock_irqsave(&gicv2.lock, flags); + clear_bit(_IRQ_DISABLED, &desc->status); + dsb(sy); + /* Enable routing */ + writel_gicd((1u << (irq % 32)), GICD_ISENABLER + (irq / 32) * 4); + spin_unlock_irqrestore(&gicv2.lock, flags); +} + +static void gicv2_irq_disable(struct irq_desc *desc) +{ + unsigned long flags; + int irq = desc->irq; + + ASSERT(spin_is_locked(&desc->lock)); + + spin_lock_irqsave(&gicv2.lock, flags); + /* Disable routing */ + writel_gicd(1u << (irq % 32), GICD_ICENABLER + (irq / 32) * 4); + set_bit(_IRQ_DISABLED, &desc->status); + spin_unlock_irqrestore(&gicv2.lock, flags); +} + +static unsigned int gicv2_irq_startup(struct irq_desc *desc) +{ + gicv2_irq_enable(desc); + + return 0; +} + +static void gicv2_irq_shutdown(struct irq_desc *desc) +{ + gicv2_irq_disable(desc); +} + +static void gicv2_irq_ack(struct irq_desc *desc) +{ + /* No ACK -- reading IAR has done this for us */ +} + +static void gicv2_host_irq_end(struct irq_desc *desc) +{ + /* Lower the priority */ + gicv2_eoi_irq(desc); + /* Deactivate */ + gicv2_dir_irq(desc); +} + +static void gicv2_guest_irq_end(struct irq_desc *desc) +{ + /* Lower the priority of the IRQ */ + gicv2_eoi_irq(desc); + /* Deactivation happens in maintenance interrupt / via GICV */ +} + +static void gicv2_irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_mask) +{ + unsigned int mask; + + ASSERT(!cpumask_empty(cpu_mask)); + + spin_lock(&gicv2.lock); + + mask = gicv2_cpu_mask(cpu_mask); + + /* Set target CPU mask (RAZ/WI on uniprocessor) */ + writeb_gicd(mask, GICD_ITARGETSR + desc->irq); + + spin_unlock(&gicv2.lock); +} + +static int gicv2_make_dt_node(const struct domain *d, + const struct dt_device_node *node, void *fdt) +{ + const struct dt_device_node *gic = dt_interrupt_controller; + const void *compatible = NULL; + u32 len; + const __be32 *regs; + int res = 0; + + compatible = dt_get_property(gic, "compatible", &len); + if ( !compatible ) + { + dprintk(XENLOG_ERR, "Can't find compatible property for the gic node\n"); + return -FDT_ERR_XEN(ENOENT); + } + + res = fdt_begin_node(fdt, "interrupt-controller"); + if ( res ) + return res; + + res = fdt_property(fdt, "compatible", compatible, len); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#interrupt-cells", 3); + if ( res ) + return res; + + res = fdt_property(fdt, "interrupt-controller", NULL, 0); + + if ( res ) + return res; + + /* + * DTB provides up to 4 regions to handle virtualization + * (in order GICD, GICC, GICH and GICV interfaces) + * however dom0 just needs GICD and GICC provided by Xen. + */ + regs = dt_get_property(gic, "reg", &len); + if ( !regs ) + { + dprintk(XENLOG_ERR, "Can't find reg property for the gic node\n"); + return -FDT_ERR_XEN(ENOENT); + } + + len = dt_cells_to_size(dt_n_addr_cells(node) + dt_n_size_cells(node)); + len *= 2; + + res = fdt_property(fdt, "reg", regs, len); + + return res; +} + +/* XXX different for level vs edge */ +static hw_irq_controller gicv2_host_irq_type = { + .typename = "gic-v2", + .startup = gicv2_irq_startup, + .shutdown = gicv2_irq_shutdown, + .enable = gicv2_irq_enable, + .disable = gicv2_irq_disable, + .ack = gicv2_irq_ack, + .end = gicv2_host_irq_end, + .set_affinity = gicv2_irq_set_affinity, +}; + +static hw_irq_controller gicv2_guest_irq_type = { + .typename = "gic-v2", + .startup = gicv2_irq_startup, + .shutdown = gicv2_irq_shutdown, + .enable = gicv2_irq_enable, + .disable = gicv2_irq_disable, + .ack = gicv2_irq_ack, + .end = gicv2_guest_irq_end, + .set_affinity = gicv2_irq_set_affinity, +}; + +const static struct gic_hw_operations gicv2_ops = { + .info = &gicv2_info, + .secondary_init = gicv2_secondary_cpu_init, + .save_state = gicv2_save_state, + .restore_state = gicv2_restore_state, + .dump_state = gicv2_dump_state, + .gicv_setup = gicv2v_setup, + .gic_host_irq_type = &gicv2_host_irq_type, + .gic_guest_irq_type = &gicv2_guest_irq_type, + .eoi_irq = gicv2_eoi_irq, + .deactivate_irq = gicv2_dir_irq, + .read_irq = gicv2_read_irq, + .set_irq_properties = gicv2_set_irq_properties, + .send_SGI = gicv2_send_SGI, + .disable_interface = gicv2_disable_interface, + .update_lr = gicv2_update_lr, + .update_hcr_status = gicv2_hcr_status, + .clear_lr = gicv2_clear_lr, + .read_lr = gicv2_read_lr, + .write_lr = gicv2_write_lr, + .read_vmcr_priority = gicv2_read_vmcr_priority, + .read_apr = gicv2_read_apr, + .make_dt_node = gicv2_make_dt_node, +}; + +/* Set up the GIC */ +static int __init gicv2_init(struct dt_device_node *node, const void *data) +{ + int res; + + dt_device_set_used_by(node, DOMID_XEN); + + res = dt_device_get_address(node, 0, &gicv2.dbase, NULL); + if ( res || !gicv2.dbase || (gicv2.dbase & ~PAGE_MASK) ) + panic("GICv2: Cannot find a valid address for the distributor"); + + res = dt_device_get_address(node, 1, &gicv2.cbase, NULL); + if ( res || !gicv2.cbase || (gicv2.cbase & ~PAGE_MASK) ) + panic("GICv2: Cannot find a valid address for the CPU"); + + res = dt_device_get_address(node, 2, &gicv2.hbase, NULL); + if ( res || !gicv2.hbase || (gicv2.hbase & ~PAGE_MASK) ) + panic("GICv2: Cannot find a valid address for the hypervisor"); + + res = dt_device_get_address(node, 3, &gicv2.vbase, NULL); + if ( res || !gicv2.vbase || (gicv2.vbase & ~PAGE_MASK) ) + panic("GICv2: Cannot find a valid address for the virtual CPU"); + + res = platform_get_irq(node, 0); + if ( res < 0 ) + panic("GICv2: Cannot find the maintenance IRQ"); + gicv2_info.maintenance_irq = res; + + /* Set the GIC as the primary interrupt controller */ + dt_interrupt_controller = node; + + /* TODO: Add check on distributor, cpu size */ + + printk("GICv2 initialization:\n" + " gic_dist_addr=%"PRIpaddr"\n" + " gic_cpu_addr=%"PRIpaddr"\n" + " gic_hyp_addr=%"PRIpaddr"\n" + " gic_vcpu_addr=%"PRIpaddr"\n" + " gic_maintenance_irq=%u\n", + gicv2.dbase, gicv2.cbase, gicv2.hbase, gicv2.vbase, + gicv2_info.maintenance_irq); + + if ( (gicv2.dbase & ~PAGE_MASK) || (gicv2.cbase & ~PAGE_MASK) || + (gicv2.hbase & ~PAGE_MASK) || (gicv2.vbase & ~PAGE_MASK) ) + panic("GICv2 interfaces not page aligned"); + + gicv2.map_dbase = ioremap_nocache(gicv2.dbase, PAGE_SIZE); + if ( !gicv2.map_dbase ) + panic("GICv2: Failed to ioremap for GIC distributor\n"); + + gicv2.map_cbase[0] = ioremap_nocache(gicv2.cbase, PAGE_SIZE); + + if ( platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) + gicv2.map_cbase[1] = ioremap_nocache(gicv2.cbase + PAGE_SIZE * 0x10, + PAGE_SIZE); + else + gicv2.map_cbase[1] = ioremap_nocache(gicv2.cbase + PAGE_SIZE, PAGE_SIZE); + + if ( !gicv2.map_cbase[0] || !gicv2.map_cbase[1] ) + panic("GICv2: Failed to ioremap for GIC CPU interface\n"); + + gicv2.map_hbase = ioremap_nocache(gicv2.hbase, PAGE_SIZE); + if ( !gicv2.map_hbase ) + panic("GICv2: Failed to ioremap for GIC Virtual interface\n"); + + /* Global settings: interrupt distributor */ + spin_lock_init(&gicv2.lock); + spin_lock(&gicv2.lock); + + gicv2_dist_init(); + gicv2_cpu_init(); + gicv2_hyp_init(); + + spin_unlock(&gicv2.lock); + + gicv2_info.hw_version = GIC_V2; + register_gic_ops(&gicv2_ops); + + return 0; +} + +static const struct dt_device_match gicv2_dt_match[] __initconst = +{ + DT_MATCH_GIC_V2, + { /* sentinel */ }, +}; + +DT_DEVICE_START(gicv2, "GICv2", DEVICE_GIC) + .dt_match = gicv2_dt_match, + .init = gicv2_init, +DT_DEVICE_END + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * 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 Mon Mar 09 11:45:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:45:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw83-0001l6-W0; Mon, 09 Mar 2015 11:45:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw82-0001kr-Eg for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:46 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 60/83-02745-9E78DF45; Mon, 09 Mar 2015 11:45:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1425901541!14353551!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9571 invoked from network); 9 Mar 2015 11:45:42 -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; 9 Mar 2015 11:45:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw7x-0002WO-5Q for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw7x-0008Ar-41 for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:41 +0000 Date: Mon, 09 Mar 2015 11:45:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Duplicate gic-v2.c file to support hip04 platform version X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 612aa4abf3edc51075ff8c89e839ac40d5f0d159 Author: Frediano Ziglio AuthorDate: Tue Mar 3 15:41:12 2015 +0000 Commit: Ian Campbell CommitDate: Thu Mar 5 16:37:33 2015 +0000 xen/arm: Duplicate gic-v2.c file to support hip04 platform version HiSilison Hip04 platform use a slightly different version. This is just a verbatim copy of the file to workaround git not fully supporting copy operation. Signed-off-by: Frediano Ziglio Acked-by: Ian Campbell --- xen/arch/arm/gic-hip04.c | 801 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 801 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/gic-hip04.c b/xen/arch/arm/gic-hip04.c new file mode 100644 index 0000000..20cdbc9 --- /dev/null +++ b/xen/arch/arm/gic-hip04.c @@ -0,0 +1,801 @@ +/* + * xen/arch/arm/gic-v2.c + * + * ARM Generic Interrupt Controller support v2 + * + * Tim Deegan + * Copyright (c) 2011 Citrix Systems. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +/* + * LR register definitions are GIC v2 specific. + * Moved these definitions from header file to here + */ +#define GICH_V2_LR_VIRTUAL_MASK 0x3ff +#define GICH_V2_LR_VIRTUAL_SHIFT 0 +#define GICH_V2_LR_PHYSICAL_MASK 0x3ff +#define GICH_V2_LR_PHYSICAL_SHIFT 10 +#define GICH_V2_LR_STATE_MASK 0x3 +#define GICH_V2_LR_STATE_SHIFT 28 +#define GICH_V2_LR_PRIORITY_SHIFT 23 +#define GICH_V2_LR_PRIORITY_MASK 0x1f +#define GICH_V2_LR_HW_SHIFT 31 +#define GICH_V2_LR_HW_MASK 0x1 +#define GICH_V2_LR_GRP_SHIFT 30 +#define GICH_V2_LR_GRP_MASK 0x1 +#define GICH_V2_LR_MAINTENANCE_IRQ (1<<19) +#define GICH_V2_LR_GRP1 (1<<30) +#define GICH_V2_LR_HW (1<<31) +#define GICH_V2_LR_CPUID_SHIFT 9 +#define GICH_V2_VTR_NRLRGS 0x3f + +#define GICH_V2_VMCR_PRIORITY_MASK 0x1f +#define GICH_V2_VMCR_PRIORITY_SHIFT 27 + +/* Global state */ +static struct { + paddr_t dbase; /* Address of distributor registers */ + void __iomem * map_dbase; /* IO mapped Address of distributor registers */ + paddr_t cbase; /* Address of CPU interface registers */ + void __iomem * map_cbase[2]; /* IO mapped Address of CPU interface registers */ + paddr_t hbase; /* Address of virtual interface registers */ + void __iomem * map_hbase; /* IO Address of virtual interface registers */ + paddr_t vbase; /* Address of virtual cpu interface registers */ + spinlock_t lock; +} gicv2; + +static struct gic_info gicv2_info; + +/* The GIC mapping of CPU interfaces does not necessarily match the + * logical CPU numbering. Let's use mapping as returned by the GIC + * itself + */ +static DEFINE_PER_CPU(u8, gic_cpu_id); + +/* Maximum cpu interface per GIC */ +#define NR_GIC_CPU_IF 8 + +static inline void writeb_gicd(uint8_t val, unsigned int offset) +{ + writeb_relaxed(val, gicv2.map_dbase + offset); +} + +static inline void writel_gicd(uint32_t val, unsigned int offset) +{ + writel_relaxed(val, gicv2.map_dbase + offset); +} + +static inline uint32_t readl_gicd(unsigned int offset) +{ + return readl_relaxed(gicv2.map_dbase + offset); +} + +static inline void writel_gicc(uint32_t val, unsigned int offset) +{ + unsigned int page = offset >> PAGE_SHIFT; + offset &= ~PAGE_MASK; + writel_relaxed(val, gicv2.map_cbase[page] + offset); +} + +static inline uint32_t readl_gicc(unsigned int offset) +{ + unsigned int page = offset >> PAGE_SHIFT; + offset &= ~PAGE_MASK; + return readl_relaxed(gicv2.map_cbase[page] + offset); +} + +static inline void writel_gich(uint32_t val, unsigned int offset) +{ + writel_relaxed(val, gicv2.map_hbase + offset); +} + +static inline uint32_t readl_gich(int unsigned offset) +{ + return readl_relaxed(gicv2.map_hbase + offset); +} + +static unsigned int gicv2_cpu_mask(const cpumask_t *cpumask) +{ + unsigned int cpu; + unsigned int mask = 0; + cpumask_t possible_mask; + + cpumask_and(&possible_mask, cpumask, &cpu_possible_map); + for_each_cpu( cpu, &possible_mask ) + { + ASSERT(cpu < NR_GIC_CPU_IF); + mask |= per_cpu(gic_cpu_id, cpu); + } + + return mask; +} + +static void gicv2_save_state(struct vcpu *v) +{ + int i; + + /* No need for spinlocks here because interrupts are disabled around + * this call and it only accesses struct vcpu fields that cannot be + * accessed simultaneously by another pCPU. + */ + for ( i = 0; i < gicv2_info.nr_lrs; i++ ) + v->arch.gic.v2.lr[i] = readl_gich(GICH_LR + i * 4); + + v->arch.gic.v2.apr = readl_gich(GICH_APR); + v->arch.gic.v2.vmcr = readl_gich(GICH_VMCR); + /* Disable until next VCPU scheduled */ + writel_gich(0, GICH_HCR); +} + +static void gicv2_restore_state(const struct vcpu *v) +{ + int i; + + for ( i = 0; i < gicv2_info.nr_lrs; i++ ) + writel_gich(v->arch.gic.v2.lr[i], GICH_LR + i * 4); + + writel_gich(v->arch.gic.v2.apr, GICH_APR); + writel_gich(v->arch.gic.v2.vmcr, GICH_VMCR); + writel_gich(GICH_HCR_EN, GICH_HCR); +} + +static void gicv2_dump_state(const struct vcpu *v) +{ + int i; + + if ( v == current ) + { + for ( i = 0; i < gicv2_info.nr_lrs; i++ ) + printk(" HW_LR[%d]=%x\n", i, + readl_gich(GICH_LR + i * 4)); + } + else + { + for ( i = 0; i < gicv2_info.nr_lrs; i++ ) + printk(" VCPU_LR[%d]=%x\n", i, v->arch.gic.v2.lr[i]); + } +} + +static void gicv2_eoi_irq(struct irq_desc *irqd) +{ + int irq = irqd->irq; + /* Lower the priority */ + writel_gicc(irq, GICC_EOIR); +} + +static void gicv2_dir_irq(struct irq_desc *irqd) +{ + /* Deactivate */ + writel_gicc(irqd->irq, GICC_DIR); +} + +static unsigned int gicv2_read_irq(void) +{ + return (readl_gicc(GICC_IAR) & GICC_IA_IRQ); +} + +/* + * needs to be called with a valid cpu_mask, ie each cpu in the mask has + * already called gic_cpu_init + */ +static void gicv2_set_irq_properties(struct irq_desc *desc, + const cpumask_t *cpu_mask, + unsigned int priority) +{ + uint32_t cfg, actual, edgebit; + unsigned int mask = gicv2_cpu_mask(cpu_mask); + unsigned int irq = desc->irq; + unsigned int type = desc->arch.type; + + ASSERT(type != DT_IRQ_TYPE_INVALID); + ASSERT(spin_is_locked(&desc->lock)); + + spin_lock(&gicv2.lock); + /* Set edge / level */ + cfg = readl_gicd(GICD_ICFGR + (irq / 16) * 4); + edgebit = 2u << (2 * (irq % 16)); + if ( type & DT_IRQ_TYPE_LEVEL_MASK ) + cfg &= ~edgebit; + else if ( type & DT_IRQ_TYPE_EDGE_BOTH ) + cfg |= edgebit; + writel_gicd(cfg, GICD_ICFGR + (irq / 16) * 4); + + actual = readl_gicd(GICD_ICFGR + (irq / 16) * 4); + if ( ( cfg & edgebit ) ^ ( actual & edgebit ) ) + { + printk(XENLOG_WARNING "GICv2: WARNING: " + "CPU%d: Failed to configure IRQ%u as %s-triggered. " + "H/w forces to %s-triggered.\n", + smp_processor_id(), desc->irq, + cfg & edgebit ? "Edge" : "Level", + actual & edgebit ? "Edge" : "Level"); + desc->arch.type = actual & edgebit ? + DT_IRQ_TYPE_EDGE_RISING : + DT_IRQ_TYPE_LEVEL_HIGH; + } + + /* Set target CPU mask (RAZ/WI on uniprocessor) */ + writeb_gicd(mask, GICD_ITARGETSR + irq); + /* Set priority */ + writeb_gicd(priority, GICD_IPRIORITYR + irq); + + spin_unlock(&gicv2.lock); +} + +static void __init gicv2_dist_init(void) +{ + uint32_t type; + uint32_t cpumask; + uint32_t gic_cpus; + int i; + + cpumask = readl_gicd(GICD_ITARGETSR) & 0xff; + cpumask |= cpumask << 8; + cpumask |= cpumask << 16; + + /* Disable the distributor */ + writel_gicd(0, GICD_CTLR); + + type = readl_gicd(GICD_TYPER); + gicv2_info.nr_lines = 32 * ((type & GICD_TYPE_LINES) + 1); + gic_cpus = 1 + ((type & GICD_TYPE_CPUS) >> 5); + printk("GICv2: %d lines, %d cpu%s%s (IID %8.8x).\n", + gicv2_info.nr_lines, gic_cpus, (gic_cpus == 1) ? "" : "s", + (type & GICD_TYPE_SEC) ? ", secure" : "", + readl_gicd(GICD_IIDR)); + + /* Default all global IRQs to level, active low */ + for ( i = 32; i < gicv2_info.nr_lines; i += 16 ) + writel_gicd(0x0, GICD_ICFGR + (i / 16) * 4); + + /* Route all global IRQs to this CPU */ + for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) + writel_gicd(cpumask, GICD_ITARGETSR + (i / 4) * 4); + + /* Default priority for global interrupts */ + for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) + writel_gicd(GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, + GICD_IPRIORITYR + (i / 4) * 4); + + /* Disable all global interrupts */ + for ( i = 32; i < gicv2_info.nr_lines; i += 32 ) + writel_gicd(~0x0, GICD_ICENABLER + (i / 32) * 4); + + /* Turn on the distributor */ + writel_gicd(GICD_CTL_ENABLE, GICD_CTLR); +} + +static void __cpuinit gicv2_cpu_init(void) +{ + int i; + + this_cpu(gic_cpu_id) = readl_gicd(GICD_ITARGETSR) & 0xff; + + /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so + * even though they are controlled with GICD registers, they must + * be set up here with the other per-cpu state. */ + writel_gicd(0xffff0000, GICD_ICENABLER); /* Disable all PPI */ + writel_gicd(0x0000ffff, GICD_ISENABLER); /* Enable all SGI */ + + /* Set SGI priorities */ + for ( i = 0; i < 16; i += 4 ) + writel_gicd(GIC_PRI_IPI << 24 | GIC_PRI_IPI << 16 | + GIC_PRI_IPI << 8 | GIC_PRI_IPI, + GICD_IPRIORITYR + (i / 4) * 4); + + /* Set PPI priorities */ + for ( i = 16; i < 32; i += 4 ) + writel_gicd(GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ, + GICD_IPRIORITYR + (i / 4) * 4); + + /* Local settings: interface controller */ + /* Don't mask by priority */ + writel_gicc(0xff, GICC_PMR); + /* Finest granularity of priority */ + writel_gicc(0x0, GICC_BPR); + /* Turn on delivery */ + writel_gicc(GICC_CTL_ENABLE|GICC_CTL_EOI, GICC_CTLR); +} + +static void gicv2_cpu_disable(void) +{ + writel_gicc(0x0, GICC_CTLR); +} + +static void __cpuinit gicv2_hyp_init(void) +{ + uint32_t vtr; + uint8_t nr_lrs; + + vtr = readl_gich(GICH_VTR); + nr_lrs = (vtr & GICH_V2_VTR_NRLRGS) + 1; + gicv2_info.nr_lrs = nr_lrs; + + writel_gich(GICH_MISR_EOI, GICH_MISR); +} + +static void __cpuinit gicv2_hyp_disable(void) +{ + writel_gich(0, GICH_HCR); +} + +static int gicv2_secondary_cpu_init(void) +{ + spin_lock(&gicv2.lock); + + gicv2_cpu_init(); + gicv2_hyp_init(); + + spin_unlock(&gicv2.lock); + + return 0; +} + +static void gicv2_send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, + const cpumask_t *cpu_mask) +{ + unsigned int mask = 0; + cpumask_t online_mask; + + switch ( irqmode ) + { + case SGI_TARGET_OTHERS: + writel_gicd(GICD_SGI_TARGET_OTHERS | sgi, GICD_SGIR); + break; + case SGI_TARGET_SELF: + writel_gicd(GICD_SGI_TARGET_SELF | sgi, GICD_SGIR); + break; + case SGI_TARGET_LIST: + cpumask_and(&online_mask, cpu_mask, &cpu_online_map); + mask = gicv2_cpu_mask(&online_mask); + writel_gicd(GICD_SGI_TARGET_LIST | + (mask << GICD_SGI_TARGET_SHIFT) | sgi, + GICD_SGIR); + break; + default: + BUG(); + } +} + +/* Shut down the per-CPU GIC interface */ +static void gicv2_disable_interface(void) +{ + spin_lock(&gicv2.lock); + gicv2_cpu_disable(); + gicv2_hyp_disable(); + spin_unlock(&gicv2.lock); +} + +static void gicv2_update_lr(int lr, const struct pending_irq *p, + unsigned int state) +{ + uint32_t lr_reg; + + BUG_ON(lr >= gicv2_info.nr_lrs); + BUG_ON(lr < 0); + + lr_reg = (((state & GICH_V2_LR_STATE_MASK) << GICH_V2_LR_STATE_SHIFT) | + ((GIC_PRI_TO_GUEST(p->priority) & GICH_V2_LR_PRIORITY_MASK) + << GICH_V2_LR_PRIORITY_SHIFT) | + ((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); + } + + writel_gich(lr_reg, GICH_LR + lr * 4); +} + +static void gicv2_clear_lr(int lr) +{ + writel_gich(0, GICH_LR + lr * 4); +} + +static int gicv2v_setup(struct domain *d) +{ + int ret; + + /* + * The hardware domain gets the hardware address. + * Guests get the virtual platform layout. + */ + if ( is_hardware_domain(d) ) + { + d->arch.vgic.dbase = gicv2.dbase; + d->arch.vgic.cbase = gicv2.cbase; + } + else + { + d->arch.vgic.dbase = GUEST_GICD_BASE; + d->arch.vgic.cbase = GUEST_GICC_BASE; + } + + /* + * Map the gic virtual cpu interface in the gic cpu interface + * region of the guest. + * + * The second page is always mapped at +4K irrespective of the + * GIC_64K_STRIDE quirk. The DTB passed to the guest reflects this. + */ + ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase), 1, + paddr_to_pfn(gicv2.vbase)); + if ( ret ) + return ret; + + if ( !platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) + ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), + 2, paddr_to_pfn(gicv2.vbase + PAGE_SIZE)); + else + ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), + 2, paddr_to_pfn(gicv2.vbase + 16*PAGE_SIZE)); + + return ret; +} + +static void gicv2_read_lr(int lr, struct gic_lr *lr_reg) +{ + uint32_t lrv; + + lrv = readl_gich(GICH_LR + lr * 4); + lr_reg->pirq = (lrv >> GICH_V2_LR_PHYSICAL_SHIFT) & GICH_V2_LR_PHYSICAL_MASK; + lr_reg->virq = (lrv >> GICH_V2_LR_VIRTUAL_SHIFT) & GICH_V2_LR_VIRTUAL_MASK; + lr_reg->priority = (lrv >> GICH_V2_LR_PRIORITY_SHIFT) & GICH_V2_LR_PRIORITY_MASK; + lr_reg->state = (lrv >> GICH_V2_LR_STATE_SHIFT) & GICH_V2_LR_STATE_MASK; + lr_reg->hw_status = (lrv >> GICH_V2_LR_HW_SHIFT) & GICH_V2_LR_HW_MASK; + lr_reg->grp = (lrv >> GICH_V2_LR_GRP_SHIFT) & GICH_V2_LR_GRP_MASK; +} + +static void gicv2_write_lr(int lr, const struct gic_lr *lr_reg) +{ + uint32_t lrv = 0; + + lrv = ( ((lr_reg->pirq & GICH_V2_LR_PHYSICAL_MASK) << GICH_V2_LR_PHYSICAL_SHIFT) | + ((lr_reg->virq & GICH_V2_LR_VIRTUAL_MASK) << GICH_V2_LR_VIRTUAL_SHIFT) | + ((uint32_t)(lr_reg->priority & GICH_V2_LR_PRIORITY_MASK) + << GICH_V2_LR_PRIORITY_SHIFT) | + ((uint32_t)(lr_reg->state & GICH_V2_LR_STATE_MASK) + << GICH_V2_LR_STATE_SHIFT) | + ((uint32_t)(lr_reg->hw_status & GICH_V2_LR_HW_MASK) + << GICH_V2_LR_HW_SHIFT) | + ((uint32_t)(lr_reg->grp & GICH_V2_LR_GRP_MASK) << GICH_V2_LR_GRP_SHIFT) ); + + writel_gich(lrv, GICH_LR + lr * 4); +} + +static void gicv2_hcr_status(uint32_t flag, bool_t status) +{ + uint32_t hcr = readl_gich(GICH_HCR); + + if ( status ) + hcr |= flag; + else + hcr &= (~flag); + + writel_gich(hcr, GICH_HCR); +} + +static unsigned int gicv2_read_vmcr_priority(void) +{ + return ((readl_gich(GICH_VMCR) >> GICH_V2_VMCR_PRIORITY_SHIFT) + & GICH_V2_VMCR_PRIORITY_MASK); +} + +static unsigned int gicv2_read_apr(int apr_reg) +{ + return readl_gich(GICH_APR); +} + +static void gicv2_irq_enable(struct irq_desc *desc) +{ + unsigned long flags; + int irq = desc->irq; + + ASSERT(spin_is_locked(&desc->lock)); + + spin_lock_irqsave(&gicv2.lock, flags); + clear_bit(_IRQ_DISABLED, &desc->status); + dsb(sy); + /* Enable routing */ + writel_gicd((1u << (irq % 32)), GICD_ISENABLER + (irq / 32) * 4); + spin_unlock_irqrestore(&gicv2.lock, flags); +} + +static void gicv2_irq_disable(struct irq_desc *desc) +{ + unsigned long flags; + int irq = desc->irq; + + ASSERT(spin_is_locked(&desc->lock)); + + spin_lock_irqsave(&gicv2.lock, flags); + /* Disable routing */ + writel_gicd(1u << (irq % 32), GICD_ICENABLER + (irq / 32) * 4); + set_bit(_IRQ_DISABLED, &desc->status); + spin_unlock_irqrestore(&gicv2.lock, flags); +} + +static unsigned int gicv2_irq_startup(struct irq_desc *desc) +{ + gicv2_irq_enable(desc); + + return 0; +} + +static void gicv2_irq_shutdown(struct irq_desc *desc) +{ + gicv2_irq_disable(desc); +} + +static void gicv2_irq_ack(struct irq_desc *desc) +{ + /* No ACK -- reading IAR has done this for us */ +} + +static void gicv2_host_irq_end(struct irq_desc *desc) +{ + /* Lower the priority */ + gicv2_eoi_irq(desc); + /* Deactivate */ + gicv2_dir_irq(desc); +} + +static void gicv2_guest_irq_end(struct irq_desc *desc) +{ + /* Lower the priority of the IRQ */ + gicv2_eoi_irq(desc); + /* Deactivation happens in maintenance interrupt / via GICV */ +} + +static void gicv2_irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_mask) +{ + unsigned int mask; + + ASSERT(!cpumask_empty(cpu_mask)); + + spin_lock(&gicv2.lock); + + mask = gicv2_cpu_mask(cpu_mask); + + /* Set target CPU mask (RAZ/WI on uniprocessor) */ + writeb_gicd(mask, GICD_ITARGETSR + desc->irq); + + spin_unlock(&gicv2.lock); +} + +static int gicv2_make_dt_node(const struct domain *d, + const struct dt_device_node *node, void *fdt) +{ + const struct dt_device_node *gic = dt_interrupt_controller; + const void *compatible = NULL; + u32 len; + const __be32 *regs; + int res = 0; + + compatible = dt_get_property(gic, "compatible", &len); + if ( !compatible ) + { + dprintk(XENLOG_ERR, "Can't find compatible property for the gic node\n"); + return -FDT_ERR_XEN(ENOENT); + } + + res = fdt_begin_node(fdt, "interrupt-controller"); + if ( res ) + return res; + + res = fdt_property(fdt, "compatible", compatible, len); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#interrupt-cells", 3); + if ( res ) + return res; + + res = fdt_property(fdt, "interrupt-controller", NULL, 0); + + if ( res ) + return res; + + /* + * DTB provides up to 4 regions to handle virtualization + * (in order GICD, GICC, GICH and GICV interfaces) + * however dom0 just needs GICD and GICC provided by Xen. + */ + regs = dt_get_property(gic, "reg", &len); + if ( !regs ) + { + dprintk(XENLOG_ERR, "Can't find reg property for the gic node\n"); + return -FDT_ERR_XEN(ENOENT); + } + + len = dt_cells_to_size(dt_n_addr_cells(node) + dt_n_size_cells(node)); + len *= 2; + + res = fdt_property(fdt, "reg", regs, len); + + return res; +} + +/* XXX different for level vs edge */ +static hw_irq_controller gicv2_host_irq_type = { + .typename = "gic-v2", + .startup = gicv2_irq_startup, + .shutdown = gicv2_irq_shutdown, + .enable = gicv2_irq_enable, + .disable = gicv2_irq_disable, + .ack = gicv2_irq_ack, + .end = gicv2_host_irq_end, + .set_affinity = gicv2_irq_set_affinity, +}; + +static hw_irq_controller gicv2_guest_irq_type = { + .typename = "gic-v2", + .startup = gicv2_irq_startup, + .shutdown = gicv2_irq_shutdown, + .enable = gicv2_irq_enable, + .disable = gicv2_irq_disable, + .ack = gicv2_irq_ack, + .end = gicv2_guest_irq_end, + .set_affinity = gicv2_irq_set_affinity, +}; + +const static struct gic_hw_operations gicv2_ops = { + .info = &gicv2_info, + .secondary_init = gicv2_secondary_cpu_init, + .save_state = gicv2_save_state, + .restore_state = gicv2_restore_state, + .dump_state = gicv2_dump_state, + .gicv_setup = gicv2v_setup, + .gic_host_irq_type = &gicv2_host_irq_type, + .gic_guest_irq_type = &gicv2_guest_irq_type, + .eoi_irq = gicv2_eoi_irq, + .deactivate_irq = gicv2_dir_irq, + .read_irq = gicv2_read_irq, + .set_irq_properties = gicv2_set_irq_properties, + .send_SGI = gicv2_send_SGI, + .disable_interface = gicv2_disable_interface, + .update_lr = gicv2_update_lr, + .update_hcr_status = gicv2_hcr_status, + .clear_lr = gicv2_clear_lr, + .read_lr = gicv2_read_lr, + .write_lr = gicv2_write_lr, + .read_vmcr_priority = gicv2_read_vmcr_priority, + .read_apr = gicv2_read_apr, + .make_dt_node = gicv2_make_dt_node, +}; + +/* Set up the GIC */ +static int __init gicv2_init(struct dt_device_node *node, const void *data) +{ + int res; + + dt_device_set_used_by(node, DOMID_XEN); + + res = dt_device_get_address(node, 0, &gicv2.dbase, NULL); + if ( res || !gicv2.dbase || (gicv2.dbase & ~PAGE_MASK) ) + panic("GICv2: Cannot find a valid address for the distributor"); + + res = dt_device_get_address(node, 1, &gicv2.cbase, NULL); + if ( res || !gicv2.cbase || (gicv2.cbase & ~PAGE_MASK) ) + panic("GICv2: Cannot find a valid address for the CPU"); + + res = dt_device_get_address(node, 2, &gicv2.hbase, NULL); + if ( res || !gicv2.hbase || (gicv2.hbase & ~PAGE_MASK) ) + panic("GICv2: Cannot find a valid address for the hypervisor"); + + res = dt_device_get_address(node, 3, &gicv2.vbase, NULL); + if ( res || !gicv2.vbase || (gicv2.vbase & ~PAGE_MASK) ) + panic("GICv2: Cannot find a valid address for the virtual CPU"); + + res = platform_get_irq(node, 0); + if ( res < 0 ) + panic("GICv2: Cannot find the maintenance IRQ"); + gicv2_info.maintenance_irq = res; + + /* Set the GIC as the primary interrupt controller */ + dt_interrupt_controller = node; + + /* TODO: Add check on distributor, cpu size */ + + printk("GICv2 initialization:\n" + " gic_dist_addr=%"PRIpaddr"\n" + " gic_cpu_addr=%"PRIpaddr"\n" + " gic_hyp_addr=%"PRIpaddr"\n" + " gic_vcpu_addr=%"PRIpaddr"\n" + " gic_maintenance_irq=%u\n", + gicv2.dbase, gicv2.cbase, gicv2.hbase, gicv2.vbase, + gicv2_info.maintenance_irq); + + if ( (gicv2.dbase & ~PAGE_MASK) || (gicv2.cbase & ~PAGE_MASK) || + (gicv2.hbase & ~PAGE_MASK) || (gicv2.vbase & ~PAGE_MASK) ) + panic("GICv2 interfaces not page aligned"); + + gicv2.map_dbase = ioremap_nocache(gicv2.dbase, PAGE_SIZE); + if ( !gicv2.map_dbase ) + panic("GICv2: Failed to ioremap for GIC distributor\n"); + + gicv2.map_cbase[0] = ioremap_nocache(gicv2.cbase, PAGE_SIZE); + + if ( platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) + gicv2.map_cbase[1] = ioremap_nocache(gicv2.cbase + PAGE_SIZE * 0x10, + PAGE_SIZE); + else + gicv2.map_cbase[1] = ioremap_nocache(gicv2.cbase + PAGE_SIZE, PAGE_SIZE); + + if ( !gicv2.map_cbase[0] || !gicv2.map_cbase[1] ) + panic("GICv2: Failed to ioremap for GIC CPU interface\n"); + + gicv2.map_hbase = ioremap_nocache(gicv2.hbase, PAGE_SIZE); + if ( !gicv2.map_hbase ) + panic("GICv2: Failed to ioremap for GIC Virtual interface\n"); + + /* Global settings: interrupt distributor */ + spin_lock_init(&gicv2.lock); + spin_lock(&gicv2.lock); + + gicv2_dist_init(); + gicv2_cpu_init(); + gicv2_hyp_init(); + + spin_unlock(&gicv2.lock); + + gicv2_info.hw_version = GIC_V2; + register_gic_ops(&gicv2_ops); + + return 0; +} + +static const struct dt_device_match gicv2_dt_match[] __initconst = +{ + DT_MATCH_GIC_V2, + { /* sentinel */ }, +}; + +DT_DEVICE_START(gicv2, "GICv2", DEVICE_GIC) + .dt_match = gicv2_dt_match, + .init = gicv2_init, +DT_DEVICE_END + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * 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 Mon Mar 09 11:45:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:45: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 1YUw8B-0001n2-5e; Mon, 09 Mar 2015 11:45:55 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw89-0001mZ-OD for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:53 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id FA/63-02994-1F78DF45; Mon, 09 Mar 2015 11:45:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1425901551!15837811!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9446 invoked from network); 9 Mar 2015 11:45: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; 9 Mar 2015 11:45:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw87-0002Wg-A4 for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw87-0008BD-8x for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:51 +0000 Date: Mon, 09 Mar 2015 11:45:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Detect GIC nodes based on class X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c58495b780df374b9f2d3a7e49d658f1ede504d9 Author: Frediano Ziglio AuthorDate: Tue Mar 3 15:41:13 2015 +0000 Commit: Ian Campbell CommitDate: Thu Mar 5 16:37:33 2015 +0000 xen/arm: Detect GIC nodes based on class Instead of having a list with all matches use device list to detect if a node is an interrupt controller. Signed-off-by: Frediano Ziglio Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 9f1f59f..aaa3b97 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1035,12 +1035,6 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("arm,armv7-timer-mem"), { /* sentinel */ }, }; - static const struct dt_device_match gic_matches[] __initconst = - { - DT_MATCH_GIC_V2, - DT_MATCH_GIC_V3, - { /* sentinel */ }, - }; static const struct dt_device_match timer_matches[] __initconst = { DT_MATCH_TIMER, @@ -1069,7 +1063,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, /* Replace these nodes with our own. Note that the original may be * used_by DOMID_XEN so this check comes first. */ - if ( dt_match_node(gic_matches, node) ) + if ( device_get_class(node) == DEVICE_GIC ) return make_gic_node(d, kinfo->fdt, node); if ( dt_match_node(timer_matches, node) ) return make_timer_node(d, kinfo->fdt, node); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:45:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:45: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 1YUw8B-0001n2-5e; Mon, 09 Mar 2015 11:45:55 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw89-0001mZ-OD for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:53 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id FA/63-02994-1F78DF45; Mon, 09 Mar 2015 11:45:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1425901551!15837811!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9446 invoked from network); 9 Mar 2015 11:45: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; 9 Mar 2015 11:45:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw87-0002Wg-A4 for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw87-0008BD-8x for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:45:51 +0000 Date: Mon, 09 Mar 2015 11:45:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Detect GIC nodes based on class X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c58495b780df374b9f2d3a7e49d658f1ede504d9 Author: Frediano Ziglio AuthorDate: Tue Mar 3 15:41:13 2015 +0000 Commit: Ian Campbell CommitDate: Thu Mar 5 16:37:33 2015 +0000 xen/arm: Detect GIC nodes based on class Instead of having a list with all matches use device list to detect if a node is an interrupt controller. Signed-off-by: Frediano Ziglio Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 9f1f59f..aaa3b97 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1035,12 +1035,6 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("arm,armv7-timer-mem"), { /* sentinel */ }, }; - static const struct dt_device_match gic_matches[] __initconst = - { - DT_MATCH_GIC_V2, - DT_MATCH_GIC_V3, - { /* sentinel */ }, - }; static const struct dt_device_match timer_matches[] __initconst = { DT_MATCH_TIMER, @@ -1069,7 +1063,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, /* Replace these nodes with our own. Note that the original may be * used_by DOMID_XEN so this check comes first. */ - if ( dt_match_node(gic_matches, node) ) + if ( device_get_class(node) == DEVICE_GIC ) return make_gic_node(d, kinfo->fdt, node); if ( dt_match_node(timer_matches, node) ) return make_timer_node(d, kinfo->fdt, node); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:46:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:46:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8N-0001pW-8W; Mon, 09 Mar 2015 11:46:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8K-0001p6-W9 for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:05 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 0E/3D-02635-CF78DF45; Mon, 09 Mar 2015 11:46:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1425901561!10419995!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17453 invoked from network); 9 Mar 2015 11:46:02 -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; 9 Mar 2015 11:46:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8H-0002Wp-Ge for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw8H-0008Bc-DY for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:01 +0000 Date: Mon, 09 Mar 2015 11:46:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Make gic-v2 code handle hip04-d01 platform X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eb94f326c257f0ed636b0f886950924a21388b51 Author: Frediano Ziglio AuthorDate: Tue Mar 3 15:41:14 2015 +0000 Commit: Ian Campbell CommitDate: Thu Mar 5 16:37:33 2015 +0000 xen/arm: Make gic-v2 code handle hip04-d01 platform The GIC in this platform is mainly compatible with the standard GICv2 beside: - ITARGET is extended to 16 bit to support 16 CPUs; - SGI mask is extended to support 16 CPUs; - maximum supported interrupt is 510; - GICH APR and LR register offsets. Signed-off-by: Frediano Ziglio Signed-off-by: Zoltan Kiss Acked-by: Ian Campbell --- MAINTAINERS | 6 + xen/arch/arm/Makefile | 1 + xen/arch/arm/gic-hip04.c | 270 ++++++++++++++++++++++++---------------------- 3 files changed, 147 insertions(+), 130 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 869c9a6..d88fca3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -138,6 +138,12 @@ F: xen/drivers/char/omap-uart.c 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 + CPU POOLS M: Juergen Gross S: Supported diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 41aba2e..935999e 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -12,6 +12,7 @@ obj-y += domctl.o obj-y += sysctl.o obj-y += domain_build.o obj-y += gic.o gic-v2.o +obj-$(CONFIG_ARM_32) += gic-hip04.o obj-$(CONFIG_ARM_64) += gic-v3.o obj-y += io.o obj-y += irq.o diff --git a/xen/arch/arm/gic-hip04.c b/xen/arch/arm/gic-hip04.c index 20cdbc9..0fda957 100644 --- a/xen/arch/arm/gic-hip04.c +++ b/xen/arch/arm/gic-hip04.c @@ -1,7 +1,8 @@ /* - * xen/arch/arm/gic-v2.c + * xen/arch/arm/gic-hip04.c * - * ARM Generic Interrupt Controller support v2 + * Generic Interrupt Controller for HiSilicon Hip04 platform + * Based heavily on gic-v2.c (id 3bcf563fec26378f7f4cf1e2ad0d4d5b3f341919) * * Tim Deegan * Copyright (c) 2011 Citrix Systems. @@ -79,16 +80,26 @@ static struct gic_info gicv2_info; * logical CPU numbering. Let's use mapping as returned by the GIC * itself */ -static DEFINE_PER_CPU(u8, gic_cpu_id); +static DEFINE_PER_CPU(u16, gic_cpu_id); /* Maximum cpu interface per GIC */ -#define NR_GIC_CPU_IF 8 +#define NR_GIC_CPU_IF 16 + +#define HIP04_GICD_SGI_TARGET_SHIFT 8 + +#define HIP04_GICH_APR 0x70 +#define HIP04_GICH_LR 0x80 static inline void writeb_gicd(uint8_t val, unsigned int offset) { writeb_relaxed(val, gicv2.map_dbase + offset); } +static inline void writew_gicd(uint16_t val, unsigned int offset) +{ + writew_relaxed(val, gicv2.map_dbase + offset); +} + static inline void writel_gicd(uint32_t val, unsigned int offset) { writel_relaxed(val, gicv2.map_dbase + offset); @@ -123,7 +134,7 @@ static inline uint32_t readl_gich(int unsigned offset) return readl_relaxed(gicv2.map_hbase + offset); } -static unsigned int gicv2_cpu_mask(const cpumask_t *cpumask) +static unsigned int hip04gic_cpu_mask(const cpumask_t *cpumask) { unsigned int cpu; unsigned int mask = 0; @@ -139,7 +150,7 @@ static unsigned int gicv2_cpu_mask(const cpumask_t *cpumask) return mask; } -static void gicv2_save_state(struct vcpu *v) +static void hip04gic_save_state(struct vcpu *v) { int i; @@ -148,27 +159,27 @@ static void gicv2_save_state(struct vcpu *v) * accessed simultaneously by another pCPU. */ for ( i = 0; i < gicv2_info.nr_lrs; i++ ) - v->arch.gic.v2.lr[i] = readl_gich(GICH_LR + i * 4); + v->arch.gic.v2.lr[i] = readl_gich(HIP04_GICH_LR + i * 4); - v->arch.gic.v2.apr = readl_gich(GICH_APR); + v->arch.gic.v2.apr = readl_gich(HIP04_GICH_APR); v->arch.gic.v2.vmcr = readl_gich(GICH_VMCR); /* Disable until next VCPU scheduled */ writel_gich(0, GICH_HCR); } -static void gicv2_restore_state(const struct vcpu *v) +static void hip04gic_restore_state(const struct vcpu *v) { int i; for ( i = 0; i < gicv2_info.nr_lrs; i++ ) - writel_gich(v->arch.gic.v2.lr[i], GICH_LR + i * 4); + writel_gich(v->arch.gic.v2.lr[i], HIP04_GICH_LR + i * 4); - writel_gich(v->arch.gic.v2.apr, GICH_APR); + writel_gich(v->arch.gic.v2.apr, HIP04_GICH_APR); writel_gich(v->arch.gic.v2.vmcr, GICH_VMCR); writel_gich(GICH_HCR_EN, GICH_HCR); } -static void gicv2_dump_state(const struct vcpu *v) +static void hip04gic_dump_state(const struct vcpu *v) { int i; @@ -176,7 +187,7 @@ static void gicv2_dump_state(const struct vcpu *v) { for ( i = 0; i < gicv2_info.nr_lrs; i++ ) printk(" HW_LR[%d]=%x\n", i, - readl_gich(GICH_LR + i * 4)); + readl_gich(HIP04_GICH_LR + i * 4)); } else { @@ -185,20 +196,20 @@ static void gicv2_dump_state(const struct vcpu *v) } } -static void gicv2_eoi_irq(struct irq_desc *irqd) +static void hip04gic_eoi_irq(struct irq_desc *irqd) { int irq = irqd->irq; /* Lower the priority */ writel_gicc(irq, GICC_EOIR); } -static void gicv2_dir_irq(struct irq_desc *irqd) +static void hip04gic_dir_irq(struct irq_desc *irqd) { /* Deactivate */ writel_gicc(irqd->irq, GICC_DIR); } -static unsigned int gicv2_read_irq(void) +static unsigned int hip04gic_read_irq(void) { return (readl_gicc(GICC_IAR) & GICC_IA_IRQ); } @@ -207,12 +218,12 @@ static unsigned int gicv2_read_irq(void) * needs to be called with a valid cpu_mask, ie each cpu in the mask has * already called gic_cpu_init */ -static void gicv2_set_irq_properties(struct irq_desc *desc, +static void hip04gic_set_irq_properties(struct irq_desc *desc, const cpumask_t *cpu_mask, unsigned int priority) { uint32_t cfg, actual, edgebit; - unsigned int mask = gicv2_cpu_mask(cpu_mask); + unsigned int mask = hip04gic_cpu_mask(cpu_mask); unsigned int irq = desc->irq; unsigned int type = desc->arch.type; @@ -232,7 +243,7 @@ static void gicv2_set_irq_properties(struct irq_desc *desc, actual = readl_gicd(GICD_ICFGR + (irq / 16) * 4); if ( ( cfg & edgebit ) ^ ( actual & edgebit ) ) { - printk(XENLOG_WARNING "GICv2: WARNING: " + printk(XENLOG_WARNING "GIC-HIP04: WARNING: " "CPU%d: Failed to configure IRQ%u as %s-triggered. " "H/w forces to %s-triggered.\n", smp_processor_id(), desc->irq, @@ -244,22 +255,21 @@ static void gicv2_set_irq_properties(struct irq_desc *desc, } /* Set target CPU mask (RAZ/WI on uniprocessor) */ - writeb_gicd(mask, GICD_ITARGETSR + irq); + writew_gicd(mask, GICD_ITARGETSR + irq * 2); /* Set priority */ writeb_gicd(priority, GICD_IPRIORITYR + irq); spin_unlock(&gicv2.lock); } -static void __init gicv2_dist_init(void) +static void __init hip04gic_dist_init(void) { uint32_t type; uint32_t cpumask; uint32_t gic_cpus; int i; - cpumask = readl_gicd(GICD_ITARGETSR) & 0xff; - cpumask |= cpumask << 8; + cpumask = readl_gicd(GICD_ITARGETSR) & 0xffff; cpumask |= cpumask << 16; /* Disable the distributor */ @@ -267,8 +277,8 @@ static void __init gicv2_dist_init(void) type = readl_gicd(GICD_TYPER); gicv2_info.nr_lines = 32 * ((type & GICD_TYPE_LINES) + 1); - gic_cpus = 1 + ((type & GICD_TYPE_CPUS) >> 5); - printk("GICv2: %d lines, %d cpu%s%s (IID %8.8x).\n", + gic_cpus = 16; + printk("GIC-HIP04: %d lines, %d cpu%s%s (IID %8.8x).\n", gicv2_info.nr_lines, gic_cpus, (gic_cpus == 1) ? "" : "s", (type & GICD_TYPE_SEC) ? ", secure" : "", readl_gicd(GICD_IIDR)); @@ -278,8 +288,8 @@ static void __init gicv2_dist_init(void) writel_gicd(0x0, GICD_ICFGR + (i / 16) * 4); /* Route all global IRQs to this CPU */ - for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) - writel_gicd(cpumask, GICD_ITARGETSR + (i / 4) * 4); + for ( i = 32; i < gicv2_info.nr_lines; i += 2 ) + writel_gicd(cpumask, GICD_ITARGETSR + (i / 2) * 4); /* Default priority for global interrupts */ for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) @@ -295,11 +305,11 @@ static void __init gicv2_dist_init(void) writel_gicd(GICD_CTL_ENABLE, GICD_CTLR); } -static void __cpuinit gicv2_cpu_init(void) +static void __cpuinit hip04gic_cpu_init(void) { int i; - this_cpu(gic_cpu_id) = readl_gicd(GICD_ITARGETSR) & 0xff; + this_cpu(gic_cpu_id) = readl_gicd(GICD_ITARGETSR) & 0xffff; /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so * even though they are controlled with GICD registers, they must @@ -328,12 +338,12 @@ static void __cpuinit gicv2_cpu_init(void) writel_gicc(GICC_CTL_ENABLE|GICC_CTL_EOI, GICC_CTLR); } -static void gicv2_cpu_disable(void) +static void hip04gic_cpu_disable(void) { writel_gicc(0x0, GICC_CTLR); } -static void __cpuinit gicv2_hyp_init(void) +static void __cpuinit hip04gic_hyp_init(void) { uint32_t vtr; uint8_t nr_lrs; @@ -345,24 +355,24 @@ static void __cpuinit gicv2_hyp_init(void) writel_gich(GICH_MISR_EOI, GICH_MISR); } -static void __cpuinit gicv2_hyp_disable(void) +static void __cpuinit hip04gic_hyp_disable(void) { writel_gich(0, GICH_HCR); } -static int gicv2_secondary_cpu_init(void) +static int hip04gic_secondary_cpu_init(void) { spin_lock(&gicv2.lock); - gicv2_cpu_init(); - gicv2_hyp_init(); + hip04gic_cpu_init(); + hip04gic_hyp_init(); spin_unlock(&gicv2.lock); return 0; } -static void gicv2_send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, +static void hip04gic_send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, const cpumask_t *cpu_mask) { unsigned int mask = 0; @@ -378,9 +388,9 @@ static void gicv2_send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, break; case SGI_TARGET_LIST: cpumask_and(&online_mask, cpu_mask, &cpu_online_map); - mask = gicv2_cpu_mask(&online_mask); + mask = hip04gic_cpu_mask(&online_mask); writel_gicd(GICD_SGI_TARGET_LIST | - (mask << GICD_SGI_TARGET_SHIFT) | sgi, + (mask << HIP04_GICD_SGI_TARGET_SHIFT) | sgi, GICD_SGIR); break; default: @@ -389,15 +399,15 @@ static void gicv2_send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, } /* Shut down the per-CPU GIC interface */ -static void gicv2_disable_interface(void) +static void hip04gic_disable_interface(void) { spin_lock(&gicv2.lock); - gicv2_cpu_disable(); - gicv2_hyp_disable(); + hip04gic_cpu_disable(); + hip04gic_hyp_disable(); spin_unlock(&gicv2.lock); } -static void gicv2_update_lr(int lr, const struct pending_irq *p, +static void hip04gic_update_lr(int lr, const struct pending_irq *p, unsigned int state) { uint32_t lr_reg; @@ -419,15 +429,15 @@ static void gicv2_update_lr(int lr, const struct pending_irq *p, << GICH_V2_LR_PHYSICAL_SHIFT); } - writel_gich(lr_reg, GICH_LR + lr * 4); + writel_gich(lr_reg, HIP04_GICH_LR + lr * 4); } -static void gicv2_clear_lr(int lr) +static void hip04gic_clear_lr(int lr) { - writel_gich(0, GICH_LR + lr * 4); + writel_gich(0, HIP04_GICH_LR + lr * 4); } -static int gicv2v_setup(struct domain *d) +static int hip04gicv_setup(struct domain *d) { int ret; @@ -468,11 +478,11 @@ static int gicv2v_setup(struct domain *d) return ret; } -static void gicv2_read_lr(int lr, struct gic_lr *lr_reg) +static void hip04gic_read_lr(int lr, struct gic_lr *lr_reg) { uint32_t lrv; - lrv = readl_gich(GICH_LR + lr * 4); + lrv = readl_gich(HIP04_GICH_LR + lr * 4); lr_reg->pirq = (lrv >> GICH_V2_LR_PHYSICAL_SHIFT) & GICH_V2_LR_PHYSICAL_MASK; lr_reg->virq = (lrv >> GICH_V2_LR_VIRTUAL_SHIFT) & GICH_V2_LR_VIRTUAL_MASK; lr_reg->priority = (lrv >> GICH_V2_LR_PRIORITY_SHIFT) & GICH_V2_LR_PRIORITY_MASK; @@ -481,7 +491,7 @@ static void gicv2_read_lr(int lr, struct gic_lr *lr_reg) lr_reg->grp = (lrv >> GICH_V2_LR_GRP_SHIFT) & GICH_V2_LR_GRP_MASK; } -static void gicv2_write_lr(int lr, const struct gic_lr *lr_reg) +static void hip04gic_write_lr(int lr, const struct gic_lr *lr_reg) { uint32_t lrv = 0; @@ -495,10 +505,10 @@ static void gicv2_write_lr(int lr, const struct gic_lr *lr_reg) << GICH_V2_LR_HW_SHIFT) | ((uint32_t)(lr_reg->grp & GICH_V2_LR_GRP_MASK) << GICH_V2_LR_GRP_SHIFT) ); - writel_gich(lrv, GICH_LR + lr * 4); + writel_gich(lrv, HIP04_GICH_LR + lr * 4); } -static void gicv2_hcr_status(uint32_t flag, bool_t status) +static void hip04gic_hcr_status(uint32_t flag, bool_t status) { uint32_t hcr = readl_gich(GICH_HCR); @@ -510,18 +520,18 @@ static void gicv2_hcr_status(uint32_t flag, bool_t status) writel_gich(hcr, GICH_HCR); } -static unsigned int gicv2_read_vmcr_priority(void) +static unsigned int hip04gic_read_vmcr_priority(void) { return ((readl_gich(GICH_VMCR) >> GICH_V2_VMCR_PRIORITY_SHIFT) & GICH_V2_VMCR_PRIORITY_MASK); } -static unsigned int gicv2_read_apr(int apr_reg) +static unsigned int hip04gic_read_apr(int apr_reg) { - return readl_gich(GICH_APR); + return readl_gich(HIP04_GICH_APR); } -static void gicv2_irq_enable(struct irq_desc *desc) +static void hip04gic_irq_enable(struct irq_desc *desc) { unsigned long flags; int irq = desc->irq; @@ -536,7 +546,7 @@ static void gicv2_irq_enable(struct irq_desc *desc) spin_unlock_irqrestore(&gicv2.lock, flags); } -static void gicv2_irq_disable(struct irq_desc *desc) +static void hip04gic_irq_disable(struct irq_desc *desc) { unsigned long flags; int irq = desc->irq; @@ -550,39 +560,39 @@ static void gicv2_irq_disable(struct irq_desc *desc) spin_unlock_irqrestore(&gicv2.lock, flags); } -static unsigned int gicv2_irq_startup(struct irq_desc *desc) +static unsigned int hip04gic_irq_startup(struct irq_desc *desc) { - gicv2_irq_enable(desc); + hip04gic_irq_enable(desc); return 0; } -static void gicv2_irq_shutdown(struct irq_desc *desc) +static void hip04gic_irq_shutdown(struct irq_desc *desc) { - gicv2_irq_disable(desc); + hip04gic_irq_disable(desc); } -static void gicv2_irq_ack(struct irq_desc *desc) +static void hip04gic_irq_ack(struct irq_desc *desc) { /* No ACK -- reading IAR has done this for us */ } -static void gicv2_host_irq_end(struct irq_desc *desc) +static void hip04gic_host_irq_end(struct irq_desc *desc) { /* Lower the priority */ - gicv2_eoi_irq(desc); + hip04gic_eoi_irq(desc); /* Deactivate */ - gicv2_dir_irq(desc); + hip04gic_dir_irq(desc); } -static void gicv2_guest_irq_end(struct irq_desc *desc) +static void hip04gic_guest_irq_end(struct irq_desc *desc) { /* Lower the priority of the IRQ */ - gicv2_eoi_irq(desc); + hip04gic_eoi_irq(desc); /* Deactivation happens in maintenance interrupt / via GICV */ } -static void gicv2_irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_mask) +static void hip04gic_irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_mask) { unsigned int mask; @@ -590,15 +600,15 @@ static void gicv2_irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_m spin_lock(&gicv2.lock); - mask = gicv2_cpu_mask(cpu_mask); + mask = hip04gic_cpu_mask(cpu_mask); /* Set target CPU mask (RAZ/WI on uniprocessor) */ - writeb_gicd(mask, GICD_ITARGETSR + desc->irq); + writew_gicd(mask, GICD_ITARGETSR + desc->irq * 2); spin_unlock(&gicv2.lock); } -static int gicv2_make_dt_node(const struct domain *d, +static int hip04gic_make_dt_node(const struct domain *d, const struct dt_device_node *node, void *fdt) { const struct dt_device_node *gic = dt_interrupt_controller; @@ -652,55 +662,55 @@ static int gicv2_make_dt_node(const struct domain *d, } /* XXX different for level vs edge */ -static hw_irq_controller gicv2_host_irq_type = { - .typename = "gic-v2", - .startup = gicv2_irq_startup, - .shutdown = gicv2_irq_shutdown, - .enable = gicv2_irq_enable, - .disable = gicv2_irq_disable, - .ack = gicv2_irq_ack, - .end = gicv2_host_irq_end, - .set_affinity = gicv2_irq_set_affinity, +static hw_irq_controller hip04gic_host_irq_type = { + .typename = "gic-hip04", + .startup = hip04gic_irq_startup, + .shutdown = hip04gic_irq_shutdown, + .enable = hip04gic_irq_enable, + .disable = hip04gic_irq_disable, + .ack = hip04gic_irq_ack, + .end = hip04gic_host_irq_end, + .set_affinity = hip04gic_irq_set_affinity, }; -static hw_irq_controller gicv2_guest_irq_type = { - .typename = "gic-v2", - .startup = gicv2_irq_startup, - .shutdown = gicv2_irq_shutdown, - .enable = gicv2_irq_enable, - .disable = gicv2_irq_disable, - .ack = gicv2_irq_ack, - .end = gicv2_guest_irq_end, - .set_affinity = gicv2_irq_set_affinity, +static hw_irq_controller hip04gic_guest_irq_type = { + .typename = "gic-hip04", + .startup = hip04gic_irq_startup, + .shutdown = hip04gic_irq_shutdown, + .enable = hip04gic_irq_enable, + .disable = hip04gic_irq_disable, + .ack = hip04gic_irq_ack, + .end = hip04gic_guest_irq_end, + .set_affinity = hip04gic_irq_set_affinity, }; -const static struct gic_hw_operations gicv2_ops = { +const static struct gic_hw_operations hip04gic_ops = { .info = &gicv2_info, - .secondary_init = gicv2_secondary_cpu_init, - .save_state = gicv2_save_state, - .restore_state = gicv2_restore_state, - .dump_state = gicv2_dump_state, - .gicv_setup = gicv2v_setup, - .gic_host_irq_type = &gicv2_host_irq_type, - .gic_guest_irq_type = &gicv2_guest_irq_type, - .eoi_irq = gicv2_eoi_irq, - .deactivate_irq = gicv2_dir_irq, - .read_irq = gicv2_read_irq, - .set_irq_properties = gicv2_set_irq_properties, - .send_SGI = gicv2_send_SGI, - .disable_interface = gicv2_disable_interface, - .update_lr = gicv2_update_lr, - .update_hcr_status = gicv2_hcr_status, - .clear_lr = gicv2_clear_lr, - .read_lr = gicv2_read_lr, - .write_lr = gicv2_write_lr, - .read_vmcr_priority = gicv2_read_vmcr_priority, - .read_apr = gicv2_read_apr, - .make_dt_node = gicv2_make_dt_node, + .secondary_init = hip04gic_secondary_cpu_init, + .save_state = hip04gic_save_state, + .restore_state = hip04gic_restore_state, + .dump_state = hip04gic_dump_state, + .gicv_setup = hip04gicv_setup, + .gic_host_irq_type = &hip04gic_host_irq_type, + .gic_guest_irq_type = &hip04gic_guest_irq_type, + .eoi_irq = hip04gic_eoi_irq, + .deactivate_irq = hip04gic_dir_irq, + .read_irq = hip04gic_read_irq, + .set_irq_properties = hip04gic_set_irq_properties, + .send_SGI = hip04gic_send_SGI, + .disable_interface = hip04gic_disable_interface, + .update_lr = hip04gic_update_lr, + .update_hcr_status = hip04gic_hcr_status, + .clear_lr = hip04gic_clear_lr, + .read_lr = hip04gic_read_lr, + .write_lr = hip04gic_write_lr, + .read_vmcr_priority = hip04gic_read_vmcr_priority, + .read_apr = hip04gic_read_apr, + .make_dt_node = hip04gic_make_dt_node, }; /* Set up the GIC */ -static int __init gicv2_init(struct dt_device_node *node, const void *data) +static int __init hip04gic_init(struct dt_device_node *node, const void *data) { int res; @@ -708,23 +718,23 @@ static int __init gicv2_init(struct dt_device_node *node, const void *data) res = dt_device_get_address(node, 0, &gicv2.dbase, NULL); if ( res || !gicv2.dbase || (gicv2.dbase & ~PAGE_MASK) ) - panic("GICv2: Cannot find a valid address for the distributor"); + panic("GIC-HIP04: Cannot find a valid address for the distributor"); res = dt_device_get_address(node, 1, &gicv2.cbase, NULL); if ( res || !gicv2.cbase || (gicv2.cbase & ~PAGE_MASK) ) - panic("GICv2: Cannot find a valid address for the CPU"); + panic("GIC-HIP04: Cannot find a valid address for the CPU"); res = dt_device_get_address(node, 2, &gicv2.hbase, NULL); if ( res || !gicv2.hbase || (gicv2.hbase & ~PAGE_MASK) ) - panic("GICv2: Cannot find a valid address for the hypervisor"); + panic("GIC-HIP04: Cannot find a valid address for the hypervisor"); res = dt_device_get_address(node, 3, &gicv2.vbase, NULL); if ( res || !gicv2.vbase || (gicv2.vbase & ~PAGE_MASK) ) - panic("GICv2: Cannot find a valid address for the virtual CPU"); + panic("GIC-HIP04: Cannot find a valid address for the virtual CPU"); res = platform_get_irq(node, 0); if ( res < 0 ) - panic("GICv2: Cannot find the maintenance IRQ"); + panic("GIC-HIP04: Cannot find the maintenance IRQ"); gicv2_info.maintenance_irq = res; /* Set the GIC as the primary interrupt controller */ @@ -732,7 +742,7 @@ static int __init gicv2_init(struct dt_device_node *node, const void *data) /* TODO: Add check on distributor, cpu size */ - printk("GICv2 initialization:\n" + printk("GIC-HIP04 initialization:\n" " gic_dist_addr=%"PRIpaddr"\n" " gic_cpu_addr=%"PRIpaddr"\n" " gic_hyp_addr=%"PRIpaddr"\n" @@ -743,11 +753,11 @@ static int __init gicv2_init(struct dt_device_node *node, const void *data) if ( (gicv2.dbase & ~PAGE_MASK) || (gicv2.cbase & ~PAGE_MASK) || (gicv2.hbase & ~PAGE_MASK) || (gicv2.vbase & ~PAGE_MASK) ) - panic("GICv2 interfaces not page aligned"); + panic("GIC-HIP04 interfaces not page aligned"); gicv2.map_dbase = ioremap_nocache(gicv2.dbase, PAGE_SIZE); if ( !gicv2.map_dbase ) - panic("GICv2: Failed to ioremap for GIC distributor\n"); + panic("GIC-HIP04: Failed to ioremap for GIC distributor\n"); gicv2.map_cbase[0] = ioremap_nocache(gicv2.cbase, PAGE_SIZE); @@ -758,37 +768,37 @@ static int __init gicv2_init(struct dt_device_node *node, const void *data) gicv2.map_cbase[1] = ioremap_nocache(gicv2.cbase + PAGE_SIZE, PAGE_SIZE); if ( !gicv2.map_cbase[0] || !gicv2.map_cbase[1] ) - panic("GICv2: Failed to ioremap for GIC CPU interface\n"); + panic("GIC-HIP04: Failed to ioremap for GIC CPU interface\n"); gicv2.map_hbase = ioremap_nocache(gicv2.hbase, PAGE_SIZE); if ( !gicv2.map_hbase ) - panic("GICv2: Failed to ioremap for GIC Virtual interface\n"); + panic("GIC-HIP04: Failed to ioremap for GIC Virtual interface\n"); /* Global settings: interrupt distributor */ spin_lock_init(&gicv2.lock); spin_lock(&gicv2.lock); - gicv2_dist_init(); - gicv2_cpu_init(); - gicv2_hyp_init(); + hip04gic_dist_init(); + hip04gic_cpu_init(); + hip04gic_hyp_init(); spin_unlock(&gicv2.lock); gicv2_info.hw_version = GIC_V2; - register_gic_ops(&gicv2_ops); + register_gic_ops(&hip04gic_ops); return 0; } -static const struct dt_device_match gicv2_dt_match[] __initconst = +static const struct dt_device_match hip04gic_dt_match[] __initconst = { - DT_MATCH_GIC_V2, + DT_MATCH_COMPATIBLE("hisilicon,hip04-intc"), { /* sentinel */ }, }; -DT_DEVICE_START(gicv2, "GICv2", DEVICE_GIC) - .dt_match = gicv2_dt_match, - .init = gicv2_init, +DT_DEVICE_START(hip04gic, "GIC-HIP04", DEVICE_GIC) + .dt_match = hip04gic_dt_match, + .init = hip04gic_init, DT_DEVICE_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 Mon Mar 09 11:46:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:46:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8N-0001pW-8W; Mon, 09 Mar 2015 11:46:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8K-0001p6-W9 for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:05 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 0E/3D-02635-CF78DF45; Mon, 09 Mar 2015 11:46:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1425901561!10419995!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17453 invoked from network); 9 Mar 2015 11:46:02 -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; 9 Mar 2015 11:46:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8H-0002Wp-Ge for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw8H-0008Bc-DY for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:01 +0000 Date: Mon, 09 Mar 2015 11:46:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Make gic-v2 code handle hip04-d01 platform X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eb94f326c257f0ed636b0f886950924a21388b51 Author: Frediano Ziglio AuthorDate: Tue Mar 3 15:41:14 2015 +0000 Commit: Ian Campbell CommitDate: Thu Mar 5 16:37:33 2015 +0000 xen/arm: Make gic-v2 code handle hip04-d01 platform The GIC in this platform is mainly compatible with the standard GICv2 beside: - ITARGET is extended to 16 bit to support 16 CPUs; - SGI mask is extended to support 16 CPUs; - maximum supported interrupt is 510; - GICH APR and LR register offsets. Signed-off-by: Frediano Ziglio Signed-off-by: Zoltan Kiss Acked-by: Ian Campbell --- MAINTAINERS | 6 + xen/arch/arm/Makefile | 1 + xen/arch/arm/gic-hip04.c | 270 ++++++++++++++++++++++++---------------------- 3 files changed, 147 insertions(+), 130 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 869c9a6..d88fca3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -138,6 +138,12 @@ F: xen/drivers/char/omap-uart.c 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 + CPU POOLS M: Juergen Gross S: Supported diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 41aba2e..935999e 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -12,6 +12,7 @@ obj-y += domctl.o obj-y += sysctl.o obj-y += domain_build.o obj-y += gic.o gic-v2.o +obj-$(CONFIG_ARM_32) += gic-hip04.o obj-$(CONFIG_ARM_64) += gic-v3.o obj-y += io.o obj-y += irq.o diff --git a/xen/arch/arm/gic-hip04.c b/xen/arch/arm/gic-hip04.c index 20cdbc9..0fda957 100644 --- a/xen/arch/arm/gic-hip04.c +++ b/xen/arch/arm/gic-hip04.c @@ -1,7 +1,8 @@ /* - * xen/arch/arm/gic-v2.c + * xen/arch/arm/gic-hip04.c * - * ARM Generic Interrupt Controller support v2 + * Generic Interrupt Controller for HiSilicon Hip04 platform + * Based heavily on gic-v2.c (id 3bcf563fec26378f7f4cf1e2ad0d4d5b3f341919) * * Tim Deegan * Copyright (c) 2011 Citrix Systems. @@ -79,16 +80,26 @@ static struct gic_info gicv2_info; * logical CPU numbering. Let's use mapping as returned by the GIC * itself */ -static DEFINE_PER_CPU(u8, gic_cpu_id); +static DEFINE_PER_CPU(u16, gic_cpu_id); /* Maximum cpu interface per GIC */ -#define NR_GIC_CPU_IF 8 +#define NR_GIC_CPU_IF 16 + +#define HIP04_GICD_SGI_TARGET_SHIFT 8 + +#define HIP04_GICH_APR 0x70 +#define HIP04_GICH_LR 0x80 static inline void writeb_gicd(uint8_t val, unsigned int offset) { writeb_relaxed(val, gicv2.map_dbase + offset); } +static inline void writew_gicd(uint16_t val, unsigned int offset) +{ + writew_relaxed(val, gicv2.map_dbase + offset); +} + static inline void writel_gicd(uint32_t val, unsigned int offset) { writel_relaxed(val, gicv2.map_dbase + offset); @@ -123,7 +134,7 @@ static inline uint32_t readl_gich(int unsigned offset) return readl_relaxed(gicv2.map_hbase + offset); } -static unsigned int gicv2_cpu_mask(const cpumask_t *cpumask) +static unsigned int hip04gic_cpu_mask(const cpumask_t *cpumask) { unsigned int cpu; unsigned int mask = 0; @@ -139,7 +150,7 @@ static unsigned int gicv2_cpu_mask(const cpumask_t *cpumask) return mask; } -static void gicv2_save_state(struct vcpu *v) +static void hip04gic_save_state(struct vcpu *v) { int i; @@ -148,27 +159,27 @@ static void gicv2_save_state(struct vcpu *v) * accessed simultaneously by another pCPU. */ for ( i = 0; i < gicv2_info.nr_lrs; i++ ) - v->arch.gic.v2.lr[i] = readl_gich(GICH_LR + i * 4); + v->arch.gic.v2.lr[i] = readl_gich(HIP04_GICH_LR + i * 4); - v->arch.gic.v2.apr = readl_gich(GICH_APR); + v->arch.gic.v2.apr = readl_gich(HIP04_GICH_APR); v->arch.gic.v2.vmcr = readl_gich(GICH_VMCR); /* Disable until next VCPU scheduled */ writel_gich(0, GICH_HCR); } -static void gicv2_restore_state(const struct vcpu *v) +static void hip04gic_restore_state(const struct vcpu *v) { int i; for ( i = 0; i < gicv2_info.nr_lrs; i++ ) - writel_gich(v->arch.gic.v2.lr[i], GICH_LR + i * 4); + writel_gich(v->arch.gic.v2.lr[i], HIP04_GICH_LR + i * 4); - writel_gich(v->arch.gic.v2.apr, GICH_APR); + writel_gich(v->arch.gic.v2.apr, HIP04_GICH_APR); writel_gich(v->arch.gic.v2.vmcr, GICH_VMCR); writel_gich(GICH_HCR_EN, GICH_HCR); } -static void gicv2_dump_state(const struct vcpu *v) +static void hip04gic_dump_state(const struct vcpu *v) { int i; @@ -176,7 +187,7 @@ static void gicv2_dump_state(const struct vcpu *v) { for ( i = 0; i < gicv2_info.nr_lrs; i++ ) printk(" HW_LR[%d]=%x\n", i, - readl_gich(GICH_LR + i * 4)); + readl_gich(HIP04_GICH_LR + i * 4)); } else { @@ -185,20 +196,20 @@ static void gicv2_dump_state(const struct vcpu *v) } } -static void gicv2_eoi_irq(struct irq_desc *irqd) +static void hip04gic_eoi_irq(struct irq_desc *irqd) { int irq = irqd->irq; /* Lower the priority */ writel_gicc(irq, GICC_EOIR); } -static void gicv2_dir_irq(struct irq_desc *irqd) +static void hip04gic_dir_irq(struct irq_desc *irqd) { /* Deactivate */ writel_gicc(irqd->irq, GICC_DIR); } -static unsigned int gicv2_read_irq(void) +static unsigned int hip04gic_read_irq(void) { return (readl_gicc(GICC_IAR) & GICC_IA_IRQ); } @@ -207,12 +218,12 @@ static unsigned int gicv2_read_irq(void) * needs to be called with a valid cpu_mask, ie each cpu in the mask has * already called gic_cpu_init */ -static void gicv2_set_irq_properties(struct irq_desc *desc, +static void hip04gic_set_irq_properties(struct irq_desc *desc, const cpumask_t *cpu_mask, unsigned int priority) { uint32_t cfg, actual, edgebit; - unsigned int mask = gicv2_cpu_mask(cpu_mask); + unsigned int mask = hip04gic_cpu_mask(cpu_mask); unsigned int irq = desc->irq; unsigned int type = desc->arch.type; @@ -232,7 +243,7 @@ static void gicv2_set_irq_properties(struct irq_desc *desc, actual = readl_gicd(GICD_ICFGR + (irq / 16) * 4); if ( ( cfg & edgebit ) ^ ( actual & edgebit ) ) { - printk(XENLOG_WARNING "GICv2: WARNING: " + printk(XENLOG_WARNING "GIC-HIP04: WARNING: " "CPU%d: Failed to configure IRQ%u as %s-triggered. " "H/w forces to %s-triggered.\n", smp_processor_id(), desc->irq, @@ -244,22 +255,21 @@ static void gicv2_set_irq_properties(struct irq_desc *desc, } /* Set target CPU mask (RAZ/WI on uniprocessor) */ - writeb_gicd(mask, GICD_ITARGETSR + irq); + writew_gicd(mask, GICD_ITARGETSR + irq * 2); /* Set priority */ writeb_gicd(priority, GICD_IPRIORITYR + irq); spin_unlock(&gicv2.lock); } -static void __init gicv2_dist_init(void) +static void __init hip04gic_dist_init(void) { uint32_t type; uint32_t cpumask; uint32_t gic_cpus; int i; - cpumask = readl_gicd(GICD_ITARGETSR) & 0xff; - cpumask |= cpumask << 8; + cpumask = readl_gicd(GICD_ITARGETSR) & 0xffff; cpumask |= cpumask << 16; /* Disable the distributor */ @@ -267,8 +277,8 @@ static void __init gicv2_dist_init(void) type = readl_gicd(GICD_TYPER); gicv2_info.nr_lines = 32 * ((type & GICD_TYPE_LINES) + 1); - gic_cpus = 1 + ((type & GICD_TYPE_CPUS) >> 5); - printk("GICv2: %d lines, %d cpu%s%s (IID %8.8x).\n", + gic_cpus = 16; + printk("GIC-HIP04: %d lines, %d cpu%s%s (IID %8.8x).\n", gicv2_info.nr_lines, gic_cpus, (gic_cpus == 1) ? "" : "s", (type & GICD_TYPE_SEC) ? ", secure" : "", readl_gicd(GICD_IIDR)); @@ -278,8 +288,8 @@ static void __init gicv2_dist_init(void) writel_gicd(0x0, GICD_ICFGR + (i / 16) * 4); /* Route all global IRQs to this CPU */ - for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) - writel_gicd(cpumask, GICD_ITARGETSR + (i / 4) * 4); + for ( i = 32; i < gicv2_info.nr_lines; i += 2 ) + writel_gicd(cpumask, GICD_ITARGETSR + (i / 2) * 4); /* Default priority for global interrupts */ for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) @@ -295,11 +305,11 @@ static void __init gicv2_dist_init(void) writel_gicd(GICD_CTL_ENABLE, GICD_CTLR); } -static void __cpuinit gicv2_cpu_init(void) +static void __cpuinit hip04gic_cpu_init(void) { int i; - this_cpu(gic_cpu_id) = readl_gicd(GICD_ITARGETSR) & 0xff; + this_cpu(gic_cpu_id) = readl_gicd(GICD_ITARGETSR) & 0xffff; /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so * even though they are controlled with GICD registers, they must @@ -328,12 +338,12 @@ static void __cpuinit gicv2_cpu_init(void) writel_gicc(GICC_CTL_ENABLE|GICC_CTL_EOI, GICC_CTLR); } -static void gicv2_cpu_disable(void) +static void hip04gic_cpu_disable(void) { writel_gicc(0x0, GICC_CTLR); } -static void __cpuinit gicv2_hyp_init(void) +static void __cpuinit hip04gic_hyp_init(void) { uint32_t vtr; uint8_t nr_lrs; @@ -345,24 +355,24 @@ static void __cpuinit gicv2_hyp_init(void) writel_gich(GICH_MISR_EOI, GICH_MISR); } -static void __cpuinit gicv2_hyp_disable(void) +static void __cpuinit hip04gic_hyp_disable(void) { writel_gich(0, GICH_HCR); } -static int gicv2_secondary_cpu_init(void) +static int hip04gic_secondary_cpu_init(void) { spin_lock(&gicv2.lock); - gicv2_cpu_init(); - gicv2_hyp_init(); + hip04gic_cpu_init(); + hip04gic_hyp_init(); spin_unlock(&gicv2.lock); return 0; } -static void gicv2_send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, +static void hip04gic_send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, const cpumask_t *cpu_mask) { unsigned int mask = 0; @@ -378,9 +388,9 @@ static void gicv2_send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, break; case SGI_TARGET_LIST: cpumask_and(&online_mask, cpu_mask, &cpu_online_map); - mask = gicv2_cpu_mask(&online_mask); + mask = hip04gic_cpu_mask(&online_mask); writel_gicd(GICD_SGI_TARGET_LIST | - (mask << GICD_SGI_TARGET_SHIFT) | sgi, + (mask << HIP04_GICD_SGI_TARGET_SHIFT) | sgi, GICD_SGIR); break; default: @@ -389,15 +399,15 @@ static void gicv2_send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, } /* Shut down the per-CPU GIC interface */ -static void gicv2_disable_interface(void) +static void hip04gic_disable_interface(void) { spin_lock(&gicv2.lock); - gicv2_cpu_disable(); - gicv2_hyp_disable(); + hip04gic_cpu_disable(); + hip04gic_hyp_disable(); spin_unlock(&gicv2.lock); } -static void gicv2_update_lr(int lr, const struct pending_irq *p, +static void hip04gic_update_lr(int lr, const struct pending_irq *p, unsigned int state) { uint32_t lr_reg; @@ -419,15 +429,15 @@ static void gicv2_update_lr(int lr, const struct pending_irq *p, << GICH_V2_LR_PHYSICAL_SHIFT); } - writel_gich(lr_reg, GICH_LR + lr * 4); + writel_gich(lr_reg, HIP04_GICH_LR + lr * 4); } -static void gicv2_clear_lr(int lr) +static void hip04gic_clear_lr(int lr) { - writel_gich(0, GICH_LR + lr * 4); + writel_gich(0, HIP04_GICH_LR + lr * 4); } -static int gicv2v_setup(struct domain *d) +static int hip04gicv_setup(struct domain *d) { int ret; @@ -468,11 +478,11 @@ static int gicv2v_setup(struct domain *d) return ret; } -static void gicv2_read_lr(int lr, struct gic_lr *lr_reg) +static void hip04gic_read_lr(int lr, struct gic_lr *lr_reg) { uint32_t lrv; - lrv = readl_gich(GICH_LR + lr * 4); + lrv = readl_gich(HIP04_GICH_LR + lr * 4); lr_reg->pirq = (lrv >> GICH_V2_LR_PHYSICAL_SHIFT) & GICH_V2_LR_PHYSICAL_MASK; lr_reg->virq = (lrv >> GICH_V2_LR_VIRTUAL_SHIFT) & GICH_V2_LR_VIRTUAL_MASK; lr_reg->priority = (lrv >> GICH_V2_LR_PRIORITY_SHIFT) & GICH_V2_LR_PRIORITY_MASK; @@ -481,7 +491,7 @@ static void gicv2_read_lr(int lr, struct gic_lr *lr_reg) lr_reg->grp = (lrv >> GICH_V2_LR_GRP_SHIFT) & GICH_V2_LR_GRP_MASK; } -static void gicv2_write_lr(int lr, const struct gic_lr *lr_reg) +static void hip04gic_write_lr(int lr, const struct gic_lr *lr_reg) { uint32_t lrv = 0; @@ -495,10 +505,10 @@ static void gicv2_write_lr(int lr, const struct gic_lr *lr_reg) << GICH_V2_LR_HW_SHIFT) | ((uint32_t)(lr_reg->grp & GICH_V2_LR_GRP_MASK) << GICH_V2_LR_GRP_SHIFT) ); - writel_gich(lrv, GICH_LR + lr * 4); + writel_gich(lrv, HIP04_GICH_LR + lr * 4); } -static void gicv2_hcr_status(uint32_t flag, bool_t status) +static void hip04gic_hcr_status(uint32_t flag, bool_t status) { uint32_t hcr = readl_gich(GICH_HCR); @@ -510,18 +520,18 @@ static void gicv2_hcr_status(uint32_t flag, bool_t status) writel_gich(hcr, GICH_HCR); } -static unsigned int gicv2_read_vmcr_priority(void) +static unsigned int hip04gic_read_vmcr_priority(void) { return ((readl_gich(GICH_VMCR) >> GICH_V2_VMCR_PRIORITY_SHIFT) & GICH_V2_VMCR_PRIORITY_MASK); } -static unsigned int gicv2_read_apr(int apr_reg) +static unsigned int hip04gic_read_apr(int apr_reg) { - return readl_gich(GICH_APR); + return readl_gich(HIP04_GICH_APR); } -static void gicv2_irq_enable(struct irq_desc *desc) +static void hip04gic_irq_enable(struct irq_desc *desc) { unsigned long flags; int irq = desc->irq; @@ -536,7 +546,7 @@ static void gicv2_irq_enable(struct irq_desc *desc) spin_unlock_irqrestore(&gicv2.lock, flags); } -static void gicv2_irq_disable(struct irq_desc *desc) +static void hip04gic_irq_disable(struct irq_desc *desc) { unsigned long flags; int irq = desc->irq; @@ -550,39 +560,39 @@ static void gicv2_irq_disable(struct irq_desc *desc) spin_unlock_irqrestore(&gicv2.lock, flags); } -static unsigned int gicv2_irq_startup(struct irq_desc *desc) +static unsigned int hip04gic_irq_startup(struct irq_desc *desc) { - gicv2_irq_enable(desc); + hip04gic_irq_enable(desc); return 0; } -static void gicv2_irq_shutdown(struct irq_desc *desc) +static void hip04gic_irq_shutdown(struct irq_desc *desc) { - gicv2_irq_disable(desc); + hip04gic_irq_disable(desc); } -static void gicv2_irq_ack(struct irq_desc *desc) +static void hip04gic_irq_ack(struct irq_desc *desc) { /* No ACK -- reading IAR has done this for us */ } -static void gicv2_host_irq_end(struct irq_desc *desc) +static void hip04gic_host_irq_end(struct irq_desc *desc) { /* Lower the priority */ - gicv2_eoi_irq(desc); + hip04gic_eoi_irq(desc); /* Deactivate */ - gicv2_dir_irq(desc); + hip04gic_dir_irq(desc); } -static void gicv2_guest_irq_end(struct irq_desc *desc) +static void hip04gic_guest_irq_end(struct irq_desc *desc) { /* Lower the priority of the IRQ */ - gicv2_eoi_irq(desc); + hip04gic_eoi_irq(desc); /* Deactivation happens in maintenance interrupt / via GICV */ } -static void gicv2_irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_mask) +static void hip04gic_irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_mask) { unsigned int mask; @@ -590,15 +600,15 @@ static void gicv2_irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_m spin_lock(&gicv2.lock); - mask = gicv2_cpu_mask(cpu_mask); + mask = hip04gic_cpu_mask(cpu_mask); /* Set target CPU mask (RAZ/WI on uniprocessor) */ - writeb_gicd(mask, GICD_ITARGETSR + desc->irq); + writew_gicd(mask, GICD_ITARGETSR + desc->irq * 2); spin_unlock(&gicv2.lock); } -static int gicv2_make_dt_node(const struct domain *d, +static int hip04gic_make_dt_node(const struct domain *d, const struct dt_device_node *node, void *fdt) { const struct dt_device_node *gic = dt_interrupt_controller; @@ -652,55 +662,55 @@ static int gicv2_make_dt_node(const struct domain *d, } /* XXX different for level vs edge */ -static hw_irq_controller gicv2_host_irq_type = { - .typename = "gic-v2", - .startup = gicv2_irq_startup, - .shutdown = gicv2_irq_shutdown, - .enable = gicv2_irq_enable, - .disable = gicv2_irq_disable, - .ack = gicv2_irq_ack, - .end = gicv2_host_irq_end, - .set_affinity = gicv2_irq_set_affinity, +static hw_irq_controller hip04gic_host_irq_type = { + .typename = "gic-hip04", + .startup = hip04gic_irq_startup, + .shutdown = hip04gic_irq_shutdown, + .enable = hip04gic_irq_enable, + .disable = hip04gic_irq_disable, + .ack = hip04gic_irq_ack, + .end = hip04gic_host_irq_end, + .set_affinity = hip04gic_irq_set_affinity, }; -static hw_irq_controller gicv2_guest_irq_type = { - .typename = "gic-v2", - .startup = gicv2_irq_startup, - .shutdown = gicv2_irq_shutdown, - .enable = gicv2_irq_enable, - .disable = gicv2_irq_disable, - .ack = gicv2_irq_ack, - .end = gicv2_guest_irq_end, - .set_affinity = gicv2_irq_set_affinity, +static hw_irq_controller hip04gic_guest_irq_type = { + .typename = "gic-hip04", + .startup = hip04gic_irq_startup, + .shutdown = hip04gic_irq_shutdown, + .enable = hip04gic_irq_enable, + .disable = hip04gic_irq_disable, + .ack = hip04gic_irq_ack, + .end = hip04gic_guest_irq_end, + .set_affinity = hip04gic_irq_set_affinity, }; -const static struct gic_hw_operations gicv2_ops = { +const static struct gic_hw_operations hip04gic_ops = { .info = &gicv2_info, - .secondary_init = gicv2_secondary_cpu_init, - .save_state = gicv2_save_state, - .restore_state = gicv2_restore_state, - .dump_state = gicv2_dump_state, - .gicv_setup = gicv2v_setup, - .gic_host_irq_type = &gicv2_host_irq_type, - .gic_guest_irq_type = &gicv2_guest_irq_type, - .eoi_irq = gicv2_eoi_irq, - .deactivate_irq = gicv2_dir_irq, - .read_irq = gicv2_read_irq, - .set_irq_properties = gicv2_set_irq_properties, - .send_SGI = gicv2_send_SGI, - .disable_interface = gicv2_disable_interface, - .update_lr = gicv2_update_lr, - .update_hcr_status = gicv2_hcr_status, - .clear_lr = gicv2_clear_lr, - .read_lr = gicv2_read_lr, - .write_lr = gicv2_write_lr, - .read_vmcr_priority = gicv2_read_vmcr_priority, - .read_apr = gicv2_read_apr, - .make_dt_node = gicv2_make_dt_node, + .secondary_init = hip04gic_secondary_cpu_init, + .save_state = hip04gic_save_state, + .restore_state = hip04gic_restore_state, + .dump_state = hip04gic_dump_state, + .gicv_setup = hip04gicv_setup, + .gic_host_irq_type = &hip04gic_host_irq_type, + .gic_guest_irq_type = &hip04gic_guest_irq_type, + .eoi_irq = hip04gic_eoi_irq, + .deactivate_irq = hip04gic_dir_irq, + .read_irq = hip04gic_read_irq, + .set_irq_properties = hip04gic_set_irq_properties, + .send_SGI = hip04gic_send_SGI, + .disable_interface = hip04gic_disable_interface, + .update_lr = hip04gic_update_lr, + .update_hcr_status = hip04gic_hcr_status, + .clear_lr = hip04gic_clear_lr, + .read_lr = hip04gic_read_lr, + .write_lr = hip04gic_write_lr, + .read_vmcr_priority = hip04gic_read_vmcr_priority, + .read_apr = hip04gic_read_apr, + .make_dt_node = hip04gic_make_dt_node, }; /* Set up the GIC */ -static int __init gicv2_init(struct dt_device_node *node, const void *data) +static int __init hip04gic_init(struct dt_device_node *node, const void *data) { int res; @@ -708,23 +718,23 @@ static int __init gicv2_init(struct dt_device_node *node, const void *data) res = dt_device_get_address(node, 0, &gicv2.dbase, NULL); if ( res || !gicv2.dbase || (gicv2.dbase & ~PAGE_MASK) ) - panic("GICv2: Cannot find a valid address for the distributor"); + panic("GIC-HIP04: Cannot find a valid address for the distributor"); res = dt_device_get_address(node, 1, &gicv2.cbase, NULL); if ( res || !gicv2.cbase || (gicv2.cbase & ~PAGE_MASK) ) - panic("GICv2: Cannot find a valid address for the CPU"); + panic("GIC-HIP04: Cannot find a valid address for the CPU"); res = dt_device_get_address(node, 2, &gicv2.hbase, NULL); if ( res || !gicv2.hbase || (gicv2.hbase & ~PAGE_MASK) ) - panic("GICv2: Cannot find a valid address for the hypervisor"); + panic("GIC-HIP04: Cannot find a valid address for the hypervisor"); res = dt_device_get_address(node, 3, &gicv2.vbase, NULL); if ( res || !gicv2.vbase || (gicv2.vbase & ~PAGE_MASK) ) - panic("GICv2: Cannot find a valid address for the virtual CPU"); + panic("GIC-HIP04: Cannot find a valid address for the virtual CPU"); res = platform_get_irq(node, 0); if ( res < 0 ) - panic("GICv2: Cannot find the maintenance IRQ"); + panic("GIC-HIP04: Cannot find the maintenance IRQ"); gicv2_info.maintenance_irq = res; /* Set the GIC as the primary interrupt controller */ @@ -732,7 +742,7 @@ static int __init gicv2_init(struct dt_device_node *node, const void *data) /* TODO: Add check on distributor, cpu size */ - printk("GICv2 initialization:\n" + printk("GIC-HIP04 initialization:\n" " gic_dist_addr=%"PRIpaddr"\n" " gic_cpu_addr=%"PRIpaddr"\n" " gic_hyp_addr=%"PRIpaddr"\n" @@ -743,11 +753,11 @@ static int __init gicv2_init(struct dt_device_node *node, const void *data) if ( (gicv2.dbase & ~PAGE_MASK) || (gicv2.cbase & ~PAGE_MASK) || (gicv2.hbase & ~PAGE_MASK) || (gicv2.vbase & ~PAGE_MASK) ) - panic("GICv2 interfaces not page aligned"); + panic("GIC-HIP04 interfaces not page aligned"); gicv2.map_dbase = ioremap_nocache(gicv2.dbase, PAGE_SIZE); if ( !gicv2.map_dbase ) - panic("GICv2: Failed to ioremap for GIC distributor\n"); + panic("GIC-HIP04: Failed to ioremap for GIC distributor\n"); gicv2.map_cbase[0] = ioremap_nocache(gicv2.cbase, PAGE_SIZE); @@ -758,37 +768,37 @@ static int __init gicv2_init(struct dt_device_node *node, const void *data) gicv2.map_cbase[1] = ioremap_nocache(gicv2.cbase + PAGE_SIZE, PAGE_SIZE); if ( !gicv2.map_cbase[0] || !gicv2.map_cbase[1] ) - panic("GICv2: Failed to ioremap for GIC CPU interface\n"); + panic("GIC-HIP04: Failed to ioremap for GIC CPU interface\n"); gicv2.map_hbase = ioremap_nocache(gicv2.hbase, PAGE_SIZE); if ( !gicv2.map_hbase ) - panic("GICv2: Failed to ioremap for GIC Virtual interface\n"); + panic("GIC-HIP04: Failed to ioremap for GIC Virtual interface\n"); /* Global settings: interrupt distributor */ spin_lock_init(&gicv2.lock); spin_lock(&gicv2.lock); - gicv2_dist_init(); - gicv2_cpu_init(); - gicv2_hyp_init(); + hip04gic_dist_init(); + hip04gic_cpu_init(); + hip04gic_hyp_init(); spin_unlock(&gicv2.lock); gicv2_info.hw_version = GIC_V2; - register_gic_ops(&gicv2_ops); + register_gic_ops(&hip04gic_ops); return 0; } -static const struct dt_device_match gicv2_dt_match[] __initconst = +static const struct dt_device_match hip04gic_dt_match[] __initconst = { - DT_MATCH_GIC_V2, + DT_MATCH_COMPATIBLE("hisilicon,hip04-intc"), { /* sentinel */ }, }; -DT_DEVICE_START(gicv2, "GICv2", DEVICE_GIC) - .dt_match = gicv2_dt_match, - .init = gicv2_init, +DT_DEVICE_START(hip04gic, "GIC-HIP04", DEVICE_GIC) + .dt_match = hip04gic_dt_match, + .init = hip04gic_init, DT_DEVICE_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 Mon Mar 09 11:46:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:46: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 1YUw8W-0001rU-Bs; Mon, 09 Mar 2015 11:46:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8U-0001r9-9n for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:14 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 75/FD-03164-5088DF45; Mon, 09 Mar 2015 11:46:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1425901571!14000167!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28261 invoked from network); 9 Mar 2015 11:46:12 -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; 9 Mar 2015 11:46:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8R-0002XN-PV for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw8R-0008CA-Jj for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:11 +0000 Date: Mon, 09 Mar 2015 11:46:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Force dom0 to use normal GICv2 driver on Hip04 platform X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1306dbdf9551d59ff0cea39925f3e593acb86d1e Author: Frediano Ziglio AuthorDate: Tue Mar 3 15:41:15 2015 +0000 Commit: Ian Campbell CommitDate: Thu Mar 5 16:37:33 2015 +0000 xen/arm: Force dom0 to use normal GICv2 driver on Hip04 platform Until vGIC support is not implemented and tested, this will prevent guest kernels to use their Hip04 driver, or crash when they don't have any. Signed-off-by: Frediano Ziglio Acked-by: Ian Campbell --- xen/arch/arm/gic-hip04.c | 18 +++++++++++------- xen/include/asm-arm/gic.h | 4 +++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/gic-hip04.c b/xen/arch/arm/gic-hip04.c index 0fda957..073ad33 100644 --- a/xen/arch/arm/gic-hip04.c +++ b/xen/arch/arm/gic-hip04.c @@ -612,17 +612,21 @@ static int hip04gic_make_dt_node(const struct domain *d, const struct dt_device_node *node, void *fdt) { const struct dt_device_node *gic = dt_interrupt_controller; - const void *compatible = NULL; + const void *compatible; u32 len; const __be32 *regs; int res = 0; - compatible = dt_get_property(gic, "compatible", &len); - if ( !compatible ) - { - dprintk(XENLOG_ERR, "Can't find compatible property for the gic node\n"); - return -FDT_ERR_XEN(ENOENT); - } + /* + * Replace compatibility string with a standard one. + * dom0 will see a compatible GIC. This as GICC is compatible + * with standard one and GICD (emulated by Xen) is compatible + * to standard. Otherwise we should implement HIP04 GICD in + * the virtual GIC. + * This actually limit CPU number to 8 for dom0. + */ + compatible = DT_COMPAT_GIC_CORTEX_A15; + len = strlen((char*) compatible) + 1; res = fdt_begin_node(fdt, "interrupt-controller"); if ( res ) diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 6f5767f..89a9b6f 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -153,8 +153,10 @@ #include #include +#define DT_COMPAT_GIC_CORTEX_A15 "arm,cortex-a15-gic" + #define DT_MATCH_GIC_V2 \ - DT_MATCH_COMPATIBLE("arm,cortex-a15-gic"), \ + DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A15), \ DT_MATCH_COMPATIBLE("arm,cortex-a7-gic"), \ DT_MATCH_COMPATIBLE("arm,gic-400") -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:46:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:46: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 1YUw8W-0001rU-Bs; Mon, 09 Mar 2015 11:46:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8U-0001r9-9n for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:14 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 75/FD-03164-5088DF45; Mon, 09 Mar 2015 11:46:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1425901571!14000167!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28261 invoked from network); 9 Mar 2015 11:46:12 -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; 9 Mar 2015 11:46:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8R-0002XN-PV for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw8R-0008CA-Jj for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:11 +0000 Date: Mon, 09 Mar 2015 11:46:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Force dom0 to use normal GICv2 driver on Hip04 platform X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1306dbdf9551d59ff0cea39925f3e593acb86d1e Author: Frediano Ziglio AuthorDate: Tue Mar 3 15:41:15 2015 +0000 Commit: Ian Campbell CommitDate: Thu Mar 5 16:37:33 2015 +0000 xen/arm: Force dom0 to use normal GICv2 driver on Hip04 platform Until vGIC support is not implemented and tested, this will prevent guest kernels to use their Hip04 driver, or crash when they don't have any. Signed-off-by: Frediano Ziglio Acked-by: Ian Campbell --- xen/arch/arm/gic-hip04.c | 18 +++++++++++------- xen/include/asm-arm/gic.h | 4 +++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/gic-hip04.c b/xen/arch/arm/gic-hip04.c index 0fda957..073ad33 100644 --- a/xen/arch/arm/gic-hip04.c +++ b/xen/arch/arm/gic-hip04.c @@ -612,17 +612,21 @@ static int hip04gic_make_dt_node(const struct domain *d, const struct dt_device_node *node, void *fdt) { const struct dt_device_node *gic = dt_interrupt_controller; - const void *compatible = NULL; + const void *compatible; u32 len; const __be32 *regs; int res = 0; - compatible = dt_get_property(gic, "compatible", &len); - if ( !compatible ) - { - dprintk(XENLOG_ERR, "Can't find compatible property for the gic node\n"); - return -FDT_ERR_XEN(ENOENT); - } + /* + * Replace compatibility string with a standard one. + * dom0 will see a compatible GIC. This as GICC is compatible + * with standard one and GICD (emulated by Xen) is compatible + * to standard. Otherwise we should implement HIP04 GICD in + * the virtual GIC. + * This actually limit CPU number to 8 for dom0. + */ + compatible = DT_COMPAT_GIC_CORTEX_A15; + len = strlen((char*) compatible) + 1; res = fdt_begin_node(fdt, "interrupt-controller"); if ( res ) diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 6f5767f..89a9b6f 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -153,8 +153,10 @@ #include #include +#define DT_COMPAT_GIC_CORTEX_A15 "arm,cortex-a15-gic" + #define DT_MATCH_GIC_V2 \ - DT_MATCH_COMPATIBLE("arm,cortex-a15-gic"), \ + DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A15), \ DT_MATCH_COMPATIBLE("arm,cortex-a7-gic"), \ DT_MATCH_COMPATIBLE("arm,gic-400") -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:46:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:46: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 1YUw8f-0001tm-GX; Mon, 09 Mar 2015 11:46:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8e-0001tX-HN for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:24 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id A3/4E-02753-F088DF45; Mon, 09 Mar 2015 11:46:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1425901582!15802546!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5855 invoked from network); 9 Mar 2015 11:46:22 -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; 9 Mar 2015 11:46:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8b-0002XT-Vl for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw8b-0008EF-Sl for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:21 +0000 Date: Mon, 09 Mar 2015 11:46:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add ThunderX platform 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 64c59d5b07f614dc9a574c3c99dafe2d909904e6 Author: Vijaya Kumar K AuthorDate: Wed Mar 4 11:36:22 2015 +0530 Commit: Ian Campbell CommitDate: Thu Mar 5 16:38:22 2015 +0000 xen/arm: Add ThunderX platform support Add basic support for Cavium ThunderX platform Signed-off-by: Vijaya Kumar K Acked-by: Ian Campbell --- xen/arch/arm/platforms/Makefile | 1 + xen/arch/arm/platforms/thunderx.c | 41 +++++++++++++++++++++++++++++++++++++ xen/arch/arm/setup.c | 1 + 3 files changed, 43 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/Makefile b/xen/arch/arm/platforms/Makefile index e173fec..d9f98f9 100644 --- a/xen/arch/arm/platforms/Makefile +++ b/xen/arch/arm/platforms/Makefile @@ -7,3 +7,4 @@ obj-$(CONFIG_ARM_32) += sunxi.o obj-$(CONFIG_ARM_32) += rcar2.o obj-$(CONFIG_ARM_64) += seattle.o obj-$(CONFIG_ARM_64) += xgene-storm.o +obj-$(CONFIG_ARM_64) += thunderx.o diff --git a/xen/arch/arm/platforms/thunderx.c b/xen/arch/arm/platforms/thunderx.c new file mode 100644 index 0000000..be6f24f --- /dev/null +++ b/xen/arch/arm/platforms/thunderx.c @@ -0,0 +1,41 @@ +/* + * xen/arch/arm/platforms/thunderx.c + * + * Cavium Thunder specific settings + * + * Vijaya Kumar K + * Copyright (c) 2015 Cavium Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include + +static const char * const thunderx_dt_compat[] __initconst = +{ + "cavium,thunder-88xx", + NULL +}; + +PLATFORM_START(thunderx, "THUNDERX") + .compatible = thunderx_dt_compat, + .dom0_gnttab_start = 0x40000000000, + .dom0_gnttab_size = 0x20000, +PLATFORM_END + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 9a1c285..b905c9f 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -71,6 +71,7 @@ static void __init init_idle_domain(void) static const char * __initdata processor_implementers[] = { ['A'] = "ARM Limited", ['B'] = "Broadcom Corporation", + ['C'] = "Cavium Inc.", ['D'] = "Digital Equipment Corp", ['M'] = "Motorola, Freescale Semiconductor Inc.", ['P'] = "Applied Micro", -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:46:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:46: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 1YUw8f-0001tm-GX; Mon, 09 Mar 2015 11:46:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8e-0001tX-HN for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:24 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id A3/4E-02753-F088DF45; Mon, 09 Mar 2015 11:46:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1425901582!15802546!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5855 invoked from network); 9 Mar 2015 11:46:22 -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; 9 Mar 2015 11:46:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8b-0002XT-Vl for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw8b-0008EF-Sl for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:21 +0000 Date: Mon, 09 Mar 2015 11:46:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add ThunderX platform 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 64c59d5b07f614dc9a574c3c99dafe2d909904e6 Author: Vijaya Kumar K AuthorDate: Wed Mar 4 11:36:22 2015 +0530 Commit: Ian Campbell CommitDate: Thu Mar 5 16:38:22 2015 +0000 xen/arm: Add ThunderX platform support Add basic support for Cavium ThunderX platform Signed-off-by: Vijaya Kumar K Acked-by: Ian Campbell --- xen/arch/arm/platforms/Makefile | 1 + xen/arch/arm/platforms/thunderx.c | 41 +++++++++++++++++++++++++++++++++++++ xen/arch/arm/setup.c | 1 + 3 files changed, 43 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/Makefile b/xen/arch/arm/platforms/Makefile index e173fec..d9f98f9 100644 --- a/xen/arch/arm/platforms/Makefile +++ b/xen/arch/arm/platforms/Makefile @@ -7,3 +7,4 @@ obj-$(CONFIG_ARM_32) += sunxi.o obj-$(CONFIG_ARM_32) += rcar2.o obj-$(CONFIG_ARM_64) += seattle.o obj-$(CONFIG_ARM_64) += xgene-storm.o +obj-$(CONFIG_ARM_64) += thunderx.o diff --git a/xen/arch/arm/platforms/thunderx.c b/xen/arch/arm/platforms/thunderx.c new file mode 100644 index 0000000..be6f24f --- /dev/null +++ b/xen/arch/arm/platforms/thunderx.c @@ -0,0 +1,41 @@ +/* + * xen/arch/arm/platforms/thunderx.c + * + * Cavium Thunder specific settings + * + * Vijaya Kumar K + * Copyright (c) 2015 Cavium Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include + +static const char * const thunderx_dt_compat[] __initconst = +{ + "cavium,thunder-88xx", + NULL +}; + +PLATFORM_START(thunderx, "THUNDERX") + .compatible = thunderx_dt_compat, + .dom0_gnttab_start = 0x40000000000, + .dom0_gnttab_size = 0x20000, +PLATFORM_END + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 9a1c285..b905c9f 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -71,6 +71,7 @@ static void __init init_idle_domain(void) static const char * __initdata processor_implementers[] = { ['A'] = "ARM Limited", ['B'] = "Broadcom Corporation", + ['C'] = "Cavium Inc.", ['D'] = "Digital Equipment Corp", ['M'] = "Motorola, Freescale Semiconductor Inc.", ['P'] = "Applied Micro", -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:46:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:46: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 1YUw8q-0001wH-V1; Mon, 09 Mar 2015 11:46:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8p-0001vr-RA for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:35 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id E1/90-02995-B188DF45; Mon, 09 Mar 2015 11:46:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1425901592!14353961!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19513 invoked from network); 9 Mar 2015 11:46:34 -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; 9 Mar 2015 11:46:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8m-0002Xb-5j for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw8m-0008Ec-3a for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:32 +0000 Date: Mon, 09 Mar 2015 11:46:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Don't pass the PSCI-0.2 node to DOM0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf8d458f5762cbb87a6965a90d36186d804ff50e Author: Vijaya Kumar K AuthorDate: Wed Mar 4 11:36:25 2015 +0530 Commit: Ian Campbell CommitDate: Thu Mar 5 16:38:49 2015 +0000 xen/arm: Don't pass the PSCI-0.2 node to DOM0 psci node is generated by xen for dom0. if the host device tree has psci-0.2 skip parsing this node and avoid copying from host device tree to dom0 device tree. Signed-off-by: Vijaya Kumar K Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index aaa3b97..ab4ad65 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1029,6 +1029,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("xen,multiboot-module"), DT_MATCH_COMPATIBLE("multiboot,module"), DT_MATCH_COMPATIBLE("arm,psci"), + DT_MATCH_COMPATIBLE("arm,psci-0.2"), DT_MATCH_PATH("/cpus"), DT_MATCH_TYPE("memory"), /* The memory mapped timer is not supported by Xen. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:46:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:46: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 1YUw8q-0001wH-V1; Mon, 09 Mar 2015 11:46:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8p-0001vr-RA for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:35 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id E1/90-02995-B188DF45; Mon, 09 Mar 2015 11:46:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1425901592!14353961!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19513 invoked from network); 9 Mar 2015 11:46:34 -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; 9 Mar 2015 11:46:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8m-0002Xb-5j for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw8m-0008Ec-3a for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:32 +0000 Date: Mon, 09 Mar 2015 11:46:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Don't pass the PSCI-0.2 node to DOM0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf8d458f5762cbb87a6965a90d36186d804ff50e Author: Vijaya Kumar K AuthorDate: Wed Mar 4 11:36:25 2015 +0530 Commit: Ian Campbell CommitDate: Thu Mar 5 16:38:49 2015 +0000 xen/arm: Don't pass the PSCI-0.2 node to DOM0 psci node is generated by xen for dom0. if the host device tree has psci-0.2 skip parsing this node and avoid copying from host device tree to dom0 device tree. Signed-off-by: Vijaya Kumar K Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index aaa3b97..ab4ad65 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1029,6 +1029,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("xen,multiboot-module"), DT_MATCH_COMPATIBLE("multiboot,module"), DT_MATCH_COMPATIBLE("arm,psci"), + DT_MATCH_COMPATIBLE("arm,psci-0.2"), DT_MATCH_PATH("/cpus"), DT_MATCH_TYPE("memory"), /* The memory mapped timer is not supported by Xen. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:46:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:46: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 1YUw91-0001zf-1c; Mon, 09 Mar 2015 11:46:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8z-0001zG-Tu for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:46 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 0F/6B-02884-5288DF45; Mon, 09 Mar 2015 11:46:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425901602!14406366!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7735 invoked from network); 9 Mar 2015 11:46:43 -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; 9 Mar 2015 11:46:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8w-0002Xk-EP for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw8w-0008F7-A9 for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:42 +0000 Date: Mon, 09 Mar 2015 11:46:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add early printk support for ThunderX platform X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 386627b10ec2cef2f1deca06236046b7d5c9abe3 Author: Vijaya Kumar K AuthorDate: Wed Mar 4 11:36:24 2015 +0530 Commit: Ian Campbell CommitDate: Thu Mar 5 16:40:59 2015 +0000 xen/arm: Add early printk support for ThunderX platform ThunderX platform uses pl011 uart. Signed-off-by: Vijaya Kumar K Acked-by: Ian Campbell [ ijc -- added to early-printk.txt ] --- docs/misc/arm/early-printk.txt | 1 + xen/arch/arm/Rules.mk | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/docs/misc/arm/early-printk.txt b/docs/misc/arm/early-printk.txt index 1ca2a55..859c635 100644 --- a/docs/misc/arm/early-printk.txt +++ b/docs/misc/arm/early-printk.txt @@ -20,6 +20,7 @@ where mach is the name of the machine: - hip04-d01: printk with 8250 on HiSilicon Hip-04 D01 - seattle: printk with pl011 for AMD Seattle processor - lager: printk with SCIF0 on Renesas R-Car H2 processors + - thunderx: printk with pl011 for Cavium ThunderX processor The base address and baud rate is hardcoded in xen/arch/arm/Rules.mk, see there when adding support for new machines. diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index c7bd227..54efa91 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -113,6 +113,10 @@ ifeq ($(CONFIG_EARLY_PRINTK), lager) EARLY_PRINTK_INC := scif EARLY_UART_BASE_ADDRESS := 0xe6e60000 endif +ifeq ($(CONFIG_EARLY_PRINTK), thunderx) +EARLY_PRINTK_INC := pl011 +EARLY_UART_BASE_ADDRESS := 0x87e024000000 +endif ifneq ($(EARLY_PRINTK_INC),) EARLY_PRINTK := y -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:46:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:46: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 1YUw91-0001zf-1c; Mon, 09 Mar 2015 11:46:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8z-0001zG-Tu for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:46 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 0F/6B-02884-5288DF45; Mon, 09 Mar 2015 11:46:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425901602!14406366!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7735 invoked from network); 9 Mar 2015 11:46:43 -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; 9 Mar 2015 11:46:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw8w-0002Xk-EP for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw8w-0008F7-A9 for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:42 +0000 Date: Mon, 09 Mar 2015 11:46:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add early printk support for ThunderX platform X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 386627b10ec2cef2f1deca06236046b7d5c9abe3 Author: Vijaya Kumar K AuthorDate: Wed Mar 4 11:36:24 2015 +0530 Commit: Ian Campbell CommitDate: Thu Mar 5 16:40:59 2015 +0000 xen/arm: Add early printk support for ThunderX platform ThunderX platform uses pl011 uart. Signed-off-by: Vijaya Kumar K Acked-by: Ian Campbell [ ijc -- added to early-printk.txt ] --- docs/misc/arm/early-printk.txt | 1 + xen/arch/arm/Rules.mk | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/docs/misc/arm/early-printk.txt b/docs/misc/arm/early-printk.txt index 1ca2a55..859c635 100644 --- a/docs/misc/arm/early-printk.txt +++ b/docs/misc/arm/early-printk.txt @@ -20,6 +20,7 @@ where mach is the name of the machine: - hip04-d01: printk with 8250 on HiSilicon Hip-04 D01 - seattle: printk with pl011 for AMD Seattle processor - lager: printk with SCIF0 on Renesas R-Car H2 processors + - thunderx: printk with pl011 for Cavium ThunderX processor The base address and baud rate is hardcoded in xen/arch/arm/Rules.mk, see there when adding support for new machines. diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index c7bd227..54efa91 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -113,6 +113,10 @@ ifeq ($(CONFIG_EARLY_PRINTK), lager) EARLY_PRINTK_INC := scif EARLY_UART_BASE_ADDRESS := 0xe6e60000 endif +ifeq ($(CONFIG_EARLY_PRINTK), thunderx) +EARLY_PRINTK_INC := pl011 +EARLY_UART_BASE_ADDRESS := 0x87e024000000 +endif ifneq ($(EARLY_PRINTK_INC),) EARLY_PRINTK := y -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:46:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:46: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 1YUw9A-00022A-4S; Mon, 09 Mar 2015 11:46:56 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw98-00021o-Ud for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:55 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 37/3B-03164-E288DF45; Mon, 09 Mar 2015 11:46:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425901612!14279131!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23631 invoked from network); 9 Mar 2015 11:46:53 -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; 9 Mar 2015 11:46:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw96-0002Xr-Iv for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw96-0008FX-Hm for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:52 +0000 Date: Mon, 09 Mar 2015 11:46:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: gic: Correctly check if an IRQ is valid in gic_interrupt X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3508bd4d7648501cbfb879585341e6a80f71581c Author: Julien Grall AuthorDate: Tue Mar 3 16:36:16 2015 +0000 Commit: Ian Campbell CommitDate: Thu Mar 5 17:06:42 2015 +0000 xen/arm: gic: Correctly check if an IRQ is valid in gic_interrupt The IRQ 1020 is reserved for special purpose, so the check should be "irq < 1020" rather than "irq < 1021". 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 390c8b0..940fb8e 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -570,7 +570,7 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) /* Reading IRQ will ACK it */ irq = gic_hw_ops->read_irq(); - if ( likely(irq >= 16 && irq < 1021) ) + if ( likely(irq >= 16 && irq < 1020) ) { local_irq_enable(); do_IRQ(regs, irq, is_fiq); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:46:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:46: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 1YUw9A-00022A-4S; Mon, 09 Mar 2015 11:46:56 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw98-00021o-Ud for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:55 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 37/3B-03164-E288DF45; Mon, 09 Mar 2015 11:46:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1425901612!14279131!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23631 invoked from network); 9 Mar 2015 11:46:53 -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; 9 Mar 2015 11:46:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw96-0002Xr-Iv for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw96-0008FX-Hm for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:46:52 +0000 Date: Mon, 09 Mar 2015 11:46:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: gic: Correctly check if an IRQ is valid in gic_interrupt X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3508bd4d7648501cbfb879585341e6a80f71581c Author: Julien Grall AuthorDate: Tue Mar 3 16:36:16 2015 +0000 Commit: Ian Campbell CommitDate: Thu Mar 5 17:06:42 2015 +0000 xen/arm: gic: Correctly check if an IRQ is valid in gic_interrupt The IRQ 1020 is reserved for special purpose, so the check should be "irq < 1020" rather than "irq < 1021". 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 390c8b0..940fb8e 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -570,7 +570,7 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) /* Reading IRQ will ACK it */ irq = gic_hw_ops->read_irq(); - if ( likely(irq >= 16 && irq < 1021) ) + if ( likely(irq >= 16 && irq < 1020) ) { local_irq_enable(); do_IRQ(regs, irq, is_fiq); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:47:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:47: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 1YUw9M-00024p-7E; Mon, 09 Mar 2015 11:47:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw9L-00024b-2K for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:47:07 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id AF/77-31919-A388DF45; Mon, 09 Mar 2015 11:47:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1425901623!10420405!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30064 invoked from network); 9 Mar 2015 11:47:03 -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; 9 Mar 2015 11:47:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw9G-0002YW-Qx for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:47:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw9G-0008G5-MD for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:47:02 +0000 Date: Mon, 09 Mar 2015 11:47:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm/policy: remove gawk-ism line in Makefile X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 00d28e5c8089963525884ae3a682a93e7e559820 Author: Wei Liu AuthorDate: Tue Mar 3 12:44:38 2015 +0000 Commit: Ian Campbell CommitDate: Thu Mar 5 17:06:43 2015 +0000 xsm/policy: remove gawk-ism line in Makefile Translate gawk regex to mawk regex to allow using mawk. The new regex works on both gawk and mawk. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Daniel De Graaf Acked-by: Ian Campbell Acked-by: Daniel De Graaf --- tools/flask/policy/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile index 54a845b..58d9ce1 100644 --- a/tools/flask/policy/Makefile +++ b/tools/flask/policy/Makefile @@ -86,7 +86,7 @@ DETECTED_MODS := $(sort $(foreach dir,$(ALL_LAYERS),$(wildcard $(dir)/*.te))) MODENABLED := on # extract settings from modules.conf -ENABLED_MODS := $(foreach mod,$(shell awk '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(MODENABLED)") print $$1 }' $(MOD_CONF) 2> /dev/null),$(subst ./,,$(shell find -iname $(mod).te))) +ENABLED_MODS := $(foreach mod,$(shell awk '/^[ \t]*[a-z]/{ if ($$3 == "$(MODENABLED)") print $$1 }' $(MOD_CONF) 2> /dev/null),$(subst ./,,$(shell find -iname $(mod).te))) ALL_MODULES := $(filter $(ENABLED_MODS),$(DETECTED_MODS)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:47:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:47: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 1YUw9M-00024p-7E; Mon, 09 Mar 2015 11:47:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw9L-00024b-2K for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:47:07 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id AF/77-31919-A388DF45; Mon, 09 Mar 2015 11:47:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1425901623!10420405!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30064 invoked from network); 9 Mar 2015 11:47:03 -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; 9 Mar 2015 11:47:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw9G-0002YW-Qx for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:47:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw9G-0008G5-MD for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:47:02 +0000 Date: Mon, 09 Mar 2015 11:47:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm/policy: remove gawk-ism line in Makefile X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 00d28e5c8089963525884ae3a682a93e7e559820 Author: Wei Liu AuthorDate: Tue Mar 3 12:44:38 2015 +0000 Commit: Ian Campbell CommitDate: Thu Mar 5 17:06:43 2015 +0000 xsm/policy: remove gawk-ism line in Makefile Translate gawk regex to mawk regex to allow using mawk. The new regex works on both gawk and mawk. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Daniel De Graaf Acked-by: Ian Campbell Acked-by: Daniel De Graaf --- tools/flask/policy/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile index 54a845b..58d9ce1 100644 --- a/tools/flask/policy/Makefile +++ b/tools/flask/policy/Makefile @@ -86,7 +86,7 @@ DETECTED_MODS := $(sort $(foreach dir,$(ALL_LAYERS),$(wildcard $(dir)/*.te))) MODENABLED := on # extract settings from modules.conf -ENABLED_MODS := $(foreach mod,$(shell awk '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(MODENABLED)") print $$1 }' $(MOD_CONF) 2> /dev/null),$(subst ./,,$(shell find -iname $(mod).te))) +ENABLED_MODS := $(foreach mod,$(shell awk '/^[ \t]*[a-z]/{ if ($$3 == "$(MODENABLED)") print $$1 }' $(MOD_CONF) 2> /dev/null),$(subst ./,,$(shell find -iname $(mod).te))) ALL_MODULES := $(filter $(ENABLED_MODS),$(DETECTED_MODS)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:47:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:47: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 1YUw9V-00026q-9p; Mon, 09 Mar 2015 11:47:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw9T-00026R-FH for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:47:15 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id F3/46-03185-2488DF45; Mon, 09 Mar 2015 11:47:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1425901633!9928025!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13276 invoked from network); 9 Mar 2015 11:47:14 -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; 9 Mar 2015 11:47:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw9Q-0002Yc-WB for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:47:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw9Q-0008HF-UN for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:47:12 +0000 Date: Mon, 09 Mar 2015 11:47:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Correct license header on libxl_flask.c to be LGPL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f919dbc0583797d1c5c09da815518084ce77eb81 Author: Ian Campbell AuthorDate: Tue Mar 3 17:02:22 2015 +0000 Commit: Ian Campbell CommitDate: Thu Mar 5 17:06:43 2015 +0000 libxl: Correct license header on libxl_flask.c to be LGPL libxl is intended to be an LGPL 2.1 licensed library, however this file inadvertently got given a GPL header. The following people have touched this file, although all but Machon's contributions are trivial and/or mechanical an Ack from each would be unambiguous: $ git log --format='%an <%aE>' tools/libxl/libxl_flask.c | sort -u Ian Campbell Ian Jackson Machon Gregory Wei Liu $ Signed-off-by: Ian Campbell Cc: Ian Jackson Cc: Machon Gregory Cc: Wei Liu Cc: Daniel De Graaf Acked-by: Ian Jackson Acked-by: Wei Liu Acked-by: M. Gregory --- tools/libxl/libxl_flask.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_flask.c b/tools/libxl/libxl_flask.c index 23f2476..38347a3 100644 --- a/tools/libxl/libxl_flask.c +++ b/tools/libxl/libxl_flask.c @@ -1,10 +1,15 @@ /* - * * Author: Machon Gregory, * - * 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 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. */ #include "libxl_osdeps.h" /* must come before any other headers */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 11:47:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 11:47: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 1YUw9V-00026q-9p; Mon, 09 Mar 2015 11:47:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw9T-00026R-FH for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:47:15 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id F3/46-03185-2488DF45; Mon, 09 Mar 2015 11:47:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1425901633!9928025!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13276 invoked from network); 9 Mar 2015 11:47:14 -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; 9 Mar 2015 11:47:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YUw9Q-0002Yc-WB for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:47:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YUw9Q-0008HF-UN for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 11:47:12 +0000 Date: Mon, 09 Mar 2015 11:47:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Correct license header on libxl_flask.c to be LGPL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f919dbc0583797d1c5c09da815518084ce77eb81 Author: Ian Campbell AuthorDate: Tue Mar 3 17:02:22 2015 +0000 Commit: Ian Campbell CommitDate: Thu Mar 5 17:06:43 2015 +0000 libxl: Correct license header on libxl_flask.c to be LGPL libxl is intended to be an LGPL 2.1 licensed library, however this file inadvertently got given a GPL header. The following people have touched this file, although all but Machon's contributions are trivial and/or mechanical an Ack from each would be unambiguous: $ git log --format='%an <%aE>' tools/libxl/libxl_flask.c | sort -u Ian Campbell Ian Jackson Machon Gregory Wei Liu $ Signed-off-by: Ian Campbell Cc: Ian Jackson Cc: Machon Gregory Cc: Wei Liu Cc: Daniel De Graaf Acked-by: Ian Jackson Acked-by: Wei Liu Acked-by: M. Gregory --- tools/libxl/libxl_flask.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_flask.c b/tools/libxl/libxl_flask.c index 23f2476..38347a3 100644 --- a/tools/libxl/libxl_flask.c +++ b/tools/libxl/libxl_flask.c @@ -1,10 +1,15 @@ /* - * * Author: Machon Gregory, * - * 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 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. */ #include "libxl_osdeps.h" /* must come before any other headers */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 18:33:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 18:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YV2UE-0001Ua-W1; Mon, 09 Mar 2015 18:33:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YV2UE-0001UO-En for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 18:33:06 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 56/26-02997-167EDF45; Mon, 09 Mar 2015 18:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425925983!14557110!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5052 invoked from network); 9 Mar 2015 18:33:05 -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; 9 Mar 2015 18:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YV2UB-0007ip-MF for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 18:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YV2UB-0005eY-1J for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 18:33:03 +0000 Date: Mon, 09 Mar 2015 18:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: return all ones on wrong-sized reads of system device I/O 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0765915d3a11ebf56d89da58b346c9b85ca3299d Author: Jan Beulich AuthorDate: Thu Mar 5 13:50:50 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:50:50 2015 +0100 x86/HVM: return all ones on wrong-sized reads of system device I/O ports So far the value presented to the guest remained uninitialized. This is CVE-2015-2044 / XSA-121. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: c9e57594e1ba5da9d705dee9f00aa4e7e925963d master date: 2015-03-05 13:34:54 +0100 --- xen/arch/x86/hvm/i8254.c | 1 + xen/arch/x86/hvm/pmtimer.c | 1 + xen/arch/x86/hvm/rtc.c | 3 ++- xen/arch/x86/hvm/vpic.c | 1 + 4 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c index c0d6bc2..809d09e 100644 --- a/xen/arch/x86/hvm/i8254.c +++ b/xen/arch/x86/hvm/i8254.c @@ -478,6 +478,7 @@ static int handle_pit_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 01ae31d..6ad2797 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -213,6 +213,7 @@ static int handle_pmt_io( if ( bytes != 4 ) { gdprintk(XENLOG_WARNING, "HVM_PMT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index b994e99..0a648d1 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -619,7 +619,8 @@ static int handle_rtc_io( if ( bytes != 1 ) { - gdprintk(XENLOG_WARNING, "HVM_RTC bas access\n"); + gdprintk(XENLOG_WARNING, "HVM_RTC bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index fea3f68..6e4d422 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -324,6 +324,7 @@ static int vpic_intercept_pic_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIC_IO bad access size %d\n", bytes); + *val = ~0; return X86EMUL_OKAY; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 18:33:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 18:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YV2UE-0001Ua-W1; Mon, 09 Mar 2015 18:33:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YV2UE-0001UO-En for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 18:33:06 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 56/26-02997-167EDF45; Mon, 09 Mar 2015 18:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1425925983!14557110!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5052 invoked from network); 9 Mar 2015 18:33:05 -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; 9 Mar 2015 18:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YV2UB-0007ip-MF for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 18:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YV2UB-0005eY-1J for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 18:33:03 +0000 Date: Mon, 09 Mar 2015 18:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: return all ones on wrong-sized reads of system device I/O 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0765915d3a11ebf56d89da58b346c9b85ca3299d Author: Jan Beulich AuthorDate: Thu Mar 5 13:50:50 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:50:50 2015 +0100 x86/HVM: return all ones on wrong-sized reads of system device I/O ports So far the value presented to the guest remained uninitialized. This is CVE-2015-2044 / XSA-121. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: c9e57594e1ba5da9d705dee9f00aa4e7e925963d master date: 2015-03-05 13:34:54 +0100 --- xen/arch/x86/hvm/i8254.c | 1 + xen/arch/x86/hvm/pmtimer.c | 1 + xen/arch/x86/hvm/rtc.c | 3 ++- xen/arch/x86/hvm/vpic.c | 1 + 4 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c index c0d6bc2..809d09e 100644 --- a/xen/arch/x86/hvm/i8254.c +++ b/xen/arch/x86/hvm/i8254.c @@ -478,6 +478,7 @@ static int handle_pit_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 01ae31d..6ad2797 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -213,6 +213,7 @@ static int handle_pmt_io( if ( bytes != 4 ) { gdprintk(XENLOG_WARNING, "HVM_PMT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index b994e99..0a648d1 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -619,7 +619,8 @@ static int handle_rtc_io( if ( bytes != 1 ) { - gdprintk(XENLOG_WARNING, "HVM_RTC bas access\n"); + gdprintk(XENLOG_WARNING, "HVM_RTC bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index fea3f68..6e4d422 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -324,6 +324,7 @@ static int vpic_intercept_pic_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIC_IO bad access size %d\n", bytes); + *val = ~0; return X86EMUL_OKAY; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 18:33:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 18:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YV2UQ-0001XN-2K; Mon, 09 Mar 2015 18:33:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YV2UP-0001XB-2K for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 18:33:17 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 40/C6-03185-C67EDF45; Mon, 09 Mar 2015 18:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1425925994!10766346!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16748 invoked from network); 9 Mar 2015 18:33:15 -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; 9 Mar 2015 18:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YV2UM-0007is-55 for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 18:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YV2UL-0005ex-Pt for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 18:33:13 +0000 Date: Mon, 09 Mar 2015 18:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] pre-fill structures for certain HYPERVISOR_xen_version sub-ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bbf1b2bde00075648c96065ba0dc390150c4808f Author: Aaron Adams AuthorDate: Thu Mar 5 13:51:53 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:51:53 2015 +0100 pre-fill structures for certain HYPERVISOR_xen_version sub-ops ... avoiding to pass hypervisor stack contents back to the caller through space unused by the respective strings. This is CVE-2015-2045 / XSA-122. Signed-off-by: Aaron Adams Acked-by: Jan Beulich Acked-by: Ian Campbell master commit: fe2e079f642effb3d24a6e1a7096ef26e691d93e master date: 2015-03-05 13:35:54 +0100 --- xen/common/kernel.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index c915bbc..fe3ccb5 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -216,6 +216,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE(void) arg) case XENVER_extraversion: { xen_extraversion_t extraversion; + + memset(extraversion, 0, sizeof(extraversion)); safe_strcpy(extraversion, xen_extra_version()); if ( copy_to_guest(arg, extraversion, ARRAY_SIZE(extraversion)) ) return -EFAULT; @@ -225,6 +227,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE(void) arg) case XENVER_compile_info: { struct xen_compile_info info; + + memset(&info, 0, sizeof(info)); safe_strcpy(info.compiler, xen_compiler()); safe_strcpy(info.compile_by, xen_compile_by()); safe_strcpy(info.compile_domain, xen_compile_domain()); @@ -260,6 +264,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE(void) arg) case XENVER_changeset: { xen_changeset_info_t chgset; + + memset(chgset, 0, sizeof(chgset)); safe_strcpy(chgset, xen_changeset()); if ( copy_to_guest(arg, chgset, ARRAY_SIZE(chgset)) ) return -EFAULT; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Mar 09 18:33:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2015 18:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YV2UQ-0001XN-2K; Mon, 09 Mar 2015 18:33:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YV2UP-0001XB-2K for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 18:33:17 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 40/C6-03185-C67EDF45; Mon, 09 Mar 2015 18:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1425925994!10766346!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16748 invoked from network); 9 Mar 2015 18:33:15 -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; 9 Mar 2015 18:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YV2UM-0007is-55 for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 18:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YV2UL-0005ex-Pt for xen-changelog@lists.xensource.com; Mon, 09 Mar 2015 18:33:13 +0000 Date: Mon, 09 Mar 2015 18:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] pre-fill structures for certain HYPERVISOR_xen_version sub-ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bbf1b2bde00075648c96065ba0dc390150c4808f Author: Aaron Adams AuthorDate: Thu Mar 5 13:51:53 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:51:53 2015 +0100 pre-fill structures for certain HYPERVISOR_xen_version sub-ops ... avoiding to pass hypervisor stack contents back to the caller through space unused by the respective strings. This is CVE-2015-2045 / XSA-122. Signed-off-by: Aaron Adams Acked-by: Jan Beulich Acked-by: Ian Campbell master commit: fe2e079f642effb3d24a6e1a7096ef26e691d93e master date: 2015-03-05 13:35:54 +0100 --- xen/common/kernel.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index c915bbc..fe3ccb5 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -216,6 +216,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE(void) arg) case XENVER_extraversion: { xen_extraversion_t extraversion; + + memset(extraversion, 0, sizeof(extraversion)); safe_strcpy(extraversion, xen_extra_version()); if ( copy_to_guest(arg, extraversion, ARRAY_SIZE(extraversion)) ) return -EFAULT; @@ -225,6 +227,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE(void) arg) case XENVER_compile_info: { struct xen_compile_info info; + + memset(&info, 0, sizeof(info)); safe_strcpy(info.compiler, xen_compiler()); safe_strcpy(info.compile_by, xen_compile_by()); safe_strcpy(info.compile_domain, xen_compile_domain()); @@ -260,6 +264,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE(void) arg) case XENVER_changeset: { xen_changeset_info_t chgset; + + memset(chgset, 0, sizeof(chgset)); safe_strcpy(chgset, xen_changeset()); if ( copy_to_guest(arg, chgset, ARRAY_SIZE(chgset)) ) return -EFAULT; -- 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 Tue Mar 10 13:44:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2015 13:44: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 1YVKS9-0004Ay-M0; Tue, 10 Mar 2015 13:44:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVKS8-0004Am-Kn for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:08 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id DA/9C-10942-725FEF45; Tue, 10 Mar 2015 13:44:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-31.messagelabs.com!1425995043!14813747!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6977 invoked from network); 10 Mar 2015 13:44:04 -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; 10 Mar 2015 13:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVKS3-0002j2-FK for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YVKS3-0007fP-EI for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:03 +0000 Message-Id: Date: Tue, 10 Mar 2015 13:44:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] usbback: copy only filled buffers to 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 # HG changeset patch # User Juergen Gross # Date 1425994647 -3600 # Node ID 72387b3c2252e38b55ff2c943388c32f0ae338e6 # Parent a8382d70a4a6205bd0fe67f04717ff32b3ed9605 usbback: copy only filled buffers to guest Copy only filled buffers to guest in usbback. After finishing a read I/O don't copy the complete I/O buffer to the guest, but only the parts which were filled by the I/O. Otherwise Dom0 kernel data might leak into the guest. Note that this includes dropping the urb->status == 0 check because it was wrong: There are status != 0 cases where some data has already been written to the buffer (e.g. in case of exact length requested and only part of the buffer filled). The actual_length is always correct and will be 0 if no data has been transferred. This is CVE-2015-0777. Signed-off-by: Juergen Gross Committed-by: Jan Beulich --- diff -r a8382d70a4a6 -r 72387b3c2252 drivers/xen/usbback/usbback.c --- a/drivers/xen/usbback/usbback.c Tue Mar 10 14:06:26 2015 +0100 +++ b/drivers/xen/usbback/usbback.c Tue Mar 10 14:37:27 2015 +0100 @@ -197,16 +197,29 @@ static void fast_flush_area(pending_req_ } static void copy_buff_to_pages(void *buff, pending_req_t *pending_req, - int start, int nr_pages) + unsigned int start, unsigned int nr_pages, + unsigned int offset, unsigned int length) { - unsigned long copied = 0; - int i; + const struct pending_req_segment *seg = pending_req->seg + start; + unsigned int i, off, len, buf_off = 0; - for (i = start; i < start + nr_pages; i++) { - memcpy((void *) vaddr(pending_req, i) + pending_req->seg[i].offset, - buff + copied, - pending_req->seg[i].length); - copied += pending_req->seg[i].length; + for (i = start; i < start + nr_pages; i++, seg++) { + len = seg->length; + off = seg->offset; + if (buf_off + len > offset) { + if (buf_off < offset) { + len -= offset - buf_off; + off += offset - buf_off; + buf_off += offset - buf_off; + } + if (buf_off + len > offset + length) + len -= offset + length - buf_off; + memcpy((void *)vaddr(pending_req, i) + off, + buff + buf_off, len); + } + buf_off += len; + if (buf_off >= offset + length) + break; } } @@ -320,17 +333,39 @@ static void usbbk_do_response(pending_re notify_remote_via_irq(usbif->irq); } +static void usbbk_copy_isoc_to_pages(struct urb *urb) +{ + pending_req_t *pending_req = urb->context; + struct usb_iso_packet_descriptor *isoc = &urb->iso_frame_desc[0]; + unsigned int n_isoc = urb->number_of_packets; + + copy_buff_to_pages(isoc, pending_req, + pending_req->nr_buffer_segs, + pending_req->nr_extra_segs, 0, + n_isoc * sizeof(*isoc)); + + if (!usb_pipein(urb->pipe)) + return; + + while (n_isoc--) { + copy_buff_to_pages(pending_req->buffer, + pending_req, 0, + pending_req->nr_buffer_segs, + isoc->offset, isoc->actual_length); + isoc++; + } +} + static void usbbk_urb_complete(struct urb *urb, struct pt_regs *regs) { pending_req_t *pending_req = (pending_req_t *)urb->context; - if (usb_pipein(urb->pipe) && urb->status == 0 && urb->actual_length > 0) + if (usb_pipeisoc(urb->pipe)) + usbbk_copy_isoc_to_pages(urb); + else if (usb_pipein(urb->pipe) && urb->actual_length > 0) copy_buff_to_pages(pending_req->buffer, pending_req, - 0, pending_req->nr_buffer_segs); - - if (usb_pipeisoc(urb->pipe)) - copy_buff_to_pages(&urb->iso_frame_desc[0], pending_req, - pending_req->nr_buffer_segs, pending_req->nr_extra_segs); + 0, pending_req->nr_buffer_segs, + 0, urb->actual_length); barrier(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 10 13:44:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2015 13:44: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 1YVKS9-0004Ay-M0; Tue, 10 Mar 2015 13:44:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVKS8-0004Am-Kn for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:08 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id DA/9C-10942-725FEF45; Tue, 10 Mar 2015 13:44:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-31.messagelabs.com!1425995043!14813747!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6977 invoked from network); 10 Mar 2015 13:44:04 -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; 10 Mar 2015 13:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVKS3-0002j2-FK for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YVKS3-0007fP-EI for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:03 +0000 Message-Id: Date: Tue, 10 Mar 2015 13:44:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] usbback: copy only filled buffers to 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 # HG changeset patch # User Juergen Gross # Date 1425994647 -3600 # Node ID 72387b3c2252e38b55ff2c943388c32f0ae338e6 # Parent a8382d70a4a6205bd0fe67f04717ff32b3ed9605 usbback: copy only filled buffers to guest Copy only filled buffers to guest in usbback. After finishing a read I/O don't copy the complete I/O buffer to the guest, but only the parts which were filled by the I/O. Otherwise Dom0 kernel data might leak into the guest. Note that this includes dropping the urb->status == 0 check because it was wrong: There are status != 0 cases where some data has already been written to the buffer (e.g. in case of exact length requested and only part of the buffer filled). The actual_length is always correct and will be 0 if no data has been transferred. This is CVE-2015-0777. Signed-off-by: Juergen Gross Committed-by: Jan Beulich --- diff -r a8382d70a4a6 -r 72387b3c2252 drivers/xen/usbback/usbback.c --- a/drivers/xen/usbback/usbback.c Tue Mar 10 14:06:26 2015 +0100 +++ b/drivers/xen/usbback/usbback.c Tue Mar 10 14:37:27 2015 +0100 @@ -197,16 +197,29 @@ static void fast_flush_area(pending_req_ } static void copy_buff_to_pages(void *buff, pending_req_t *pending_req, - int start, int nr_pages) + unsigned int start, unsigned int nr_pages, + unsigned int offset, unsigned int length) { - unsigned long copied = 0; - int i; + const struct pending_req_segment *seg = pending_req->seg + start; + unsigned int i, off, len, buf_off = 0; - for (i = start; i < start + nr_pages; i++) { - memcpy((void *) vaddr(pending_req, i) + pending_req->seg[i].offset, - buff + copied, - pending_req->seg[i].length); - copied += pending_req->seg[i].length; + for (i = start; i < start + nr_pages; i++, seg++) { + len = seg->length; + off = seg->offset; + if (buf_off + len > offset) { + if (buf_off < offset) { + len -= offset - buf_off; + off += offset - buf_off; + buf_off += offset - buf_off; + } + if (buf_off + len > offset + length) + len -= offset + length - buf_off; + memcpy((void *)vaddr(pending_req, i) + off, + buff + buf_off, len); + } + buf_off += len; + if (buf_off >= offset + length) + break; } } @@ -320,17 +333,39 @@ static void usbbk_do_response(pending_re notify_remote_via_irq(usbif->irq); } +static void usbbk_copy_isoc_to_pages(struct urb *urb) +{ + pending_req_t *pending_req = urb->context; + struct usb_iso_packet_descriptor *isoc = &urb->iso_frame_desc[0]; + unsigned int n_isoc = urb->number_of_packets; + + copy_buff_to_pages(isoc, pending_req, + pending_req->nr_buffer_segs, + pending_req->nr_extra_segs, 0, + n_isoc * sizeof(*isoc)); + + if (!usb_pipein(urb->pipe)) + return; + + while (n_isoc--) { + copy_buff_to_pages(pending_req->buffer, + pending_req, 0, + pending_req->nr_buffer_segs, + isoc->offset, isoc->actual_length); + isoc++; + } +} + static void usbbk_urb_complete(struct urb *urb, struct pt_regs *regs) { pending_req_t *pending_req = (pending_req_t *)urb->context; - if (usb_pipein(urb->pipe) && urb->status == 0 && urb->actual_length > 0) + if (usb_pipeisoc(urb->pipe)) + usbbk_copy_isoc_to_pages(urb); + else if (usb_pipein(urb->pipe) && urb->actual_length > 0) copy_buff_to_pages(pending_req->buffer, pending_req, - 0, pending_req->nr_buffer_segs); - - if (usb_pipeisoc(urb->pipe)) - copy_buff_to_pages(&urb->iso_frame_desc[0], pending_req, - pending_req->nr_buffer_segs, pending_req->nr_extra_segs); + 0, pending_req->nr_buffer_segs, + 0, urb->actual_length); barrier(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 10 13:44:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2015 13:44: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 1YVKS6-0004AZ-JF; Tue, 10 Mar 2015 13:44:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVKS5-0004AP-TQ for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:06 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id F2/9F-03219-525FEF45; Tue, 10 Mar 2015 13:44:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-31.messagelabs.com!1425995043!14711198!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10196 invoked from network); 10 Mar 2015 13:44:04 -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; 10 Mar 2015 13:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVKS3-0002iz-6X for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YVKS3-0007fA-0h for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:03 +0000 Message-Id: Date: Tue, 10 Mar 2015 13:44:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] pciback: limit guest control of command register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1425992786 -3600 # Node ID a8382d70a4a6205bd0fe67f04717ff32b3ed9605 # Parent 29dd60ae4773da716d26260e19743081c1dd162a pciback: limit guest control of command register Otherwise the guest can abuse that control to cause e.g. PCIe Unsupported Request responses (by disabling memory and/or I/O decoding and subsequently causing [CPU side] accesses to the respective address ranges), which (depending on system configuration) may be fatal to the host. This is CVE-2015-2150 / XSA-120. Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk --- diff -r 29dd60ae4773 -r a8382d70a4a6 drivers/xen/pciback/conf_space.c --- a/drivers/xen/pciback/conf_space.c Fri Mar 06 10:54:09 2015 +0100 +++ b/drivers/xen/pciback/conf_space.c Tue Mar 10 14:06:26 2015 +0100 @@ -15,7 +15,7 @@ #include "conf_space.h" #include "conf_space_quirks.h" -static int permissive; +int permissive; module_param(permissive, bool, 0644); #define DEFINE_PCI_CONFIG(op,size,type) \ diff -r 29dd60ae4773 -r a8382d70a4a6 drivers/xen/pciback/conf_space.h --- a/drivers/xen/pciback/conf_space.h Fri Mar 06 10:54:09 2015 +0100 +++ b/drivers/xen/pciback/conf_space.h Tue Mar 10 14:06:26 2015 +0100 @@ -64,6 +64,8 @@ struct config_field_entry { void *data; }; +extern int permissive; + #define OFFSET(cfg_entry) ((cfg_entry)->base_offset+(cfg_entry)->field->offset) /* Add fields to a device - the add_fields macro expects to get a pointer to diff -r 29dd60ae4773 -r a8382d70a4a6 drivers/xen/pciback/conf_space_header.c --- a/drivers/xen/pciback/conf_space_header.c Fri Mar 06 10:54:09 2015 +0100 +++ b/drivers/xen/pciback/conf_space_header.c Tue Mar 10 14:06:26 2015 +0100 @@ -9,6 +9,10 @@ #include "pciback.h" #include "conf_space.h" +struct pci_cmd_info { + u16 val; +}; + struct pci_bar_info { u32 val; u32 len_val; @@ -18,21 +22,35 @@ struct pci_bar_info { #define is_enable_cmd(value) ((value)&(PCI_COMMAND_MEMORY|PCI_COMMAND_IO)) #define is_master_cmd(value) ((value)&PCI_COMMAND_MASTER) +/* Bits guests are allowed to control in permissive mode. */ +#define PCI_COMMAND_GUEST (PCI_COMMAND_MASTER|PCI_COMMAND_SPECIAL| \ + PCI_COMMAND_INVALIDATE|PCI_COMMAND_VGA_PALETTE| \ + PCI_COMMAND_WAIT|PCI_COMMAND_FAST_BACK) + +static void *command_init(struct pci_dev *dev, int offset) +{ + struct pci_cmd_info *cmd = kmalloc(sizeof(*cmd), GFP_KERNEL); + int err; + + if (!cmd) + return ERR_PTR(-ENOMEM); + + err = pci_read_config_word(dev, PCI_COMMAND, &cmd->val); + if (err) { + kfree(cmd); + return ERR_PTR(err); + } + + return cmd; +} + static int command_read(struct pci_dev *dev, int offset, u16 *value, void *data) { - int i; - int ret; + int ret = pci_read_config_word(dev, offset, value); + const struct pci_cmd_info *cmd = data; - ret = pciback_read_config_word(dev, offset, value, data); - if (!dev->is_enabled) - return ret; - - for (i = 0; i < PCI_ROM_RESOURCE; i++) { - if (dev->resource[i].flags & IORESOURCE_IO) - *value |= PCI_COMMAND_IO; - if (dev->resource[i].flags & IORESOURCE_MEM) - *value |= PCI_COMMAND_MEMORY; - } + *value &= PCI_COMMAND_GUEST; + *value |= cmd->val & ~PCI_COMMAND_GUEST; return ret; } @@ -40,6 +58,9 @@ static int command_read(struct pci_dev * static int command_write(struct pci_dev *dev, int offset, u16 value, void *data) { int err; + u16 val; + struct pci_cmd_info *cmd = data; + struct pciback_dev_data *dev_data = pci_get_drvdata(dev); if (!dev->is_enabled && is_enable_cmd(value)) { if (unlikely(verbose_request)) @@ -76,6 +97,18 @@ static int command_write(struct pci_dev } } + cmd->val = value; + + if (!permissive && (!dev_data || !dev_data->permissive)) + return 0; + + /* Only allow the guest to control certain bits. */ + err = pci_read_config_word(dev, offset, &val); + if (err || val == value) + return err; + value &= PCI_COMMAND_GUEST; + value |= val & ~PCI_COMMAND_GUEST; + return pci_write_config_word(dev, offset, value); } @@ -275,6 +308,8 @@ static const struct config_field header_ { .offset = PCI_COMMAND, .size = 2, + .init = command_init, + .release = bar_release, .u.w.read = command_read, .u.w.write = command_write, }, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 10 13:44:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2015 13:44: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 1YVKS6-0004AZ-JF; Tue, 10 Mar 2015 13:44:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVKS5-0004AP-TQ for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:06 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id F2/9F-03219-525FEF45; Tue, 10 Mar 2015 13:44:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-31.messagelabs.com!1425995043!14711198!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10196 invoked from network); 10 Mar 2015 13:44:04 -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; 10 Mar 2015 13:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVKS3-0002iz-6X for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YVKS3-0007fA-0h for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:03 +0000 Message-Id: Date: Tue, 10 Mar 2015 13:44:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] pciback: limit guest control of command register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1425992786 -3600 # Node ID a8382d70a4a6205bd0fe67f04717ff32b3ed9605 # Parent 29dd60ae4773da716d26260e19743081c1dd162a pciback: limit guest control of command register Otherwise the guest can abuse that control to cause e.g. PCIe Unsupported Request responses (by disabling memory and/or I/O decoding and subsequently causing [CPU side] accesses to the respective address ranges), which (depending on system configuration) may be fatal to the host. This is CVE-2015-2150 / XSA-120. Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk --- diff -r 29dd60ae4773 -r a8382d70a4a6 drivers/xen/pciback/conf_space.c --- a/drivers/xen/pciback/conf_space.c Fri Mar 06 10:54:09 2015 +0100 +++ b/drivers/xen/pciback/conf_space.c Tue Mar 10 14:06:26 2015 +0100 @@ -15,7 +15,7 @@ #include "conf_space.h" #include "conf_space_quirks.h" -static int permissive; +int permissive; module_param(permissive, bool, 0644); #define DEFINE_PCI_CONFIG(op,size,type) \ diff -r 29dd60ae4773 -r a8382d70a4a6 drivers/xen/pciback/conf_space.h --- a/drivers/xen/pciback/conf_space.h Fri Mar 06 10:54:09 2015 +0100 +++ b/drivers/xen/pciback/conf_space.h Tue Mar 10 14:06:26 2015 +0100 @@ -64,6 +64,8 @@ struct config_field_entry { void *data; }; +extern int permissive; + #define OFFSET(cfg_entry) ((cfg_entry)->base_offset+(cfg_entry)->field->offset) /* Add fields to a device - the add_fields macro expects to get a pointer to diff -r 29dd60ae4773 -r a8382d70a4a6 drivers/xen/pciback/conf_space_header.c --- a/drivers/xen/pciback/conf_space_header.c Fri Mar 06 10:54:09 2015 +0100 +++ b/drivers/xen/pciback/conf_space_header.c Tue Mar 10 14:06:26 2015 +0100 @@ -9,6 +9,10 @@ #include "pciback.h" #include "conf_space.h" +struct pci_cmd_info { + u16 val; +}; + struct pci_bar_info { u32 val; u32 len_val; @@ -18,21 +22,35 @@ struct pci_bar_info { #define is_enable_cmd(value) ((value)&(PCI_COMMAND_MEMORY|PCI_COMMAND_IO)) #define is_master_cmd(value) ((value)&PCI_COMMAND_MASTER) +/* Bits guests are allowed to control in permissive mode. */ +#define PCI_COMMAND_GUEST (PCI_COMMAND_MASTER|PCI_COMMAND_SPECIAL| \ + PCI_COMMAND_INVALIDATE|PCI_COMMAND_VGA_PALETTE| \ + PCI_COMMAND_WAIT|PCI_COMMAND_FAST_BACK) + +static void *command_init(struct pci_dev *dev, int offset) +{ + struct pci_cmd_info *cmd = kmalloc(sizeof(*cmd), GFP_KERNEL); + int err; + + if (!cmd) + return ERR_PTR(-ENOMEM); + + err = pci_read_config_word(dev, PCI_COMMAND, &cmd->val); + if (err) { + kfree(cmd); + return ERR_PTR(err); + } + + return cmd; +} + static int command_read(struct pci_dev *dev, int offset, u16 *value, void *data) { - int i; - int ret; + int ret = pci_read_config_word(dev, offset, value); + const struct pci_cmd_info *cmd = data; - ret = pciback_read_config_word(dev, offset, value, data); - if (!dev->is_enabled) - return ret; - - for (i = 0; i < PCI_ROM_RESOURCE; i++) { - if (dev->resource[i].flags & IORESOURCE_IO) - *value |= PCI_COMMAND_IO; - if (dev->resource[i].flags & IORESOURCE_MEM) - *value |= PCI_COMMAND_MEMORY; - } + *value &= PCI_COMMAND_GUEST; + *value |= cmd->val & ~PCI_COMMAND_GUEST; return ret; } @@ -40,6 +58,9 @@ static int command_read(struct pci_dev * static int command_write(struct pci_dev *dev, int offset, u16 value, void *data) { int err; + u16 val; + struct pci_cmd_info *cmd = data; + struct pciback_dev_data *dev_data = pci_get_drvdata(dev); if (!dev->is_enabled && is_enable_cmd(value)) { if (unlikely(verbose_request)) @@ -76,6 +97,18 @@ static int command_write(struct pci_dev } } + cmd->val = value; + + if (!permissive && (!dev_data || !dev_data->permissive)) + return 0; + + /* Only allow the guest to control certain bits. */ + err = pci_read_config_word(dev, offset, &val); + if (err || val == value) + return err; + value &= PCI_COMMAND_GUEST; + value |= val & ~PCI_COMMAND_GUEST; + return pci_write_config_word(dev, offset, value); } @@ -275,6 +308,8 @@ static const struct config_field header_ { .offset = PCI_COMMAND, .size = 2, + .init = command_init, + .release = bar_release, .u.w.read = command_read, .u.w.write = command_write, }, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 10 13:44:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2015 13:44: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 1YVKSA-0004Bn-OE; Tue, 10 Mar 2015 13:44:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVKS9-0004Ax-V5 for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:10 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id A8/3F-02635-825FEF45; Tue, 10 Mar 2015 13:44:08 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-27.messagelabs.com!1425995043!16184135!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10412 invoked from network); 10 Mar 2015 13:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Mar 2015 13:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVKS3-0002j5-Pn for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YVKS3-0007fe-Oc for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:03 +0000 Message-Id: Date: Tue, 10 Mar 2015 13:44:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] xenbus: add proper handling of XS_ERROR from Xenbus for transactions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jennifer Herbert # Date 1425994719 -3600 # Node ID afe2ac5137b8c247dea886c732d09791fe44ac91 # Parent 72387b3c2252e38b55ff2c943388c32f0ae338e6 xenbus: add proper handling of XS_ERROR from Xenbus for transactions If Xenstore sends back a XS_ERROR for TRANSACTION_END, the driver wrongly removes the transaction from the transaction list. For TRANSACTION_START, it leaks memory. Check the message as returned from xenbus_dev_request_and_reply(), and clean up for TRANSACTION_START or discard the error for TRANSACTION_END. Signed-off-by: Jennifer Herbert Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r 72387b3c2252 -r afe2ac5137b8 drivers/xen/xenbus/xenbus_dev.c --- a/drivers/xen/xenbus/xenbus_dev.c Tue Mar 10 14:37:27 2015 +0100 +++ b/drivers/xen/xenbus/xenbus_dev.c Tue Mar 10 14:38:39 2015 +0100 @@ -343,9 +343,13 @@ static ssize_t xenbus_dev_write(struct f } if (msg_type == XS_TRANSACTION_START) { - trans->handle.id = simple_strtoul(reply, NULL, 0); - list_add(&trans->list, &u->transactions); - } else if (msg_type == XS_TRANSACTION_END) { + if (u->u.msg.type == XS_ERROR) + kfree(trans); + else { + trans->handle.id = simple_strtoul(reply, NULL, 0); + list_add(&trans->list, &u->transactions); + } + } else if (u->u.msg.type == XS_TRANSACTION_END) { list_del(&trans->list); kfree(trans); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 10 13:44:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2015 13:44: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 1YVKSA-0004Bn-OE; Tue, 10 Mar 2015 13:44:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVKS9-0004Ax-V5 for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:10 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id A8/3F-02635-825FEF45; Tue, 10 Mar 2015 13:44:08 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-27.messagelabs.com!1425995043!16184135!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10412 invoked from network); 10 Mar 2015 13:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Mar 2015 13:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVKS3-0002j5-Pn for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YVKS3-0007fe-Oc for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 13:44:03 +0000 Message-Id: Date: Tue, 10 Mar 2015 13:44:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] xenbus: add proper handling of XS_ERROR from Xenbus for transactions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jennifer Herbert # Date 1425994719 -3600 # Node ID afe2ac5137b8c247dea886c732d09791fe44ac91 # Parent 72387b3c2252e38b55ff2c943388c32f0ae338e6 xenbus: add proper handling of XS_ERROR from Xenbus for transactions If Xenstore sends back a XS_ERROR for TRANSACTION_END, the driver wrongly removes the transaction from the transaction list. For TRANSACTION_START, it leaks memory. Check the message as returned from xenbus_dev_request_and_reply(), and clean up for TRANSACTION_START or discard the error for TRANSACTION_END. Signed-off-by: Jennifer Herbert Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r 72387b3c2252 -r afe2ac5137b8 drivers/xen/xenbus/xenbus_dev.c --- a/drivers/xen/xenbus/xenbus_dev.c Tue Mar 10 14:37:27 2015 +0100 +++ b/drivers/xen/xenbus/xenbus_dev.c Tue Mar 10 14:38:39 2015 +0100 @@ -343,9 +343,13 @@ static ssize_t xenbus_dev_write(struct f } if (msg_type == XS_TRANSACTION_START) { - trans->handle.id = simple_strtoul(reply, NULL, 0); - list_add(&trans->list, &u->transactions); - } else if (msg_type == XS_TRANSACTION_END) { + if (u->u.msg.type == XS_ERROR) + kfree(trans); + else { + trans->handle.id = simple_strtoul(reply, NULL, 0); + list_add(&trans->list, &u->transactions); + } + } else if (u->u.msg.type == XS_TRANSACTION_END) { list_del(&trans->list); kfree(trans); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 10 15:33:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2015 15:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVM9b-0000zW-5J; Tue, 10 Mar 2015 15:33:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVM9a-0000zO-37 for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 15:33:06 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 81/1E-23575-1BE0FF45; Tue, 10 Mar 2015 15:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1426001583!8995405!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1114 invoked from network); 10 Mar 2015 15:33:04 -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; 10 Mar 2015 15:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVM9X-0003xd-BQ for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 15:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YVM9X-0003L4-5Z for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 15:33:03 +0000 Date: Tue, 10 Mar 2015 15:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/HVM: return all ones on wrong-sized reads of system device I/O 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ef036402d2a3fbc6abafb333c5deef2433919bb Author: Jan Beulich AuthorDate: Thu Mar 5 13:42:41 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:42:41 2015 +0100 x86/HVM: return all ones on wrong-sized reads of system device I/O ports So far the value presented to the guest remained uninitialized. This is CVE-2015-2044 / XSA-121. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: c9e57594e1ba5da9d705dee9f00aa4e7e925963d master date: 2015-03-05 13:34:54 +0100 --- xen/arch/x86/hvm/i8254.c | 1 + xen/arch/x86/hvm/pmtimer.c | 1 + xen/arch/x86/hvm/rtc.c | 3 ++- xen/arch/x86/hvm/vpic.c | 1 + 4 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c index 3ec01c0..36a0a53 100644 --- a/xen/arch/x86/hvm/i8254.c +++ b/xen/arch/x86/hvm/i8254.c @@ -486,6 +486,7 @@ static int handle_pit_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 01ae31d..6ad2797 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -213,6 +213,7 @@ static int handle_pmt_io( if ( bytes != 4 ) { gdprintk(XENLOG_WARNING, "HVM_PMT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index 3fab660..3448971 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -703,7 +703,8 @@ static int handle_rtc_io( if ( bytes != 1 ) { - gdprintk(XENLOG_WARNING, "HVM_RTC bas access\n"); + gdprintk(XENLOG_WARNING, "HVM_RTC bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index 2c6e6e5..c2c8fb6 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -331,6 +331,7 @@ static int vpic_intercept_pic_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIC_IO bad access size %d\n", bytes); + *val = ~0; return X86EMUL_OKAY; } -- 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 Mar 10 15:33:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2015 15:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVM9b-0000zW-5J; Tue, 10 Mar 2015 15:33:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVM9a-0000zO-37 for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 15:33:06 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 81/1E-23575-1BE0FF45; Tue, 10 Mar 2015 15:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1426001583!8995405!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1114 invoked from network); 10 Mar 2015 15:33:04 -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; 10 Mar 2015 15:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVM9X-0003xd-BQ for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 15:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YVM9X-0003L4-5Z for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 15:33:03 +0000 Date: Tue, 10 Mar 2015 15:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/HVM: return all ones on wrong-sized reads of system device I/O 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ef036402d2a3fbc6abafb333c5deef2433919bb Author: Jan Beulich AuthorDate: Thu Mar 5 13:42:41 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:42:41 2015 +0100 x86/HVM: return all ones on wrong-sized reads of system device I/O ports So far the value presented to the guest remained uninitialized. This is CVE-2015-2044 / XSA-121. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: c9e57594e1ba5da9d705dee9f00aa4e7e925963d master date: 2015-03-05 13:34:54 +0100 --- xen/arch/x86/hvm/i8254.c | 1 + xen/arch/x86/hvm/pmtimer.c | 1 + xen/arch/x86/hvm/rtc.c | 3 ++- xen/arch/x86/hvm/vpic.c | 1 + 4 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c index 3ec01c0..36a0a53 100644 --- a/xen/arch/x86/hvm/i8254.c +++ b/xen/arch/x86/hvm/i8254.c @@ -486,6 +486,7 @@ static int handle_pit_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 01ae31d..6ad2797 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -213,6 +213,7 @@ static int handle_pmt_io( if ( bytes != 4 ) { gdprintk(XENLOG_WARNING, "HVM_PMT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index 3fab660..3448971 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -703,7 +703,8 @@ static int handle_rtc_io( if ( bytes != 1 ) { - gdprintk(XENLOG_WARNING, "HVM_RTC bas access\n"); + gdprintk(XENLOG_WARNING, "HVM_RTC bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index 2c6e6e5..c2c8fb6 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -331,6 +331,7 @@ static int vpic_intercept_pic_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIC_IO bad access size %d\n", bytes); + *val = ~0; return X86EMUL_OKAY; } -- 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 Mar 10 15:33:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2015 15:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVM9m-00010d-8C; Tue, 10 Mar 2015 15:33:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVM9k-00010L-C2 for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 15:33:16 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 52/27-03168-BBE0FF45; Tue, 10 Mar 2015 15:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1426001593!16125878!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26737 invoked from network); 10 Mar 2015 15:33:14 -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; 10 Mar 2015 15:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVM9h-0003xh-NS for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 15:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YVM9h-0003MC-FJ for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 15:33:13 +0000 Date: Tue, 10 Mar 2015 15:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] pre-fill structures for certain HYPERVISOR_xen_version sub-ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 25c6ee85a88b42ab6e63a418008448f1935d3312 Author: Aaron Adams AuthorDate: Thu Mar 5 13:43:38 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:43:38 2015 +0100 pre-fill structures for certain HYPERVISOR_xen_version sub-ops ... avoiding to pass hypervisor stack contents back to the caller through space unused by the respective strings. This is CVE-2015-2045 / XSA-122. Signed-off-by: Aaron Adams Acked-by: Jan Beulich Acked-by: Ian Campbell master commit: fe2e079f642effb3d24a6e1a7096ef26e691d93e master date: 2015-03-05 13:35:54 +0100 --- xen/common/kernel.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index d23c422..bafd44f 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -240,6 +240,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_extraversion: { xen_extraversion_t extraversion; + + memset(extraversion, 0, sizeof(extraversion)); safe_strcpy(extraversion, xen_extra_version()); if ( copy_to_guest(arg, extraversion, ARRAY_SIZE(extraversion)) ) return -EFAULT; @@ -249,6 +251,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_compile_info: { struct xen_compile_info info; + + memset(&info, 0, sizeof(info)); safe_strcpy(info.compiler, xen_compiler()); safe_strcpy(info.compile_by, xen_compile_by()); safe_strcpy(info.compile_domain, xen_compile_domain()); @@ -284,6 +288,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_changeset: { xen_changeset_info_t chgset; + + memset(chgset, 0, sizeof(chgset)); safe_strcpy(chgset, xen_changeset()); if ( copy_to_guest(arg, chgset, ARRAY_SIZE(chgset)) ) return -EFAULT; -- 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 Mar 10 15:33:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2015 15:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVM9m-00010d-8C; Tue, 10 Mar 2015 15:33:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVM9k-00010L-C2 for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 15:33:16 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 52/27-03168-BBE0FF45; Tue, 10 Mar 2015 15:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1426001593!16125878!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26737 invoked from network); 10 Mar 2015 15:33:14 -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; 10 Mar 2015 15:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVM9h-0003xh-NS for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 15:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YVM9h-0003MC-FJ for xen-changelog@lists.xensource.com; Tue, 10 Mar 2015 15:33:13 +0000 Date: Tue, 10 Mar 2015 15:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] pre-fill structures for certain HYPERVISOR_xen_version sub-ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 25c6ee85a88b42ab6e63a418008448f1935d3312 Author: Aaron Adams AuthorDate: Thu Mar 5 13:43:38 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:43:38 2015 +0100 pre-fill structures for certain HYPERVISOR_xen_version sub-ops ... avoiding to pass hypervisor stack contents back to the caller through space unused by the respective strings. This is CVE-2015-2045 / XSA-122. Signed-off-by: Aaron Adams Acked-by: Jan Beulich Acked-by: Ian Campbell master commit: fe2e079f642effb3d24a6e1a7096ef26e691d93e master date: 2015-03-05 13:35:54 +0100 --- xen/common/kernel.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index d23c422..bafd44f 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -240,6 +240,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_extraversion: { xen_extraversion_t extraversion; + + memset(extraversion, 0, sizeof(extraversion)); safe_strcpy(extraversion, xen_extra_version()); if ( copy_to_guest(arg, extraversion, ARRAY_SIZE(extraversion)) ) return -EFAULT; @@ -249,6 +251,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_compile_info: { struct xen_compile_info info; + + memset(&info, 0, sizeof(info)); safe_strcpy(info.compiler, xen_compiler()); safe_strcpy(info.compile_by, xen_compile_by()); safe_strcpy(info.compile_domain, xen_compile_domain()); @@ -284,6 +288,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_changeset: { xen_changeset_info_t chgset; + + memset(chgset, 0, sizeof(chgset)); safe_strcpy(chgset, xen_changeset()); if ( copy_to_guest(arg, chgset, ARRAY_SIZE(chgset)) ) return -EFAULT; -- 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 Mar 11 12:33:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Mar 2015 12:33: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 1YVfov-0000B3-3H; Wed, 11 Mar 2015 12:33:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVfou-0000AY-Cq for xen-changelog@lists.xensource.com; Wed, 11 Mar 2015 12:33:04 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 8E/2D-18228-FF530055; Wed, 11 Mar 2015 12:33:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1426077182!11027920!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28057 invoked from network); 11 Mar 2015 12:33:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2015 12:33:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVfor-0000d8-TI for xen-changelog@lists.xensource.com; Wed, 11 Mar 2015 12:33:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YVfor-0000eq-QL for xen-changelog@lists.xensource.com; Wed, 11 Mar 2015 12:33:01 +0000 Date: Wed, 11 Mar 2015 12:33:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [mini-os master] mini-os: sort objects in binary archives X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bd5920cb92e6799bfd64957284a9e2cfe7699039 Author: Olaf Hering AuthorDate: Tue Feb 3 12:45:37 2015 +0100 Commit: Ian Campbell CommitDate: Wed Mar 11 10:46:31 2015 +0000 mini-os: sort objects in binary archives When building stubdom the mini-os objects are also linked into the binary. Unfortunately the linker will place them in the order found in the archive. Since this order is random the resulting stubdom binary differs when it was built from identical sources but on different build hosts. To help with creating a reproducible binary the elements in an archive must simply be sorted before passing them to $(AR). Signed-off-by: Olaf Hering Cc: Stefano Stabellini Cc: Samuel Thibault Acked-by: Samuel Thibault [ ijc -- massaged paths to apply to external mini-os tree ] --- Makefile | 4 ++-- arch/x86/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f16520e..9482ec0 100644 --- a/Makefile +++ b/Makefile @@ -146,9 +146,9 @@ arch_lib: ifeq ($(CONFIG_LWIP),y) # lwIP library -LWC := $(shell find $(LWIPDIR)/src -type f -name '*.c') +LWC := $(sort $(shell find $(LWIPDIR)/src -type f -name '*.c')) LWC := $(filter-out %6.c %ip6_addr.c %ethernetif.c, $(LWC)) -LWO := $(patsubst %.c,%.o,$(LWC)) +LWO := $(patsubst %.c,%.o,$(LWC) LWO += $(OBJ_DIR)/lwip-arch.o ifeq ($(CONFIG_NETFRONT),y) LWO += $(OBJ_DIR)/lwip-net.o diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 9f04a93..a46766c 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -13,7 +13,7 @@ include ../../minios.mk # Sources here are all *.c *.S without $(MINIOS_TARGET_ARCH).S # This is handled in $(HEAD_ARCH_OBJ) -ARCH_SRCS := $(wildcard *.c) +ARCH_SRCS := $(sort $(wildcard *.c)) # The objects built from the sources. ARCH_OBJS := $(patsubst %.c,$(OBJ_DIR)/%.o,$(ARCH_SRCS)) -- generated by git-patchbot for /home/xen/git/mini-os.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 11 12:33:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Mar 2015 12:33: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 1YVfov-0000B3-3H; Wed, 11 Mar 2015 12:33:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVfou-0000AY-Cq for xen-changelog@lists.xensource.com; Wed, 11 Mar 2015 12:33:04 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 8E/2D-18228-FF530055; Wed, 11 Mar 2015 12:33:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1426077182!11027920!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28057 invoked from network); 11 Mar 2015 12:33:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2015 12:33:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVfor-0000d8-TI for xen-changelog@lists.xensource.com; Wed, 11 Mar 2015 12:33:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YVfor-0000eq-QL for xen-changelog@lists.xensource.com; Wed, 11 Mar 2015 12:33:01 +0000 Date: Wed, 11 Mar 2015 12:33:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [mini-os master] mini-os: sort objects in binary archives X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bd5920cb92e6799bfd64957284a9e2cfe7699039 Author: Olaf Hering AuthorDate: Tue Feb 3 12:45:37 2015 +0100 Commit: Ian Campbell CommitDate: Wed Mar 11 10:46:31 2015 +0000 mini-os: sort objects in binary archives When building stubdom the mini-os objects are also linked into the binary. Unfortunately the linker will place them in the order found in the archive. Since this order is random the resulting stubdom binary differs when it was built from identical sources but on different build hosts. To help with creating a reproducible binary the elements in an archive must simply be sorted before passing them to $(AR). Signed-off-by: Olaf Hering Cc: Stefano Stabellini Cc: Samuel Thibault Acked-by: Samuel Thibault [ ijc -- massaged paths to apply to external mini-os tree ] --- Makefile | 4 ++-- arch/x86/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f16520e..9482ec0 100644 --- a/Makefile +++ b/Makefile @@ -146,9 +146,9 @@ arch_lib: ifeq ($(CONFIG_LWIP),y) # lwIP library -LWC := $(shell find $(LWIPDIR)/src -type f -name '*.c') +LWC := $(sort $(shell find $(LWIPDIR)/src -type f -name '*.c')) LWC := $(filter-out %6.c %ip6_addr.c %ethernetif.c, $(LWC)) -LWO := $(patsubst %.c,%.o,$(LWC)) +LWO := $(patsubst %.c,%.o,$(LWC) LWO += $(OBJ_DIR)/lwip-arch.o ifeq ($(CONFIG_NETFRONT),y) LWO += $(OBJ_DIR)/lwip-net.o diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 9f04a93..a46766c 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -13,7 +13,7 @@ include ../../minios.mk # Sources here are all *.c *.S without $(MINIOS_TARGET_ARCH).S # This is handled in $(HEAD_ARCH_OBJ) -ARCH_SRCS := $(wildcard *.c) +ARCH_SRCS := $(sort $(wildcard *.c)) # The objects built from the sources. ARCH_OBJS := $(patsubst %.c,$(OBJ_DIR)/%.o,$(ARCH_SRCS)) -- generated by git-patchbot for /home/xen/git/mini-os.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 11 12:33:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Mar 2015 12:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVfp6-0000Jk-5w; Wed, 11 Mar 2015 12:33:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVfp5-0000Io-6S for xen-changelog@lists.xensource.com; Wed, 11 Mar 2015 12:33:15 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id BC/85-03168-A0630055; Wed, 11 Mar 2015 12:33:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1426077192!11946683!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8021 invoked from network); 11 Mar 2015 12:33:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2015 12:33:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVfp2-0000dM-2f for xen-changelog@lists.xensource.com; Wed, 11 Mar 2015 12:33:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YVfp2-0000fF-0e for xen-changelog@lists.xensource.com; Wed, 11 Mar 2015 12:33:12 +0000 Date: Wed, 11 Mar 2015 12:33:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [mini-os master] mini-os: replace XEN_TARGET_ARCH with MINIOS_TARGET_ARCH X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0b7f0f62fd0e1154d29849b9f2e6de3783742ce Author: Wei Liu AuthorDate: Tue Mar 10 13:14:38 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 11:36:13 2015 +0000 mini-os: replace XEN_TARGET_ARCH with MINIOS_TARGET_ARCH One place was missed when I did the replacement in 55f7cd7427 ("Mini-OS: standalone build"). Signed-off-by: Wei Liu Acked-by: Samuel Thibault Acked-by: Ian Campbell --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 9482ec0..3e5d95e 100644 --- a/Makefile +++ b/Makefile @@ -165,7 +165,7 @@ OBJS := $(filter-out $(OBJ_DIR)/lwip%.o $(LWO), $(OBJS)) ifeq ($(libc),y) ifeq ($(CONFIG_XC),y) -APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libxc-$(XEN_TARGET_ARCH) -whole-archive -lxenguest -lxenctrl -no-whole-archive +APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libxc-$(MINIOS_TARGET_ARCH) -whole-archive -lxenguest -lxenctrl -no-whole-archive endif APP_LDLIBS += -lpci APP_LDLIBS += -lz -- generated by git-patchbot for /home/xen/git/mini-os.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 11 12:33:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Mar 2015 12:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVfp6-0000Jk-5w; Wed, 11 Mar 2015 12:33:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVfp5-0000Io-6S for xen-changelog@lists.xensource.com; Wed, 11 Mar 2015 12:33:15 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id BC/85-03168-A0630055; Wed, 11 Mar 2015 12:33:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1426077192!11946683!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8021 invoked from network); 11 Mar 2015 12:33:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Mar 2015 12:33:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YVfp2-0000dM-2f for xen-changelog@lists.xensource.com; Wed, 11 Mar 2015 12:33:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YVfp2-0000fF-0e for xen-changelog@lists.xensource.com; Wed, 11 Mar 2015 12:33:12 +0000 Date: Wed, 11 Mar 2015 12:33:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [mini-os master] mini-os: replace XEN_TARGET_ARCH with MINIOS_TARGET_ARCH X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0b7f0f62fd0e1154d29849b9f2e6de3783742ce Author: Wei Liu AuthorDate: Tue Mar 10 13:14:38 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 11:36:13 2015 +0000 mini-os: replace XEN_TARGET_ARCH with MINIOS_TARGET_ARCH One place was missed when I did the replacement in 55f7cd7427 ("Mini-OS: standalone build"). Signed-off-by: Wei Liu Acked-by: Samuel Thibault Acked-by: Ian Campbell --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 9482ec0..3e5d95e 100644 --- a/Makefile +++ b/Makefile @@ -165,7 +165,7 @@ OBJS := $(filter-out $(OBJ_DIR)/lwip%.o $(LWO), $(OBJS)) ifeq ($(libc),y) ifeq ($(CONFIG_XC),y) -APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libxc-$(XEN_TARGET_ARCH) -whole-archive -lxenguest -lxenctrl -no-whole-archive +APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libxc-$(MINIOS_TARGET_ARCH) -whole-archive -lxenguest -lxenctrl -no-whole-archive endif APP_LDLIBS += -lpci APP_LDLIBS += -lz -- generated by git-patchbot for /home/xen/git/mini-os.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 13 10:33:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Mar 2015 10:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YWMtu-0008K0-Ow; Fri, 13 Mar 2015 10:33:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YWMtt-0008Jr-Lu for xen-changelog@lists.xensource.com; Fri, 13 Mar 2015 10:33:05 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id B4/DC-09646-0ECB2055; Fri, 13 Mar 2015 10:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1426242783!12571327!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27381 invoked from network); 13 Mar 2015 10:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2015 10:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YWMtr-0005CI-2H for xen-changelog@lists.xensource.com; Fri, 13 Mar 2015 10:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YWMtq-0004oT-Pw for xen-changelog@lists.xensource.com; Fri, 13 Mar 2015 10:33:02 +0000 Date: Fri, 13 Mar 2015 10:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [mini-os master] Fix accidentally removed brace causing a build error. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit edfd5aae6ec5ba7d0a8834a3e9dfe5e69424150a Author: Sander Eikelenboom AuthorDate: Thu Mar 12 19:08:05 2015 +0100 Commit: Ian Campbell CommitDate: Fri Mar 13 09:30:17 2015 +0000 Fix accidentally removed brace causing a build error. Introduced in: commit bd5920cb92e6799bfd64957284a9e2cfe7699039 "mini-os: sort objects in binary archives" Signed-off-by: Sander Eikelenboom Acked-by: Ian Campbell --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 3e5d95e..2cb5e51 100644 --- a/Makefile +++ b/Makefile @@ -148,7 +148,7 @@ ifeq ($(CONFIG_LWIP),y) # lwIP library LWC := $(sort $(shell find $(LWIPDIR)/src -type f -name '*.c')) LWC := $(filter-out %6.c %ip6_addr.c %ethernetif.c, $(LWC)) -LWO := $(patsubst %.c,%.o,$(LWC) +LWO := $(patsubst %.c,%.o,$(LWC)) LWO += $(OBJ_DIR)/lwip-arch.o ifeq ($(CONFIG_NETFRONT),y) LWO += $(OBJ_DIR)/lwip-net.o -- generated by git-patchbot for /home/xen/git/mini-os.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Mar 13 10:33:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Mar 2015 10:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YWMtu-0008K0-Ow; Fri, 13 Mar 2015 10:33:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YWMtt-0008Jr-Lu for xen-changelog@lists.xensource.com; Fri, 13 Mar 2015 10:33:05 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id B4/DC-09646-0ECB2055; Fri, 13 Mar 2015 10:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1426242783!12571327!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27381 invoked from network); 13 Mar 2015 10:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 13 Mar 2015 10:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YWMtr-0005CI-2H for xen-changelog@lists.xensource.com; Fri, 13 Mar 2015 10:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YWMtq-0004oT-Pw for xen-changelog@lists.xensource.com; Fri, 13 Mar 2015 10:33:02 +0000 Date: Fri, 13 Mar 2015 10:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [mini-os master] Fix accidentally removed brace causing a build error. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit edfd5aae6ec5ba7d0a8834a3e9dfe5e69424150a Author: Sander Eikelenboom AuthorDate: Thu Mar 12 19:08:05 2015 +0100 Commit: Ian Campbell CommitDate: Fri Mar 13 09:30:17 2015 +0000 Fix accidentally removed brace causing a build error. Introduced in: commit bd5920cb92e6799bfd64957284a9e2cfe7699039 "mini-os: sort objects in binary archives" Signed-off-by: Sander Eikelenboom Acked-by: Ian Campbell --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 3e5d95e..2cb5e51 100644 --- a/Makefile +++ b/Makefile @@ -148,7 +148,7 @@ ifeq ($(CONFIG_LWIP),y) # lwIP library LWC := $(sort $(shell find $(LWIPDIR)/src -type f -name '*.c')) LWC := $(filter-out %6.c %ip6_addr.c %ethernetif.c, $(LWC)) -LWO := $(patsubst %.c,%.o,$(LWC) +LWO := $(patsubst %.c,%.o,$(LWC)) LWO += $(OBJ_DIR)/lwip-arch.o ifeq ($(CONFIG_NETFRONT),y) LWO += $(OBJ_DIR)/lwip-net.o -- generated by git-patchbot for /home/xen/git/mini-os.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 17 21:22:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Mar 2015 21:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywC-0001lM-92; Tue, 17 Mar 2015 21: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 1YXywA-0001k6-Vb for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:07 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id A8/36-06320-EFA98055; Tue, 17 Mar 2015 21:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1426627324!13749735!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7770 invoked from network); 17 Mar 2015 21:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Mar 2015 21:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXyw8-0006jh-1l for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YXyw7-00064J-KN for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:03 +0000 Date: Tue, 17 Mar 2015 21:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] update Xen version to 4.3.4-rc2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 75cd1503a683aa92f73730f1b21e80d1223b043a Author: Jan Beulich AuthorDate: Tue Mar 3 18:00:13 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 3 18:00:13 2015 +0100 update Xen version to 4.3.4-rc2 --- Config.mk | 2 +- xen/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index e5dd70b..b318a23 100644 --- a/Config.mk +++ b/Config.mk @@ -224,7 +224,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 9550be0726b577cf038691c77d8c924c43e7cebd +QEMU_TAG ?= xen-4.3.4-rc2 # Mon Feb 2 16:49:59 2015 +0000 # cirrus: fix an uninitialized variable diff --git a/xen/Makefile b/xen/Makefile index 11be691..d1b1a59 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 3 -export XEN_EXTRAVERSION ?= .4-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4-rc2$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 17 21:22:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Mar 2015 21:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywC-0001lM-92; Tue, 17 Mar 2015 21: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 1YXywA-0001k6-Vb for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:07 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id A8/36-06320-EFA98055; Tue, 17 Mar 2015 21:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1426627324!13749735!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7770 invoked from network); 17 Mar 2015 21:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Mar 2015 21:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXyw8-0006jh-1l for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YXyw7-00064J-KN for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:03 +0000 Date: Tue, 17 Mar 2015 21:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] update Xen version to 4.3.4-rc2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 75cd1503a683aa92f73730f1b21e80d1223b043a Author: Jan Beulich AuthorDate: Tue Mar 3 18:00:13 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 3 18:00:13 2015 +0100 update Xen version to 4.3.4-rc2 --- Config.mk | 2 +- xen/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index e5dd70b..b318a23 100644 --- a/Config.mk +++ b/Config.mk @@ -224,7 +224,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 9550be0726b577cf038691c77d8c924c43e7cebd +QEMU_TAG ?= xen-4.3.4-rc2 # Mon Feb 2 16:49:59 2015 +0000 # cirrus: fix an uninitialized variable diff --git a/xen/Makefile b/xen/Makefile index 11be691..d1b1a59 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 3 -export XEN_EXTRAVERSION ?= .4-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4-rc2$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 17 21:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Mar 2015 21:22:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywM-0001pI-CB; Tue, 17 Mar 2015 21:22:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywK-0001of-UC for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:17 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 4F/0B-13627-80B98055; Tue, 17 Mar 2015 21:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1426627334!13072009!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28638 invoked from network); 17 Mar 2015 21:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Mar 2015 21:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywI-0006jk-83 for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YXywI-00065k-6R for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:14 +0000 Date: Tue, 17 Mar 2015 21:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: return all ones on wrong-sized reads of system device I/O 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3db79e9f71f551a51359cb40e39586d8a15dae02 Author: Jan Beulich AuthorDate: Thu Mar 5 13:48:07 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:48:07 2015 +0100 x86/HVM: return all ones on wrong-sized reads of system device I/O ports So far the value presented to the guest remained uninitialized. This is CVE-2015-2044 / XSA-121. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: c9e57594e1ba5da9d705dee9f00aa4e7e925963d master date: 2015-03-05 13:34:54 +0100 --- xen/arch/x86/hvm/i8254.c | 1 + xen/arch/x86/hvm/pmtimer.c | 1 + xen/arch/x86/hvm/rtc.c | 3 ++- xen/arch/x86/hvm/vpic.c | 1 + 4 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c index c0d6bc2..809d09e 100644 --- a/xen/arch/x86/hvm/i8254.c +++ b/xen/arch/x86/hvm/i8254.c @@ -478,6 +478,7 @@ static int handle_pit_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 01ae31d..6ad2797 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -213,6 +213,7 @@ static int handle_pmt_io( if ( bytes != 4 ) { gdprintk(XENLOG_WARNING, "HVM_PMT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index 639b4c5..30270cb 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -696,7 +696,8 @@ static int handle_rtc_io( if ( bytes != 1 ) { - gdprintk(XENLOG_WARNING, "HVM_RTC bas access\n"); + gdprintk(XENLOG_WARNING, "HVM_RTC bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index fea3f68..6e4d422 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -324,6 +324,7 @@ static int vpic_intercept_pic_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIC_IO bad access size %d\n", bytes); + *val = ~0; return X86EMUL_OKAY; } -- 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 Tue Mar 17 21:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Mar 2015 21:22:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywM-0001pI-CB; Tue, 17 Mar 2015 21:22:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywK-0001of-UC for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:17 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 4F/0B-13627-80B98055; Tue, 17 Mar 2015 21:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1426627334!13072009!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28638 invoked from network); 17 Mar 2015 21:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Mar 2015 21:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywI-0006jk-83 for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YXywI-00065k-6R for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:14 +0000 Date: Tue, 17 Mar 2015 21:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: return all ones on wrong-sized reads of system device I/O 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3db79e9f71f551a51359cb40e39586d8a15dae02 Author: Jan Beulich AuthorDate: Thu Mar 5 13:48:07 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:48:07 2015 +0100 x86/HVM: return all ones on wrong-sized reads of system device I/O ports So far the value presented to the guest remained uninitialized. This is CVE-2015-2044 / XSA-121. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: c9e57594e1ba5da9d705dee9f00aa4e7e925963d master date: 2015-03-05 13:34:54 +0100 --- xen/arch/x86/hvm/i8254.c | 1 + xen/arch/x86/hvm/pmtimer.c | 1 + xen/arch/x86/hvm/rtc.c | 3 ++- xen/arch/x86/hvm/vpic.c | 1 + 4 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c index c0d6bc2..809d09e 100644 --- a/xen/arch/x86/hvm/i8254.c +++ b/xen/arch/x86/hvm/i8254.c @@ -478,6 +478,7 @@ static int handle_pit_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 01ae31d..6ad2797 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -213,6 +213,7 @@ static int handle_pmt_io( if ( bytes != 4 ) { gdprintk(XENLOG_WARNING, "HVM_PMT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index 639b4c5..30270cb 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -696,7 +696,8 @@ static int handle_rtc_io( if ( bytes != 1 ) { - gdprintk(XENLOG_WARNING, "HVM_RTC bas access\n"); + gdprintk(XENLOG_WARNING, "HVM_RTC bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index fea3f68..6e4d422 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -324,6 +324,7 @@ static int vpic_intercept_pic_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIC_IO bad access size %d\n", bytes); + *val = ~0; return X86EMUL_OKAY; } -- 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 Tue Mar 17 21:22:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Mar 2015 21:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywW-0001uV-FM; Tue, 17 Mar 2015 21:22:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywV-0001u4-7s for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:27 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 82/E9-22408-21B98055; Tue, 17 Mar 2015 21:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1426627344!9132664!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21547 invoked from network); 17 Mar 2015 21:22:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Mar 2015 21:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywS-0006jw-BR for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YXywS-00066C-AQ for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:24 +0000 Date: Tue, 17 Mar 2015 21:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] pre-fill structures for certain HYPERVISOR_xen_version sub-ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 982b8a650f4c1560dcf611232c5cae3ce94425c7 Author: Aaron Adams AuthorDate: Thu Mar 5 13:48:58 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:48:58 2015 +0100 pre-fill structures for certain HYPERVISOR_xen_version sub-ops ... avoiding to pass hypervisor stack contents back to the caller through space unused by the respective strings. This is CVE-2015-2045 / XSA-122. Signed-off-by: Aaron Adams Acked-by: Jan Beulich Acked-by: Ian Campbell master commit: fe2e079f642effb3d24a6e1a7096ef26e691d93e master date: 2015-03-05 13:35:54 +0100 --- xen/common/kernel.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 72fb905..265124c 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -216,6 +216,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_extraversion: { xen_extraversion_t extraversion; + + memset(extraversion, 0, sizeof(extraversion)); safe_strcpy(extraversion, xen_extra_version()); if ( copy_to_guest(arg, extraversion, ARRAY_SIZE(extraversion)) ) return -EFAULT; @@ -225,6 +227,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_compile_info: { struct xen_compile_info info; + + memset(&info, 0, sizeof(info)); safe_strcpy(info.compiler, xen_compiler()); safe_strcpy(info.compile_by, xen_compile_by()); safe_strcpy(info.compile_domain, xen_compile_domain()); @@ -260,6 +264,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_changeset: { xen_changeset_info_t chgset; + + memset(chgset, 0, sizeof(chgset)); safe_strcpy(chgset, xen_changeset()); if ( copy_to_guest(arg, chgset, ARRAY_SIZE(chgset)) ) return -EFAULT; -- 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 Tue Mar 17 21:22:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Mar 2015 21:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywW-0001uV-FM; Tue, 17 Mar 2015 21:22:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywV-0001u4-7s for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:27 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 82/E9-22408-21B98055; Tue, 17 Mar 2015 21:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1426627344!9132664!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21547 invoked from network); 17 Mar 2015 21:22:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Mar 2015 21:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywS-0006jw-BR for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YXywS-00066C-AQ for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:24 +0000 Date: Tue, 17 Mar 2015 21:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] pre-fill structures for certain HYPERVISOR_xen_version sub-ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 982b8a650f4c1560dcf611232c5cae3ce94425c7 Author: Aaron Adams AuthorDate: Thu Mar 5 13:48:58 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:48:58 2015 +0100 pre-fill structures for certain HYPERVISOR_xen_version sub-ops ... avoiding to pass hypervisor stack contents back to the caller through space unused by the respective strings. This is CVE-2015-2045 / XSA-122. Signed-off-by: Aaron Adams Acked-by: Jan Beulich Acked-by: Ian Campbell master commit: fe2e079f642effb3d24a6e1a7096ef26e691d93e master date: 2015-03-05 13:35:54 +0100 --- xen/common/kernel.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 72fb905..265124c 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -216,6 +216,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_extraversion: { xen_extraversion_t extraversion; + + memset(extraversion, 0, sizeof(extraversion)); safe_strcpy(extraversion, xen_extra_version()); if ( copy_to_guest(arg, extraversion, ARRAY_SIZE(extraversion)) ) return -EFAULT; @@ -225,6 +227,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_compile_info: { struct xen_compile_info info; + + memset(&info, 0, sizeof(info)); safe_strcpy(info.compiler, xen_compiler()); safe_strcpy(info.compile_by, xen_compile_by()); safe_strcpy(info.compile_domain, xen_compile_domain()); @@ -260,6 +264,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_changeset: { xen_changeset_info_t chgset; + + memset(chgset, 0, sizeof(chgset)); safe_strcpy(chgset, xen_changeset()); if ( copy_to_guest(arg, chgset, ARRAY_SIZE(chgset)) ) return -EFAULT; -- 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 Tue Mar 17 21:22:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Mar 2015 21:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywg-0001x1-IH; Tue, 17 Mar 2015 21:22:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywe-0001wr-P0 for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:36 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 19/62-17231-C1B98055; Tue, 17 Mar 2015 21:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1426627354!8024970!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20283 invoked from network); 17 Mar 2015 21:22:35 -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; 17 Mar 2015 21:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywc-0006k4-J1 for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YXywc-0006C8-Es for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:34 +0000 Date: Tue, 17 Mar 2015 21:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] flask: avoid installing policy file as '/boot' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 08d6f790eb66d3bc91f19e6e2ea7e93fc9162763 Author: Vadim A. Misbakh-Soloviov AuthorDate: Tue Jul 30 16:34:38 2013 +0400 Commit: Ian Campbell CommitDate: Mon Mar 9 09:31:23 2015 +0000 flask: avoid installing policy file as '/boot' Signed-off-by: Vadim A. Misbakh-Soloviov Acked-by: Daniel De Graaf (cherry picked from commit 8bff3edead4318bfebc487f929f833d11922c238) --- tools/flask/policy/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile index e666f3e..df1e8f3 100644 --- a/tools/flask/policy/Makefile +++ b/tools/flask/policy/Makefile @@ -103,6 +103,7 @@ POLICY_SECTIONS += $(USERS) $(CONSTRAINTS) $(ISID_DEFS) all: $(POLICY_FILENAME) install: $(POLICY_FILENAME) + $(INSTALL_DIR) $(POLICY_LOADPATH) $(INSTALL_DATA) $^ $(POLICY_LOADPATH) $(POLICY_FILENAME): policy.conf -- 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 Tue Mar 17 21:22:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Mar 2015 21:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywg-0001x1-IH; Tue, 17 Mar 2015 21:22:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywe-0001wr-P0 for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:36 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 19/62-17231-C1B98055; Tue, 17 Mar 2015 21:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1426627354!8024970!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20283 invoked from network); 17 Mar 2015 21:22:35 -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; 17 Mar 2015 21:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywc-0006k4-J1 for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YXywc-0006C8-Es for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:34 +0000 Date: Tue, 17 Mar 2015 21:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] flask: avoid installing policy file as '/boot' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 08d6f790eb66d3bc91f19e6e2ea7e93fc9162763 Author: Vadim A. Misbakh-Soloviov AuthorDate: Tue Jul 30 16:34:38 2013 +0400 Commit: Ian Campbell CommitDate: Mon Mar 9 09:31:23 2015 +0000 flask: avoid installing policy file as '/boot' Signed-off-by: Vadim A. Misbakh-Soloviov Acked-by: Daniel De Graaf (cherry picked from commit 8bff3edead4318bfebc487f929f833d11922c238) --- tools/flask/policy/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile index e666f3e..df1e8f3 100644 --- a/tools/flask/policy/Makefile +++ b/tools/flask/policy/Makefile @@ -103,6 +103,7 @@ POLICY_SECTIONS += $(USERS) $(CONSTRAINTS) $(ISID_DEFS) all: $(POLICY_FILENAME) install: $(POLICY_FILENAME) + $(INSTALL_DIR) $(POLICY_LOADPATH) $(INSTALL_DATA) $^ $(POLICY_LOADPATH) $(POLICY_FILENAME): policy.conf -- 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 Tue Mar 17 21:22:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Mar 2015 21:22:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywr-0001yP-LS; Tue, 17 Mar 2015 21:22:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywq-0001yE-4h for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:48 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 8C/4D-30864-72B98055; Tue, 17 Mar 2015 21:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1426627364!13663298!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3938 invoked from network); 17 Mar 2015 21:22: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; 17 Mar 2015 21:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywm-0006kA-Pj for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YXywm-0006CY-Mh for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:44 +0000 Date: Tue, 17 Mar 2015 21:22:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86emul: fully ignore segment override for register-only operations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d6effa69e62818b7d02e50eec84a6f4c76696ba Author: Jan Beulich AuthorDate: Tue Mar 10 13:59:15 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 13:59:15 2015 +0100 x86emul: fully ignore segment override for register-only operations For ModRM encoded instructions with register operands we must not overwrite ea.mem.seg (if a - bogus in that case - segment override was present) as it aliases with ea.reg. This is CVE-2015-2151 / XSA-123. Reported-by: Felix Wilhelm Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Keir Fraser master commit: bcf92a5382b75fd964c1f8678b2d9a3abe6dec39 master date: 2015-03-10 13:45:51 +0100 --- xen/arch/x86/x86_emulate/x86_emulate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 2b6a509..164c2d1 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1640,7 +1640,7 @@ x86_emulate( } } - if ( override_seg != -1 ) + if ( override_seg != -1 && ea.type == OP_MEM ) ea.mem.seg = override_seg; /* Decode and fetch the source operand: register, memory or immediate. */ -- 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 Tue Mar 17 21:22:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Mar 2015 21:22:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywr-0001yP-LS; Tue, 17 Mar 2015 21:22:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywq-0001yE-4h for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:48 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 8C/4D-30864-72B98055; Tue, 17 Mar 2015 21:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1426627364!13663298!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3938 invoked from network); 17 Mar 2015 21:22: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; 17 Mar 2015 21:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywm-0006kA-Pj for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YXywm-0006CY-Mh for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:44 +0000 Date: Tue, 17 Mar 2015 21:22:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86emul: fully ignore segment override for register-only operations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d6effa69e62818b7d02e50eec84a6f4c76696ba Author: Jan Beulich AuthorDate: Tue Mar 10 13:59:15 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 13:59:15 2015 +0100 x86emul: fully ignore segment override for register-only operations For ModRM encoded instructions with register operands we must not overwrite ea.mem.seg (if a - bogus in that case - segment override was present) as it aliases with ea.reg. This is CVE-2015-2151 / XSA-123. Reported-by: Felix Wilhelm Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Keir Fraser master commit: bcf92a5382b75fd964c1f8678b2d9a3abe6dec39 master date: 2015-03-10 13:45:51 +0100 --- xen/arch/x86/x86_emulate/x86_emulate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 2b6a509..164c2d1 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1640,7 +1640,7 @@ x86_emulate( } } - if ( override_seg != -1 ) + if ( override_seg != -1 && ea.type == OP_MEM ) ea.mem.seg = override_seg; /* Decode and fetch the source operand: register, memory or immediate. */ -- 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 Tue Mar 17 21:22:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Mar 2015 21:22:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXyx0-0001zv-Ny; Tue, 17 Mar 2015 21:22:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywz-0001zc-NW for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:57 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id AE/7B-13627-03B98055; Tue, 17 Mar 2015 21:22:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1426627375!13018204!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22643 invoked from network); 17 Mar 2015 21:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Mar 2015 21:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywx-0006kJ-1U for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YXyww-0006D2-Sw for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:54 +0000 Date: Tue, 17 Mar 2015 21:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/tboot: invalidate FIX_TBOOT_MAP_ADDRESS mapping after use X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 00eba3b0bc5db6933e1c920c6e51028315d559c9 Author: Jan Beulich AuthorDate: Thu Mar 12 14:22:10 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 12 14:22:10 2015 +0100 x86/tboot: invalidate FIX_TBOOT_MAP_ADDRESS mapping after use In order for commit cbeeaa7d ("x86/nmi: fix shootdown of pcpus running in VMX non-root mode")'s re-use of that fixmap entry to not cause undesirable (in crash context) cross-CPU TLB flushes, invalidate the fixmap entry right after use. Signed-off-by: Jan Beulich master commit: 375a09cffacff820e025c65d0cdfbd403ecb30cc master date: 2015-03-04 09:59:47 +0100 --- xen/arch/x86/tboot.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index 1eed2e3..245d22c 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -140,6 +140,7 @@ void __init tboot_probe(void) TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_BASE); tboot_copy_memory((unsigned char *)&sinit_size, sizeof(sinit_size), TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_SIZE); + __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); } /* definitions from xen/drivers/passthrough/vtd/iommu.h @@ -477,6 +478,8 @@ int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler) dmar_table_raw = xmalloc_array(unsigned char, dmar_table_length); tboot_copy_memory(dmar_table_raw, dmar_table_length, pa); dmar_table = (struct acpi_table_header *)dmar_table_raw; + __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); + rc = dmar_handler(dmar_table); xfree(dmar_table_raw); -- 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 Tue Mar 17 21:22:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Mar 2015 21:22:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXyx0-0001zv-Ny; Tue, 17 Mar 2015 21:22:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywz-0001zc-NW for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:57 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id AE/7B-13627-03B98055; Tue, 17 Mar 2015 21:22:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1426627375!13018204!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22643 invoked from network); 17 Mar 2015 21:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Mar 2015 21:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXywx-0006kJ-1U for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YXyww-0006D2-Sw for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:22:54 +0000 Date: Tue, 17 Mar 2015 21:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/tboot: invalidate FIX_TBOOT_MAP_ADDRESS mapping after use X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 00eba3b0bc5db6933e1c920c6e51028315d559c9 Author: Jan Beulich AuthorDate: Thu Mar 12 14:22:10 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 12 14:22:10 2015 +0100 x86/tboot: invalidate FIX_TBOOT_MAP_ADDRESS mapping after use In order for commit cbeeaa7d ("x86/nmi: fix shootdown of pcpus running in VMX non-root mode")'s re-use of that fixmap entry to not cause undesirable (in crash context) cross-CPU TLB flushes, invalidate the fixmap entry right after use. Signed-off-by: Jan Beulich master commit: 375a09cffacff820e025c65d0cdfbd403ecb30cc master date: 2015-03-04 09:59:47 +0100 --- xen/arch/x86/tboot.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index 1eed2e3..245d22c 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -140,6 +140,7 @@ void __init tboot_probe(void) TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_BASE); tboot_copy_memory((unsigned char *)&sinit_size, sizeof(sinit_size), TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_SIZE); + __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); } /* definitions from xen/drivers/passthrough/vtd/iommu.h @@ -477,6 +478,8 @@ int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler) dmar_table_raw = xmalloc_array(unsigned char, dmar_table_length); tboot_copy_memory(dmar_table_raw, dmar_table_length, pa); dmar_table = (struct acpi_table_header *)dmar_table_raw; + __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); + rc = dmar_handler(dmar_table); xfree(dmar_table_raw); -- 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 Tue Mar 17 21:23:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Mar 2015 21: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 1YXyxB-00022Q-Uf; Tue, 17 Mar 2015 21:23:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXyxA-00021L-4u for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:23:08 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 33/35-18734-B3B98055; Tue, 17 Mar 2015 21:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1426627385!12953550!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24707 invoked from network); 17 Mar 2015 21:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Mar 2015 21:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXyx7-0006ks-Ay for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YXyx7-0006DZ-4w for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:23:05 +0000 Date: Tue, 17 Mar 2015 21:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools: libxl: Explicitly disable graphics backends on qemu cmdline X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1cf1e6024bfec941e10fe7308b04c9da1a7e74e4 Author: Ian Campbell AuthorDate: Fri Feb 20 14:41:09 2015 +0000 Commit: Ian Jackson CommitDate: Thu Mar 12 13:47:55 2015 +0000 tools: libxl: Explicitly disable graphics backends on qemu cmdline By default qemu will try to create some sort of backend for the emulated VGA device, either SDL or VNC. However when the user specifies sdl=0 and vnc=0 in their configuration libxl was not explicitly disabling either backend, which could lead to one unexpectedly running. If either sdl=1 or vnc=1 is configured then both before and after this change only the backends which are explicitly enabled are configured, i.e. this issue only occurs when all backends are supposed to have been disabled. This affects qemu-xen and qemu-xen-traditional differently. If qemu-xen was compiled with SDL support then this would result in an SDL window being opened if $DISPLAY is valid, or a failure to start the guest if not. Passing "-display none" to qemu before any further -sdl options disables this default behaviour and ensures that SDL is only started if the libxl configuration demands it. If qemu-xen was compiled without SDL support then qemu would instead start a VNC server listening on ::1 (IPv6 localhost) or 127.0.0.1 (IPv4 localhost) with IPv6 preferred if available. Explicitly pass "-vnc none" when vnc is not enabled in the libxl configuration to remove this possibility. qemu-xen-traditional would never start a vnc backend unless asked. However by default it will start an SDL backend, the way to disable this is to pass a -vnc option. In other words passing "-vnc none" will disable both vnc and sdl by default. sdl can then be reenabled if configured by subsequent use of the -sdl option. Tested with both qemu-xen and qemu-xen-traditional built with SDL support and: xl cr # defaults xl cr sdl=0 vnc=0 xl cr sdl=1 vnc=0 xl cr sdl=0 vnc=1 xl cr sdl=0 vnc=0 vga=\"none\" xl cr sdl=0 vnc=0 nographic=1 with both valid and invalid $DISPLAY. This is XSA-119 / CVE-2015-2152. Reported-by: Sander Eikelenboom Signed-off-by: Ian Campbell Acked-by: Ian Jackson (cherry picked from commit 91b0ae9db33f72468b1d411a07f53085c893c097) (cherry picked from commit 6616c4d6fe454cf04c90057cc5e752e1aed23b23) (cherry picked from commit 84ca072f37fa41de1d98524c1a60b7feba0fdc97) --- tools/libxl/libxl_dm.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 4dd71f1..8a83103 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -153,7 +153,14 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if (libxl_defbool_val(vnc->findunused)) { flexarray_append(dm_args, "-vncunused"); } - } + } else + /* + * VNC is not enabled by default by qemu-xen-traditional, + * however passing -vnc none causes SDL to not be + * (unexpectedly) enabled by default. This is overridden by + * explicitly passing -sdl below as required. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); if (sdl) { flexarray_append(dm_args, "-sdl"); @@ -426,7 +433,17 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, } flexarray_append(dm_args, vncarg); - } + } else + /* + * Ensure that by default no vnc server is created. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); + + /* + * Ensure that by default no display backend is created. Further + * options given below might then enable more. + */ + flexarray_append_pair(dm_args, "-display", "none"); if (sdl) { flexarray_append(dm_args, "-sdl"); -- 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 Tue Mar 17 21:23:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Mar 2015 21: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 1YXyxB-00022Q-Uf; Tue, 17 Mar 2015 21:23:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXyxA-00021L-4u for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:23:08 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 33/35-18734-B3B98055; Tue, 17 Mar 2015 21:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1426627385!12953550!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24707 invoked from network); 17 Mar 2015 21:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Mar 2015 21:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXyx7-0006ks-Ay for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YXyx7-0006DZ-4w for xen-changelog@lists.xensource.com; Tue, 17 Mar 2015 21:23:05 +0000 Date: Tue, 17 Mar 2015 21:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools: libxl: Explicitly disable graphics backends on qemu cmdline X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1cf1e6024bfec941e10fe7308b04c9da1a7e74e4 Author: Ian Campbell AuthorDate: Fri Feb 20 14:41:09 2015 +0000 Commit: Ian Jackson CommitDate: Thu Mar 12 13:47:55 2015 +0000 tools: libxl: Explicitly disable graphics backends on qemu cmdline By default qemu will try to create some sort of backend for the emulated VGA device, either SDL or VNC. However when the user specifies sdl=0 and vnc=0 in their configuration libxl was not explicitly disabling either backend, which could lead to one unexpectedly running. If either sdl=1 or vnc=1 is configured then both before and after this change only the backends which are explicitly enabled are configured, i.e. this issue only occurs when all backends are supposed to have been disabled. This affects qemu-xen and qemu-xen-traditional differently. If qemu-xen was compiled with SDL support then this would result in an SDL window being opened if $DISPLAY is valid, or a failure to start the guest if not. Passing "-display none" to qemu before any further -sdl options disables this default behaviour and ensures that SDL is only started if the libxl configuration demands it. If qemu-xen was compiled without SDL support then qemu would instead start a VNC server listening on ::1 (IPv6 localhost) or 127.0.0.1 (IPv4 localhost) with IPv6 preferred if available. Explicitly pass "-vnc none" when vnc is not enabled in the libxl configuration to remove this possibility. qemu-xen-traditional would never start a vnc backend unless asked. However by default it will start an SDL backend, the way to disable this is to pass a -vnc option. In other words passing "-vnc none" will disable both vnc and sdl by default. sdl can then be reenabled if configured by subsequent use of the -sdl option. Tested with both qemu-xen and qemu-xen-traditional built with SDL support and: xl cr # defaults xl cr sdl=0 vnc=0 xl cr sdl=1 vnc=0 xl cr sdl=0 vnc=1 xl cr sdl=0 vnc=0 vga=\"none\" xl cr sdl=0 vnc=0 nographic=1 with both valid and invalid $DISPLAY. This is XSA-119 / CVE-2015-2152. Reported-by: Sander Eikelenboom Signed-off-by: Ian Campbell Acked-by: Ian Jackson (cherry picked from commit 91b0ae9db33f72468b1d411a07f53085c893c097) (cherry picked from commit 6616c4d6fe454cf04c90057cc5e752e1aed23b23) (cherry picked from commit 84ca072f37fa41de1d98524c1a60b7feba0fdc97) --- tools/libxl/libxl_dm.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 4dd71f1..8a83103 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -153,7 +153,14 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if (libxl_defbool_val(vnc->findunused)) { flexarray_append(dm_args, "-vncunused"); } - } + } else + /* + * VNC is not enabled by default by qemu-xen-traditional, + * however passing -vnc none causes SDL to not be + * (unexpectedly) enabled by default. This is overridden by + * explicitly passing -sdl below as required. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); if (sdl) { flexarray_append(dm_args, "-sdl"); @@ -426,7 +433,17 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, } flexarray_append(dm_args, vncarg); - } + } else + /* + * Ensure that by default no vnc server is created. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); + + /* + * Ensure that by default no display backend is created. Further + * options given below might then enable more. + */ + flexarray_append_pair(dm_args, "-display", "none"); if (sdl) { flexarray_append(dm_args, "-sdl"); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Mar 18 22:55:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 22: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 1YYMrj-0002qE-Mt; Wed, 18 Mar 2015 22:55:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMrh-0002q5-P6 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:05 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id A1/16-09011-9420A055; Wed, 18 Mar 2015 22:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1426719303!13400393!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23377 invoked from network); 18 Mar 2015 22:55:04 -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; 18 Mar 2015 22:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMrf-0006Rn-9d for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYMrf-0003Qs-1K for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:03 +0000 Date: Wed, 18 Mar 2015 22:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86emul: fully ignore segment override for register-only operations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 902998e38cb844c02befb2c2d53a196739dd914a Author: Jan Beulich AuthorDate: Tue Mar 10 13:55:17 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 13:55:17 2015 +0100 x86emul: fully ignore segment override for register-only operations For ModRM encoded instructions with register operands we must not overwrite ea.mem.seg (if a - bogus in that case - segment override was present) as it aliases with ea.reg. This is CVE-2015-2151 / XSA-123. Reported-by: Felix Wilhelm Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Keir Fraser master commit: bcf92a5382b75fd964c1f8678b2d9a3abe6dec39 master date: 2015-03-10 13:45:51 +0100 --- xen/arch/x86/x86_emulate/x86_emulate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 8d01e41..8ff31d0 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1756,7 +1756,7 @@ x86_emulate( } } - if ( override_seg != -1 ) + if ( override_seg != -1 && ea.type == OP_MEM ) ea.mem.seg = override_seg; /* Early operand adjustments. */ -- 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 Mar 18 22:55:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 22: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 1YYMrj-0002qE-Mt; Wed, 18 Mar 2015 22:55:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMrh-0002q5-P6 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:05 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id A1/16-09011-9420A055; Wed, 18 Mar 2015 22:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1426719303!13400393!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23377 invoked from network); 18 Mar 2015 22:55:04 -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; 18 Mar 2015 22:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMrf-0006Rn-9d for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYMrf-0003Qs-1K for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:03 +0000 Date: Wed, 18 Mar 2015 22:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86emul: fully ignore segment override for register-only operations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 902998e38cb844c02befb2c2d53a196739dd914a Author: Jan Beulich AuthorDate: Tue Mar 10 13:55:17 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 13:55:17 2015 +0100 x86emul: fully ignore segment override for register-only operations For ModRM encoded instructions with register operands we must not overwrite ea.mem.seg (if a - bogus in that case - segment override was present) as it aliases with ea.reg. This is CVE-2015-2151 / XSA-123. Reported-by: Felix Wilhelm Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Keir Fraser master commit: bcf92a5382b75fd964c1f8678b2d9a3abe6dec39 master date: 2015-03-10 13:45:51 +0100 --- xen/arch/x86/x86_emulate/x86_emulate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 8d01e41..8ff31d0 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1756,7 +1756,7 @@ x86_emulate( } } - if ( override_seg != -1 ) + if ( override_seg != -1 && ea.type == OP_MEM ) ea.mem.seg = override_seg; /* Early operand adjustments. */ -- 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 Mar 18 22:55:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 22:55:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMrt-0002qu-QV; Wed, 18 Mar 2015 22:55:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMrr-0002qk-V5 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:16 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 3D/DF-18732-3520A055; Wed, 18 Mar 2015 22:55:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1426719313!11733023!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7150 invoked from network); 18 Mar 2015 22:55:14 -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; 18 Mar 2015 22:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMrp-0006Rq-FK for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYMrp-0003RH-DX for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:13 +0000 Date: Wed, 18 Mar 2015 22:55:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/tboot: invalidate FIX_TBOOT_MAP_ADDRESS mapping after use X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0b141e53e242755a69d7d612a9d401d3d37a9e3 Author: Jan Beulich AuthorDate: Thu Mar 12 14:18:28 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 12 14:18:28 2015 +0100 x86/tboot: invalidate FIX_TBOOT_MAP_ADDRESS mapping after use In order for commit cbeeaa7d ("x86/nmi: fix shootdown of pcpus running in VMX non-root mode")'s re-use of that fixmap entry to not cause undesirable (in crash context) cross-CPU TLB flushes, invalidate the fixmap entry right after use. Signed-off-by: Jan Beulich master commit: 375a09cffacff820e025c65d0cdfbd403ecb30cc master date: 2015-03-04 09:59:47 +0100 --- xen/arch/x86/tboot.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index a8fb3a0..ca4839e 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -138,6 +138,7 @@ void __init tboot_probe(void) TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_BASE); tboot_copy_memory((unsigned char *)&sinit_size, sizeof(sinit_size), TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_SIZE); + __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); } /* definitions from xen/drivers/passthrough/vtd/iommu.h @@ -476,6 +477,8 @@ int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler) dmar_table_raw = xmalloc_array(unsigned char, dmar_table_length); tboot_copy_memory(dmar_table_raw, dmar_table_length, pa); dmar_table = (struct acpi_table_header *)dmar_table_raw; + __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); + rc = dmar_handler(dmar_table); xfree(dmar_table_raw); -- 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 Mar 18 22:55:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 22:55:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMrt-0002qu-QV; Wed, 18 Mar 2015 22:55:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMrr-0002qk-V5 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:16 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 3D/DF-18732-3520A055; Wed, 18 Mar 2015 22:55:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1426719313!11733023!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7150 invoked from network); 18 Mar 2015 22:55:14 -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; 18 Mar 2015 22:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMrp-0006Rq-FK for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYMrp-0003RH-DX for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:13 +0000 Date: Wed, 18 Mar 2015 22:55:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/tboot: invalidate FIX_TBOOT_MAP_ADDRESS mapping after use X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0b141e53e242755a69d7d612a9d401d3d37a9e3 Author: Jan Beulich AuthorDate: Thu Mar 12 14:18:28 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 12 14:18:28 2015 +0100 x86/tboot: invalidate FIX_TBOOT_MAP_ADDRESS mapping after use In order for commit cbeeaa7d ("x86/nmi: fix shootdown of pcpus running in VMX non-root mode")'s re-use of that fixmap entry to not cause undesirable (in crash context) cross-CPU TLB flushes, invalidate the fixmap entry right after use. Signed-off-by: Jan Beulich master commit: 375a09cffacff820e025c65d0cdfbd403ecb30cc master date: 2015-03-04 09:59:47 +0100 --- xen/arch/x86/tboot.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index a8fb3a0..ca4839e 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -138,6 +138,7 @@ void __init tboot_probe(void) TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_BASE); tboot_copy_memory((unsigned char *)&sinit_size, sizeof(sinit_size), TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_SIZE); + __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); } /* definitions from xen/drivers/passthrough/vtd/iommu.h @@ -476,6 +477,8 @@ int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler) dmar_table_raw = xmalloc_array(unsigned char, dmar_table_length); tboot_copy_memory(dmar_table_raw, dmar_table_length, pa); dmar_table = (struct acpi_table_header *)dmar_table_raw; + __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); + rc = dmar_handler(dmar_table); xfree(dmar_table_raw); -- 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 Mar 18 22:55:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 22:55: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 1YYMs2-0002sA-VM; Wed, 18 Mar 2015 22:55:26 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMs2-0002s3-K6 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:26 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 09/0A-02124-D520A055; Wed, 18 Mar 2015 22:55:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1426719323!11709334!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18988 invoked from network); 18 Mar 2015 22:55:24 -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; 18 Mar 2015 22:55:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMrz-0006Rz-O8 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYMrz-0003Re-Ii for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:23 +0000 Date: Wed, 18 Mar 2015 22:55:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools: libxl: Explicitly disable graphics backends on qemu cmdline X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6616c4d6fe454cf04c90057cc5e752e1aed23b23 Author: Ian Campbell AuthorDate: Fri Feb 20 14:41:09 2015 +0000 Commit: Ian Jackson CommitDate: Thu Mar 12 13:47:23 2015 +0000 tools: libxl: Explicitly disable graphics backends on qemu cmdline By default qemu will try to create some sort of backend for the emulated VGA device, either SDL or VNC. However when the user specifies sdl=0 and vnc=0 in their configuration libxl was not explicitly disabling either backend, which could lead to one unexpectedly running. If either sdl=1 or vnc=1 is configured then both before and after this change only the backends which are explicitly enabled are configured, i.e. this issue only occurs when all backends are supposed to have been disabled. This affects qemu-xen and qemu-xen-traditional differently. If qemu-xen was compiled with SDL support then this would result in an SDL window being opened if $DISPLAY is valid, or a failure to start the guest if not. Passing "-display none" to qemu before any further -sdl options disables this default behaviour and ensures that SDL is only started if the libxl configuration demands it. If qemu-xen was compiled without SDL support then qemu would instead start a VNC server listening on ::1 (IPv6 localhost) or 127.0.0.1 (IPv4 localhost) with IPv6 preferred if available. Explicitly pass "-vnc none" when vnc is not enabled in the libxl configuration to remove this possibility. qemu-xen-traditional would never start a vnc backend unless asked. However by default it will start an SDL backend, the way to disable this is to pass a -vnc option. In other words passing "-vnc none" will disable both vnc and sdl by default. sdl can then be reenabled if configured by subsequent use of the -sdl option. Tested with both qemu-xen and qemu-xen-traditional built with SDL support and: xl cr # defaults xl cr sdl=0 vnc=0 xl cr sdl=1 vnc=0 xl cr sdl=0 vnc=1 xl cr sdl=0 vnc=0 vga=\"none\" xl cr sdl=0 vnc=0 nographic=1 with both valid and invalid $DISPLAY. This is XSA-119 / CVE-2015-2152. Reported-by: Sander Eikelenboom Signed-off-by: Ian Campbell Acked-by: Ian Jackson (cherry picked from commit 91b0ae9db33f72468b1d411a07f53085c893c097) --- tools/libxl/libxl_dm.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index c2b0487..094a133 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -180,7 +180,14 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if (libxl_defbool_val(vnc->findunused)) { flexarray_append(dm_args, "-vncunused"); } - } + } else + /* + * VNC is not enabled by default by qemu-xen-traditional, + * however passing -vnc none causes SDL to not be + * (unexpectedly) enabled by default. This is overridden by + * explicitly passing -sdl below as required. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); if (sdl) { flexarray_append(dm_args, "-sdl"); @@ -513,7 +520,17 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, } flexarray_append(dm_args, vncarg); - } + } else + /* + * Ensure that by default no vnc server is created. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); + + /* + * Ensure that by default no display backend is created. Further + * options given below might then enable more. + */ + flexarray_append_pair(dm_args, "-display", "none"); if (sdl) { flexarray_append(dm_args, "-sdl"); -- 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 Mar 18 22:55:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 22:55: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 1YYMs2-0002sA-VM; Wed, 18 Mar 2015 22:55:26 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMs2-0002s3-K6 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:26 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 09/0A-02124-D520A055; Wed, 18 Mar 2015 22:55:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1426719323!11709334!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18988 invoked from network); 18 Mar 2015 22:55:24 -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; 18 Mar 2015 22:55:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMrz-0006Rz-O8 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYMrz-0003Re-Ii for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:23 +0000 Date: Wed, 18 Mar 2015 22:55:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools: libxl: Explicitly disable graphics backends on qemu cmdline X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6616c4d6fe454cf04c90057cc5e752e1aed23b23 Author: Ian Campbell AuthorDate: Fri Feb 20 14:41:09 2015 +0000 Commit: Ian Jackson CommitDate: Thu Mar 12 13:47:23 2015 +0000 tools: libxl: Explicitly disable graphics backends on qemu cmdline By default qemu will try to create some sort of backend for the emulated VGA device, either SDL or VNC. However when the user specifies sdl=0 and vnc=0 in their configuration libxl was not explicitly disabling either backend, which could lead to one unexpectedly running. If either sdl=1 or vnc=1 is configured then both before and after this change only the backends which are explicitly enabled are configured, i.e. this issue only occurs when all backends are supposed to have been disabled. This affects qemu-xen and qemu-xen-traditional differently. If qemu-xen was compiled with SDL support then this would result in an SDL window being opened if $DISPLAY is valid, or a failure to start the guest if not. Passing "-display none" to qemu before any further -sdl options disables this default behaviour and ensures that SDL is only started if the libxl configuration demands it. If qemu-xen was compiled without SDL support then qemu would instead start a VNC server listening on ::1 (IPv6 localhost) or 127.0.0.1 (IPv4 localhost) with IPv6 preferred if available. Explicitly pass "-vnc none" when vnc is not enabled in the libxl configuration to remove this possibility. qemu-xen-traditional would never start a vnc backend unless asked. However by default it will start an SDL backend, the way to disable this is to pass a -vnc option. In other words passing "-vnc none" will disable both vnc and sdl by default. sdl can then be reenabled if configured by subsequent use of the -sdl option. Tested with both qemu-xen and qemu-xen-traditional built with SDL support and: xl cr # defaults xl cr sdl=0 vnc=0 xl cr sdl=1 vnc=0 xl cr sdl=0 vnc=1 xl cr sdl=0 vnc=0 vga=\"none\" xl cr sdl=0 vnc=0 nographic=1 with both valid and invalid $DISPLAY. This is XSA-119 / CVE-2015-2152. Reported-by: Sander Eikelenboom Signed-off-by: Ian Campbell Acked-by: Ian Jackson (cherry picked from commit 91b0ae9db33f72468b1d411a07f53085c893c097) --- tools/libxl/libxl_dm.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index c2b0487..094a133 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -180,7 +180,14 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if (libxl_defbool_val(vnc->findunused)) { flexarray_append(dm_args, "-vncunused"); } - } + } else + /* + * VNC is not enabled by default by qemu-xen-traditional, + * however passing -vnc none causes SDL to not be + * (unexpectedly) enabled by default. This is overridden by + * explicitly passing -sdl below as required. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); if (sdl) { flexarray_append(dm_args, "-sdl"); @@ -513,7 +520,17 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, } flexarray_append(dm_args, vncarg); - } + } else + /* + * Ensure that by default no vnc server is created. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); + + /* + * Ensure that by default no display backend is created. Further + * options given below might then enable more. + */ + flexarray_append_pair(dm_args, "-display", "none"); if (sdl) { flexarray_append(dm_args, "-sdl"); -- 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 Mar 18 22:55:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 22:55: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 1YYMsD-0002ti-1Z; Wed, 18 Mar 2015 22:55:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMsC-0002ta-9Y for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:36 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 3F/11-09646-7620A055; Wed, 18 Mar 2015 22:55:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1426719334!14092224!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10980 invoked from network); 18 Mar 2015 22:55:35 -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; 18 Mar 2015 22:55:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMs9-0006S8-W3 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYMs9-0003S5-Qz for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:33 +0000 Date: Wed, 18 Mar 2015 22:55:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xen: arm: correct arm64 version of gva_to_ma_par X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e76209d69c406ecc3518dbd0e2efa5705273fa20 Author: Ian Campbell AuthorDate: Fri Mar 13 10:39:50 2015 +0000 Commit: Ian Campbell CommitDate: Fri Mar 13 12:08:06 2015 +0000 xen: arm: correct arm64 version of gva_to_ma_par The implementation was backwards and checked that the guest could read when asked about write and vice versa. This is an update to the fix for XSA-98. Reported-by: Tamas K Lengyel Signed-off-by: Ian Campbell (cherry picked from commit c1245e9d5bf311b5a3267ea4b077a16561fcf439) --- xen/include/asm-arm/arm64/page.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/arm64/page.h b/xen/include/asm-arm/arm64/page.h index 1fd416d..e7a761d 100644 --- a/xen/include/asm-arm/arm64/page.h +++ b/xen/include/asm-arm/arm64/page.h @@ -89,9 +89,9 @@ static inline uint64_t gva_to_ma_par(vaddr_t va, unsigned int flags) uint64_t par, tmp = READ_SYSREG64(PAR_EL1); if ( (flags & GV2M_WRITE) == GV2M_WRITE ) - asm volatile ("at s12e1r, %0;" : : "r" (va)); - else asm volatile ("at s12e1w, %0;" : : "r" (va)); + else + asm volatile ("at s12e1r, %0;" : : "r" (va)); isb(); par = READ_SYSREG64(PAR_EL1); WRITE_SYSREG64(tmp, PAR_EL1); -- 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 Mar 18 22:55:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 22:55: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 1YYMsD-0002ti-1Z; Wed, 18 Mar 2015 22:55:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMsC-0002ta-9Y for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:36 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 3F/11-09646-7620A055; Wed, 18 Mar 2015 22:55:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1426719334!14092224!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10980 invoked from network); 18 Mar 2015 22:55:35 -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; 18 Mar 2015 22:55:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYMs9-0006S8-W3 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYMs9-0003S5-Qz for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 22:55:33 +0000 Date: Wed, 18 Mar 2015 22:55:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xen: arm: correct arm64 version of gva_to_ma_par X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e76209d69c406ecc3518dbd0e2efa5705273fa20 Author: Ian Campbell AuthorDate: Fri Mar 13 10:39:50 2015 +0000 Commit: Ian Campbell CommitDate: Fri Mar 13 12:08:06 2015 +0000 xen: arm: correct arm64 version of gva_to_ma_par The implementation was backwards and checked that the guest could read when asked about write and vice versa. This is an update to the fix for XSA-98. Reported-by: Tamas K Lengyel Signed-off-by: Ian Campbell (cherry picked from commit c1245e9d5bf311b5a3267ea4b077a16561fcf439) --- xen/include/asm-arm/arm64/page.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/arm64/page.h b/xen/include/asm-arm/arm64/page.h index 1fd416d..e7a761d 100644 --- a/xen/include/asm-arm/arm64/page.h +++ b/xen/include/asm-arm/arm64/page.h @@ -89,9 +89,9 @@ static inline uint64_t gva_to_ma_par(vaddr_t va, unsigned int flags) uint64_t par, tmp = READ_SYSREG64(PAR_EL1); if ( (flags & GV2M_WRITE) == GV2M_WRITE ) - asm volatile ("at s12e1r, %0;" : : "r" (va)); - else asm volatile ("at s12e1w, %0;" : : "r" (va)); + else + asm volatile ("at s12e1r, %0;" : : "r" (va)); isb(); par = READ_SYSREG64(PAR_EL1); WRITE_SYSREG64(tmp, PAR_EL1); -- 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 Mar 18 23:33:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 23:33: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 1YYNSV-0008CE-4p; Wed, 18 Mar 2015 23:33:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNST-0008C6-F5 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:05 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id DD/26-18732-03B0A055; Wed, 18 Mar 2015 23:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1426721583!7570473!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25552 invoked from network); 18 Mar 2015 23:33:04 -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; 18 Mar 2015 23:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNSQ-0006sV-Uz for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYNSQ-0004fi-R3 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:02 +0000 Date: Wed, 18 Mar 2015 23:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: return all ones on wrong-sized reads of system device I/O 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d699dde9f0b46cf55b2250fa13b5c402c45fc1e Author: Jan Beulich AuthorDate: Thu Mar 5 13:45:22 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:45:22 2015 +0100 x86/HVM: return all ones on wrong-sized reads of system device I/O ports So far the value presented to the guest remained uninitialized. This is CVE-2015-2044 / XSA-121. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: c9e57594e1ba5da9d705dee9f00aa4e7e925963d master date: 2015-03-05 13:34:54 +0100 --- xen/arch/x86/hvm/i8254.c | 1 + xen/arch/x86/hvm/pmtimer.c | 1 + xen/arch/x86/hvm/rtc.c | 3 ++- xen/arch/x86/hvm/vpic.c | 1 + 4 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c index f7493b8..e92424e 100644 --- a/xen/arch/x86/hvm/i8254.c +++ b/xen/arch/x86/hvm/i8254.c @@ -477,6 +477,7 @@ static int handle_pit_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 01ae31d..6ad2797 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -213,6 +213,7 @@ static int handle_pmt_io( if ( bytes != 4 ) { gdprintk(XENLOG_WARNING, "HVM_PMT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index 639b4c5..30270cb 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -696,7 +696,8 @@ static int handle_rtc_io( if ( bytes != 1 ) { - gdprintk(XENLOG_WARNING, "HVM_RTC bas access\n"); + gdprintk(XENLOG_WARNING, "HVM_RTC bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index fea3f68..6e4d422 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -324,6 +324,7 @@ static int vpic_intercept_pic_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIC_IO bad access size %d\n", bytes); + *val = ~0; return X86EMUL_OKAY; } -- 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 Mar 18 23:33:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 23:33: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 1YYNSV-0008CE-4p; Wed, 18 Mar 2015 23:33:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNST-0008C6-F5 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:05 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id DD/26-18732-03B0A055; Wed, 18 Mar 2015 23:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1426721583!7570473!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25552 invoked from network); 18 Mar 2015 23:33:04 -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; 18 Mar 2015 23:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNSQ-0006sV-Uz for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYNSQ-0004fi-R3 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:02 +0000 Date: Wed, 18 Mar 2015 23:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: return all ones on wrong-sized reads of system device I/O 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d699dde9f0b46cf55b2250fa13b5c402c45fc1e Author: Jan Beulich AuthorDate: Thu Mar 5 13:45:22 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:45:22 2015 +0100 x86/HVM: return all ones on wrong-sized reads of system device I/O ports So far the value presented to the guest remained uninitialized. This is CVE-2015-2044 / XSA-121. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: c9e57594e1ba5da9d705dee9f00aa4e7e925963d master date: 2015-03-05 13:34:54 +0100 --- xen/arch/x86/hvm/i8254.c | 1 + xen/arch/x86/hvm/pmtimer.c | 1 + xen/arch/x86/hvm/rtc.c | 3 ++- xen/arch/x86/hvm/vpic.c | 1 + 4 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c index f7493b8..e92424e 100644 --- a/xen/arch/x86/hvm/i8254.c +++ b/xen/arch/x86/hvm/i8254.c @@ -477,6 +477,7 @@ static int handle_pit_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 01ae31d..6ad2797 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -213,6 +213,7 @@ static int handle_pmt_io( if ( bytes != 4 ) { gdprintk(XENLOG_WARNING, "HVM_PMT bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index 639b4c5..30270cb 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -696,7 +696,8 @@ static int handle_rtc_io( if ( bytes != 1 ) { - gdprintk(XENLOG_WARNING, "HVM_RTC bas access\n"); + gdprintk(XENLOG_WARNING, "HVM_RTC bad access\n"); + *val = ~0; return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index fea3f68..6e4d422 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -324,6 +324,7 @@ static int vpic_intercept_pic_io( if ( bytes != 1 ) { gdprintk(XENLOG_WARNING, "PIC_IO bad access size %d\n", bytes); + *val = ~0; return X86EMUL_OKAY; } -- 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 Mar 18 23:33:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 23:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNSf-0008DM-7I; Wed, 18 Mar 2015 23:33:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNSe-0008D7-21 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:16 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id A3/5D-07208-B3B0A055; Wed, 18 Mar 2015 23:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1426721593!13458121!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17493 invoked from network); 18 Mar 2015 23:33:14 -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; 18 Mar 2015 23:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNSb-0006sb-Bx for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYNSb-0004g7-2e for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:13 +0000 Date: Wed, 18 Mar 2015 23:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] pre-fill structures for certain HYPERVISOR_xen_version sub-ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 40ab3d6b78a9f5a8a22bb333fdca0309e4a2fb4b Author: Aaron Adams AuthorDate: Thu Mar 5 13:46:24 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:46:24 2015 +0100 pre-fill structures for certain HYPERVISOR_xen_version sub-ops ... avoiding to pass hypervisor stack contents back to the caller through space unused by the respective strings. This is CVE-2015-2045 / XSA-122. Signed-off-by: Aaron Adams Acked-by: Jan Beulich Acked-by: Ian Campbell master commit: fe2e079f642effb3d24a6e1a7096ef26e691d93e master date: 2015-03-05 13:35:54 +0100 --- xen/common/kernel.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index b371f8f..0e34e59 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -233,6 +233,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_extraversion: { xen_extraversion_t extraversion; + + memset(extraversion, 0, sizeof(extraversion)); safe_strcpy(extraversion, xen_extra_version()); if ( copy_to_guest(arg, extraversion, ARRAY_SIZE(extraversion)) ) return -EFAULT; @@ -242,6 +244,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_compile_info: { struct xen_compile_info info; + + memset(&info, 0, sizeof(info)); safe_strcpy(info.compiler, xen_compiler()); safe_strcpy(info.compile_by, xen_compile_by()); safe_strcpy(info.compile_domain, xen_compile_domain()); @@ -277,6 +281,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_changeset: { xen_changeset_info_t chgset; + + memset(chgset, 0, sizeof(chgset)); safe_strcpy(chgset, xen_changeset()); if ( copy_to_guest(arg, chgset, ARRAY_SIZE(chgset)) ) return -EFAULT; -- 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 Mar 18 23:33:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 23:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNSf-0008DM-7I; Wed, 18 Mar 2015 23:33:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNSe-0008D7-21 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:16 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id A3/5D-07208-B3B0A055; Wed, 18 Mar 2015 23:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1426721593!13458121!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17493 invoked from network); 18 Mar 2015 23:33:14 -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; 18 Mar 2015 23:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNSb-0006sb-Bx for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYNSb-0004g7-2e for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:13 +0000 Date: Wed, 18 Mar 2015 23:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] pre-fill structures for certain HYPERVISOR_xen_version sub-ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 40ab3d6b78a9f5a8a22bb333fdca0309e4a2fb4b Author: Aaron Adams AuthorDate: Thu Mar 5 13:46:24 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 13:46:24 2015 +0100 pre-fill structures for certain HYPERVISOR_xen_version sub-ops ... avoiding to pass hypervisor stack contents back to the caller through space unused by the respective strings. This is CVE-2015-2045 / XSA-122. Signed-off-by: Aaron Adams Acked-by: Jan Beulich Acked-by: Ian Campbell master commit: fe2e079f642effb3d24a6e1a7096ef26e691d93e master date: 2015-03-05 13:35:54 +0100 --- xen/common/kernel.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index b371f8f..0e34e59 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -233,6 +233,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_extraversion: { xen_extraversion_t extraversion; + + memset(extraversion, 0, sizeof(extraversion)); safe_strcpy(extraversion, xen_extra_version()); if ( copy_to_guest(arg, extraversion, ARRAY_SIZE(extraversion)) ) return -EFAULT; @@ -242,6 +244,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_compile_info: { struct xen_compile_info info; + + memset(&info, 0, sizeof(info)); safe_strcpy(info.compiler, xen_compiler()); safe_strcpy(info.compile_by, xen_compile_by()); safe_strcpy(info.compile_domain, xen_compile_domain()); @@ -277,6 +281,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_changeset: { xen_changeset_info_t chgset; + + memset(chgset, 0, sizeof(chgset)); safe_strcpy(chgset, xen_changeset()); if ( copy_to_guest(arg, chgset, ARRAY_SIZE(chgset)) ) return -EFAULT; -- 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 Mar 18 23:33:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 23:33: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 1YYNSs-0008F1-A0; Wed, 18 Mar 2015 23:33:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNSq-0008Ei-9C for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:28 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 0D/03-09646-74B0A055; Wed, 18 Mar 2015 23:33:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1426721603!14132525!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12838 invoked from network); 18 Mar 2015 23:33:24 -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; 18 Mar 2015 23:33:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNSl-0006sh-MZ for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYNSl-0004gU-FC for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:23 +0000 Date: Wed, 18 Mar 2015 23:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86emul: fully ignore segment override for register-only operations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4cefc72fc883945dcc71c877ceab779f16e52e76 Author: Jan Beulich AuthorDate: Tue Mar 10 13:58:00 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 13:58:00 2015 +0100 x86emul: fully ignore segment override for register-only operations For ModRM encoded instructions with register operands we must not overwrite ea.mem.seg (if a - bogus in that case - segment override was present) as it aliases with ea.reg. This is CVE-2015-2151 / XSA-123. Reported-by: Felix Wilhelm Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Keir Fraser master commit: bcf92a5382b75fd964c1f8678b2d9a3abe6dec39 master date: 2015-03-10 13:45:51 +0100 --- xen/arch/x86/x86_emulate/x86_emulate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index cb172e9..6656072 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1641,7 +1641,7 @@ x86_emulate( } } - if ( override_seg != -1 ) + if ( override_seg != -1 && ea.type == OP_MEM ) ea.mem.seg = override_seg; /* Early operand adjustments. */ -- 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 Mar 18 23:33:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 23:33: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 1YYNSs-0008F1-A0; Wed, 18 Mar 2015 23:33:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNSq-0008Ei-9C for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:28 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 0D/03-09646-74B0A055; Wed, 18 Mar 2015 23:33:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1426721603!14132525!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12838 invoked from network); 18 Mar 2015 23:33:24 -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; 18 Mar 2015 23:33:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNSl-0006sh-MZ for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYNSl-0004gU-FC for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:23 +0000 Date: Wed, 18 Mar 2015 23:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86emul: fully ignore segment override for register-only operations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4cefc72fc883945dcc71c877ceab779f16e52e76 Author: Jan Beulich AuthorDate: Tue Mar 10 13:58:00 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 13:58:00 2015 +0100 x86emul: fully ignore segment override for register-only operations For ModRM encoded instructions with register operands we must not overwrite ea.mem.seg (if a - bogus in that case - segment override was present) as it aliases with ea.reg. This is CVE-2015-2151 / XSA-123. Reported-by: Felix Wilhelm Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Keir Fraser master commit: bcf92a5382b75fd964c1f8678b2d9a3abe6dec39 master date: 2015-03-10 13:45:51 +0100 --- xen/arch/x86/x86_emulate/x86_emulate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index cb172e9..6656072 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1641,7 +1641,7 @@ x86_emulate( } } - if ( override_seg != -1 ) + if ( override_seg != -1 && ea.type == OP_MEM ) ea.mem.seg = override_seg; /* Early operand adjustments. */ -- 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 Mar 18 23:33:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 23:33: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 1YYNT0-0008GS-CP; Wed, 18 Mar 2015 23:33:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNSy-0008G7-Cf for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:36 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id B0/3F-04321-F4B0A055; Wed, 18 Mar 2015 23:33:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1426721614!9749388!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8222 invoked from network); 18 Mar 2015 23:33:35 -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; 18 Mar 2015 23:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNSv-0006sp-RU for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYNSv-0004gy-Pf for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:33 +0000 Date: Wed, 18 Mar 2015 23:33:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/tboot: invalidate FIX_TBOOT_MAP_ADDRESS mapping after use X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b9654f9dcbd4bc5bcc61251dc1a2a20fed7867a2 Author: Jan Beulich AuthorDate: Thu Mar 12 14:20:52 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 12 14:20:52 2015 +0100 x86/tboot: invalidate FIX_TBOOT_MAP_ADDRESS mapping after use In order for commit cbeeaa7d ("x86/nmi: fix shootdown of pcpus running in VMX non-root mode")'s re-use of that fixmap entry to not cause undesirable (in crash context) cross-CPU TLB flushes, invalidate the fixmap entry right after use. Signed-off-by: Jan Beulich master commit: 375a09cffacff820e025c65d0cdfbd403ecb30cc master date: 2015-03-04 09:59:47 +0100 --- xen/arch/x86/tboot.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index ccde4a0..9fb3f19 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -140,6 +140,7 @@ void __init tboot_probe(void) TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_BASE); tboot_copy_memory((unsigned char *)&sinit_size, sizeof(sinit_size), TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_SIZE); + __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); } /* definitions from xen/drivers/passthrough/vtd/iommu.h @@ -477,6 +478,8 @@ int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler) dmar_table_raw = xmalloc_array(unsigned char, dmar_table_length); tboot_copy_memory(dmar_table_raw, dmar_table_length, pa); dmar_table = (struct acpi_table_header *)dmar_table_raw; + __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); + rc = dmar_handler(dmar_table); xfree(dmar_table_raw); -- 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 Mar 18 23:33:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 23:33: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 1YYNT0-0008GS-CP; Wed, 18 Mar 2015 23:33:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNSy-0008G7-Cf for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:36 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id B0/3F-04321-F4B0A055; Wed, 18 Mar 2015 23:33:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1426721614!9749388!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8222 invoked from network); 18 Mar 2015 23:33:35 -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; 18 Mar 2015 23:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNSv-0006sp-RU for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYNSv-0004gy-Pf for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:33 +0000 Date: Wed, 18 Mar 2015 23:33:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/tboot: invalidate FIX_TBOOT_MAP_ADDRESS mapping after use X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b9654f9dcbd4bc5bcc61251dc1a2a20fed7867a2 Author: Jan Beulich AuthorDate: Thu Mar 12 14:20:52 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 12 14:20:52 2015 +0100 x86/tboot: invalidate FIX_TBOOT_MAP_ADDRESS mapping after use In order for commit cbeeaa7d ("x86/nmi: fix shootdown of pcpus running in VMX non-root mode")'s re-use of that fixmap entry to not cause undesirable (in crash context) cross-CPU TLB flushes, invalidate the fixmap entry right after use. Signed-off-by: Jan Beulich master commit: 375a09cffacff820e025c65d0cdfbd403ecb30cc master date: 2015-03-04 09:59:47 +0100 --- xen/arch/x86/tboot.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index ccde4a0..9fb3f19 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -140,6 +140,7 @@ void __init tboot_probe(void) TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_BASE); tboot_copy_memory((unsigned char *)&sinit_size, sizeof(sinit_size), TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_SIZE); + __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); } /* definitions from xen/drivers/passthrough/vtd/iommu.h @@ -477,6 +478,8 @@ int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler) dmar_table_raw = xmalloc_array(unsigned char, dmar_table_length); tboot_copy_memory(dmar_table_raw, dmar_table_length, pa); dmar_table = (struct acpi_table_header *)dmar_table_raw; + __set_fixmap(FIX_TBOOT_MAP_ADDRESS, 0, 0); + rc = dmar_handler(dmar_table); xfree(dmar_table_raw); -- 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 Mar 18 23:33:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 23:33:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNT9-0008IR-HF; Wed, 18 Mar 2015 23:33:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNT8-0008IB-W4 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:47 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 0E/F4-01923-A5B0A055; Wed, 18 Mar 2015 23:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1426721624!13530421!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1231 invoked from network); 18 Mar 2015 23:33:45 -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; 18 Mar 2015 23:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNT6-0006sz-0M for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYNT5-0004hM-VF for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:43 +0000 Date: Wed, 18 Mar 2015 23:33:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools: libxl: Explicitly disable graphics backends on qemu cmdline X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 84ca072f37fa41de1d98524c1a60b7feba0fdc97 Author: Ian Campbell AuthorDate: Fri Feb 20 14:41:09 2015 +0000 Commit: Ian Jackson CommitDate: Thu Mar 12 13:47:44 2015 +0000 tools: libxl: Explicitly disable graphics backends on qemu cmdline By default qemu will try to create some sort of backend for the emulated VGA device, either SDL or VNC. However when the user specifies sdl=0 and vnc=0 in their configuration libxl was not explicitly disabling either backend, which could lead to one unexpectedly running. If either sdl=1 or vnc=1 is configured then both before and after this change only the backends which are explicitly enabled are configured, i.e. this issue only occurs when all backends are supposed to have been disabled. This affects qemu-xen and qemu-xen-traditional differently. If qemu-xen was compiled with SDL support then this would result in an SDL window being opened if $DISPLAY is valid, or a failure to start the guest if not. Passing "-display none" to qemu before any further -sdl options disables this default behaviour and ensures that SDL is only started if the libxl configuration demands it. If qemu-xen was compiled without SDL support then qemu would instead start a VNC server listening on ::1 (IPv6 localhost) or 127.0.0.1 (IPv4 localhost) with IPv6 preferred if available. Explicitly pass "-vnc none" when vnc is not enabled in the libxl configuration to remove this possibility. qemu-xen-traditional would never start a vnc backend unless asked. However by default it will start an SDL backend, the way to disable this is to pass a -vnc option. In other words passing "-vnc none" will disable both vnc and sdl by default. sdl can then be reenabled if configured by subsequent use of the -sdl option. Tested with both qemu-xen and qemu-xen-traditional built with SDL support and: xl cr # defaults xl cr sdl=0 vnc=0 xl cr sdl=1 vnc=0 xl cr sdl=0 vnc=1 xl cr sdl=0 vnc=0 vga=\"none\" xl cr sdl=0 vnc=0 nographic=1 with both valid and invalid $DISPLAY. This is XSA-119 / CVE-2015-2152. Reported-by: Sander Eikelenboom Signed-off-by: Ian Campbell Acked-by: Ian Jackson (cherry picked from commit 91b0ae9db33f72468b1d411a07f53085c893c097) (cherry picked from commit 6616c4d6fe454cf04c90057cc5e752e1aed23b23) --- tools/libxl/libxl_dm.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index f6f7bbd..4dbfddc 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -179,7 +179,14 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if (libxl_defbool_val(vnc->findunused)) { flexarray_append(dm_args, "-vncunused"); } - } + } else + /* + * VNC is not enabled by default by qemu-xen-traditional, + * however passing -vnc none causes SDL to not be + * (unexpectedly) enabled by default. This is overridden by + * explicitly passing -sdl below as required. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); if (sdl) { flexarray_append(dm_args, "-sdl"); @@ -463,7 +470,17 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, } flexarray_append(dm_args, vncarg); - } + } else + /* + * Ensure that by default no vnc server is created. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); + + /* + * Ensure that by default no display backend is created. Further + * options given below might then enable more. + */ + flexarray_append_pair(dm_args, "-display", "none"); if (sdl) { flexarray_append(dm_args, "-sdl"); -- 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 Mar 18 23:33:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 23:33:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNT9-0008IR-HF; Wed, 18 Mar 2015 23:33:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNT8-0008IB-W4 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:47 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 0E/F4-01923-A5B0A055; Wed, 18 Mar 2015 23:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1426721624!13530421!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1231 invoked from network); 18 Mar 2015 23:33:45 -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; 18 Mar 2015 23:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNT6-0006sz-0M for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYNT5-0004hM-VF for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:43 +0000 Date: Wed, 18 Mar 2015 23:33:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools: libxl: Explicitly disable graphics backends on qemu cmdline X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 84ca072f37fa41de1d98524c1a60b7feba0fdc97 Author: Ian Campbell AuthorDate: Fri Feb 20 14:41:09 2015 +0000 Commit: Ian Jackson CommitDate: Thu Mar 12 13:47:44 2015 +0000 tools: libxl: Explicitly disable graphics backends on qemu cmdline By default qemu will try to create some sort of backend for the emulated VGA device, either SDL or VNC. However when the user specifies sdl=0 and vnc=0 in their configuration libxl was not explicitly disabling either backend, which could lead to one unexpectedly running. If either sdl=1 or vnc=1 is configured then both before and after this change only the backends which are explicitly enabled are configured, i.e. this issue only occurs when all backends are supposed to have been disabled. This affects qemu-xen and qemu-xen-traditional differently. If qemu-xen was compiled with SDL support then this would result in an SDL window being opened if $DISPLAY is valid, or a failure to start the guest if not. Passing "-display none" to qemu before any further -sdl options disables this default behaviour and ensures that SDL is only started if the libxl configuration demands it. If qemu-xen was compiled without SDL support then qemu would instead start a VNC server listening on ::1 (IPv6 localhost) or 127.0.0.1 (IPv4 localhost) with IPv6 preferred if available. Explicitly pass "-vnc none" when vnc is not enabled in the libxl configuration to remove this possibility. qemu-xen-traditional would never start a vnc backend unless asked. However by default it will start an SDL backend, the way to disable this is to pass a -vnc option. In other words passing "-vnc none" will disable both vnc and sdl by default. sdl can then be reenabled if configured by subsequent use of the -sdl option. Tested with both qemu-xen and qemu-xen-traditional built with SDL support and: xl cr # defaults xl cr sdl=0 vnc=0 xl cr sdl=1 vnc=0 xl cr sdl=0 vnc=1 xl cr sdl=0 vnc=0 vga=\"none\" xl cr sdl=0 vnc=0 nographic=1 with both valid and invalid $DISPLAY. This is XSA-119 / CVE-2015-2152. Reported-by: Sander Eikelenboom Signed-off-by: Ian Campbell Acked-by: Ian Jackson (cherry picked from commit 91b0ae9db33f72468b1d411a07f53085c893c097) (cherry picked from commit 6616c4d6fe454cf04c90057cc5e752e1aed23b23) --- tools/libxl/libxl_dm.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index f6f7bbd..4dbfddc 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -179,7 +179,14 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if (libxl_defbool_val(vnc->findunused)) { flexarray_append(dm_args, "-vncunused"); } - } + } else + /* + * VNC is not enabled by default by qemu-xen-traditional, + * however passing -vnc none causes SDL to not be + * (unexpectedly) enabled by default. This is overridden by + * explicitly passing -sdl below as required. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); if (sdl) { flexarray_append(dm_args, "-sdl"); @@ -463,7 +470,17 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, } flexarray_append(dm_args, vncarg); - } + } else + /* + * Ensure that by default no vnc server is created. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); + + /* + * Ensure that by default no display backend is created. Further + * options given below might then enable more. + */ + flexarray_append_pair(dm_args, "-display", "none"); if (sdl) { flexarray_append(dm_args, "-sdl"); -- 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 Mar 18 23:33:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 23:33:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNTJ-0008KJ-KG; Wed, 18 Mar 2015 23:33:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNTI-0008K7-Ct for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:56 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 1A/A5-14925-36B0A055; Wed, 18 Mar 2015 23:33:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1426721634!11712574!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23260 invoked from network); 18 Mar 2015 23:33:55 -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; 18 Mar 2015 23:33:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNTG-0006t8-52 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYNTG-0004hk-44 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:54 +0000 Date: Wed, 18 Mar 2015 23:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: correct arm64 version of gva_to_ma_par X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 04ac29f0c38236840ed852b4fc0933d388a0e776 Author: Ian Campbell AuthorDate: Fri Mar 13 10:39:50 2015 +0000 Commit: Ian Campbell CommitDate: Fri Mar 13 12:08:17 2015 +0000 xen: arm: correct arm64 version of gva_to_ma_par The implementation was backwards and checked that the guest could read when asked about write and vice versa. This is an update to the fix for XSA-98. Reported-by: Tamas K Lengyel Signed-off-by: Ian Campbell (cherry picked from commit c1245e9d5bf311b5a3267ea4b077a16561fcf439) --- xen/include/asm-arm/arm64/page.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/arm64/page.h b/xen/include/asm-arm/arm64/page.h index 3922d87..de903c9 100644 --- a/xen/include/asm-arm/arm64/page.h +++ b/xen/include/asm-arm/arm64/page.h @@ -88,9 +88,9 @@ static inline uint64_t gva_to_ma_par(vaddr_t va, unsigned int flags) uint64_t par, tmp = READ_SYSREG64(PAR_EL1); if ( (flags & GV2M_WRITE) == GV2M_WRITE ) - asm volatile ("at s12e1r, %0;" : : "r" (va)); - else asm volatile ("at s12e1w, %0;" : : "r" (va)); + else + asm volatile ("at s12e1r, %0;" : : "r" (va)); isb(); par = READ_SYSREG64(PAR_EL1); WRITE_SYSREG64(tmp, PAR_EL1); -- 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 Mar 18 23:33:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Mar 2015 23:33:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNTJ-0008KJ-KG; Wed, 18 Mar 2015 23:33:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNTI-0008K7-Ct for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:56 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 1A/A5-14925-36B0A055; Wed, 18 Mar 2015 23:33:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1426721634!11712574!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23260 invoked from network); 18 Mar 2015 23:33:55 -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; 18 Mar 2015 23:33:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYNTG-0006t8-52 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYNTG-0004hk-44 for xen-changelog@lists.xensource.com; Wed, 18 Mar 2015 23:33:54 +0000 Date: Wed, 18 Mar 2015 23:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: correct arm64 version of gva_to_ma_par X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 04ac29f0c38236840ed852b4fc0933d388a0e776 Author: Ian Campbell AuthorDate: Fri Mar 13 10:39:50 2015 +0000 Commit: Ian Campbell CommitDate: Fri Mar 13 12:08:17 2015 +0000 xen: arm: correct arm64 version of gva_to_ma_par The implementation was backwards and checked that the guest could read when asked about write and vice versa. This is an update to the fix for XSA-98. Reported-by: Tamas K Lengyel Signed-off-by: Ian Campbell (cherry picked from commit c1245e9d5bf311b5a3267ea4b077a16561fcf439) --- xen/include/asm-arm/arm64/page.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/arm64/page.h b/xen/include/asm-arm/arm64/page.h index 3922d87..de903c9 100644 --- a/xen/include/asm-arm/arm64/page.h +++ b/xen/include/asm-arm/arm64/page.h @@ -88,9 +88,9 @@ static inline uint64_t gva_to_ma_par(vaddr_t va, unsigned int flags) uint64_t par, tmp = READ_SYSREG64(PAR_EL1); if ( (flags & GV2M_WRITE) == GV2M_WRITE ) - asm volatile ("at s12e1r, %0;" : : "r" (va)); - else asm volatile ("at s12e1w, %0;" : : "r" (va)); + else + asm volatile ("at s12e1r, %0;" : : "r" (va)); isb(); par = READ_SYSREG64(PAR_EL1); WRITE_SYSREG64(tmp, PAR_EL1); -- 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 Thu Mar 19 18:00:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:00: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 1YYejp-0002Q7-2Y; Thu, 19 Mar 2015 18:00:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYejo-0002OK-6q for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:00:08 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 41/A8-18861-7AE0B055; Thu, 19 Mar 2015 18:00:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1426788006!11933364!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 328 invoked from network); 19 Mar 2015 18:00:06 -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; 19 Mar 2015 18:00:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYeji-0001yD-Uw for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:00:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYeji-0006qg-SI for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:00:02 +0000 Date: Thu, 19 Mar 2015 18:00:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86emul: fully ignore segment override for register-only operations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e38350a3a01678d65f66ddf6a0eb4ca0bd9bfb96 Author: Jan Beulich AuthorDate: Tue Mar 10 14:00:22 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:00:22 2015 +0100 x86emul: fully ignore segment override for register-only operations For ModRM encoded instructions with register operands we must not overwrite ea.mem.seg (if a - bogus in that case - segment override was present) as it aliases with ea.reg. This is CVE-2015-2151 / XSA-123. Reported-by: Felix Wilhelm Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Keir Fraser master commit: bcf92a5382b75fd964c1f8678b2d9a3abe6dec39 master date: 2015-03-10 13:45:51 +0100 --- xen/arch/x86/x86_emulate/x86_emulate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 6480a27..0bad3f0 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1640,7 +1640,7 @@ x86_emulate( } } - if ( override_seg != -1 ) + if ( override_seg != -1 && ea.type == OP_MEM ) ea.mem.seg = override_seg; /* Decode and fetch the source operand: register, memory or immediate. */ -- 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 Mar 19 18:00:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:00: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 1YYejp-0002Q7-2Y; Thu, 19 Mar 2015 18:00:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYejo-0002OK-6q for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:00:08 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 41/A8-18861-7AE0B055; Thu, 19 Mar 2015 18:00:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1426788006!11933364!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 328 invoked from network); 19 Mar 2015 18:00:06 -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; 19 Mar 2015 18:00:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYeji-0001yD-Uw for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:00:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYeji-0006qg-SI for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:00:02 +0000 Date: Thu, 19 Mar 2015 18:00:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86emul: fully ignore segment override for register-only operations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e38350a3a01678d65f66ddf6a0eb4ca0bd9bfb96 Author: Jan Beulich AuthorDate: Tue Mar 10 14:00:22 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:00:22 2015 +0100 x86emul: fully ignore segment override for register-only operations For ModRM encoded instructions with register operands we must not overwrite ea.mem.seg (if a - bogus in that case - segment override was present) as it aliases with ea.reg. This is CVE-2015-2151 / XSA-123. Reported-by: Felix Wilhelm Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Keir Fraser master commit: bcf92a5382b75fd964c1f8678b2d9a3abe6dec39 master date: 2015-03-10 13:45:51 +0100 --- xen/arch/x86/x86_emulate/x86_emulate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 6480a27..0bad3f0 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1640,7 +1640,7 @@ x86_emulate( } } - if ( override_seg != -1 ) + if ( override_seg != -1 && ea.type == OP_MEM ) ea.mem.seg = override_seg; /* Decode and fetch the source operand: register, memory or immediate. */ -- 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 Mar 19 18:00:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:00:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYek0-0002XL-5x; Thu, 19 Mar 2015 18:00:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYejz-0002W4-1y for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:00:19 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id F3/10-01069-2BE0B055; Thu, 19 Mar 2015 18:00:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1426788016!14361957!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19806 invoked from network); 19 Mar 2015 18:00:17 -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; 19 Mar 2015 18:00:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYejw-00021M-4r for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:00:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYejw-0006rI-1m for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:00:16 +0000 Date: Thu, 19 Mar 2015 18:00:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] tools: libxl: Explicitly disable graphics backends on qemu cmdline X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5bec01c19839e150e489dd04376c65f961830c86 Author: Ian Campbell AuthorDate: Fri Feb 20 14:41:09 2015 +0000 Commit: Ian Jackson CommitDate: Thu Mar 12 13:48:11 2015 +0000 tools: libxl: Explicitly disable graphics backends on qemu cmdline By default qemu will try to create some sort of backend for the emulated VGA device, either SDL or VNC. However when the user specifies sdl=0 and vnc=0 in their configuration libxl was not explicitly disabling either backend, which could lead to one unexpectedly running. If either sdl=1 or vnc=1 is configured then both before and after this change only the backends which are explicitly enabled are configured, i.e. this issue only occurs when all backends are supposed to have been disabled. This affects qemu-xen and qemu-xen-traditional differently. If qemu-xen was compiled with SDL support then this would result in an SDL window being opened if $DISPLAY is valid, or a failure to start the guest if not. Passing "-display none" to qemu before any further -sdl options disables this default behaviour and ensures that SDL is only started if the libxl configuration demands it. If qemu-xen was compiled without SDL support then qemu would instead start a VNC server listening on ::1 (IPv6 localhost) or 127.0.0.1 (IPv4 localhost) with IPv6 preferred if available. Explicitly pass "-vnc none" when vnc is not enabled in the libxl configuration to remove this possibility. qemu-xen-traditional would never start a vnc backend unless asked. However by default it will start an SDL backend, the way to disable this is to pass a -vnc option. In other words passing "-vnc none" will disable both vnc and sdl by default. sdl can then be reenabled if configured by subsequent use of the -sdl option. Tested with both qemu-xen and qemu-xen-traditional built with SDL support and: xl cr # defaults xl cr sdl=0 vnc=0 xl cr sdl=1 vnc=0 xl cr sdl=0 vnc=1 xl cr sdl=0 vnc=0 vga=\"none\" xl cr sdl=0 vnc=0 nographic=1 with both valid and invalid $DISPLAY. This is XSA-119 / CVE-2015-2152. Reported-by: Sander Eikelenboom Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 88a4894..6a1b91f 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -147,7 +147,15 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if (libxl_defbool_val(vnc->findunused)) { flexarray_append(dm_args, "-vncunused"); } - } + } else + /* + * VNC is not enabled by default by qemu-xen-traditional, + * however passing -vnc none causes SDL to not be + * (unexpectedly) enabled by default. This is overridden by + * explicitly passing -sdl below as required. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); + if (sdl) { flexarray_append(dm_args, "-sdl"); if (!libxl_defbool_val(sdl->opengl)) { @@ -394,7 +402,18 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, vncarg = libxl__sprintf(gc, "%s,to=99", vncarg); } flexarray_append(dm_args, vncarg); - } + } else + /* + * Ensure that by default no vnc server is created. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); + + /* + * Ensure that by default no display backend is created. Further + * options given below might then enable more. + */ + flexarray_append_pair(dm_args, "-display", "none"); + if (sdl) { flexarray_append(dm_args, "-sdl"); /* XXX sdl->{display,xauthority} into $DISPLAY/$XAUTHORITY */ -- 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 Mar 19 18:00:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:00:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYek0-0002XL-5x; Thu, 19 Mar 2015 18:00:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYejz-0002W4-1y for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:00:19 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id F3/10-01069-2BE0B055; Thu, 19 Mar 2015 18:00:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1426788016!14361957!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19806 invoked from network); 19 Mar 2015 18:00:17 -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; 19 Mar 2015 18:00:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYejw-00021M-4r for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:00:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYejw-0006rI-1m for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:00:16 +0000 Date: Thu, 19 Mar 2015 18:00:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] tools: libxl: Explicitly disable graphics backends on qemu cmdline X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5bec01c19839e150e489dd04376c65f961830c86 Author: Ian Campbell AuthorDate: Fri Feb 20 14:41:09 2015 +0000 Commit: Ian Jackson CommitDate: Thu Mar 12 13:48:11 2015 +0000 tools: libxl: Explicitly disable graphics backends on qemu cmdline By default qemu will try to create some sort of backend for the emulated VGA device, either SDL or VNC. However when the user specifies sdl=0 and vnc=0 in their configuration libxl was not explicitly disabling either backend, which could lead to one unexpectedly running. If either sdl=1 or vnc=1 is configured then both before and after this change only the backends which are explicitly enabled are configured, i.e. this issue only occurs when all backends are supposed to have been disabled. This affects qemu-xen and qemu-xen-traditional differently. If qemu-xen was compiled with SDL support then this would result in an SDL window being opened if $DISPLAY is valid, or a failure to start the guest if not. Passing "-display none" to qemu before any further -sdl options disables this default behaviour and ensures that SDL is only started if the libxl configuration demands it. If qemu-xen was compiled without SDL support then qemu would instead start a VNC server listening on ::1 (IPv6 localhost) or 127.0.0.1 (IPv4 localhost) with IPv6 preferred if available. Explicitly pass "-vnc none" when vnc is not enabled in the libxl configuration to remove this possibility. qemu-xen-traditional would never start a vnc backend unless asked. However by default it will start an SDL backend, the way to disable this is to pass a -vnc option. In other words passing "-vnc none" will disable both vnc and sdl by default. sdl can then be reenabled if configured by subsequent use of the -sdl option. Tested with both qemu-xen and qemu-xen-traditional built with SDL support and: xl cr # defaults xl cr sdl=0 vnc=0 xl cr sdl=1 vnc=0 xl cr sdl=0 vnc=1 xl cr sdl=0 vnc=0 vga=\"none\" xl cr sdl=0 vnc=0 nographic=1 with both valid and invalid $DISPLAY. This is XSA-119 / CVE-2015-2152. Reported-by: Sander Eikelenboom Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 88a4894..6a1b91f 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -147,7 +147,15 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if (libxl_defbool_val(vnc->findunused)) { flexarray_append(dm_args, "-vncunused"); } - } + } else + /* + * VNC is not enabled by default by qemu-xen-traditional, + * however passing -vnc none causes SDL to not be + * (unexpectedly) enabled by default. This is overridden by + * explicitly passing -sdl below as required. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); + if (sdl) { flexarray_append(dm_args, "-sdl"); if (!libxl_defbool_val(sdl->opengl)) { @@ -394,7 +402,18 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, vncarg = libxl__sprintf(gc, "%s,to=99", vncarg); } flexarray_append(dm_args, vncarg); - } + } else + /* + * Ensure that by default no vnc server is created. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); + + /* + * Ensure that by default no display backend is created. Further + * options given below might then enable more. + */ + flexarray_append_pair(dm_args, "-display", "none"); + if (sdl) { flexarray_append(dm_args, "-sdl"); /* XXX sdl->{display,xauthority} into $DISPLAY/$XAUTHORITY */ -- 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 Mar 19 18:33:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:33: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 1YYfFk-0001MW-HU; Thu, 19 Mar 2015 18:33:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfFj-0001M1-Ce for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:07 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id F0/D9-30447-2661B055; Thu, 19 Mar 2015 18:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1426789984!14385764!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17358 invoked from network); 19 Mar 2015 18:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfFg-0002ME-3Q for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfFg-00082C-0H for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:04 +0000 Date: Thu, 19 Mar 2015 18:33:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] do_xen_version() 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 a68d1b65bb1bbb9b8db2d82695d32ac09c52a2d7 Author: Jan Beulich AuthorDate: Fri Mar 6 16:54:53 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 6 16:54:53 2015 +0100 do_xen_version() cleanup - use exisiting latched value of current->domain where available - use __copy_to_guest() instead of copy_to_guest() where possible - drop redundant inclusion of xen/config.h - drop pointless braces - consistenly use typedef names - formatting Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/common/kernel.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 8a04d8b..f63de10 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -4,7 +4,6 @@ * Copyright (c) 2002-2005 K A Fraser */ -#include #include #include #include @@ -233,9 +232,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) switch ( cmd ) { case XENVER_version: - { return (xen_major_version() << 16) | xen_minor_version(); - } case XENVER_extraversion: { @@ -250,7 +247,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_compile_info: { - struct xen_compile_info info; + xen_compile_info_t info; memset(&info, 0, sizeof(info)); safe_strcpy(info.compiler, xen_compiler()); @@ -279,6 +276,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) xen_platform_parameters_t params = { .virt_start = HYPERVISOR_VIRT_START }; + if ( copy_to_guest(arg, ¶ms, 1) ) return -EFAULT; return 0; @@ -310,11 +308,11 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) fi.submap = 0; if ( VM_ASSIST(d, VMASST_TYPE_pae_extended_cr3) ) fi.submap |= (1U << XENFEAT_pae_pgdir_above_4gb); - if ( paging_mode_translate(current->domain) ) + if ( paging_mode_translate(d) ) fi.submap |= (1U << XENFEAT_writable_page_tables) | (1U << XENFEAT_auto_translated_physmap); - if ( is_hardware_domain(current->domain) ) + if ( is_hardware_domain(d) ) fi.submap |= 1U << XENFEAT_dom0; #ifdef CONFIG_X86 switch ( d->guest_type ) @@ -341,31 +339,25 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) return -EINVAL; } - if ( copy_to_guest(arg, &fi, 1) ) + if ( __copy_to_guest(arg, &fi, 1) ) return -EFAULT; return 0; } case XENVER_pagesize: - { return (!guest_handle_is_null(arg) ? -EINVAL : PAGE_SIZE); - } case XENVER_guest_handle: - { if ( copy_to_guest(arg, current->domain->handle, ARRAY_SIZE(current->domain->handle)) ) return -EFAULT; return 0; - } case XENVER_commandline: - { if ( copy_to_guest(arg, saved_cmdline, ARRAY_SIZE(saved_cmdline)) ) return -EFAULT; return 0; } - } return -ENOSYS; } -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:33:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:33: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 1YYfFk-0001MW-HU; Thu, 19 Mar 2015 18:33:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfFj-0001M1-Ce for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:07 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id F0/D9-30447-2661B055; Thu, 19 Mar 2015 18:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1426789984!14385764!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17358 invoked from network); 19 Mar 2015 18:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfFg-0002ME-3Q for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfFg-00082C-0H for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:04 +0000 Date: Thu, 19 Mar 2015 18:33:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] do_xen_version() 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 a68d1b65bb1bbb9b8db2d82695d32ac09c52a2d7 Author: Jan Beulich AuthorDate: Fri Mar 6 16:54:53 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 6 16:54:53 2015 +0100 do_xen_version() cleanup - use exisiting latched value of current->domain where available - use __copy_to_guest() instead of copy_to_guest() where possible - drop redundant inclusion of xen/config.h - drop pointless braces - consistenly use typedef names - formatting Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/common/kernel.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 8a04d8b..f63de10 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -4,7 +4,6 @@ * Copyright (c) 2002-2005 K A Fraser */ -#include #include #include #include @@ -233,9 +232,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) switch ( cmd ) { case XENVER_version: - { return (xen_major_version() << 16) | xen_minor_version(); - } case XENVER_extraversion: { @@ -250,7 +247,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_compile_info: { - struct xen_compile_info info; + xen_compile_info_t info; memset(&info, 0, sizeof(info)); safe_strcpy(info.compiler, xen_compiler()); @@ -279,6 +276,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) xen_platform_parameters_t params = { .virt_start = HYPERVISOR_VIRT_START }; + if ( copy_to_guest(arg, ¶ms, 1) ) return -EFAULT; return 0; @@ -310,11 +308,11 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) fi.submap = 0; if ( VM_ASSIST(d, VMASST_TYPE_pae_extended_cr3) ) fi.submap |= (1U << XENFEAT_pae_pgdir_above_4gb); - if ( paging_mode_translate(current->domain) ) + if ( paging_mode_translate(d) ) fi.submap |= (1U << XENFEAT_writable_page_tables) | (1U << XENFEAT_auto_translated_physmap); - if ( is_hardware_domain(current->domain) ) + if ( is_hardware_domain(d) ) fi.submap |= 1U << XENFEAT_dom0; #ifdef CONFIG_X86 switch ( d->guest_type ) @@ -341,31 +339,25 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) return -EINVAL; } - if ( copy_to_guest(arg, &fi, 1) ) + if ( __copy_to_guest(arg, &fi, 1) ) return -EFAULT; return 0; } case XENVER_pagesize: - { return (!guest_handle_is_null(arg) ? -EINVAL : PAGE_SIZE); - } case XENVER_guest_handle: - { if ( copy_to_guest(arg, current->domain->handle, ARRAY_SIZE(current->domain->handle)) ) return -EFAULT; return 0; - } case XENVER_commandline: - { if ( copy_to_guest(arg, saved_cmdline, ARRAY_SIZE(saved_cmdline)) ) return -EFAULT; return 0; } - } return -ENOSYS; } -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:33:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:33: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 1YYfFu-0001Od-Vc; Thu, 19 Mar 2015 18:33:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfFt-0001OK-8B for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:17 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id FC/6A-01814-C661B055; Thu, 19 Mar 2015 18:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1426789994!13737793!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19170 invoked from network); 19 Mar 2015 18:33: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; 19 Mar 2015 18:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfFq-0002MK-9c for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfFq-00082m-8C for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:14 +0000 Date: Thu, 19 Mar 2015 18:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] test_x86_emulate: fix inline assembly in blowfish code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2090ff500d2de38f23f85a931032699ec15064e7 Author: Jan Beulich AuthorDate: Fri Mar 6 16:56:16 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 6 16:56:16 2015 +0100 test_x86_emulate: fix inline assembly in blowfish code With certain gcc versions, commit 1166ecf781 ("tools/Rules.mk: Don't optimize debug builds; add macro debugging information") results in the file scope inline assembly no longer being emitted to the .text section without explicitly switching to it, which causes the blowfish test to signal SEGV. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- tools/tests/x86_emulator/blowfish.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/tests/x86_emulator/blowfish.c b/tools/tests/x86_emulator/blowfish.c index 8b9280c..494a4c6 100644 --- a/tools/tests/x86_emulator/blowfish.c +++ b/tools/tests/x86_emulator/blowfish.c @@ -21,7 +21,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA uint64_t blowfish_test(uint64_t input); asm ( - ".globl _start\n" + "\t.text\n" + "\t.globl _start\n" "_start:\n" #if defined(__i386__) "push %edx; push %eax; " -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:33:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:33: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 1YYfFu-0001Od-Vc; Thu, 19 Mar 2015 18:33:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfFt-0001OK-8B for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:17 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id FC/6A-01814-C661B055; Thu, 19 Mar 2015 18:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1426789994!13737793!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19170 invoked from network); 19 Mar 2015 18:33: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; 19 Mar 2015 18:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfFq-0002MK-9c for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfFq-00082m-8C for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:14 +0000 Date: Thu, 19 Mar 2015 18:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] test_x86_emulate: fix inline assembly in blowfish code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2090ff500d2de38f23f85a931032699ec15064e7 Author: Jan Beulich AuthorDate: Fri Mar 6 16:56:16 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 6 16:56:16 2015 +0100 test_x86_emulate: fix inline assembly in blowfish code With certain gcc versions, commit 1166ecf781 ("tools/Rules.mk: Don't optimize debug builds; add macro debugging information") results in the file scope inline assembly no longer being emitted to the .text section without explicitly switching to it, which causes the blowfish test to signal SEGV. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- tools/tests/x86_emulator/blowfish.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/tests/x86_emulator/blowfish.c b/tools/tests/x86_emulator/blowfish.c index 8b9280c..494a4c6 100644 --- a/tools/tests/x86_emulator/blowfish.c +++ b/tools/tests/x86_emulator/blowfish.c @@ -21,7 +21,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA uint64_t blowfish_test(uint64_t input); asm ( - ".globl _start\n" + "\t.text\n" + "\t.globl _start\n" "_start:\n" #if defined(__i386__) "push %edx; push %eax; " -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:33:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:33: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 1YYfG5-0001Qj-On; Thu, 19 Mar 2015 18:33:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfG3-0001Py-CD for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:27 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 86/2D-21221-6761B055; Thu, 19 Mar 2015 18:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1426790004!14414177!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24091 invoked from network); 19 Mar 2015 18:33:25 -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; 19 Mar 2015 18:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfG0-0002MQ-EW for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfG0-00083t-Cu for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:24 +0000 Date: Thu, 19 Mar 2015 18:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit: generalize __vcpu_has_soft_affinity() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3582093e013824bc66ce87c3a0615772b856a7a9 Author: Jan Beulich AuthorDate: Fri Mar 6 16:56:53 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 6 16:56:53 2015 +0100 credit: generalize __vcpu_has_soft_affinity() As pointed out in the discussion of the patch at http://lists.xenproject.org/archives/html/xen-devel/2015-02/msg03256.html generalizing the conditions here means code elsewhere doesn't need to take into consideration internals of how load balancing in the credit scheduler works. Signed-off-by: Jan Beulich Reviewed-by: George Dunlap Reviewed-by: Dario Faggioli --- xen/common/sched_credit.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 156b43b..bec67ff 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -279,24 +279,23 @@ __runq_remove(struct csched_vcpu *svc) /* * Hard affinity balancing is always necessary and must never be skipped. - * OTOH, if the vcpu's soft affinity is full (it spans all the possible - * pcpus) we can safely avoid dealing with it entirely. + * But soft affinity need only be considered when it has a functionally + * different effect than other constraints (such as hard affinity, cpus + * online, or cpupools). * - * A vcpu's soft affinity is also deemed meaningless in case it has empty - * intersection with mask, to cover the cases where using the soft affinity - * mask seems legit, but would instead led to trying to schedule the vcpu - * on _no_ pcpu! Typical use cases are for mask to be equal to the vcpu's - * hard affinity, or to the && of hard affinity and the set of online cpus - * in the domain's cpupool. + * Soft affinity only needs to be considered if: + * * The cpus in the cpupool are not a subset of soft affinity + * * The hard affinity is not a subset of soft affinity + * * There is an overlap between the soft affinity and the mask which is + * currently being considered. */ static inline int __vcpu_has_soft_affinity(const struct vcpu *vc, const cpumask_t *mask) { - if ( cpumask_full(vc->cpu_soft_affinity) - || !cpumask_intersects(vc->cpu_soft_affinity, mask) ) - return 0; - - return 1; + return !cpumask_subset(cpupool_online_cpumask(vc->domain->cpupool), + vc->cpu_soft_affinity) && + !cpumask_subset(vc->cpu_hard_affinity, vc->cpu_soft_affinity) && + cpumask_intersects(vc->cpu_soft_affinity, mask); } /* -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:33:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:33: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 1YYfG5-0001Qj-On; Thu, 19 Mar 2015 18:33:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfG3-0001Py-CD for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:27 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 86/2D-21221-6761B055; Thu, 19 Mar 2015 18:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1426790004!14414177!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24091 invoked from network); 19 Mar 2015 18:33:25 -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; 19 Mar 2015 18:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfG0-0002MQ-EW for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfG0-00083t-Cu for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:24 +0000 Date: Thu, 19 Mar 2015 18:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit: generalize __vcpu_has_soft_affinity() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3582093e013824bc66ce87c3a0615772b856a7a9 Author: Jan Beulich AuthorDate: Fri Mar 6 16:56:53 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 6 16:56:53 2015 +0100 credit: generalize __vcpu_has_soft_affinity() As pointed out in the discussion of the patch at http://lists.xenproject.org/archives/html/xen-devel/2015-02/msg03256.html generalizing the conditions here means code elsewhere doesn't need to take into consideration internals of how load balancing in the credit scheduler works. Signed-off-by: Jan Beulich Reviewed-by: George Dunlap Reviewed-by: Dario Faggioli --- xen/common/sched_credit.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 156b43b..bec67ff 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -279,24 +279,23 @@ __runq_remove(struct csched_vcpu *svc) /* * Hard affinity balancing is always necessary and must never be skipped. - * OTOH, if the vcpu's soft affinity is full (it spans all the possible - * pcpus) we can safely avoid dealing with it entirely. + * But soft affinity need only be considered when it has a functionally + * different effect than other constraints (such as hard affinity, cpus + * online, or cpupools). * - * A vcpu's soft affinity is also deemed meaningless in case it has empty - * intersection with mask, to cover the cases where using the soft affinity - * mask seems legit, but would instead led to trying to schedule the vcpu - * on _no_ pcpu! Typical use cases are for mask to be equal to the vcpu's - * hard affinity, or to the && of hard affinity and the set of online cpus - * in the domain's cpupool. + * Soft affinity only needs to be considered if: + * * The cpus in the cpupool are not a subset of soft affinity + * * The hard affinity is not a subset of soft affinity + * * There is an overlap between the soft affinity and the mask which is + * currently being considered. */ static inline int __vcpu_has_soft_affinity(const struct vcpu *vc, const cpumask_t *mask) { - if ( cpumask_full(vc->cpu_soft_affinity) - || !cpumask_intersects(vc->cpu_soft_affinity, mask) ) - return 0; - - return 1; + return !cpumask_subset(cpupool_online_cpumask(vc->domain->cpupool), + vc->cpu_soft_affinity) && + !cpumask_subset(vc->cpu_hard_affinity, vc->cpu_soft_affinity) && + cpumask_intersects(vc->cpu_soft_affinity, mask); } /* -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:33:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:33:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGF-0001TK-15; Thu, 19 Mar 2015 18:33:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGD-0001Sx-Vm for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:38 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id AC/21-31982-1861B055; Thu, 19 Mar 2015 18:33:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1426790014!11951848!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13180 invoked from network); 19 Mar 2015 18:33:36 -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; 19 Mar 2015 18:33:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGA-0002MY-Km for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfGA-00084O-JU for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:34 +0000 Date: Thu, 19 Mar 2015 18:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: allow specifying the NUMA nodes Dom0 should run on X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 705313c093b7c6eb72e2842c22a9f05201924ab4 Author: Jan Beulich AuthorDate: Fri Mar 6 17:26:30 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 6 17:26:30 2015 +0100 x86: allow specifying the NUMA nodes Dom0 should run on ... by introducing a "dom0_nodes" option augmenting the "dom0_mem" and "dom0_max_vcpus" ones. Note that this gives meaning to MEMF_exact_node specified alone (i.e. implicitly combined with NUMA_NO_NODE): In such a case any node inside the domain's node mask is acceptable, but no other node. This changed behavior is (implicitly) being exposed through the memop hypercalls. Note further that this change doesn't take care of moving the initrd image into memory matching Dom0's affinity when the initrd doesn't get copied (because of being part of the initial mapping) anyway. And note finally that this doesn't get us meaningfully closer to handing vNUMA information to Dom0 (which will require the current striping of allocations to become node-specific in order for the passed on information to be meaningful). Signed-off-by: Jan Beulich Acked-by: Ian Campbell Reviewed-by: Dario Faggioli Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 12 +++++ xen/arch/x86/domain_build.c | 88 ++++++++++++++++++++++++++++++---- xen/arch/x86/setup.c | 12 ++++- xen/common/page_alloc.c | 7 +-- xen/include/asm-x86/setup.h | 3 +- 5 files changed, 104 insertions(+), 18 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 63871cb..e125212 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -551,6 +551,18 @@ any dom0 autoballooning feature present in your toolstack. See the _xl.conf(5)_ man page or [Xen Best Practices](http://wiki.xen.org/wiki/Xen_Best_Practices#Xen_dom0_dedicated_memory_and_preventing_dom0_memory_ballooning). +### dom0\_nodes + +> `= List of [ | relaxed | strict ]` + +> Default: `strict` + +Specify the NUMA nodes to place Dom0 on. Defaults for vCPU-s created +and memory assigned to Dom0 will be adjusted to match the node +restrictions set up here. Note that the values to be specified here are +ACPI PXM ones, not Xen internal node numbers. `relaxed` sets up vCPU +affinities to prefer but be not limited to the specified node(s). + ### dom0\_shadow > `= ` diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index a7d55ca..6d7a592 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -100,11 +100,70 @@ static void __init parse_dom0_max_vcpus(const char *s) } custom_param("dom0_max_vcpus", parse_dom0_max_vcpus); -unsigned int __init dom0_max_vcpus(void) +static __initdata unsigned int dom0_nr_pxms; +static __initdata unsigned int dom0_pxms[MAX_NUMNODES] = + { [0 ... MAX_NUMNODES - 1] = ~0 }; +static __initdata bool_t dom0_affinity_relaxed; + +static void __init parse_dom0_nodes(const char *s) { - unsigned max_vcpus; + do { + if ( isdigit(*s) ) + dom0_pxms[dom0_nr_pxms] = simple_strtoul(s, &s, 0); + else if ( !strncmp(s, "relaxed", 7) && (!s[7] || s[7] == ',') ) + { + dom0_affinity_relaxed = 1; + s += 7; + } + else if ( !strncmp(s, "strict", 6) && (!s[6] || s[6] == ',') ) + { + dom0_affinity_relaxed = 0; + s += 6; + } + else + break; + } while ( ++dom0_nr_pxms < ARRAY_SIZE(dom0_pxms) && *s++ == ',' ); +} +custom_param("dom0_nodes", parse_dom0_nodes); + +static cpumask_t __initdata dom0_cpus; - max_vcpus = num_cpupool_cpus(cpupool0); +static struct vcpu *__init setup_dom0_vcpu(struct domain *d, + unsigned int vcpu_id, + unsigned int cpu) +{ + struct vcpu *v = alloc_vcpu(d, vcpu_id, cpu); + + if ( v ) + { + if ( !d->is_pinned && !dom0_affinity_relaxed ) + cpumask_copy(v->cpu_hard_affinity, &dom0_cpus); + cpumask_copy(v->cpu_soft_affinity, &dom0_cpus); + } + + return v; +} + +static nodemask_t __initdata dom0_nodes; + +unsigned int __init dom0_max_vcpus(void) +{ + unsigned int i, max_vcpus; + nodeid_t node; + + for ( i = 0; i < dom0_nr_pxms; ++i ) + if ( (node = pxm_to_node(dom0_pxms[i])) != NUMA_NO_NODE ) + node_set(node, dom0_nodes); + nodes_and(dom0_nodes, dom0_nodes, node_online_map); + if ( nodes_empty(dom0_nodes) ) + dom0_nodes = node_online_map; + for_each_node_mask ( node, dom0_nodes ) + cpumask_or(&dom0_cpus, &dom0_cpus, &node_to_cpumask(node)); + cpumask_and(&dom0_cpus, &dom0_cpus, cpupool0->cpu_valid); + if ( cpumask_empty(&dom0_cpus) ) + cpumask_copy(&dom0_cpus, cpupool0->cpu_valid); + + max_vcpus = cpumask_weight(&dom0_cpus); if ( opt_dom0_max_vcpus_min > max_vcpus ) max_vcpus = opt_dom0_max_vcpus_min; if ( opt_dom0_max_vcpus_max < max_vcpus ) @@ -119,12 +178,15 @@ struct vcpu *__init alloc_dom0_vcpu0(struct domain *dom0) { unsigned int max_vcpus = dom0_max_vcpus(); + dom0->node_affinity = dom0_nodes; + dom0->auto_node_affinity = !dom0_nr_pxms; + dom0->vcpu = xzalloc_array(struct vcpu *, max_vcpus); if ( !dom0->vcpu ) return NULL; dom0->max_vcpus = max_vcpus; - return alloc_vcpu(dom0, 0, 0); + return setup_dom0_vcpu(dom0, 0, cpumask_first(&dom0_cpus)); } #ifdef CONFIG_SHADOW_PAGING @@ -156,7 +218,7 @@ static struct page_info * __init alloc_chunk( struct domain *d, unsigned long max_pages) { static unsigned int __initdata last_order = MAX_ORDER; - static unsigned int __initdata memflags = MEMF_no_dma; + static unsigned int __initdata memflags = MEMF_no_dma|MEMF_exact_node; struct page_info *page; unsigned int order = get_order_from_pages(max_pages), free_order; @@ -190,7 +252,7 @@ static struct page_info * __init alloc_chunk( if ( d->tot_pages + (1 << order) > d->max_pages ) continue; - pg2 = alloc_domheap_pages(d, order, 0); + pg2 = alloc_domheap_pages(d, order, MEMF_exact_node); if ( pg2 > page ) { free_domheap_pages(page, free_order); @@ -217,10 +279,14 @@ static unsigned long __init dom0_paging_pages(const struct domain *d, static unsigned long __init compute_dom0_nr_pages( struct domain *d, struct elf_dom_parms *parms, unsigned long initrd_len) { - unsigned long avail = avail_domheap_pages() + initial_images_nrpages(); - unsigned long nr_pages, min_pages, max_pages; + nodeid_t node; + unsigned long avail = 0, nr_pages, min_pages, max_pages; bool_t need_paging; + for_each_node_mask ( node, dom0_nodes ) + avail += avail_domheap_pages_region(node, 0, 0) + + initial_images_nrpages(node); + /* Reserve memory for further dom0 vcpu-struct allocations... */ avail -= (d->max_vcpus - 1UL) << get_order_from_bytes(sizeof(struct vcpu)); @@ -1230,11 +1296,11 @@ int __init construct_dom0( printk("Dom0 has maximum %u VCPUs\n", d->max_vcpus); - cpu = cpumask_first(cpupool0->cpu_valid); + cpu = v->processor; for ( i = 1; i < d->max_vcpus; i++ ) { - cpu = cpumask_cycle(cpu, cpupool0->cpu_valid); - (void)alloc_vcpu(d, i, cpu); + cpu = cpumask_cycle(cpu, &dom0_cpus); + setup_dom0_vcpu(d, i, cpu); } /* diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 7593533..384df03 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -140,13 +140,21 @@ static void __init parse_acpi_param(char *s) static const module_t *__initdata initial_images; static unsigned int __initdata nr_initial_images; -unsigned long __init initial_images_nrpages(void) +unsigned long __init initial_images_nrpages(nodeid_t node) { + unsigned long node_start = node_start_pfn(node); + unsigned long node_end = node_end_pfn(node); unsigned long nr; unsigned int i; for ( nr = i = 0; i < nr_initial_images; ++i ) - nr += PFN_UP(initial_images[i].mod_end); + { + unsigned long start = initial_images[i].mod_start; + unsigned long end = start + PFN_UP(initial_images[i].mod_end); + + if ( end > node_start && node_end > start ) + nr += min(node_end, end) - max(node_start, start); + } return nr; } diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index d96d25b..9060386 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -581,7 +581,7 @@ static struct page_info *alloc_heap_pages( struct domain *d) { unsigned int i, j, zone = 0, nodemask_retry = 0; - nodeid_t first_node, node = MEMF_get_node(memflags); + nodeid_t first_node, node = MEMF_get_node(memflags), req_node = node; unsigned long request = 1UL << order; struct page_info *pg; nodemask_t nodemask = (d != NULL ) ? d->node_affinity : node_online_map; @@ -593,7 +593,6 @@ static struct page_info *alloc_heap_pages( if ( node == NUMA_NO_NODE ) { - memflags &= ~MEMF_exact_node; if ( d != NULL ) { node = next_node(d->last_alloc_node, nodemask); @@ -654,7 +653,7 @@ static struct page_info *alloc_heap_pages( goto found; } while ( zone-- > zone_lo ); /* careful: unsigned zone may wrap */ - if ( memflags & MEMF_exact_node ) + if ( (memflags & MEMF_exact_node) && req_node != NUMA_NO_NODE ) goto not_found; /* Pick next node. */ @@ -671,7 +670,7 @@ static struct page_info *alloc_heap_pages( if ( node == first_node ) { /* When we have tried all in nodemask, we fall back to others. */ - if ( nodemask_retry++ ) + if ( (memflags & MEMF_exact_node) || nodemask_retry++ ) goto not_found; nodes_andnot(nodemask, node_online_map, nodemask); first_node = node = first_node(nodemask); diff --git a/xen/include/asm-x86/setup.h b/xen/include/asm-x86/setup.h index 762eb02..08bc23a 100644 --- a/xen/include/asm-x86/setup.h +++ b/xen/include/asm-x86/setup.h @@ -2,6 +2,7 @@ #define __X86_SETUP_H_ #include +#include extern unsigned long xenheap_initial_phys_start; @@ -32,7 +33,7 @@ int construct_dom0( void *(*bootstrap_map)(const module_t *), char *cmdline); -unsigned long initial_images_nrpages(void); +unsigned long initial_images_nrpages(nodeid_t node); void discard_initial_images(void); unsigned int dom0_max_vcpus(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 Mar 19 18:33:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:33:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGF-0001TK-15; Thu, 19 Mar 2015 18:33:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGD-0001Sx-Vm for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:38 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id AC/21-31982-1861B055; Thu, 19 Mar 2015 18:33:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1426790014!11951848!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13180 invoked from network); 19 Mar 2015 18:33:36 -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; 19 Mar 2015 18:33:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGA-0002MY-Km for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfGA-00084O-JU for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:34 +0000 Date: Thu, 19 Mar 2015 18:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: allow specifying the NUMA nodes Dom0 should run on X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 705313c093b7c6eb72e2842c22a9f05201924ab4 Author: Jan Beulich AuthorDate: Fri Mar 6 17:26:30 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 6 17:26:30 2015 +0100 x86: allow specifying the NUMA nodes Dom0 should run on ... by introducing a "dom0_nodes" option augmenting the "dom0_mem" and "dom0_max_vcpus" ones. Note that this gives meaning to MEMF_exact_node specified alone (i.e. implicitly combined with NUMA_NO_NODE): In such a case any node inside the domain's node mask is acceptable, but no other node. This changed behavior is (implicitly) being exposed through the memop hypercalls. Note further that this change doesn't take care of moving the initrd image into memory matching Dom0's affinity when the initrd doesn't get copied (because of being part of the initial mapping) anyway. And note finally that this doesn't get us meaningfully closer to handing vNUMA information to Dom0 (which will require the current striping of allocations to become node-specific in order for the passed on information to be meaningful). Signed-off-by: Jan Beulich Acked-by: Ian Campbell Reviewed-by: Dario Faggioli Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 12 +++++ xen/arch/x86/domain_build.c | 88 ++++++++++++++++++++++++++++++---- xen/arch/x86/setup.c | 12 ++++- xen/common/page_alloc.c | 7 +-- xen/include/asm-x86/setup.h | 3 +- 5 files changed, 104 insertions(+), 18 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 63871cb..e125212 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -551,6 +551,18 @@ any dom0 autoballooning feature present in your toolstack. See the _xl.conf(5)_ man page or [Xen Best Practices](http://wiki.xen.org/wiki/Xen_Best_Practices#Xen_dom0_dedicated_memory_and_preventing_dom0_memory_ballooning). +### dom0\_nodes + +> `= List of [ | relaxed | strict ]` + +> Default: `strict` + +Specify the NUMA nodes to place Dom0 on. Defaults for vCPU-s created +and memory assigned to Dom0 will be adjusted to match the node +restrictions set up here. Note that the values to be specified here are +ACPI PXM ones, not Xen internal node numbers. `relaxed` sets up vCPU +affinities to prefer but be not limited to the specified node(s). + ### dom0\_shadow > `= ` diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index a7d55ca..6d7a592 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -100,11 +100,70 @@ static void __init parse_dom0_max_vcpus(const char *s) } custom_param("dom0_max_vcpus", parse_dom0_max_vcpus); -unsigned int __init dom0_max_vcpus(void) +static __initdata unsigned int dom0_nr_pxms; +static __initdata unsigned int dom0_pxms[MAX_NUMNODES] = + { [0 ... MAX_NUMNODES - 1] = ~0 }; +static __initdata bool_t dom0_affinity_relaxed; + +static void __init parse_dom0_nodes(const char *s) { - unsigned max_vcpus; + do { + if ( isdigit(*s) ) + dom0_pxms[dom0_nr_pxms] = simple_strtoul(s, &s, 0); + else if ( !strncmp(s, "relaxed", 7) && (!s[7] || s[7] == ',') ) + { + dom0_affinity_relaxed = 1; + s += 7; + } + else if ( !strncmp(s, "strict", 6) && (!s[6] || s[6] == ',') ) + { + dom0_affinity_relaxed = 0; + s += 6; + } + else + break; + } while ( ++dom0_nr_pxms < ARRAY_SIZE(dom0_pxms) && *s++ == ',' ); +} +custom_param("dom0_nodes", parse_dom0_nodes); + +static cpumask_t __initdata dom0_cpus; - max_vcpus = num_cpupool_cpus(cpupool0); +static struct vcpu *__init setup_dom0_vcpu(struct domain *d, + unsigned int vcpu_id, + unsigned int cpu) +{ + struct vcpu *v = alloc_vcpu(d, vcpu_id, cpu); + + if ( v ) + { + if ( !d->is_pinned && !dom0_affinity_relaxed ) + cpumask_copy(v->cpu_hard_affinity, &dom0_cpus); + cpumask_copy(v->cpu_soft_affinity, &dom0_cpus); + } + + return v; +} + +static nodemask_t __initdata dom0_nodes; + +unsigned int __init dom0_max_vcpus(void) +{ + unsigned int i, max_vcpus; + nodeid_t node; + + for ( i = 0; i < dom0_nr_pxms; ++i ) + if ( (node = pxm_to_node(dom0_pxms[i])) != NUMA_NO_NODE ) + node_set(node, dom0_nodes); + nodes_and(dom0_nodes, dom0_nodes, node_online_map); + if ( nodes_empty(dom0_nodes) ) + dom0_nodes = node_online_map; + for_each_node_mask ( node, dom0_nodes ) + cpumask_or(&dom0_cpus, &dom0_cpus, &node_to_cpumask(node)); + cpumask_and(&dom0_cpus, &dom0_cpus, cpupool0->cpu_valid); + if ( cpumask_empty(&dom0_cpus) ) + cpumask_copy(&dom0_cpus, cpupool0->cpu_valid); + + max_vcpus = cpumask_weight(&dom0_cpus); if ( opt_dom0_max_vcpus_min > max_vcpus ) max_vcpus = opt_dom0_max_vcpus_min; if ( opt_dom0_max_vcpus_max < max_vcpus ) @@ -119,12 +178,15 @@ struct vcpu *__init alloc_dom0_vcpu0(struct domain *dom0) { unsigned int max_vcpus = dom0_max_vcpus(); + dom0->node_affinity = dom0_nodes; + dom0->auto_node_affinity = !dom0_nr_pxms; + dom0->vcpu = xzalloc_array(struct vcpu *, max_vcpus); if ( !dom0->vcpu ) return NULL; dom0->max_vcpus = max_vcpus; - return alloc_vcpu(dom0, 0, 0); + return setup_dom0_vcpu(dom0, 0, cpumask_first(&dom0_cpus)); } #ifdef CONFIG_SHADOW_PAGING @@ -156,7 +218,7 @@ static struct page_info * __init alloc_chunk( struct domain *d, unsigned long max_pages) { static unsigned int __initdata last_order = MAX_ORDER; - static unsigned int __initdata memflags = MEMF_no_dma; + static unsigned int __initdata memflags = MEMF_no_dma|MEMF_exact_node; struct page_info *page; unsigned int order = get_order_from_pages(max_pages), free_order; @@ -190,7 +252,7 @@ static struct page_info * __init alloc_chunk( if ( d->tot_pages + (1 << order) > d->max_pages ) continue; - pg2 = alloc_domheap_pages(d, order, 0); + pg2 = alloc_domheap_pages(d, order, MEMF_exact_node); if ( pg2 > page ) { free_domheap_pages(page, free_order); @@ -217,10 +279,14 @@ static unsigned long __init dom0_paging_pages(const struct domain *d, static unsigned long __init compute_dom0_nr_pages( struct domain *d, struct elf_dom_parms *parms, unsigned long initrd_len) { - unsigned long avail = avail_domheap_pages() + initial_images_nrpages(); - unsigned long nr_pages, min_pages, max_pages; + nodeid_t node; + unsigned long avail = 0, nr_pages, min_pages, max_pages; bool_t need_paging; + for_each_node_mask ( node, dom0_nodes ) + avail += avail_domheap_pages_region(node, 0, 0) + + initial_images_nrpages(node); + /* Reserve memory for further dom0 vcpu-struct allocations... */ avail -= (d->max_vcpus - 1UL) << get_order_from_bytes(sizeof(struct vcpu)); @@ -1230,11 +1296,11 @@ int __init construct_dom0( printk("Dom0 has maximum %u VCPUs\n", d->max_vcpus); - cpu = cpumask_first(cpupool0->cpu_valid); + cpu = v->processor; for ( i = 1; i < d->max_vcpus; i++ ) { - cpu = cpumask_cycle(cpu, cpupool0->cpu_valid); - (void)alloc_vcpu(d, i, cpu); + cpu = cpumask_cycle(cpu, &dom0_cpus); + setup_dom0_vcpu(d, i, cpu); } /* diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 7593533..384df03 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -140,13 +140,21 @@ static void __init parse_acpi_param(char *s) static const module_t *__initdata initial_images; static unsigned int __initdata nr_initial_images; -unsigned long __init initial_images_nrpages(void) +unsigned long __init initial_images_nrpages(nodeid_t node) { + unsigned long node_start = node_start_pfn(node); + unsigned long node_end = node_end_pfn(node); unsigned long nr; unsigned int i; for ( nr = i = 0; i < nr_initial_images; ++i ) - nr += PFN_UP(initial_images[i].mod_end); + { + unsigned long start = initial_images[i].mod_start; + unsigned long end = start + PFN_UP(initial_images[i].mod_end); + + if ( end > node_start && node_end > start ) + nr += min(node_end, end) - max(node_start, start); + } return nr; } diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index d96d25b..9060386 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -581,7 +581,7 @@ static struct page_info *alloc_heap_pages( struct domain *d) { unsigned int i, j, zone = 0, nodemask_retry = 0; - nodeid_t first_node, node = MEMF_get_node(memflags); + nodeid_t first_node, node = MEMF_get_node(memflags), req_node = node; unsigned long request = 1UL << order; struct page_info *pg; nodemask_t nodemask = (d != NULL ) ? d->node_affinity : node_online_map; @@ -593,7 +593,6 @@ static struct page_info *alloc_heap_pages( if ( node == NUMA_NO_NODE ) { - memflags &= ~MEMF_exact_node; if ( d != NULL ) { node = next_node(d->last_alloc_node, nodemask); @@ -654,7 +653,7 @@ static struct page_info *alloc_heap_pages( goto found; } while ( zone-- > zone_lo ); /* careful: unsigned zone may wrap */ - if ( memflags & MEMF_exact_node ) + if ( (memflags & MEMF_exact_node) && req_node != NUMA_NO_NODE ) goto not_found; /* Pick next node. */ @@ -671,7 +670,7 @@ static struct page_info *alloc_heap_pages( if ( node == first_node ) { /* When we have tried all in nodemask, we fall back to others. */ - if ( nodemask_retry++ ) + if ( (memflags & MEMF_exact_node) || nodemask_retry++ ) goto not_found; nodes_andnot(nodemask, node_online_map, nodemask); first_node = node = first_node(nodemask); diff --git a/xen/include/asm-x86/setup.h b/xen/include/asm-x86/setup.h index 762eb02..08bc23a 100644 --- a/xen/include/asm-x86/setup.h +++ b/xen/include/asm-x86/setup.h @@ -2,6 +2,7 @@ #define __X86_SETUP_H_ #include +#include extern unsigned long xenheap_initial_phys_start; @@ -32,7 +33,7 @@ int construct_dom0( void *(*bootstrap_map)(const module_t *), char *cmdline); -unsigned long initial_images_nrpages(void); +unsigned long initial_images_nrpages(nodeid_t node); void discard_initial_images(void); unsigned int dom0_max_vcpus(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 Mar 19 18:33:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:33: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 1YYfGP-0001WP-Be; Thu, 19 Mar 2015 18:33:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGN-0001Vl-CO for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:47 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 00/92-32332-A861B055; Thu, 19 Mar 2015 18:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1426790025!11958654!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24725 invoked from network); 19 Mar 2015 18:33:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:33:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGK-0002Me-Qt for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfGK-00084n-Pl for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:44 +0000 Date: Thu, 19 Mar 2015 18:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] allow domain heap allocations to specify more than one NUMA node X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7596378e454773220a0003e18295a064f2c472c Author: Jan Beulich AuthorDate: Fri Mar 6 17:27:33 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 6 17:27:33 2015 +0100 allow domain heap allocations to specify more than one NUMA node ... using struct domain as a container for passing the respective affinity mask: Quite a number of allocations are domain specific, yet not to be accounted for that domain. Introduce a flag suppressing the accounting altogether (i.e. going beyond MEMF_no_refcount) and use it right away in common code (x86 and IOMMU code will get adjusted subsequently). Signed-off-by: Jan Beulich Reviewed-by: Dario Faggioli Acked-by: Ian Campbell Reviewed-by: Andrew Cooper --- xen/common/grant_table.c | 3 ++- xen/common/memory.c | 3 ++- xen/common/page_alloc.c | 9 +++++++-- xen/include/xen/mm.h | 2 ++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 1a11766..dfb45f8 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1657,7 +1657,8 @@ gnttab_transfer( struct page_info *new_page; void *sp, *dp; - new_page = alloc_domheap_page(NULL, MEMF_bits(max_bitsize)); + new_page = alloc_domheap_page(e, MEMF_no_owner | + MEMF_bits(max_bitsize)); if ( new_page == NULL ) { gop.status = GNTST_address_too_big; diff --git a/xen/common/memory.c b/xen/common/memory.c index 9d9d43c..60432ec 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -462,7 +462,8 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) /* Allocate a chunk's worth of anonymous output pages. */ for ( j = 0; j < (1UL << out_chunk_order); j++ ) { - page = alloc_domheap_pages(NULL, exch.out.extent_order, memflags); + page = alloc_domheap_pages(d, exch.out.extent_order, + MEMF_no_owner | memflags); if ( unlikely(page == NULL) ) { rc = -ENOMEM; diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 9060386..d999296 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1685,10 +1685,14 @@ struct page_info *alloc_domheap_pages( ASSERT(!in_irq()); - bits = domain_clamp_alloc_bitsize(d, bits ? : (BITS_PER_LONG+PAGE_SHIFT)); + bits = domain_clamp_alloc_bitsize(memflags & MEMF_no_owner ? NULL : d, + bits ? : (BITS_PER_LONG+PAGE_SHIFT)); if ( (zone_hi = min_t(unsigned int, bits_to_zone(bits), zone_hi)) == 0 ) return NULL; + if ( memflags & MEMF_no_owner ) + memflags |= MEMF_no_refcount; + if ( dma_bitsize && ((dma_zone = bits_to_zone(dma_bitsize)) < zone_hi) ) pg = alloc_heap_pages(dma_zone + 1, zone_hi, order, memflags, d); @@ -1698,7 +1702,8 @@ struct page_info *alloc_domheap_pages( memflags, d)) == NULL)) ) return NULL; - if ( (d != NULL) && assign_pages(d, pg, order, memflags) ) + if ( d && !(memflags & MEMF_no_owner) && + assign_pages(d, pg, order, memflags) ) { free_heap_pages(pg, order); return NULL; diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 6ea8b8c..fd60c9c 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -120,6 +120,8 @@ struct npfec { #define MEMF_no_dma (1U<<_MEMF_no_dma) #define _MEMF_exact_node 4 #define MEMF_exact_node (1U<<_MEMF_exact_node) +#define _MEMF_no_owner 5 +#define MEMF_no_owner (1U<<_MEMF_no_owner) #define _MEMF_node 8 #define MEMF_node_mask ((1U << (8 * sizeof(nodeid_t))) - 1) #define MEMF_node(n) ((((n) + 1) & MEMF_node_mask) << _MEMF_node) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:33:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:33: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 1YYfGP-0001WP-Be; Thu, 19 Mar 2015 18:33:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGN-0001Vl-CO for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:47 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 00/92-32332-A861B055; Thu, 19 Mar 2015 18:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1426790025!11958654!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24725 invoked from network); 19 Mar 2015 18:33:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:33:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGK-0002Me-Qt for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfGK-00084n-Pl for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:44 +0000 Date: Thu, 19 Mar 2015 18:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] allow domain heap allocations to specify more than one NUMA node X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7596378e454773220a0003e18295a064f2c472c Author: Jan Beulich AuthorDate: Fri Mar 6 17:27:33 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 6 17:27:33 2015 +0100 allow domain heap allocations to specify more than one NUMA node ... using struct domain as a container for passing the respective affinity mask: Quite a number of allocations are domain specific, yet not to be accounted for that domain. Introduce a flag suppressing the accounting altogether (i.e. going beyond MEMF_no_refcount) and use it right away in common code (x86 and IOMMU code will get adjusted subsequently). Signed-off-by: Jan Beulich Reviewed-by: Dario Faggioli Acked-by: Ian Campbell Reviewed-by: Andrew Cooper --- xen/common/grant_table.c | 3 ++- xen/common/memory.c | 3 ++- xen/common/page_alloc.c | 9 +++++++-- xen/include/xen/mm.h | 2 ++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 1a11766..dfb45f8 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1657,7 +1657,8 @@ gnttab_transfer( struct page_info *new_page; void *sp, *dp; - new_page = alloc_domheap_page(NULL, MEMF_bits(max_bitsize)); + new_page = alloc_domheap_page(e, MEMF_no_owner | + MEMF_bits(max_bitsize)); if ( new_page == NULL ) { gop.status = GNTST_address_too_big; diff --git a/xen/common/memory.c b/xen/common/memory.c index 9d9d43c..60432ec 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -462,7 +462,8 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) /* Allocate a chunk's worth of anonymous output pages. */ for ( j = 0; j < (1UL << out_chunk_order); j++ ) { - page = alloc_domheap_pages(NULL, exch.out.extent_order, memflags); + page = alloc_domheap_pages(d, exch.out.extent_order, + MEMF_no_owner | memflags); if ( unlikely(page == NULL) ) { rc = -ENOMEM; diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 9060386..d999296 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1685,10 +1685,14 @@ struct page_info *alloc_domheap_pages( ASSERT(!in_irq()); - bits = domain_clamp_alloc_bitsize(d, bits ? : (BITS_PER_LONG+PAGE_SHIFT)); + bits = domain_clamp_alloc_bitsize(memflags & MEMF_no_owner ? NULL : d, + bits ? : (BITS_PER_LONG+PAGE_SHIFT)); if ( (zone_hi = min_t(unsigned int, bits_to_zone(bits), zone_hi)) == 0 ) return NULL; + if ( memflags & MEMF_no_owner ) + memflags |= MEMF_no_refcount; + if ( dma_bitsize && ((dma_zone = bits_to_zone(dma_bitsize)) < zone_hi) ) pg = alloc_heap_pages(dma_zone + 1, zone_hi, order, memflags, d); @@ -1698,7 +1702,8 @@ struct page_info *alloc_domheap_pages( memflags, d)) == NULL)) ) return NULL; - if ( (d != NULL) && assign_pages(d, pg, order, memflags) ) + if ( d && !(memflags & MEMF_no_owner) && + assign_pages(d, pg, order, memflags) ) { free_heap_pages(pg, order); return NULL; diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 6ea8b8c..fd60c9c 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -120,6 +120,8 @@ struct npfec { #define MEMF_no_dma (1U<<_MEMF_no_dma) #define _MEMF_exact_node 4 #define MEMF_exact_node (1U<<_MEMF_exact_node) +#define _MEMF_no_owner 5 +#define MEMF_no_owner (1U<<_MEMF_no_owner) #define _MEMF_node 8 #define MEMF_node_mask ((1U << (8 * sizeof(nodeid_t))) - 1) #define MEMF_node(n) ((((n) + 1) & MEMF_node_mask) << _MEMF_node) -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:33:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:33: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 1YYfGZ-0001YB-FP; Thu, 19 Mar 2015 18:33:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGY-0001Y2-4Y for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:58 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id DA/D2-02005-5961B055; Thu, 19 Mar 2015 18:33:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1426790035!13681604!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2371 invoked from network); 19 Mar 2015 18:33:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGV-0002Mn-0U for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfGU-00085D-Vj for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:54 +0000 Date: Thu, 19 Mar 2015 18:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: widen NUMA nodes to be allocated from X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4e59089ed90a11b9e30e67191789293bb07af686 Author: Jan Beulich AuthorDate: Fri Mar 6 17:28:54 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 6 17:28:54 2015 +0100 x86: widen NUMA nodes to be allocated from Signed-off-by: Jan Beulich Reviewed-by: Dario Faggioli Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 5 +++-- xen/arch/x86/domain_build.c | 2 +- xen/arch/x86/domctl.c | 2 +- xen/arch/x86/hvm/stdvga.c | 2 +- xen/arch/x86/hvm/vlapic.c | 3 +-- xen/arch/x86/mm.c | 11 +++++------ xen/arch/x86/mm/hap/hap.c | 2 +- xen/arch/x86/mm/shadow/common.c | 2 +- 8 files changed, 14 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 21f0766..04c1898 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -285,7 +285,8 @@ struct vcpu_guest_context *alloc_vcpu_guest_context(void) for ( i = 0; i < PFN_UP(sizeof(struct vcpu_guest_context)); ++i ) { - struct page_info *pg = alloc_domheap_page(NULL, 0); + struct page_info *pg = alloc_domheap_page(current->domain, + MEMF_no_owner); if ( unlikely(pg == NULL) ) { @@ -322,7 +323,7 @@ static int setup_compat_l4(struct vcpu *v) l4_pgentry_t *l4tab; int rc; - pg = alloc_domheap_page(NULL, MEMF_node(vcpu_to_node(v))); + pg = alloc_domheap_page(v->domain, MEMF_no_owner); if ( pg == NULL ) return -ENOMEM; diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 6d7a592..e5c845c 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -1194,7 +1194,7 @@ int __init construct_dom0( } else { - page = alloc_domheap_page(NULL, 0); + page = alloc_domheap_page(d, MEMF_no_owner); if ( !page ) panic("Not enough RAM for domain 0 PML4"); page->u.inuse.type_info = PGT_l4_page_table|PGT_validated|1; diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index a1c5db0..3e5bef1 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -150,7 +150,7 @@ long arch_do_domctl( break; } - page = alloc_domheap_page(NULL, 0); + page = alloc_domheap_page(current->domain, MEMF_no_owner); if ( !page ) { ret = -ENOMEM; diff --git a/xen/arch/x86/hvm/stdvga.c b/xen/arch/x86/hvm/stdvga.c index 060512a..13d1029 100644 --- a/xen/arch/x86/hvm/stdvga.c +++ b/xen/arch/x86/hvm/stdvga.c @@ -604,7 +604,7 @@ void stdvga_init(struct domain *d) for ( i = 0; i != ARRAY_SIZE(s->vram_page); i++ ) { - pg = alloc_domheap_page(NULL, MEMF_node(domain_to_node(d))); + pg = alloc_domheap_page(d, MEMF_no_owner); if ( pg == NULL ) break; s->vram_page[i] = pg; diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index cee8699..92b0fa8 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -1417,7 +1417,6 @@ HVM_REGISTER_SAVE_RESTORE(LAPIC_REGS, lapic_save_regs, lapic_load_regs, int vlapic_init(struct vcpu *v) { struct vlapic *vlapic = vcpu_vlapic(v); - unsigned int memflags = MEMF_node(vcpu_to_node(v)); HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "%d", v->vcpu_id); @@ -1431,7 +1430,7 @@ int vlapic_init(struct vcpu *v) if (vlapic->regs_page == NULL) { - vlapic->regs_page = alloc_domheap_page(NULL, memflags); + vlapic->regs_page = alloc_domheap_page(v->domain, MEMF_no_owner); if ( vlapic->regs_page == NULL ) { dprintk(XENLOG_ERR, "alloc vlapic regs error: %d/%d\n", diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index ca5369a..45acfb5 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5883,7 +5883,6 @@ int create_perdomain_mapping(struct domain *d, unsigned long va, l3_pgentry_t *l3tab; l2_pgentry_t *l2tab; l1_pgentry_t *l1tab; - unsigned int memf = MEMF_node(domain_to_node(d)); int rc = 0; ASSERT(va >= PERDOMAIN_VIRT_START && @@ -5891,7 +5890,7 @@ int create_perdomain_mapping(struct domain *d, unsigned long va, if ( !d->arch.perdomain_l3_pg ) { - pg = alloc_domheap_page(NULL, MEMF_node(domain_to_node(d))); + pg = alloc_domheap_page(d, MEMF_no_owner); if ( !pg ) return -ENOMEM; l3tab = __map_domain_page(pg); @@ -5912,7 +5911,7 @@ int create_perdomain_mapping(struct domain *d, unsigned long va, if ( !(l3e_get_flags(l3tab[l3_table_offset(va)]) & _PAGE_PRESENT) ) { - pg = alloc_domheap_page(NULL, memf); + pg = alloc_domheap_page(d, MEMF_no_owner); if ( !pg ) { unmap_domain_page(l3tab); @@ -5941,7 +5940,7 @@ int create_perdomain_mapping(struct domain *d, unsigned long va, { if ( pl1tab && !IS_NIL(pl1tab) ) { - l1tab = alloc_xenheap_pages(0, memf); + l1tab = alloc_xenheap_pages(0, MEMF_node(domain_to_node(d))); if ( !l1tab ) { rc = -ENOMEM; @@ -5953,7 +5952,7 @@ int create_perdomain_mapping(struct domain *d, unsigned long va, } else { - pg = alloc_domheap_page(NULL, memf); + pg = alloc_domheap_page(d, MEMF_no_owner); if ( !pg ) { rc = -ENOMEM; @@ -5970,7 +5969,7 @@ int create_perdomain_mapping(struct domain *d, unsigned long va, if ( ppg && !(l1e_get_flags(l1tab[l1_table_offset(va)]) & _PAGE_PRESENT) ) { - pg = alloc_domheap_page(NULL, memf); + pg = alloc_domheap_page(d, MEMF_no_owner); if ( pg ) { clear_domain_page(page_to_mfn(pg)); diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 97f5168..4ecb2e2 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -331,7 +331,7 @@ hap_set_allocation(struct domain *d, unsigned int pages, int *preempted) if ( d->arch.paging.hap.total_pages < pages ) { /* Need to allocate more memory from domheap */ - pg = alloc_domheap_page(NULL, MEMF_node(domain_to_node(d))); + pg = alloc_domheap_page(d, MEMF_no_owner); if ( pg == NULL ) { HAP_PRINTK("failed to allocate hap pages.\n"); diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 01bc750..2e43d6d 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1677,7 +1677,7 @@ static unsigned int sh_set_allocation(struct domain *d, { /* Need to allocate more memory from domheap */ sp = (struct page_info *) - alloc_domheap_page(NULL, MEMF_node(domain_to_node(d))); + alloc_domheap_page(d, MEMF_no_owner); if ( sp == NULL ) { SHADOW_PRINTK("failed to allocate shadow pages.\n"); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:33:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:33: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 1YYfGZ-0001YB-FP; Thu, 19 Mar 2015 18:33:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGY-0001Y2-4Y for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:58 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id DA/D2-02005-5961B055; Thu, 19 Mar 2015 18:33:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1426790035!13681604!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2371 invoked from network); 19 Mar 2015 18:33:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGV-0002Mn-0U for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfGU-00085D-Vj for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:33:54 +0000 Date: Thu, 19 Mar 2015 18:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: widen NUMA nodes to be allocated from X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4e59089ed90a11b9e30e67191789293bb07af686 Author: Jan Beulich AuthorDate: Fri Mar 6 17:28:54 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 6 17:28:54 2015 +0100 x86: widen NUMA nodes to be allocated from Signed-off-by: Jan Beulich Reviewed-by: Dario Faggioli Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 5 +++-- xen/arch/x86/domain_build.c | 2 +- xen/arch/x86/domctl.c | 2 +- xen/arch/x86/hvm/stdvga.c | 2 +- xen/arch/x86/hvm/vlapic.c | 3 +-- xen/arch/x86/mm.c | 11 +++++------ xen/arch/x86/mm/hap/hap.c | 2 +- xen/arch/x86/mm/shadow/common.c | 2 +- 8 files changed, 14 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 21f0766..04c1898 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -285,7 +285,8 @@ struct vcpu_guest_context *alloc_vcpu_guest_context(void) for ( i = 0; i < PFN_UP(sizeof(struct vcpu_guest_context)); ++i ) { - struct page_info *pg = alloc_domheap_page(NULL, 0); + struct page_info *pg = alloc_domheap_page(current->domain, + MEMF_no_owner); if ( unlikely(pg == NULL) ) { @@ -322,7 +323,7 @@ static int setup_compat_l4(struct vcpu *v) l4_pgentry_t *l4tab; int rc; - pg = alloc_domheap_page(NULL, MEMF_node(vcpu_to_node(v))); + pg = alloc_domheap_page(v->domain, MEMF_no_owner); if ( pg == NULL ) return -ENOMEM; diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 6d7a592..e5c845c 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -1194,7 +1194,7 @@ int __init construct_dom0( } else { - page = alloc_domheap_page(NULL, 0); + page = alloc_domheap_page(d, MEMF_no_owner); if ( !page ) panic("Not enough RAM for domain 0 PML4"); page->u.inuse.type_info = PGT_l4_page_table|PGT_validated|1; diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index a1c5db0..3e5bef1 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -150,7 +150,7 @@ long arch_do_domctl( break; } - page = alloc_domheap_page(NULL, 0); + page = alloc_domheap_page(current->domain, MEMF_no_owner); if ( !page ) { ret = -ENOMEM; diff --git a/xen/arch/x86/hvm/stdvga.c b/xen/arch/x86/hvm/stdvga.c index 060512a..13d1029 100644 --- a/xen/arch/x86/hvm/stdvga.c +++ b/xen/arch/x86/hvm/stdvga.c @@ -604,7 +604,7 @@ void stdvga_init(struct domain *d) for ( i = 0; i != ARRAY_SIZE(s->vram_page); i++ ) { - pg = alloc_domheap_page(NULL, MEMF_node(domain_to_node(d))); + pg = alloc_domheap_page(d, MEMF_no_owner); if ( pg == NULL ) break; s->vram_page[i] = pg; diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index cee8699..92b0fa8 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -1417,7 +1417,6 @@ HVM_REGISTER_SAVE_RESTORE(LAPIC_REGS, lapic_save_regs, lapic_load_regs, int vlapic_init(struct vcpu *v) { struct vlapic *vlapic = vcpu_vlapic(v); - unsigned int memflags = MEMF_node(vcpu_to_node(v)); HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "%d", v->vcpu_id); @@ -1431,7 +1430,7 @@ int vlapic_init(struct vcpu *v) if (vlapic->regs_page == NULL) { - vlapic->regs_page = alloc_domheap_page(NULL, memflags); + vlapic->regs_page = alloc_domheap_page(v->domain, MEMF_no_owner); if ( vlapic->regs_page == NULL ) { dprintk(XENLOG_ERR, "alloc vlapic regs error: %d/%d\n", diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index ca5369a..45acfb5 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5883,7 +5883,6 @@ int create_perdomain_mapping(struct domain *d, unsigned long va, l3_pgentry_t *l3tab; l2_pgentry_t *l2tab; l1_pgentry_t *l1tab; - unsigned int memf = MEMF_node(domain_to_node(d)); int rc = 0; ASSERT(va >= PERDOMAIN_VIRT_START && @@ -5891,7 +5890,7 @@ int create_perdomain_mapping(struct domain *d, unsigned long va, if ( !d->arch.perdomain_l3_pg ) { - pg = alloc_domheap_page(NULL, MEMF_node(domain_to_node(d))); + pg = alloc_domheap_page(d, MEMF_no_owner); if ( !pg ) return -ENOMEM; l3tab = __map_domain_page(pg); @@ -5912,7 +5911,7 @@ int create_perdomain_mapping(struct domain *d, unsigned long va, if ( !(l3e_get_flags(l3tab[l3_table_offset(va)]) & _PAGE_PRESENT) ) { - pg = alloc_domheap_page(NULL, memf); + pg = alloc_domheap_page(d, MEMF_no_owner); if ( !pg ) { unmap_domain_page(l3tab); @@ -5941,7 +5940,7 @@ int create_perdomain_mapping(struct domain *d, unsigned long va, { if ( pl1tab && !IS_NIL(pl1tab) ) { - l1tab = alloc_xenheap_pages(0, memf); + l1tab = alloc_xenheap_pages(0, MEMF_node(domain_to_node(d))); if ( !l1tab ) { rc = -ENOMEM; @@ -5953,7 +5952,7 @@ int create_perdomain_mapping(struct domain *d, unsigned long va, } else { - pg = alloc_domheap_page(NULL, memf); + pg = alloc_domheap_page(d, MEMF_no_owner); if ( !pg ) { rc = -ENOMEM; @@ -5970,7 +5969,7 @@ int create_perdomain_mapping(struct domain *d, unsigned long va, if ( ppg && !(l1e_get_flags(l1tab[l1_table_offset(va)]) & _PAGE_PRESENT) ) { - pg = alloc_domheap_page(NULL, memf); + pg = alloc_domheap_page(d, MEMF_no_owner); if ( pg ) { clear_domain_page(page_to_mfn(pg)); diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 97f5168..4ecb2e2 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -331,7 +331,7 @@ hap_set_allocation(struct domain *d, unsigned int pages, int *preempted) if ( d->arch.paging.hap.total_pages < pages ) { /* Need to allocate more memory from domheap */ - pg = alloc_domheap_page(NULL, MEMF_node(domain_to_node(d))); + pg = alloc_domheap_page(d, MEMF_no_owner); if ( pg == NULL ) { HAP_PRINTK("failed to allocate hap pages.\n"); diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 01bc750..2e43d6d 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1677,7 +1677,7 @@ static unsigned int sh_set_allocation(struct domain *d, { /* Need to allocate more memory from domheap */ sp = (struct page_info *) - alloc_domheap_page(NULL, MEMF_node(domain_to_node(d))); + alloc_domheap_page(d, MEMF_no_owner); if ( sp == NULL ) { SHADOW_PRINTK("failed to allocate shadow pages.\n"); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:34:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:34: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 1YYfGi-0001a3-Ti; Thu, 19 Mar 2015 18:34:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGh-0001Zl-LW for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:07 +0000 Content-Length: 3452 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id F4/F4-14870-E961B055; Thu, 19 Mar 2015 18:34:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1426790045!8994640!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16836 invoked from network); 19 Mar 2015 18:34:06 -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; 19 Mar 2015 18:34:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGf-0002NM-63 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfGf-00085j-5A for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:05 +0000 Date: Thu, 19 Mar 2015 18:34:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: print_vtd_entries() should cope with superpages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============5462504379801830968==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5462504379801830968== Content-Length: 3070 Content-Transfer-Encoding: quoted-printable commit 92cf6c2456dc428694ed95b6b1dec5bb84319790 Author: Jan Beulich AuthorDate: Mon Mar 9 14:00:19 2015 +0100 Commit: Jan Beulich CommitDate: Mon Mar 9 14:00:19 2015 +0100 VT-d: print_vtd_entries() should cope with superpages Even if VT-d code alone (i.e. when not sharing tables with EPT) still doesn't support superpages, this function - invoked upon DMA remapping faults - needs to cope with such. While at it also replace a few more plain numbers with suitable named constants. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.h | 12 ++++++++---- xen/drivers/passthrough/vtd/utils.c | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index c3e5181..d6e6520 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -268,18 +268,22 @@ struct dma_pte { }; #define DMA_PTE_READ (1) #define DMA_PTE_WRITE (2) +#define DMA_PTE_PROT (DMA_PTE_READ | DMA_PTE_WRITE) +#define DMA_PTE_SP (1 << 7) #define DMA_PTE_SNP (1 << 11) #define dma_clear_pte(p) do {(p).val =3D 0;} while(0) #define dma_set_pte_readable(p) do {(p).val |=3D DMA_PTE_READ;} while(0) #define dma_set_pte_writable(p) do {(p).val |=3D DMA_PTE_WRITE;} while(0) -#define dma_set_pte_superpage(p) do {(p).val |=3D (1 << 7);} while(0) +#define dma_set_pte_superpage(p) do {(p).val |=3D DMA_PTE_SP;} while(0) #define dma_set_pte_snp(p) do {(p).val |=3D DMA_PTE_SNP;} while(0) -#define dma_set_pte_prot(p, prot) \ - do {(p).val =3D ((p).val & ~3) | ((prot) & 3); } while (0) +#define dma_set_pte_prot(p, prot) do { \ + (p).val =3D ((p).val & ~DMA_PTE_PROT) | ((prot) & DMA_PTE_PROT); \ + } while (0) #define dma_pte_addr(p) ((p).val & PADDR_MASK & PAGE_MASK_4K) #define dma_set_pte_addr(p, addr) do {\ (p).val |=3D ((addr) & PAGE_MASK_4K); } while (0) -#define dma_pte_present(p) (((p).val & 3) !=3D 0) +#define dma_pte_present(p) (((p).val & DMA_PTE_PROT) !=3D 0) +#define dma_pte_superpage(p) (((p).val & DMA_PTE_SP) !=3D 0) /* interrupt remap entry */ struct iremap_entry { diff --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/vtd/utils.c index db4c326..bd14c02 100644 --- a/xen/drivers/passthrough/vtd/utils.c +++ b/xen/drivers/passthrough/vtd/utils.c @@ -179,6 +179,8 @@ void print_vtd_entries(struct iommu *iommu, int bus, int devfn, u64 gmfn) printk(" l%d[%x] not present\n", level, l_index); break; } + if ( dma_pte_superpage(pte) ) + break; val =3D dma_pte_addr(pte); } while ( --level ); } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5462504379801830968== 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 --===============5462504379801830968==-- From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:34:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:34: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 1YYfGi-0001a3-Ti; Thu, 19 Mar 2015 18:34:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGh-0001Zl-LW for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:07 +0000 Content-Length: 3452 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id F4/F4-14870-E961B055; Thu, 19 Mar 2015 18:34:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1426790045!8994640!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16836 invoked from network); 19 Mar 2015 18:34:06 -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; 19 Mar 2015 18:34:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGf-0002NM-63 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfGf-00085j-5A for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:05 +0000 Date: Thu, 19 Mar 2015 18:34:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: print_vtd_entries() should cope with superpages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============5462504379801830968==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5462504379801830968== Content-Length: 3070 Content-Transfer-Encoding: quoted-printable commit 92cf6c2456dc428694ed95b6b1dec5bb84319790 Author: Jan Beulich AuthorDate: Mon Mar 9 14:00:19 2015 +0100 Commit: Jan Beulich CommitDate: Mon Mar 9 14:00:19 2015 +0100 VT-d: print_vtd_entries() should cope with superpages Even if VT-d code alone (i.e. when not sharing tables with EPT) still doesn't support superpages, this function - invoked upon DMA remapping faults - needs to cope with such. While at it also replace a few more plain numbers with suitable named constants. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.h | 12 ++++++++---- xen/drivers/passthrough/vtd/utils.c | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index c3e5181..d6e6520 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -268,18 +268,22 @@ struct dma_pte { }; #define DMA_PTE_READ (1) #define DMA_PTE_WRITE (2) +#define DMA_PTE_PROT (DMA_PTE_READ | DMA_PTE_WRITE) +#define DMA_PTE_SP (1 << 7) #define DMA_PTE_SNP (1 << 11) #define dma_clear_pte(p) do {(p).val =3D 0;} while(0) #define dma_set_pte_readable(p) do {(p).val |=3D DMA_PTE_READ;} while(0) #define dma_set_pte_writable(p) do {(p).val |=3D DMA_PTE_WRITE;} while(0) -#define dma_set_pte_superpage(p) do {(p).val |=3D (1 << 7);} while(0) +#define dma_set_pte_superpage(p) do {(p).val |=3D DMA_PTE_SP;} while(0) #define dma_set_pte_snp(p) do {(p).val |=3D DMA_PTE_SNP;} while(0) -#define dma_set_pte_prot(p, prot) \ - do {(p).val =3D ((p).val & ~3) | ((prot) & 3); } while (0) +#define dma_set_pte_prot(p, prot) do { \ + (p).val =3D ((p).val & ~DMA_PTE_PROT) | ((prot) & DMA_PTE_PROT); \ + } while (0) #define dma_pte_addr(p) ((p).val & PADDR_MASK & PAGE_MASK_4K) #define dma_set_pte_addr(p, addr) do {\ (p).val |=3D ((addr) & PAGE_MASK_4K); } while (0) -#define dma_pte_present(p) (((p).val & 3) !=3D 0) +#define dma_pte_present(p) (((p).val & DMA_PTE_PROT) !=3D 0) +#define dma_pte_superpage(p) (((p).val & DMA_PTE_SP) !=3D 0) /* interrupt remap entry */ struct iremap_entry { diff --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/vtd/utils.c index db4c326..bd14c02 100644 --- a/xen/drivers/passthrough/vtd/utils.c +++ b/xen/drivers/passthrough/vtd/utils.c @@ -179,6 +179,8 @@ void print_vtd_entries(struct iommu *iommu, int bus, int devfn, u64 gmfn) printk(" l%d[%x] not present\n", level, l_index); break; } + if ( dma_pte_superpage(pte) ) + break; val =3D dma_pte_addr(pte); } while ( --level ); } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5462504379801830968== 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 --===============5462504379801830968==-- From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:34:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:34: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 1YYfGt-0001cg-4A; Thu, 19 Mar 2015 18:34:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGr-0001cI-Qt for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:18 +0000 Content-Length: 3823 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 44/6B-05122-9A61B055; Thu, 19 Mar 2015 18:34:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1426790055!14414369!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30246 invoked from network); 19 Mar 2015 18:34:16 -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; 19 Mar 2015 18:34:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGp-0002NS-B7 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfGp-00086K-9t for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:15 +0000 Date: Thu, 19 Mar 2015 18:34:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] iommu: fix usage of shared EPT/IOMMU page tables on PVH 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="===============5932842883801317454==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5932842883801317454== Content-Length: 3455 Content-Transfer-Encoding: quoted-printable commit 7978429727a9da328444749951005b595de41098 Author: Roger Pau Monn=C3=A9 AuthorDate: Mon Mar 9 14:01:40 2015 +0100 Commit: Jan Beulich CommitDate: Mon Mar 9 14:01:40 2015 +0100 iommu: fix usage of shared EPT/IOMMU page tables on PVH guests iommu_share_p2m_table should not prevent PVH guests from using a shared page table between the IOMMU and EPT. Clean the code by removing the asserts in the vendor specific implementations (amd_iommu_share_p2m, iommu_set_pgd), and moving the hap_enabled assert to the caller (iommu_share_p2m_table). Also fix another incorrect usage of is_hvm_domain usage in arch_iommu_populate_page_table. This has not given problems so far because all the pages in PVH guests are of type PGT_writable_page. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Jan Beulich Tested-by: David Vrabel Reviewed-by: Tim Deegan Acked-by: Kevin Tian --- xen/drivers/passthrough/amd/iommu_map.c | 2 -- xen/drivers/passthrough/iommu.c | 3 ++- xen/drivers/passthrough/vtd/iommu.c | 2 -- xen/drivers/passthrough/x86/iommu.c | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_map.c b/xen/drivers/passthrough/amd/iommu_map.c index a8c60ec..31dc05d 100644 --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -785,8 +785,6 @@ void amd_iommu_share_p2m(struct domain *d) struct page_info *p2m_table; mfn_t pgd_mfn; - ASSERT( is_hvm_domain(d) && d->arch.hvm_domain.hap_enabled ); - if ( !iommu_use_hap_pt(d) ) return; diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index cc12735..7fcbbb1 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -332,7 +332,8 @@ void iommu_share_p2m_table(struct domain* d) { const struct iommu_ops *ops =3D iommu_get_ops(); - if ( iommu_enabled && is_hvm_domain(d) ) + ASSERT( hap_enabled(d) ); + if ( iommu_enabled ) ops->share_p2m(d); } diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 1063677..48676c5 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1789,8 +1789,6 @@ static void iommu_set_pgd(struct domain *d) struct hvm_iommu *hd =3D domain_hvm_iommu(d); mfn_t pgd_mfn; - ASSERT( is_hvm_domain(d) && d->arch.hvm_domain.hap_enabled ); - if ( !iommu_use_hap_pt(d) ) return; diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c index 52d8948..9eb8d33 100644 --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -56,7 +56,7 @@ int arch_iommu_populate_page_table(struct domain *d) while ( !rc && (page =3D page_list_remove_head(&d->page_list)) ) { - if ( is_hvm_domain(d) || + if ( has_hvm_container_domain(d) || (page->u.inuse.type_info & PGT_type_mask) =3D=3D PGT_writable_page ) { BUG_ON(SHARED_M2P(mfn_to_gmfn(d, page_to_mfn(page)))); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5932842883801317454== 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 --===============5932842883801317454==-- From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:34:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:34: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 1YYfGt-0001cg-4A; Thu, 19 Mar 2015 18:34:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGr-0001cI-Qt for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:18 +0000 Content-Length: 3823 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 44/6B-05122-9A61B055; Thu, 19 Mar 2015 18:34:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1426790055!14414369!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30246 invoked from network); 19 Mar 2015 18:34:16 -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; 19 Mar 2015 18:34:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGp-0002NS-B7 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfGp-00086K-9t for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:15 +0000 Date: Thu, 19 Mar 2015 18:34:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] iommu: fix usage of shared EPT/IOMMU page tables on PVH 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="===============5932842883801317454==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5932842883801317454== Content-Length: 3455 Content-Transfer-Encoding: quoted-printable commit 7978429727a9da328444749951005b595de41098 Author: Roger Pau Monn=C3=A9 AuthorDate: Mon Mar 9 14:01:40 2015 +0100 Commit: Jan Beulich CommitDate: Mon Mar 9 14:01:40 2015 +0100 iommu: fix usage of shared EPT/IOMMU page tables on PVH guests iommu_share_p2m_table should not prevent PVH guests from using a shared page table between the IOMMU and EPT. Clean the code by removing the asserts in the vendor specific implementations (amd_iommu_share_p2m, iommu_set_pgd), and moving the hap_enabled assert to the caller (iommu_share_p2m_table). Also fix another incorrect usage of is_hvm_domain usage in arch_iommu_populate_page_table. This has not given problems so far because all the pages in PVH guests are of type PGT_writable_page. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Jan Beulich Tested-by: David Vrabel Reviewed-by: Tim Deegan Acked-by: Kevin Tian --- xen/drivers/passthrough/amd/iommu_map.c | 2 -- xen/drivers/passthrough/iommu.c | 3 ++- xen/drivers/passthrough/vtd/iommu.c | 2 -- xen/drivers/passthrough/x86/iommu.c | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_map.c b/xen/drivers/passthrough/amd/iommu_map.c index a8c60ec..31dc05d 100644 --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -785,8 +785,6 @@ void amd_iommu_share_p2m(struct domain *d) struct page_info *p2m_table; mfn_t pgd_mfn; - ASSERT( is_hvm_domain(d) && d->arch.hvm_domain.hap_enabled ); - if ( !iommu_use_hap_pt(d) ) return; diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index cc12735..7fcbbb1 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -332,7 +332,8 @@ void iommu_share_p2m_table(struct domain* d) { const struct iommu_ops *ops =3D iommu_get_ops(); - if ( iommu_enabled && is_hvm_domain(d) ) + ASSERT( hap_enabled(d) ); + if ( iommu_enabled ) ops->share_p2m(d); } diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 1063677..48676c5 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1789,8 +1789,6 @@ static void iommu_set_pgd(struct domain *d) struct hvm_iommu *hd =3D domain_hvm_iommu(d); mfn_t pgd_mfn; - ASSERT( is_hvm_domain(d) && d->arch.hvm_domain.hap_enabled ); - if ( !iommu_use_hap_pt(d) ) return; diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c index 52d8948..9eb8d33 100644 --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -56,7 +56,7 @@ int arch_iommu_populate_page_table(struct domain *d) while ( !rc && (page =3D page_list_remove_head(&d->page_list)) ) { - if ( is_hvm_domain(d) || + if ( has_hvm_container_domain(d) || (page->u.inuse.type_info & PGT_type_mask) =3D=3D PGT_writable_page ) { BUG_ON(SHARED_M2P(mfn_to_gmfn(d, page_to_mfn(page)))); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5932842883801317454== 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 --===============5932842883801317454==-- From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:34:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:34: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 1YYfH3-0001fJ-Ip; Thu, 19 Mar 2015 18:34:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfH2-0001es-9T for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:28 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 4E/2D-16504-3B61B055; Thu, 19 Mar 2015 18:34:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1426790065!13792042!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28433 invoked from network); 19 Mar 2015 18:34:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:34:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGz-0002NY-GC for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfGz-00087i-F3 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:25 +0000 Date: Thu, 19 Mar 2015 18:34:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: clean up initialization and #defines X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77618649c65d3851c4af9e306ed770137e31dfcb Author: Daniel De Graaf AuthorDate: Mon Mar 9 14:04:55 2015 +0100 Commit: Jan Beulich CommitDate: Mon Mar 9 14:04:55 2015 +0100 flask: clean up initialization and #defines This removes the FLASK_DEVELOP and FLASK_BOOTPARAM configuration parameters which have never been settable by users. Disabling the FLASK_DEVELOP configuration option has not produced a compiling hypervisor for some time, and the FLASK_BOOTPARAM option will be replaced with a more flexible boot parameter. This also changes the return type of xsm_initcall_t to void to properly reflect the fact that the caller ignores the return value. Signed-off-by: Daniel De Graaf Reviewed-by: Wei Liu Reviewed-by: Andrew Cooper --- xen/include/xen/config.h | 4 ---- xen/include/xsm/xsm.h | 2 +- xen/xsm/flask/avc.c | 2 -- xen/xsm/flask/flask_op.c | 4 ---- xen/xsm/flask/hooks.c | 6 ++---- xen/xsm/flask/include/avc.h | 4 ---- xen/xsm/flask/include/security.h | 5 ----- 7 files changed, 3 insertions(+), 24 deletions(-) diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index 7bef8a6..d3d9911 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -100,10 +100,6 @@ #ifdef FLASK_ENABLE #define XSM_MAGIC 0xf97cff8c -/* Enable permissive mode (xl setenforce or flask_enforcing parameter) */ -#define FLASK_DEVELOP 1 -/* Allow runtime disabling of FLASK via the flask_enable parameter */ -#define FLASK_BOOTPARAM 1 /* Maintain statistics on the access vector cache */ #define FLASK_AVC_STATS 1 #endif diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 4ce089f..0437735 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -42,7 +42,7 @@ typedef enum xsm_default xsm_default_t; extern char *policy_buffer; extern u32 policy_size; -typedef int (*xsm_initcall_t)(void); +typedef void (*xsm_initcall_t)(void); extern xsm_initcall_t __xsm_initcall_start[], __xsm_initcall_end[]; diff --git a/xen/xsm/flask/avc.c b/xen/xsm/flask/avc.c index fc6580e..b1a4f8a 100644 --- a/xen/xsm/flask/avc.c +++ b/xen/xsm/flask/avc.c @@ -251,8 +251,6 @@ void __init avc_init(void) } atomic_set(&avc_cache.active_nodes, 0); atomic_set(&avc_cache.lru_hint, 0); - - printk("AVC INITIALIZED\n"); } int avc_get_hash_stats(struct xen_flask_hash_stats *arg) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 7743aac..0e89360 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -24,15 +24,11 @@ #define _copy_to_guest copy_to_guest #define _copy_from_guest copy_from_guest -#ifdef FLASK_DEVELOP int flask_enforcing = 0; integer_param("flask_enforcing", flask_enforcing); -#endif -#ifdef FLASK_BOOTPARAM int flask_enabled = 1; integer_param("flask_enabled", flask_enabled); -#endif #define MAX_POLICY_SIZE 0x4000000 diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 65094bb..dad5deb 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1626,14 +1626,14 @@ static struct xsm_operations flask_ops = { #endif }; -static __init int flask_init(void) +static __init void flask_init(void) { int ret = 0; if ( !flask_enabled ) { printk("Flask: Disabled at boot.\n"); - return 0; + return; } printk("Flask: Initializing.\n"); @@ -1650,8 +1650,6 @@ static __init int flask_init(void) printk("Flask: Starting in enforcing mode.\n"); else printk("Flask: Starting in permissive mode.\n"); - - return ret; } xsm_initcall(flask_init); diff --git a/xen/xsm/flask/include/avc.h b/xen/xsm/flask/include/avc.h index 42a5e4b..a00a6eb 100644 --- a/xen/xsm/flask/include/avc.h +++ b/xen/xsm/flask/include/avc.h @@ -17,11 +17,7 @@ #include "av_permissions.h" #include "security.h" -#ifdef FLASK_DEVELOP extern int flask_enforcing; -#else -#define flask_enforcing 1 -#endif /* * An entry in the AVC. diff --git a/xen/xsm/flask/include/security.h b/xen/xsm/flask/include/security.h index 348f018..dea0143 100644 --- a/xen/xsm/flask/include/security.h +++ b/xen/xsm/flask/include/security.h @@ -35,12 +35,7 @@ #define POLICYDB_VERSION_MIN POLICYDB_VERSION_BASE #define POLICYDB_VERSION_MAX POLICYDB_VERSION_BOUNDARY -#ifdef FLASK_BOOTPARAM extern int flask_enabled; -#else -#define flask_enabled 1 -#endif - extern int flask_mls_enabled; int security_load_policy(void * data, size_t len); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:34:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:34: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 1YYfH3-0001fJ-Ip; Thu, 19 Mar 2015 18:34:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfH2-0001es-9T for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:28 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 4E/2D-16504-3B61B055; Thu, 19 Mar 2015 18:34:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1426790065!13792042!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28433 invoked from network); 19 Mar 2015 18:34:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:34:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfGz-0002NY-GC for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfGz-00087i-F3 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:25 +0000 Date: Thu, 19 Mar 2015 18:34:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: clean up initialization and #defines X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77618649c65d3851c4af9e306ed770137e31dfcb Author: Daniel De Graaf AuthorDate: Mon Mar 9 14:04:55 2015 +0100 Commit: Jan Beulich CommitDate: Mon Mar 9 14:04:55 2015 +0100 flask: clean up initialization and #defines This removes the FLASK_DEVELOP and FLASK_BOOTPARAM configuration parameters which have never been settable by users. Disabling the FLASK_DEVELOP configuration option has not produced a compiling hypervisor for some time, and the FLASK_BOOTPARAM option will be replaced with a more flexible boot parameter. This also changes the return type of xsm_initcall_t to void to properly reflect the fact that the caller ignores the return value. Signed-off-by: Daniel De Graaf Reviewed-by: Wei Liu Reviewed-by: Andrew Cooper --- xen/include/xen/config.h | 4 ---- xen/include/xsm/xsm.h | 2 +- xen/xsm/flask/avc.c | 2 -- xen/xsm/flask/flask_op.c | 4 ---- xen/xsm/flask/hooks.c | 6 ++---- xen/xsm/flask/include/avc.h | 4 ---- xen/xsm/flask/include/security.h | 5 ----- 7 files changed, 3 insertions(+), 24 deletions(-) diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index 7bef8a6..d3d9911 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -100,10 +100,6 @@ #ifdef FLASK_ENABLE #define XSM_MAGIC 0xf97cff8c -/* Enable permissive mode (xl setenforce or flask_enforcing parameter) */ -#define FLASK_DEVELOP 1 -/* Allow runtime disabling of FLASK via the flask_enable parameter */ -#define FLASK_BOOTPARAM 1 /* Maintain statistics on the access vector cache */ #define FLASK_AVC_STATS 1 #endif diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 4ce089f..0437735 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -42,7 +42,7 @@ typedef enum xsm_default xsm_default_t; extern char *policy_buffer; extern u32 policy_size; -typedef int (*xsm_initcall_t)(void); +typedef void (*xsm_initcall_t)(void); extern xsm_initcall_t __xsm_initcall_start[], __xsm_initcall_end[]; diff --git a/xen/xsm/flask/avc.c b/xen/xsm/flask/avc.c index fc6580e..b1a4f8a 100644 --- a/xen/xsm/flask/avc.c +++ b/xen/xsm/flask/avc.c @@ -251,8 +251,6 @@ void __init avc_init(void) } atomic_set(&avc_cache.active_nodes, 0); atomic_set(&avc_cache.lru_hint, 0); - - printk("AVC INITIALIZED\n"); } int avc_get_hash_stats(struct xen_flask_hash_stats *arg) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 7743aac..0e89360 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -24,15 +24,11 @@ #define _copy_to_guest copy_to_guest #define _copy_from_guest copy_from_guest -#ifdef FLASK_DEVELOP int flask_enforcing = 0; integer_param("flask_enforcing", flask_enforcing); -#endif -#ifdef FLASK_BOOTPARAM int flask_enabled = 1; integer_param("flask_enabled", flask_enabled); -#endif #define MAX_POLICY_SIZE 0x4000000 diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 65094bb..dad5deb 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1626,14 +1626,14 @@ static struct xsm_operations flask_ops = { #endif }; -static __init int flask_init(void) +static __init void flask_init(void) { int ret = 0; if ( !flask_enabled ) { printk("Flask: Disabled at boot.\n"); - return 0; + return; } printk("Flask: Initializing.\n"); @@ -1650,8 +1650,6 @@ static __init int flask_init(void) printk("Flask: Starting in enforcing mode.\n"); else printk("Flask: Starting in permissive mode.\n"); - - return ret; } xsm_initcall(flask_init); diff --git a/xen/xsm/flask/include/avc.h b/xen/xsm/flask/include/avc.h index 42a5e4b..a00a6eb 100644 --- a/xen/xsm/flask/include/avc.h +++ b/xen/xsm/flask/include/avc.h @@ -17,11 +17,7 @@ #include "av_permissions.h" #include "security.h" -#ifdef FLASK_DEVELOP extern int flask_enforcing; -#else -#define flask_enforcing 1 -#endif /* * An entry in the AVC. diff --git a/xen/xsm/flask/include/security.h b/xen/xsm/flask/include/security.h index 348f018..dea0143 100644 --- a/xen/xsm/flask/include/security.h +++ b/xen/xsm/flask/include/security.h @@ -35,12 +35,7 @@ #define POLICYDB_VERSION_MIN POLICYDB_VERSION_BASE #define POLICYDB_VERSION_MAX POLICYDB_VERSION_BOUNDARY -#ifdef FLASK_BOOTPARAM extern int flask_enabled; -#else -#define flask_enabled 1 -#endif - extern int flask_mls_enabled; int security_load_policy(void * data, size_t len); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:34:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:34: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 1YYfHE-0001hQ-O9; Thu, 19 Mar 2015 18:34:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHC-0001h4-8E for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:38 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id CA/33-18861-DB61B055; Thu, 19 Mar 2015 18:34:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1426790075!12005386!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29920 invoked from network); 19 Mar 2015 18:34:36 -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; 19 Mar 2015 18:34:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfH9-0002Ng-Lh for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfH9-00088W-Jv for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:35 +0000 Date: Thu, 19 Mar 2015 18:34:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86emul: fully ignore segment override for register-only operations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bcf92a5382b75fd964c1f8678b2d9a3abe6dec39 Author: Jan Beulich AuthorDate: Tue Mar 10 13:45:51 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 13:45:51 2015 +0100 x86emul: fully ignore segment override for register-only operations For ModRM encoded instructions with register operands we must not overwrite ea.mem.seg (if a - bogus in that case - segment override was present) as it aliases with ea.reg. This is CVE-2015-2151 / XSA-123. Reported-by: Felix Wilhelm Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Keir Fraser --- xen/arch/x86/x86_emulate/x86_emulate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 5e9e040..0c73695 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1757,7 +1757,7 @@ x86_emulate( } } - if ( override_seg != -1 ) + if ( override_seg != -1 && ea.type == OP_MEM ) ea.mem.seg = override_seg; /* Early operand adjustments. */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:34:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:34: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 1YYfHE-0001hQ-O9; Thu, 19 Mar 2015 18:34:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHC-0001h4-8E for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:38 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id CA/33-18861-DB61B055; Thu, 19 Mar 2015 18:34:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1426790075!12005386!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29920 invoked from network); 19 Mar 2015 18:34:36 -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; 19 Mar 2015 18:34:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfH9-0002Ng-Lh for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfH9-00088W-Jv for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:35 +0000 Date: Thu, 19 Mar 2015 18:34:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86emul: fully ignore segment override for register-only operations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bcf92a5382b75fd964c1f8678b2d9a3abe6dec39 Author: Jan Beulich AuthorDate: Tue Mar 10 13:45:51 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 13:45:51 2015 +0100 x86emul: fully ignore segment override for register-only operations For ModRM encoded instructions with register operands we must not overwrite ea.mem.seg (if a - bogus in that case - segment override was present) as it aliases with ea.reg. This is CVE-2015-2151 / XSA-123. Reported-by: Felix Wilhelm Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Keir Fraser --- xen/arch/x86/x86_emulate/x86_emulate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 5e9e040..0c73695 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1757,7 +1757,7 @@ x86_emulate( } } - if ( override_seg != -1 ) + if ( override_seg != -1 && ea.type == OP_MEM ) ea.mem.seg = override_seg; /* Early operand adjustments. */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:34:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:34: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 1YYfHP-0001jK-2w; Thu, 19 Mar 2015 18:34:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHM-0001ir-R5 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:49 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id B0/C2-31982-8C61B055; Thu, 19 Mar 2015 18:34:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1426790086!7840431!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20404 invoked from network); 19 Mar 2015 18:34:46 -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; 19 Mar 2015 18:34:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHJ-0002Nn-RX for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfHJ-00089F-Pn for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:45 +0000 Date: Thu, 19 Mar 2015 18:34:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: create unified "flask=" boot parameter X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b5f90278f5a5c9658a481a99f6a18bf4badba616 Author: Daniel De Graaf AuthorDate: Tue Mar 10 13:50:24 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 13:50:24 2015 +0100 flask: create unified "flask=" boot parameter This unifies the flask_enforcing and flask_enabled boot parameters into a single parameter with additional states. Defined options are: enforcing - require policy to be loaded at boot time and enforce it permissive - a missing or broken policy does not panic disabled - revert to dummy (no XSM) policy. Was flask_enabled=0 late - bootloader policy is not used; later loadpolicy is enforcing The default mode remains "permissive" and the flask_enforcing boot parameter is retained for compatibility. If flask_enforcing=1 is specified and flask= is not, the bootloader policy will be loaded in enforcing mode if present, but errors will disable access controls until a successful loadpolicy instead of causing a panic at boot. Suggested-by: Julien Grall Signed-off-by: Daniel De Graaf Reviewed-by: Andrew Cooper --- docs/man/xl.pod.1 | 4 ++-- docs/misc/xen-command-line.markdown | 30 +++++++++++++++++++++++++----- docs/misc/xsm-flask.txt | 29 ----------------------------- xen/xsm/flask/flask_op.c | 34 ++++++++++++++++++++++++++++++---- xen/xsm/flask/hooks.c | 32 +++++++++++++++++++++++--------- xen/xsm/flask/include/avc.h | 2 +- xen/xsm/flask/include/security.h | 10 +++++++++- 7 files changed, 90 insertions(+), 51 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index cd80ffc..198ee2b 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -1441,8 +1441,8 @@ Determine if the FLASK security module is loaded and enforcing its policy. =item B I<1|0|Enforcing|Permissive> Enable or disable enforcing of the FLASK access controls. The default is -permissive and can be changed using the flask_enforcing option on the -hypervisor's command line. +permissive, but this can be changed to enforcing by specifying "flask=enforcing" +or "flask=late" on the hypervisor's command line. =item B I diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index e125212..5044da1 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -638,11 +638,31 @@ hardware domain is architecture dependent. Note that specifying zero as domU value means zero, while for dom0 it means to use the default. -### flask\_enabled -> `= ` - -### flask\_enforcing -> `= ` +### flask +> `= permissive | enforcing | late | disabled` + +> Default: `permissive` + +Specify how the FLASK security server should be configured. This option is only +available if the hypervisor was compiled with XSM support (which can be enabled +by setting XSM\_ENABLE = y in .config). + +* `permissive`: This is intended for development and is not suitable for use + with untrusted guests. If a policy is provided by the bootloader, it will be + loaded; errors will be reported to the ring buffer but will not prevent + booting. The policy can be changed to enforcing mode using "xl setenforce". +* `enforcing`: This requires a security policy to be provided by the bootloader + and will enter enforcing mode prior to the creation of domain 0. If a valid + policy is not provided, the hypervisor will not continue booting. +* `late`: This disables loading of the security policy from the bootloader. + FLASK will be enabled but will not enforce access controls until a policy is + loaded by a domain using "xl loadpolicy". Once a policy is loaded, FLASK will + run in enforcing mode unless "xl setenforce" has changed that setting. +* `disabled`: This causes the XSM framework to revert to the dummy module. The + dummy module provides the same security policy as is used when compiling the + hypervisor without support for XSM. The xsm\_op hypercall can also be used to + switch to this mode after boot, but there is no way to re-enable FLASK once + the dummy module is loaded. ### font > `= ` where height is `8x8 | 8x14 | 8x16` diff --git a/docs/misc/xsm-flask.txt b/docs/misc/xsm-flask.txt index 9559028..ab05913 100644 --- a/docs/misc/xsm-flask.txt +++ b/docs/misc/xsm-flask.txt @@ -396,32 +396,3 @@ the ranges being denied to more easily determine what resources are required. When running in permissive mode, only the first denial of a given source/destination is printed to the log, so labeling devices using this method may require multiple passes to find all required ranges. - -Additional notes on XSM:FLASK ------------------------------ - -1) xen command line parameters - - a) flask_enforcing - - The default value for flask_enforcing is '0'. This parameter causes the - platform to boot in permissive mode which means that the policy is loaded - but not enforced. This mode is often helpful for developing new systems - and policies as the policy violations are reported on the xen console and - may be viewed in dom0 through 'xl dmesg'. - - To boot the platform into enforcing mode, which means that the policy is - loaded and enforced, append 'flask_enforcing=1' on the grub line. - - This parameter may also be changed through the flask hypercall. - - b) flask_enabled - - The default value for flask_enabled is '1'. This parameter causes the - platform to enable the FLASK security module under the XSM framework. - The parameter may be enabled/disabled only once per boot. If the parameter - is set to '0', only a reboot can re-enable flask. When flask_enabled is '0' - the DUMMY module is enforced. - - This parameter may also be changed through the flask hypercall. But may - only be performed once per boot. diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 0e89360..84c7fec 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -24,11 +24,12 @@ #define _copy_to_guest copy_to_guest #define _copy_from_guest copy_from_guest -int flask_enforcing = 0; -integer_param("flask_enforcing", flask_enforcing); +enum flask_bootparam_t __read_mostly flask_bootparam = FLASK_BOOTPARAM_PERMISSIVE; +static void parse_flask_param(char *s); +custom_param("flask", parse_flask_param); -int flask_enabled = 1; -integer_param("flask_enabled", flask_enabled); +bool_t __read_mostly flask_enforcing = 0; +boolean_param("flask_enforcing", flask_enforcing); #define MAX_POLICY_SIZE 0x4000000 @@ -60,6 +61,26 @@ extern int ss_initialized; extern struct xsm_operations *original_ops; +static void __init parse_flask_param(char *s) +{ + if ( !strcmp(s, "enforcing") ) + { + flask_enforcing = 1; + flask_bootparam = FLASK_BOOTPARAM_ENFORCING; + } + else if ( !strcmp(s, "late") ) + { + flask_enforcing = 1; + flask_bootparam = FLASK_BOOTPARAM_LATELOAD; + } + else if ( !strcmp(s, "disabled") ) + flask_bootparam = FLASK_BOOTPARAM_DISABLED; + else if ( !strcmp(s, "permissive") ) + flask_bootparam = FLASK_BOOTPARAM_PERMISSIVE; + else + flask_bootparam = FLASK_BOOTPARAM_INVALID; +} + static int domain_has_security(struct domain *d, u32 perms) { struct domain_security_struct *dsec; @@ -502,6 +523,7 @@ static int flask_security_load(struct xen_flask_load *load) { int ret; void *buf = NULL; + bool_t is_reload = ss_initialized; ret = domain_has_security(current->domain, SECURITY__LOAD_POLICY); if ( ret ) @@ -526,6 +548,10 @@ static int flask_security_load(struct xen_flask_load *load) if ( ret ) goto out; + if ( !is_reload ) + printk(XENLOG_INFO "Flask: Policy loaded, continuing in %s mode.\n", + flask_enforcing ? "enforcing" : "permissive"); + xfree(bool_pending_values); bool_pending_values = NULL; ret = 0; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index dad5deb..05dafed 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1628,15 +1628,23 @@ static struct xsm_operations flask_ops = { static __init void flask_init(void) { - int ret = 0; + int ret = -ENOENT; - if ( !flask_enabled ) + switch ( flask_bootparam ) { - printk("Flask: Disabled at boot.\n"); + case FLASK_BOOTPARAM_DISABLED: + printk(XENLOG_INFO "Flask: Disabled at boot.\n"); return; - } - printk("Flask: Initializing.\n"); + case FLASK_BOOTPARAM_PERMISSIVE: + case FLASK_BOOTPARAM_ENFORCING: + case FLASK_BOOTPARAM_LATELOAD: + break; + + case FLASK_BOOTPARAM_INVALID: + default: + panic("Flask: Invalid value for flask= boot parameter.\n"); + } avc_init(); @@ -1644,12 +1652,18 @@ static __init void flask_init(void) if ( register_xsm(&flask_ops) ) panic("Flask: Unable to register with XSM"); - ret = security_load_policy(policy_buffer, policy_size); + if ( policy_size && flask_bootparam != FLASK_BOOTPARAM_LATELOAD ) + ret = security_load_policy(policy_buffer, policy_size); + + if ( ret && flask_bootparam == FLASK_BOOTPARAM_ENFORCING ) + panic("Unable to load FLASK policy"); - if ( flask_enforcing ) - printk("Flask: Starting in enforcing mode.\n"); + if ( ret ) + printk(XENLOG_INFO "Flask: Access controls disabled until policy is loaded.\n"); + else if ( flask_enforcing ) + printk(XENLOG_INFO "Flask: Starting in enforcing mode.\n"); else - printk("Flask: Starting in permissive mode.\n"); + printk(XENLOG_INFO "Flask: Starting in permissive mode.\n"); } xsm_initcall(flask_init); diff --git a/xen/xsm/flask/include/avc.h b/xen/xsm/flask/include/avc.h index a00a6eb..c7a99fc 100644 --- a/xen/xsm/flask/include/avc.h +++ b/xen/xsm/flask/include/avc.h @@ -17,7 +17,7 @@ #include "av_permissions.h" #include "security.h" -extern int flask_enforcing; +extern bool_t flask_enforcing; /* * An entry in the AVC. diff --git a/xen/xsm/flask/include/security.h b/xen/xsm/flask/include/security.h index dea0143..d07bae0 100644 --- a/xen/xsm/flask/include/security.h +++ b/xen/xsm/flask/include/security.h @@ -35,7 +35,15 @@ #define POLICYDB_VERSION_MIN POLICYDB_VERSION_BASE #define POLICYDB_VERSION_MAX POLICYDB_VERSION_BOUNDARY -extern int flask_enabled; +enum flask_bootparam_t { + FLASK_BOOTPARAM_PERMISSIVE, + FLASK_BOOTPARAM_ENFORCING, + FLASK_BOOTPARAM_LATELOAD, + FLASK_BOOTPARAM_DISABLED, + FLASK_BOOTPARAM_INVALID, +}; + +extern enum flask_bootparam_t flask_bootparam; extern int flask_mls_enabled; int security_load_policy(void * data, size_t len); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:34:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:34: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 1YYfHP-0001jK-2w; Thu, 19 Mar 2015 18:34:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHM-0001ir-R5 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:49 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id B0/C2-31982-8C61B055; Thu, 19 Mar 2015 18:34:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1426790086!7840431!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20404 invoked from network); 19 Mar 2015 18:34:46 -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; 19 Mar 2015 18:34:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHJ-0002Nn-RX for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfHJ-00089F-Pn for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:45 +0000 Date: Thu, 19 Mar 2015 18:34:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: create unified "flask=" boot parameter X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b5f90278f5a5c9658a481a99f6a18bf4badba616 Author: Daniel De Graaf AuthorDate: Tue Mar 10 13:50:24 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 13:50:24 2015 +0100 flask: create unified "flask=" boot parameter This unifies the flask_enforcing and flask_enabled boot parameters into a single parameter with additional states. Defined options are: enforcing - require policy to be loaded at boot time and enforce it permissive - a missing or broken policy does not panic disabled - revert to dummy (no XSM) policy. Was flask_enabled=0 late - bootloader policy is not used; later loadpolicy is enforcing The default mode remains "permissive" and the flask_enforcing boot parameter is retained for compatibility. If flask_enforcing=1 is specified and flask= is not, the bootloader policy will be loaded in enforcing mode if present, but errors will disable access controls until a successful loadpolicy instead of causing a panic at boot. Suggested-by: Julien Grall Signed-off-by: Daniel De Graaf Reviewed-by: Andrew Cooper --- docs/man/xl.pod.1 | 4 ++-- docs/misc/xen-command-line.markdown | 30 +++++++++++++++++++++++++----- docs/misc/xsm-flask.txt | 29 ----------------------------- xen/xsm/flask/flask_op.c | 34 ++++++++++++++++++++++++++++++---- xen/xsm/flask/hooks.c | 32 +++++++++++++++++++++++--------- xen/xsm/flask/include/avc.h | 2 +- xen/xsm/flask/include/security.h | 10 +++++++++- 7 files changed, 90 insertions(+), 51 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index cd80ffc..198ee2b 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -1441,8 +1441,8 @@ Determine if the FLASK security module is loaded and enforcing its policy. =item B I<1|0|Enforcing|Permissive> Enable or disable enforcing of the FLASK access controls. The default is -permissive and can be changed using the flask_enforcing option on the -hypervisor's command line. +permissive, but this can be changed to enforcing by specifying "flask=enforcing" +or "flask=late" on the hypervisor's command line. =item B I diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index e125212..5044da1 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -638,11 +638,31 @@ hardware domain is architecture dependent. Note that specifying zero as domU value means zero, while for dom0 it means to use the default. -### flask\_enabled -> `= ` - -### flask\_enforcing -> `= ` +### flask +> `= permissive | enforcing | late | disabled` + +> Default: `permissive` + +Specify how the FLASK security server should be configured. This option is only +available if the hypervisor was compiled with XSM support (which can be enabled +by setting XSM\_ENABLE = y in .config). + +* `permissive`: This is intended for development and is not suitable for use + with untrusted guests. If a policy is provided by the bootloader, it will be + loaded; errors will be reported to the ring buffer but will not prevent + booting. The policy can be changed to enforcing mode using "xl setenforce". +* `enforcing`: This requires a security policy to be provided by the bootloader + and will enter enforcing mode prior to the creation of domain 0. If a valid + policy is not provided, the hypervisor will not continue booting. +* `late`: This disables loading of the security policy from the bootloader. + FLASK will be enabled but will not enforce access controls until a policy is + loaded by a domain using "xl loadpolicy". Once a policy is loaded, FLASK will + run in enforcing mode unless "xl setenforce" has changed that setting. +* `disabled`: This causes the XSM framework to revert to the dummy module. The + dummy module provides the same security policy as is used when compiling the + hypervisor without support for XSM. The xsm\_op hypercall can also be used to + switch to this mode after boot, but there is no way to re-enable FLASK once + the dummy module is loaded. ### font > `= ` where height is `8x8 | 8x14 | 8x16` diff --git a/docs/misc/xsm-flask.txt b/docs/misc/xsm-flask.txt index 9559028..ab05913 100644 --- a/docs/misc/xsm-flask.txt +++ b/docs/misc/xsm-flask.txt @@ -396,32 +396,3 @@ the ranges being denied to more easily determine what resources are required. When running in permissive mode, only the first denial of a given source/destination is printed to the log, so labeling devices using this method may require multiple passes to find all required ranges. - -Additional notes on XSM:FLASK ------------------------------ - -1) xen command line parameters - - a) flask_enforcing - - The default value for flask_enforcing is '0'. This parameter causes the - platform to boot in permissive mode which means that the policy is loaded - but not enforced. This mode is often helpful for developing new systems - and policies as the policy violations are reported on the xen console and - may be viewed in dom0 through 'xl dmesg'. - - To boot the platform into enforcing mode, which means that the policy is - loaded and enforced, append 'flask_enforcing=1' on the grub line. - - This parameter may also be changed through the flask hypercall. - - b) flask_enabled - - The default value for flask_enabled is '1'. This parameter causes the - platform to enable the FLASK security module under the XSM framework. - The parameter may be enabled/disabled only once per boot. If the parameter - is set to '0', only a reboot can re-enable flask. When flask_enabled is '0' - the DUMMY module is enforced. - - This parameter may also be changed through the flask hypercall. But may - only be performed once per boot. diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 0e89360..84c7fec 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -24,11 +24,12 @@ #define _copy_to_guest copy_to_guest #define _copy_from_guest copy_from_guest -int flask_enforcing = 0; -integer_param("flask_enforcing", flask_enforcing); +enum flask_bootparam_t __read_mostly flask_bootparam = FLASK_BOOTPARAM_PERMISSIVE; +static void parse_flask_param(char *s); +custom_param("flask", parse_flask_param); -int flask_enabled = 1; -integer_param("flask_enabled", flask_enabled); +bool_t __read_mostly flask_enforcing = 0; +boolean_param("flask_enforcing", flask_enforcing); #define MAX_POLICY_SIZE 0x4000000 @@ -60,6 +61,26 @@ extern int ss_initialized; extern struct xsm_operations *original_ops; +static void __init parse_flask_param(char *s) +{ + if ( !strcmp(s, "enforcing") ) + { + flask_enforcing = 1; + flask_bootparam = FLASK_BOOTPARAM_ENFORCING; + } + else if ( !strcmp(s, "late") ) + { + flask_enforcing = 1; + flask_bootparam = FLASK_BOOTPARAM_LATELOAD; + } + else if ( !strcmp(s, "disabled") ) + flask_bootparam = FLASK_BOOTPARAM_DISABLED; + else if ( !strcmp(s, "permissive") ) + flask_bootparam = FLASK_BOOTPARAM_PERMISSIVE; + else + flask_bootparam = FLASK_BOOTPARAM_INVALID; +} + static int domain_has_security(struct domain *d, u32 perms) { struct domain_security_struct *dsec; @@ -502,6 +523,7 @@ static int flask_security_load(struct xen_flask_load *load) { int ret; void *buf = NULL; + bool_t is_reload = ss_initialized; ret = domain_has_security(current->domain, SECURITY__LOAD_POLICY); if ( ret ) @@ -526,6 +548,10 @@ static int flask_security_load(struct xen_flask_load *load) if ( ret ) goto out; + if ( !is_reload ) + printk(XENLOG_INFO "Flask: Policy loaded, continuing in %s mode.\n", + flask_enforcing ? "enforcing" : "permissive"); + xfree(bool_pending_values); bool_pending_values = NULL; ret = 0; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index dad5deb..05dafed 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1628,15 +1628,23 @@ static struct xsm_operations flask_ops = { static __init void flask_init(void) { - int ret = 0; + int ret = -ENOENT; - if ( !flask_enabled ) + switch ( flask_bootparam ) { - printk("Flask: Disabled at boot.\n"); + case FLASK_BOOTPARAM_DISABLED: + printk(XENLOG_INFO "Flask: Disabled at boot.\n"); return; - } - printk("Flask: Initializing.\n"); + case FLASK_BOOTPARAM_PERMISSIVE: + case FLASK_BOOTPARAM_ENFORCING: + case FLASK_BOOTPARAM_LATELOAD: + break; + + case FLASK_BOOTPARAM_INVALID: + default: + panic("Flask: Invalid value for flask= boot parameter.\n"); + } avc_init(); @@ -1644,12 +1652,18 @@ static __init void flask_init(void) if ( register_xsm(&flask_ops) ) panic("Flask: Unable to register with XSM"); - ret = security_load_policy(policy_buffer, policy_size); + if ( policy_size && flask_bootparam != FLASK_BOOTPARAM_LATELOAD ) + ret = security_load_policy(policy_buffer, policy_size); + + if ( ret && flask_bootparam == FLASK_BOOTPARAM_ENFORCING ) + panic("Unable to load FLASK policy"); - if ( flask_enforcing ) - printk("Flask: Starting in enforcing mode.\n"); + if ( ret ) + printk(XENLOG_INFO "Flask: Access controls disabled until policy is loaded.\n"); + else if ( flask_enforcing ) + printk(XENLOG_INFO "Flask: Starting in enforcing mode.\n"); else - printk("Flask: Starting in permissive mode.\n"); + printk(XENLOG_INFO "Flask: Starting in permissive mode.\n"); } xsm_initcall(flask_init); diff --git a/xen/xsm/flask/include/avc.h b/xen/xsm/flask/include/avc.h index a00a6eb..c7a99fc 100644 --- a/xen/xsm/flask/include/avc.h +++ b/xen/xsm/flask/include/avc.h @@ -17,7 +17,7 @@ #include "av_permissions.h" #include "security.h" -extern int flask_enforcing; +extern bool_t flask_enforcing; /* * An entry in the AVC. diff --git a/xen/xsm/flask/include/security.h b/xen/xsm/flask/include/security.h index dea0143..d07bae0 100644 --- a/xen/xsm/flask/include/security.h +++ b/xen/xsm/flask/include/security.h @@ -35,7 +35,15 @@ #define POLICYDB_VERSION_MIN POLICYDB_VERSION_BASE #define POLICYDB_VERSION_MAX POLICYDB_VERSION_BOUNDARY -extern int flask_enabled; +enum flask_bootparam_t { + FLASK_BOOTPARAM_PERMISSIVE, + FLASK_BOOTPARAM_ENFORCING, + FLASK_BOOTPARAM_LATELOAD, + FLASK_BOOTPARAM_DISABLED, + FLASK_BOOTPARAM_INVALID, +}; + +extern enum flask_bootparam_t flask_bootparam; extern int flask_mls_enabled; int security_load_policy(void * data, size_t len); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:34:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:34: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 1YYfHX-0001l3-7M; Thu, 19 Mar 2015 18:34:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHW-0001ko-9C for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:58 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 7B/E9-13427-1D61B055; Thu, 19 Mar 2015 18:34:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1426790096!11981938!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27746 invoked from network); 19 Mar 2015 18:34:57 -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; 19 Mar 2015 18:34:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHU-0002Nw-0q for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfHT-0008AU-VK for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:55 +0000 Date: Thu, 19 Mar 2015 18:34:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI: fix getting EFI variable list on some systems X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f4eb9d27d0ebd62a0b6cdff8213726f5ae8f25c Author: Ross Lagerwall AuthorDate: Tue Mar 10 13:52:01 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 13:52:01 2015 +0100 EFI: fix getting EFI variable list on some systems Copy the entire output buffer to the guest because some firmwares update size on successful calls (contrary to the spec) and the buffer may contain data beyond the output size that the firmware requires on a subsequent GetNextVariableName() call (e.g. a NULL character). Note that this shouldn't change the amount of data copied because on success, a compliant firmware does not change size and so the entire buffer is copied anyway. If size is changed, Xen does not copy the buffer. Without this change, the following (simplified) sequence would occur: GetNextVariableName: in \0, size 1024 || out AdminPw\0, size 7 GetNextVariableName: in AdminPw\0, size 1024 || out UserPw\0, size 6 GetNextVariableName: in UserPww\0, size 1024 || NOT FOUND This was seen on an Intel S1200RP_SE with firmware S1200RP.86B.02.02.0005.102320140911, version 4.6, date 2014-10-23. Signed-off-by: Ross Lagerwall Reviewed-by: Andrew Cooper --- xen/common/efi/runtime.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index 7ed5bfa..5ed8b01 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -516,9 +516,13 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) cast_guid(&op->u.get_next_variable_name.vendor_guid)); efi_rs_leave(cr3); + /* + * Copy the variable name if necessary. The caller provided size + * is used because some firmwares update size when they shouldn't. + * */ if ( !EFI_ERROR(status) && - copy_to_guest(op->u.get_next_variable_name.name, - name.raw, size) ) + __copy_to_guest(op->u.get_next_variable_name.name, + name.raw, op->u.get_next_variable_name.size) ) rc = -EFAULT; op->u.get_next_variable_name.size = size; } -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:34:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:34: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 1YYfHX-0001l3-7M; Thu, 19 Mar 2015 18:34:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHW-0001ko-9C for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:58 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 7B/E9-13427-1D61B055; Thu, 19 Mar 2015 18:34:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1426790096!11981938!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27746 invoked from network); 19 Mar 2015 18:34:57 -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; 19 Mar 2015 18:34:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHU-0002Nw-0q for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfHT-0008AU-VK for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:34:55 +0000 Date: Thu, 19 Mar 2015 18:34:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI: fix getting EFI variable list on some systems X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f4eb9d27d0ebd62a0b6cdff8213726f5ae8f25c Author: Ross Lagerwall AuthorDate: Tue Mar 10 13:52:01 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 13:52:01 2015 +0100 EFI: fix getting EFI variable list on some systems Copy the entire output buffer to the guest because some firmwares update size on successful calls (contrary to the spec) and the buffer may contain data beyond the output size that the firmware requires on a subsequent GetNextVariableName() call (e.g. a NULL character). Note that this shouldn't change the amount of data copied because on success, a compliant firmware does not change size and so the entire buffer is copied anyway. If size is changed, Xen does not copy the buffer. Without this change, the following (simplified) sequence would occur: GetNextVariableName: in \0, size 1024 || out AdminPw\0, size 7 GetNextVariableName: in AdminPw\0, size 1024 || out UserPw\0, size 6 GetNextVariableName: in UserPww\0, size 1024 || NOT FOUND This was seen on an Intel S1200RP_SE with firmware S1200RP.86B.02.02.0005.102320140911, version 4.6, date 2014-10-23. Signed-off-by: Ross Lagerwall Reviewed-by: Andrew Cooper --- xen/common/efi/runtime.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index 7ed5bfa..5ed8b01 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -516,9 +516,13 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) cast_guid(&op->u.get_next_variable_name.vendor_guid)); efi_rs_leave(cr3); + /* + * Copy the variable name if necessary. The caller provided size + * is used because some firmwares update size when they shouldn't. + * */ if ( !EFI_ERROR(status) && - copy_to_guest(op->u.get_next_variable_name.name, - name.raw, size) ) + __copy_to_guest(op->u.get_next_variable_name.name, + name.raw, op->u.get_next_variable_name.size) ) rc = -EFAULT; op->u.get_next_variable_name.size = size; } -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:35:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:35: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 1YYfHi-0001nE-Ag; Thu, 19 Mar 2015 18:35:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHg-0001mq-Oz for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:08 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 85/A6-11927-CD61B055; Thu, 19 Mar 2015 18:35:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1426790106!6668378!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2235 invoked from network); 19 Mar 2015 18:35:07 -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; 19 Mar 2015 18:35:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHe-0002OS-71 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfHe-0008BV-4X for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:06 +0000 Date: Thu, 19 Mar 2015 18:35:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: use xc_dom_panic when decompressor is not supported X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b00f39b27b36b2e43038dc54abe2576f7eccce9b Author: Wei Liu AuthorDate: Fri Mar 6 11:33:48 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 11:36:38 2015 +0000 libxc: use xc_dom_panic when decompressor is not supported State explicitly that specific decompressor is not supported by libxc. Without this change, libxc error message only says the provided kernel is invalid, which is misleading. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: svenvan.van@gmail.com Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_dom_bzimageloader.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tools/libxc/xc_dom_bzimageloader.c b/tools/libxc/xc_dom_bzimageloader.c index 964ebdc..3bb17dd 100644 --- a/tools/libxc/xc_dom_bzimageloader.c +++ b/tools/libxc/xc_dom_bzimageloader.c @@ -185,8 +185,9 @@ static int xc_try_bzip2_decode( static int xc_try_bzip2_decode( struct xc_dom_image *dom, void **blob, size_t *size) { - DOMPRINTF("%s: BZIP2 decompress support unavailable", - __FUNCTION__); + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: BZIP2 decompress support unavailable", + __FUNCTION__); return -1; } @@ -367,16 +368,18 @@ static int xc_try_lzma_decode( static int xc_try_xz_decode( struct xc_dom_image *dom, void **blob, size_t *size) { - DOMPRINTF("%s: XZ decompress support unavailable", - __FUNCTION__); + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: XZ decompress support unavailable", + __FUNCTION__); return -1; } static int xc_try_lzma_decode( struct xc_dom_image *dom, void **blob, size_t *size) { - DOMPRINTF("%s: LZMA decompress support unavailable", - __FUNCTION__); + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: LZMA decompress support unavailable", + __FUNCTION__); return -1; } @@ -577,8 +580,9 @@ static int xc_try_lzo1x_decode( static int xc_try_lzo1x_decode( struct xc_dom_image *dom, void **blob, size_t *size) { - DOMPRINTF("%s: LZO1x decompress support unavailable\n", - __FUNCTION__); + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: LZO1x decompress support unavailable\n", + __FUNCTION__); return -1; } -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:35:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:35: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 1YYfHi-0001nE-Ag; Thu, 19 Mar 2015 18:35:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHg-0001mq-Oz for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:08 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 85/A6-11927-CD61B055; Thu, 19 Mar 2015 18:35:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1426790106!6668378!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2235 invoked from network); 19 Mar 2015 18:35:07 -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; 19 Mar 2015 18:35:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHe-0002OS-71 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfHe-0008BV-4X for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:06 +0000 Date: Thu, 19 Mar 2015 18:35:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: use xc_dom_panic when decompressor is not supported X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b00f39b27b36b2e43038dc54abe2576f7eccce9b Author: Wei Liu AuthorDate: Fri Mar 6 11:33:48 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 11:36:38 2015 +0000 libxc: use xc_dom_panic when decompressor is not supported State explicitly that specific decompressor is not supported by libxc. Without this change, libxc error message only says the provided kernel is invalid, which is misleading. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: svenvan.van@gmail.com Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_dom_bzimageloader.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tools/libxc/xc_dom_bzimageloader.c b/tools/libxc/xc_dom_bzimageloader.c index 964ebdc..3bb17dd 100644 --- a/tools/libxc/xc_dom_bzimageloader.c +++ b/tools/libxc/xc_dom_bzimageloader.c @@ -185,8 +185,9 @@ static int xc_try_bzip2_decode( static int xc_try_bzip2_decode( struct xc_dom_image *dom, void **blob, size_t *size) { - DOMPRINTF("%s: BZIP2 decompress support unavailable", - __FUNCTION__); + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: BZIP2 decompress support unavailable", + __FUNCTION__); return -1; } @@ -367,16 +368,18 @@ static int xc_try_lzma_decode( static int xc_try_xz_decode( struct xc_dom_image *dom, void **blob, size_t *size) { - DOMPRINTF("%s: XZ decompress support unavailable", - __FUNCTION__); + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: XZ decompress support unavailable", + __FUNCTION__); return -1; } static int xc_try_lzma_decode( struct xc_dom_image *dom, void **blob, size_t *size) { - DOMPRINTF("%s: LZMA decompress support unavailable", - __FUNCTION__); + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: LZMA decompress support unavailable", + __FUNCTION__); return -1; } @@ -577,8 +580,9 @@ static int xc_try_lzo1x_decode( static int xc_try_lzo1x_decode( struct xc_dom_image *dom, void **blob, size_t *size) { - DOMPRINTF("%s: LZO1x decompress support unavailable\n", - __FUNCTION__); + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: LZO1x decompress support unavailable\n", + __FUNCTION__); return -1; } -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:35:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:35: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 1YYfHs-0001pN-GM; Thu, 19 Mar 2015 18:35:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHr-0001p8-3q for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:19 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 06/D7-21485-6E61B055; Thu, 19 Mar 2015 18:35:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1426790116!10080949!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15285 invoked from network); 19 Mar 2015 18:35:17 -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; 19 Mar 2015 18:35:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHo-0002Oa-Cv for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfHo-0008CD-BC for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:16 +0000 Date: Thu, 19 Mar 2015 18:35:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "libxl: Wait for ballooning if free memory is increasing" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b022d88b4dd4e176c447911f65208c12d5f9a903 Author: Stefano Stabellini AuthorDate: Fri Mar 6 17:19:14 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 11:36:38 2015 +0000 Revert "libxl: Wait for ballooning if free memory is increasing" This reverts commit 2563bca11544361dc2afa5e20b5663e10a0715cb. Signed-off-by: Stefano Stabellini Reviewed-by: Mike Latimer Tested-by: Mike Latimer Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 17 +++-------------- 1 files changed, 3 insertions(+), 14 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 5c40e84..f326df4 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2198,9 +2198,8 @@ static int preserve_domain(uint32_t *r_domid, libxl_event *event, static int freemem(uint32_t domid, libxl_domain_build_info *b_info) { - int rc, retries; - const int MAX_RETRIES = 3; - uint32_t need_memkb, free_memkb, free_memkb_prev = 0; + int rc, retries = 3; + uint32_t need_memkb, free_memkb; if (!autoballoon) return 0; @@ -2209,7 +2208,6 @@ static int freemem(uint32_t domid, libxl_domain_build_info *b_info) if (rc < 0) return rc; - retries = MAX_RETRIES; do { rc = libxl_get_free_memory(ctx, &free_memkb); if (rc < 0) @@ -2234,16 +2232,7 @@ static int freemem(uint32_t domid, libxl_domain_build_info *b_info) if (rc < 0) return rc; - /* - * If the amount of free mem has increased on this iteration (i.e. - * some progress has been made) then reset the retry counter. - */ - if (free_memkb > free_memkb_prev) { - retries = MAX_RETRIES; - free_memkb_prev = free_memkb; - } else { - retries--; - } + retries--; } while (retries > 0); return ERROR_NOMEM; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:35:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:35: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 1YYfHs-0001pN-GM; Thu, 19 Mar 2015 18:35:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHr-0001p8-3q for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:19 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 06/D7-21485-6E61B055; Thu, 19 Mar 2015 18:35:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1426790116!10080949!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15285 invoked from network); 19 Mar 2015 18:35:17 -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; 19 Mar 2015 18:35:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHo-0002Oa-Cv for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfHo-0008CD-BC for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:16 +0000 Date: Thu, 19 Mar 2015 18:35:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "libxl: Wait for ballooning if free memory is increasing" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b022d88b4dd4e176c447911f65208c12d5f9a903 Author: Stefano Stabellini AuthorDate: Fri Mar 6 17:19:14 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 11:36:38 2015 +0000 Revert "libxl: Wait for ballooning if free memory is increasing" This reverts commit 2563bca11544361dc2afa5e20b5663e10a0715cb. Signed-off-by: Stefano Stabellini Reviewed-by: Mike Latimer Tested-by: Mike Latimer Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 17 +++-------------- 1 files changed, 3 insertions(+), 14 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 5c40e84..f326df4 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2198,9 +2198,8 @@ static int preserve_domain(uint32_t *r_domid, libxl_event *event, static int freemem(uint32_t domid, libxl_domain_build_info *b_info) { - int rc, retries; - const int MAX_RETRIES = 3; - uint32_t need_memkb, free_memkb, free_memkb_prev = 0; + int rc, retries = 3; + uint32_t need_memkb, free_memkb; if (!autoballoon) return 0; @@ -2209,7 +2208,6 @@ static int freemem(uint32_t domid, libxl_domain_build_info *b_info) if (rc < 0) return rc; - retries = MAX_RETRIES; do { rc = libxl_get_free_memory(ctx, &free_memkb); if (rc < 0) @@ -2234,16 +2232,7 @@ static int freemem(uint32_t domid, libxl_domain_build_info *b_info) if (rc < 0) return rc; - /* - * If the amount of free mem has increased on this iteration (i.e. - * some progress has been made) then reset the retry counter. - */ - if (free_memkb > free_memkb_prev) { - retries = MAX_RETRIES; - free_memkb_prev = free_memkb; - } else { - retries--; - } + retries--; } while (retries > 0); return ERROR_NOMEM; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:35:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:35: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 1YYfI3-0001r5-JZ; Thu, 19 Mar 2015 18:35:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfI1-0001qr-JQ for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:29 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 13/1F-26576-0F61B055; Thu, 19 Mar 2015 18:35:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1426790126!13738380!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 653 invoked from network); 19 Mar 2015 18:35:27 -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; 19 Mar 2015 18:35:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHy-0002Ok-J3 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfHy-0008DD-Hq for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:26 +0000 Date: Thu, 19 Mar 2015 18:35:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl_wait_for_memory_target: wait as long as dom0 is making progress X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd3aa246f1cdfc8d017282662706fd5973961d68 Author: Stefano Stabellini AuthorDate: Fri Mar 6 17:19:15 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 11:36:38 2015 +0000 libxl_wait_for_memory_target: wait as long as dom0 is making progress Decrement wait_secs only if dom0 is making no progress toward reaching the balloon target, otherwise loop again for free. Signed-off-by: Stefano Stabellini Reviewed-by: Mike Latimer Tested-by: Mike Latimer Acked-by: Ian Campbell --- tools/libxl/libxl.c | 29 ++++++++++++++++++++++------- tools/libxl/libxl.h | 14 +++++++++++++- tools/libxl/xl_cmdimpl.c | 4 ++-- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 088786e..648a227 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4959,26 +4959,41 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) { int rc = 0; uint32_t target_memkb = 0; + uint64_t current_memkb, prev_memkb; libxl_dominfo info; + rc = libxl_get_memory_target(ctx, domid, &target_memkb); + if (rc < 0) + return rc; + libxl_dominfo_init(&info); + prev_memkb = UINT64_MAX; do { - wait_secs--; sleep(1); - rc = libxl_get_memory_target(ctx, domid, &target_memkb); - if (rc < 0) - goto out; - libxl_dominfo_dispose(&info); libxl_dominfo_init(&info); rc = libxl_domain_info(ctx, &info, domid); if (rc < 0) goto out; - } while (wait_secs > 0 && (info.current_memkb + info.outstanding_memkb) > target_memkb); - if ((info.current_memkb + info.outstanding_memkb) <= target_memkb) + current_memkb = info.current_memkb + info.outstanding_memkb; + + if (current_memkb > prev_memkb) + { + rc = ERROR_FAIL; + goto out; + } + else if (current_memkb == prev_memkb) + wait_secs--; + /* if current_memkb < prev_memkb loop for free as progress has + * been made */ + + prev_memkb = current_memkb; + } while (wait_secs > 0 && current_memkb > target_memkb); + + if (current_memkb <= target_memkb) rc = 0; else rc = ERROR_FAIL; diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 6bbc52d..5eec092 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1050,7 +1050,19 @@ int libxl_domain_need_memory(libxl_ctx *ctx, libxl_domain_build_info *b_info, int libxl_get_free_memory(libxl_ctx *ctx, uint32_t *memkb); /* wait for a given amount of memory to be free in the system */ int libxl_wait_for_free_memory(libxl_ctx *ctx, uint32_t domid, uint32_t memory_kb, int wait_secs); -/* wait for the memory target of a domain to be reached */ +/* + * Wait for the memory target of a domain to be reached. Does not + * decrement wait_secs if the domain is making progress toward reaching + * the target. If the domain is not making progress, wait_secs is + * decremented. If the timeout expires before the target is reached, the + * function returns ERROR_FAIL. + * + * Older versions of this function (Xen 4.5 and older), decremented + * wait_secs even if the domain was making progress, resulting in far + * lower overall wait times. To make sure that your calling routine + * works with new and old implementations of the function, pass enough + * time for the guest to reach its target as an argument. + */ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs); int libxl_vncviewer_exec(libxl_ctx *ctx, uint32_t domid, int autopass); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index f326df4..3c3bab3 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2226,8 +2226,8 @@ static int freemem(uint32_t domid, libxl_domain_build_info *b_info) else if (rc != ERROR_NOMEM) return rc; - /* the memory target has been reached but the free memory is still - * not enough: loop over again */ + /* wait until dom0 reaches its target, as long as we are making + * progress */ rc = libxl_wait_for_memory_target(ctx, 0, 1); if (rc < 0) return 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 Thu Mar 19 18:35:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:35: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 1YYfI3-0001r5-JZ; Thu, 19 Mar 2015 18:35:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfI1-0001qr-JQ for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:29 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 13/1F-26576-0F61B055; Thu, 19 Mar 2015 18:35:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1426790126!13738380!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 653 invoked from network); 19 Mar 2015 18:35:27 -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; 19 Mar 2015 18:35:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfHy-0002Ok-J3 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfHy-0008DD-Hq for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:26 +0000 Date: Thu, 19 Mar 2015 18:35:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl_wait_for_memory_target: wait as long as dom0 is making progress X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd3aa246f1cdfc8d017282662706fd5973961d68 Author: Stefano Stabellini AuthorDate: Fri Mar 6 17:19:15 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 11:36:38 2015 +0000 libxl_wait_for_memory_target: wait as long as dom0 is making progress Decrement wait_secs only if dom0 is making no progress toward reaching the balloon target, otherwise loop again for free. Signed-off-by: Stefano Stabellini Reviewed-by: Mike Latimer Tested-by: Mike Latimer Acked-by: Ian Campbell --- tools/libxl/libxl.c | 29 ++++++++++++++++++++++------- tools/libxl/libxl.h | 14 +++++++++++++- tools/libxl/xl_cmdimpl.c | 4 ++-- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 088786e..648a227 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4959,26 +4959,41 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) { int rc = 0; uint32_t target_memkb = 0; + uint64_t current_memkb, prev_memkb; libxl_dominfo info; + rc = libxl_get_memory_target(ctx, domid, &target_memkb); + if (rc < 0) + return rc; + libxl_dominfo_init(&info); + prev_memkb = UINT64_MAX; do { - wait_secs--; sleep(1); - rc = libxl_get_memory_target(ctx, domid, &target_memkb); - if (rc < 0) - goto out; - libxl_dominfo_dispose(&info); libxl_dominfo_init(&info); rc = libxl_domain_info(ctx, &info, domid); if (rc < 0) goto out; - } while (wait_secs > 0 && (info.current_memkb + info.outstanding_memkb) > target_memkb); - if ((info.current_memkb + info.outstanding_memkb) <= target_memkb) + current_memkb = info.current_memkb + info.outstanding_memkb; + + if (current_memkb > prev_memkb) + { + rc = ERROR_FAIL; + goto out; + } + else if (current_memkb == prev_memkb) + wait_secs--; + /* if current_memkb < prev_memkb loop for free as progress has + * been made */ + + prev_memkb = current_memkb; + } while (wait_secs > 0 && current_memkb > target_memkb); + + if (current_memkb <= target_memkb) rc = 0; else rc = ERROR_FAIL; diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 6bbc52d..5eec092 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1050,7 +1050,19 @@ int libxl_domain_need_memory(libxl_ctx *ctx, libxl_domain_build_info *b_info, int libxl_get_free_memory(libxl_ctx *ctx, uint32_t *memkb); /* wait for a given amount of memory to be free in the system */ int libxl_wait_for_free_memory(libxl_ctx *ctx, uint32_t domid, uint32_t memory_kb, int wait_secs); -/* wait for the memory target of a domain to be reached */ +/* + * Wait for the memory target of a domain to be reached. Does not + * decrement wait_secs if the domain is making progress toward reaching + * the target. If the domain is not making progress, wait_secs is + * decremented. If the timeout expires before the target is reached, the + * function returns ERROR_FAIL. + * + * Older versions of this function (Xen 4.5 and older), decremented + * wait_secs even if the domain was making progress, resulting in far + * lower overall wait times. To make sure that your calling routine + * works with new and old implementations of the function, pass enough + * time for the guest to reach its target as an argument. + */ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs); int libxl_vncviewer_exec(libxl_ctx *ctx, uint32_t domid, int autopass); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index f326df4..3c3bab3 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2226,8 +2226,8 @@ static int freemem(uint32_t domid, libxl_domain_build_info *b_info) else if (rc != ERROR_NOMEM) return rc; - /* the memory target has been reached but the free memory is still - * not enough: loop over again */ + /* wait until dom0 reaches its target, as long as we are making + * progress */ rc = libxl_wait_for_memory_target(ctx, 0, 1); if (rc < 0) return 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 Thu Mar 19 18:35:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:35: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 1YYfIC-0001sp-5m; Thu, 19 Mar 2015 18:35:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIB-0001se-IE for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:39 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 5C/ED-17310-AF61B055; Thu, 19 Mar 2015 18:35:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1426790136!11067089!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2888 invoked from network); 19 Mar 2015 18:35:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:35:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfI8-0002Os-Os for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfI8-0008Dd-Mc for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:36 +0000 Date: Thu, 19 Mar 2015 18:35:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] freemem: remove call to libxl_wait_for_free_memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 883b30a09610d08164ddf21b9346f0033a8dc16c Author: Stefano Stabellini AuthorDate: Fri Mar 6 17:19:16 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 11:36:38 2015 +0000 freemem: remove call to libxl_wait_for_free_memory Now that libxl_wait_for_memory_target is capable of waiting until dom0 reaches its target, we can remove the other wait function call: libxl_wait_for_free_memory. No need to wait twice. Once dom0 has met its target, simply loop again and recalculate free_memkb. Signed-off-by: Stefano Stabellini Reviewed-by: Mike Latimer Tested-by: Mike Latimer Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 3c3bab3..399b6b6 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2220,15 +2220,9 @@ static int freemem(uint32_t domid, libxl_domain_build_info *b_info) if (rc < 0) return rc; - rc = libxl_wait_for_free_memory(ctx, domid, need_memkb, 10); - if (!rc) - return 0; - else if (rc != ERROR_NOMEM) - return rc; - /* wait until dom0 reaches its target, as long as we are making * progress */ - rc = libxl_wait_for_memory_target(ctx, 0, 1); + rc = libxl_wait_for_memory_target(ctx, 0, 10); if (rc < 0) return 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 Thu Mar 19 18:35:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:35: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 1YYfIC-0001sp-5m; Thu, 19 Mar 2015 18:35:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIB-0001se-IE for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:39 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 5C/ED-17310-AF61B055; Thu, 19 Mar 2015 18:35:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1426790136!11067089!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2888 invoked from network); 19 Mar 2015 18:35:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:35:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfI8-0002Os-Os for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfI8-0008Dd-Mc for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:36 +0000 Date: Thu, 19 Mar 2015 18:35:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] freemem: remove call to libxl_wait_for_free_memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 883b30a09610d08164ddf21b9346f0033a8dc16c Author: Stefano Stabellini AuthorDate: Fri Mar 6 17:19:16 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 11:36:38 2015 +0000 freemem: remove call to libxl_wait_for_free_memory Now that libxl_wait_for_memory_target is capable of waiting until dom0 reaches its target, we can remove the other wait function call: libxl_wait_for_free_memory. No need to wait twice. Once dom0 has met its target, simply loop again and recalculate free_memkb. Signed-off-by: Stefano Stabellini Reviewed-by: Mike Latimer Tested-by: Mike Latimer Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 3c3bab3..399b6b6 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2220,15 +2220,9 @@ static int freemem(uint32_t domid, libxl_domain_build_info *b_info) if (rc < 0) return rc; - rc = libxl_wait_for_free_memory(ctx, domid, need_memkb, 10); - if (!rc) - return 0; - else if (rc != ERROR_NOMEM) - return rc; - /* wait until dom0 reaches its target, as long as we are making * progress */ - rc = libxl_wait_for_memory_target(ctx, 0, 1); + rc = libxl_wait_for_memory_target(ctx, 0, 10); if (rc < 0) return 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 Thu Mar 19 18:35:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:35: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 1YYfIM-0001ul-8J; Thu, 19 Mar 2015 18:35:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIL-0001uX-AB for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:49 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id C1/2E-11605-4071B055; Thu, 19 Mar 2015 18:35:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1426790147!11940624!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8384 invoked from network); 19 Mar 2015 18:35:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:35:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfII-0002Oy-V4 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfII-0008E2-Ta for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:46 +0000 Date: Thu, 19 Mar 2015 18:35:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl_wait_for_memory_target: wait for 2 sec at a time X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0c8d70336bbf3d83d6d927fecdd716010c4907dc Author: Stefano Stabellini AuthorDate: Fri Mar 6 17:19:17 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 11:36:38 2015 +0000 libxl_wait_for_memory_target: wait for 2 sec at a time Use a 2 sec sleep time in the loop to allow the guest to release a decent amount of memory in an iteration (empirical tests show ballooning speed to be 512MB/sec or recent boxes). Signed-off-by: Stefano Stabellini Reviewed-by: Mike Latimer Tested-by: Mike Latimer Acked-by: Ian Campbell --- tools/libxl/libxl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 648a227..94b4d59 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4970,7 +4970,7 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) prev_memkb = UINT64_MAX; do { - sleep(1); + sleep(2); libxl_dominfo_dispose(&info); libxl_dominfo_init(&info); @@ -4986,7 +4986,7 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) goto out; } else if (current_memkb == prev_memkb) - wait_secs--; + wait_secs -= 2; /* if current_memkb < prev_memkb loop for free as progress has * been made */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:35:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:35: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 1YYfIM-0001ul-8J; Thu, 19 Mar 2015 18:35:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIL-0001uX-AB for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:49 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id C1/2E-11605-4071B055; Thu, 19 Mar 2015 18:35:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1426790147!11940624!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8384 invoked from network); 19 Mar 2015 18:35:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:35:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfII-0002Oy-V4 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfII-0008E2-Ta for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:46 +0000 Date: Thu, 19 Mar 2015 18:35:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl_wait_for_memory_target: wait for 2 sec at a time X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0c8d70336bbf3d83d6d927fecdd716010c4907dc Author: Stefano Stabellini AuthorDate: Fri Mar 6 17:19:17 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 11:36:38 2015 +0000 libxl_wait_for_memory_target: wait for 2 sec at a time Use a 2 sec sleep time in the loop to allow the guest to release a decent amount of memory in an iteration (empirical tests show ballooning speed to be 512MB/sec or recent boxes). Signed-off-by: Stefano Stabellini Reviewed-by: Mike Latimer Tested-by: Mike Latimer Acked-by: Ian Campbell --- tools/libxl/libxl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 648a227..94b4d59 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4970,7 +4970,7 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) prev_memkb = UINT64_MAX; do { - sleep(1); + sleep(2); libxl_dominfo_dispose(&info); libxl_dominfo_init(&info); @@ -4986,7 +4986,7 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) goto out; } else if (current_memkb == prev_memkb) - wait_secs--; + wait_secs -= 2; /* if current_memkb < prev_memkb loop for free as progress has * been made */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:36:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:36:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIX-0001we-Em; Thu, 19 Mar 2015 18:36:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIV-0001wL-T6 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:00 +0000 Content-Length: 5950 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 65/2D-01814-F071B055; Thu, 19 Mar 2015 18:35:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1426790157!13834985!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30630 invoked from network); 19 Mar 2015 18:35:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:35:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIT-0002P7-4A for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfIT-0008Ek-3G for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:57 +0000 Date: Thu, 19 Mar 2015 18:35:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VHD: Fix locale aware character encoding handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7451590322418459066==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7451590322418459066== Content-Length: 5680 Content-Transfer-Encoding: quoted-printable commit 816d50cb49a61fab8c96512e22bba9d5256a008c Author: Philipp Hahn AuthorDate: Sun Mar 8 11:54:17 2015 +0100 Commit: Ian Campbell CommitDate: Wed Mar 11 11:36:39 2015 +0000 VHD: Fix locale aware character encoding handling ASCII is 7 bit only, which does not work in UTF-8 environments: > failed to read parent name Setup locale in vhd-util to parse LC_CTYPE and use the right codeset when doing file name encoding and decoding. Increase allocation for UTF-8 buffer as one UTF-16 character might use twice as much space in UTF-8 (or more). Don't check outbytesleft=3D=3D0 as one UTF-8 characters get encoded into 1..8 bytes, so it's perfectly fine (and expected) for the output to have remaining bytes left. Test-case: $ ./vhd-util create -n =C3=A4.vhd -s 1 $ ./vhd-util snapshot -n snap.vhd -p =C3=A4.vhd ; echo $=3F See for more information about the details of handling the encoding right. Signed-off-by: Philipp Hahn Acked-by: Ian Campbell --- tools/blktap2/vhd/lib/libvhd.c | 27 +++++++++++++++++++-------- tools/blktap2/vhd/vhd-util.c | 3 +++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/tools/blktap2/vhd/lib/libvhd.c b/tools/blktap2/vhd/lib/libvhd.c index 95eb5d6..1fd5b4e 100644 --- a/tools/blktap2/vhd/lib/libvhd.c +++ b/tools/blktap2/vhd/lib/libvhd.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "libvhd.h" #include "relative-path.h" @@ -1296,6 +1297,7 @@ vhd_macx_encode_location(char *name, char **out, int *outlen) size_t ibl, obl; char *uri, *uri_utf8, *uri_utf8p, *ret; const char *urip; + char *codeset; err =3D 0; ret =3D NULL; @@ -1304,7 +1306,7 @@ vhd_macx_encode_location(char *name, char **out, int *outlen) len =3D strlen(name) + strlen("file://"); ibl =3D len; - obl =3D len; + obl =3D len * 2; urip =3D uri =3D malloc(ibl + 1); uri_utf8 =3D uri_utf8p =3D malloc(obl); @@ -1312,7 +1314,8 @@ vhd_macx_encode_location(char *name, char **out, int *outlen) if (!uri || !uri_utf8) return -ENOMEM; - cd =3D iconv_open("UTF-8", "ASCII"); + codeset =3D nl_langinfo(CODESET); + cd =3D iconv_open("UTF-8", codeset); if (cd =3D=3D (iconv_t)-1) { err =3D -errno; goto out; @@ -1325,7 +1328,7 @@ vhd_macx_encode_location(char *name, char **out, int *outlen) (char **) #endif &urip, &ibl, &uri_utf8p, &obl) =3D=3D (size_t)-1 || - ibl || obl) { + ibl) { err =3D (errno =3F -errno : -EIO); goto out; } @@ -1357,6 +1360,7 @@ vhd_w2u_encode_location(char *name, char **out, int *outlen) size_t ibl, obl; char *uri, *uri_utf16, *uri_utf16p, *tmp, *ret; const char *urip; + char *codeset; err =3D 0; ret =3D NULL; @@ -1404,7 +1408,8 @@ vhd_w2u_encode_location(char *name, char **out, int *outlen) * MICROSOFT_COMPAT * little endian unicode here */ - cd =3D iconv_open("UTF-16LE", "ASCII"); + codeset =3D nl_langinfo(CODESET); + cd =3D iconv_open("UTF-16LE", codeset); if (cd =3D=3D (iconv_t)-1) { err =3D -errno; goto out; @@ -1415,7 +1420,7 @@ vhd_w2u_encode_location(char *name, char **out, int *outlen) (char **) #endif &urip, &ibl, &uri_utf16p, &obl) =3D=3D (size_t)-1 || - ibl || obl) { + ibl) { err =3D (errno =3F -errno : -EIO); goto out; } @@ -1447,11 +1452,13 @@ vhd_macx_decode_location(const char *in, char *out, int len) iconv_t cd; char *name; size_t ibl, obl; + char *codeset; name =3D out; ibl =3D obl =3D len; - cd =3D iconv_open("ASCII", "UTF-8"); + codeset =3D nl_langinfo(CODESET); + cd =3D iconv_open(codeset, "UTF-8"); if (cd =3D=3D (iconv_t)-1) return NULL; @@ -1479,11 +1486,13 @@ vhd_w2u_decode_location(const char *in, char *out, int len, char *utf_type) iconv_t cd; char *name, *tmp; size_t ibl, obl; + char *codeset; tmp =3D name =3D out; ibl =3D obl =3D len; - cd =3D iconv_open("ASCII", utf_type); + codeset =3D nl_langinfo(CODESET); + cd =3D iconv_open(codeset, utf_type); if (cd =3D=3D (iconv_t)-1) return NULL; @@ -2450,6 +2459,7 @@ vhd_initialize_header_parent_name(vhd_context_t *ctx, const char *parent_path) size_t ibl, obl; char *ppath, *dst; const char *pname; + char *codeset; err =3D 0; pname =3D NULL; @@ -2459,7 +2469,8 @@ vhd_initialize_header_parent_name(vhd_context_t *ctx, const char *parent_path) * MICROSOFT_COMPAT * big endian unicode here */ - cd =3D iconv_open(UTF_16BE, "ASCII"); + codeset =3D nl_langinfo(CODESET); + cd =3D iconv_open(UTF_16BE, codeset); if (cd =3D=3D (iconv_t)-1) { err =3D -errno; goto out; diff --git a/tools/blktap2/vhd/vhd-util.c b/tools/blktap2/vhd/vhd-util.c index 944a59e..13f1835 100644 --- a/tools/blktap2/vhd/vhd-util.c +++ b/tools/blktap2/vhd/vhd-util.c @@ -28,6 +28,8 @@ #include #include #include +#include +#include #include "libvhd.h" #include "vhd-util.h" @@ -114,6 +116,7 @@ main(int argc, char *argv[]) if (setrlimit(RLIMIT_CORE, &rlim) < 0) fprintf(stderr, "setrlimit failed: %d\n", errno); #endif + setlocale(LC_CTYPE, ""); ret =3D 0; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7451590322418459066== 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 --===============7451590322418459066==-- From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:36:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:36:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIX-0001we-Em; Thu, 19 Mar 2015 18:36:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIV-0001wL-T6 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:00 +0000 Content-Length: 5950 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 65/2D-01814-F071B055; Thu, 19 Mar 2015 18:35:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1426790157!13834985!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30630 invoked from network); 19 Mar 2015 18:35:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:35:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIT-0002P7-4A for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfIT-0008Ek-3G for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:35:57 +0000 Date: Thu, 19 Mar 2015 18:35:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VHD: Fix locale aware character encoding handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7451590322418459066==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7451590322418459066== Content-Length: 5680 Content-Transfer-Encoding: quoted-printable commit 816d50cb49a61fab8c96512e22bba9d5256a008c Author: Philipp Hahn AuthorDate: Sun Mar 8 11:54:17 2015 +0100 Commit: Ian Campbell CommitDate: Wed Mar 11 11:36:39 2015 +0000 VHD: Fix locale aware character encoding handling ASCII is 7 bit only, which does not work in UTF-8 environments: > failed to read parent name Setup locale in vhd-util to parse LC_CTYPE and use the right codeset when doing file name encoding and decoding. Increase allocation for UTF-8 buffer as one UTF-16 character might use twice as much space in UTF-8 (or more). Don't check outbytesleft=3D=3D0 as one UTF-8 characters get encoded into 1..8 bytes, so it's perfectly fine (and expected) for the output to have remaining bytes left. Test-case: $ ./vhd-util create -n =C3=A4.vhd -s 1 $ ./vhd-util snapshot -n snap.vhd -p =C3=A4.vhd ; echo $=3F See for more information about the details of handling the encoding right. Signed-off-by: Philipp Hahn Acked-by: Ian Campbell --- tools/blktap2/vhd/lib/libvhd.c | 27 +++++++++++++++++++-------- tools/blktap2/vhd/vhd-util.c | 3 +++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/tools/blktap2/vhd/lib/libvhd.c b/tools/blktap2/vhd/lib/libvhd.c index 95eb5d6..1fd5b4e 100644 --- a/tools/blktap2/vhd/lib/libvhd.c +++ b/tools/blktap2/vhd/lib/libvhd.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "libvhd.h" #include "relative-path.h" @@ -1296,6 +1297,7 @@ vhd_macx_encode_location(char *name, char **out, int *outlen) size_t ibl, obl; char *uri, *uri_utf8, *uri_utf8p, *ret; const char *urip; + char *codeset; err =3D 0; ret =3D NULL; @@ -1304,7 +1306,7 @@ vhd_macx_encode_location(char *name, char **out, int *outlen) len =3D strlen(name) + strlen("file://"); ibl =3D len; - obl =3D len; + obl =3D len * 2; urip =3D uri =3D malloc(ibl + 1); uri_utf8 =3D uri_utf8p =3D malloc(obl); @@ -1312,7 +1314,8 @@ vhd_macx_encode_location(char *name, char **out, int *outlen) if (!uri || !uri_utf8) return -ENOMEM; - cd =3D iconv_open("UTF-8", "ASCII"); + codeset =3D nl_langinfo(CODESET); + cd =3D iconv_open("UTF-8", codeset); if (cd =3D=3D (iconv_t)-1) { err =3D -errno; goto out; @@ -1325,7 +1328,7 @@ vhd_macx_encode_location(char *name, char **out, int *outlen) (char **) #endif &urip, &ibl, &uri_utf8p, &obl) =3D=3D (size_t)-1 || - ibl || obl) { + ibl) { err =3D (errno =3F -errno : -EIO); goto out; } @@ -1357,6 +1360,7 @@ vhd_w2u_encode_location(char *name, char **out, int *outlen) size_t ibl, obl; char *uri, *uri_utf16, *uri_utf16p, *tmp, *ret; const char *urip; + char *codeset; err =3D 0; ret =3D NULL; @@ -1404,7 +1408,8 @@ vhd_w2u_encode_location(char *name, char **out, int *outlen) * MICROSOFT_COMPAT * little endian unicode here */ - cd =3D iconv_open("UTF-16LE", "ASCII"); + codeset =3D nl_langinfo(CODESET); + cd =3D iconv_open("UTF-16LE", codeset); if (cd =3D=3D (iconv_t)-1) { err =3D -errno; goto out; @@ -1415,7 +1420,7 @@ vhd_w2u_encode_location(char *name, char **out, int *outlen) (char **) #endif &urip, &ibl, &uri_utf16p, &obl) =3D=3D (size_t)-1 || - ibl || obl) { + ibl) { err =3D (errno =3F -errno : -EIO); goto out; } @@ -1447,11 +1452,13 @@ vhd_macx_decode_location(const char *in, char *out, int len) iconv_t cd; char *name; size_t ibl, obl; + char *codeset; name =3D out; ibl =3D obl =3D len; - cd =3D iconv_open("ASCII", "UTF-8"); + codeset =3D nl_langinfo(CODESET); + cd =3D iconv_open(codeset, "UTF-8"); if (cd =3D=3D (iconv_t)-1) return NULL; @@ -1479,11 +1486,13 @@ vhd_w2u_decode_location(const char *in, char *out, int len, char *utf_type) iconv_t cd; char *name, *tmp; size_t ibl, obl; + char *codeset; tmp =3D name =3D out; ibl =3D obl =3D len; - cd =3D iconv_open("ASCII", utf_type); + codeset =3D nl_langinfo(CODESET); + cd =3D iconv_open(codeset, utf_type); if (cd =3D=3D (iconv_t)-1) return NULL; @@ -2450,6 +2459,7 @@ vhd_initialize_header_parent_name(vhd_context_t *ctx, const char *parent_path) size_t ibl, obl; char *ppath, *dst; const char *pname; + char *codeset; err =3D 0; pname =3D NULL; @@ -2459,7 +2469,8 @@ vhd_initialize_header_parent_name(vhd_context_t *ctx, const char *parent_path) * MICROSOFT_COMPAT * big endian unicode here */ - cd =3D iconv_open(UTF_16BE, "ASCII"); + codeset =3D nl_langinfo(CODESET); + cd =3D iconv_open(UTF_16BE, codeset); if (cd =3D=3D (iconv_t)-1) { err =3D -errno; goto out; diff --git a/tools/blktap2/vhd/vhd-util.c b/tools/blktap2/vhd/vhd-util.c index 944a59e..13f1835 100644 --- a/tools/blktap2/vhd/vhd-util.c +++ b/tools/blktap2/vhd/vhd-util.c @@ -28,6 +28,8 @@ #include #include #include +#include +#include #include "libvhd.h" #include "vhd-util.h" @@ -114,6 +116,7 @@ main(int argc, char *argv[]) if (setrlimit(RLIMIT_CORE, &rlim) < 0) fprintf(stderr, "setrlimit failed: %d\n", errno); #endif + setlocale(LC_CTYPE, ""); ret =3D 0; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7451590322418459066== 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 --===============7451590322418459066==-- From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:36:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:36: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 1YYfIg-00021F-Hr; Thu, 19 Mar 2015 18:36:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIf-00020l-SY for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:09 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id CA/7F-10326-9171B055; Thu, 19 Mar 2015 18:36:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1426790167!13760356!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14019 invoked from network); 19 Mar 2015 18:36: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; 19 Mar 2015 18:36:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfId-0002Pe-9S for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfId-0008Fb-8C for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:07 +0000 Date: Thu, 19 Mar 2015 18:36:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: cleanup one libxl__calloc() usage X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f0638e914a542f20e8bb369dd476dfc6c020f0a Author: Tiejun Chen AuthorDate: Tue Mar 10 14:28:16 2015 +0800 Commit: Ian Campbell CommitDate: Wed Mar 11 11:36:39 2015 +0000 tools/libxl: cleanup one libxl__calloc() usage Its pointless because internally, libxl__calloc() would always terminate program execution if failed, libxl__calloc() | + void *ptr = calloc(nmemb, size); + if (!ptr) libxl__alloc_failed(CTX, __func__, nmemb, size); | + _exit(-1); Signed-off-by: Tiejun Chen Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_dm.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 8599a6a..cb006df 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1175,10 +1175,6 @@ static void spawn_stub_launch_dm(libxl__egc *egc, num_console++; console = libxl__calloc(gc, num_console, sizeof(libxl__device_console)); - if (!console) { - ret = ERROR_NOMEM; - goto out; - } for (i = 0; i < num_console; i++) { libxl__device device; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:36:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:36: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 1YYfIg-00021F-Hr; Thu, 19 Mar 2015 18:36:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIf-00020l-SY for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:09 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id CA/7F-10326-9171B055; Thu, 19 Mar 2015 18:36:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1426790167!13760356!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14019 invoked from network); 19 Mar 2015 18:36: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; 19 Mar 2015 18:36:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfId-0002Pe-9S for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfId-0008Fb-8C for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:07 +0000 Date: Thu, 19 Mar 2015 18:36:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: cleanup one libxl__calloc() usage X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f0638e914a542f20e8bb369dd476dfc6c020f0a Author: Tiejun Chen AuthorDate: Tue Mar 10 14:28:16 2015 +0800 Commit: Ian Campbell CommitDate: Wed Mar 11 11:36:39 2015 +0000 tools/libxl: cleanup one libxl__calloc() usage Its pointless because internally, libxl__calloc() would always terminate program execution if failed, libxl__calloc() | + void *ptr = calloc(nmemb, size); + if (!ptr) libxl__alloc_failed(CTX, __func__, nmemb, size); | + _exit(-1); Signed-off-by: Tiejun Chen Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_dm.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 8599a6a..cb006df 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1175,10 +1175,6 @@ static void spawn_stub_launch_dm(libxl__egc *egc, num_console++; console = libxl__calloc(gc, num_console, sizeof(libxl__device_console)); - if (!console) { - ret = ERROR_NOMEM; - goto out; - } for (i = 0; i < num_console; i++) { libxl__device device; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:36:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:36: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 1YYfIr-00022y-Km; Thu, 19 Mar 2015 18:36:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIq-00022j-4I for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:20 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 87/E8-01563-3271B055; Thu, 19 Mar 2015 18:36:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1426790177!13835059!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32169 invoked from network); 19 Mar 2015 18:36:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:36:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIn-0002Pm-Ez for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfIn-0008GH-Dt for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:17 +0000 Date: Thu, 19 Mar 2015 18:36:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MINIOS_UPSTREAM_REVISION 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 00f1fc5fd2bb9c7cf7f0e8a841ee741e547a4145 Author: Ian Campbell AuthorDate: Wed Mar 11 10:47:33 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 11:37:58 2015 +0000 MINIOS_UPSTREAM_REVISION Update Signed-off-by: Ian Campbell --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index c0c0775..f457b5d 100644 --- a/Config.mk +++ b/Config.mk @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= a065efc7c7ce8bb3e5cb3e463099d023d4a92927 QEMU_UPSTREAM_REVISION ?= master -MINIOS_UPSTREAM_REVISION ?= 55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d -# Thu Jan 29 19:10:04 2015 +0000 -# Mini-OS: standalone build +MINIOS_UPSTREAM_REVISION ?= d0b7f0f62fd0e1154d29849b9f2e6de3783742ce +# Tue Mar 10 13:14:38 2015 +0000 +# mini-os: replace XEN_TARGET_ARCH with MINIOS_TARGET_ARCH SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 # Wed Feb 18 12:49:59 2015 -0500 -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:36:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:36: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 1YYfIr-00022y-Km; Thu, 19 Mar 2015 18:36:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIq-00022j-4I for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:20 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 87/E8-01563-3271B055; Thu, 19 Mar 2015 18:36:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1426790177!13835059!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32169 invoked from network); 19 Mar 2015 18:36:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:36:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIn-0002Pm-Ez for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfIn-0008GH-Dt for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:17 +0000 Date: Thu, 19 Mar 2015 18:36:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MINIOS_UPSTREAM_REVISION 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 00f1fc5fd2bb9c7cf7f0e8a841ee741e547a4145 Author: Ian Campbell AuthorDate: Wed Mar 11 10:47:33 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 11:37:58 2015 +0000 MINIOS_UPSTREAM_REVISION Update Signed-off-by: Ian Campbell --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index c0c0775..f457b5d 100644 --- a/Config.mk +++ b/Config.mk @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= a065efc7c7ce8bb3e5cb3e463099d023d4a92927 QEMU_UPSTREAM_REVISION ?= master -MINIOS_UPSTREAM_REVISION ?= 55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d -# Thu Jan 29 19:10:04 2015 +0000 -# Mini-OS: standalone build +MINIOS_UPSTREAM_REVISION ?= d0b7f0f62fd0e1154d29849b9f2e6de3783742ce +# Tue Mar 10 13:14:38 2015 +0000 +# mini-os: replace XEN_TARGET_ARCH with MINIOS_TARGET_ARCH SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 # Wed Feb 18 12:49:59 2015 -0500 -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:36:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:36: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 1YYfJ1-00024x-Ol; Thu, 19 Mar 2015 18:36:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJ0-00024b-22 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:30 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 15/36-31237-D271B055; Thu, 19 Mar 2015 18:36:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1426790187!14394270!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30467 invoked from network); 19 Mar 2015 18:36:28 -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; 19 Mar 2015 18:36:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIx-0002Ps-KO for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfIx-0008Hj-Ir for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:27 +0000 Date: Thu, 19 Mar 2015 18:36:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] stubdom: export XEN_ROOT in makefile X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 35843c0165d302ff4b9d3e9e14e2df9505d40588 Author: Wei Liu AuthorDate: Tue Mar 10 13:14:39 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 11:38:52 2015 +0000 stubdom: export XEN_ROOT in makefile ... because XEN_ROOT is used in mini-os's Config.mk. Signed-off-by: Wei Liu Acked-by: Samuel Thibault Acked-by: Ian Campbell --- stubdom/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index f339b20..d9e7e40 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -1,6 +1,7 @@ XEN_ROOT = $(CURDIR)/.. MINI_OS = $(XEN_ROOT)/extras/mini-os +export XEN_ROOT export XEN_OS=MiniOS export stubdom=y -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:36:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:36: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 1YYfJ1-00024x-Ol; Thu, 19 Mar 2015 18:36:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJ0-00024b-22 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:30 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 15/36-31237-D271B055; Thu, 19 Mar 2015 18:36:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1426790187!14394270!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30467 invoked from network); 19 Mar 2015 18:36:28 -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; 19 Mar 2015 18:36:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfIx-0002Ps-KO for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfIx-0008Hj-Ir for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:27 +0000 Date: Thu, 19 Mar 2015 18:36:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] stubdom: export XEN_ROOT in makefile X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 35843c0165d302ff4b9d3e9e14e2df9505d40588 Author: Wei Liu AuthorDate: Tue Mar 10 13:14:39 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 11:38:52 2015 +0000 stubdom: export XEN_ROOT in makefile ... because XEN_ROOT is used in mini-os's Config.mk. Signed-off-by: Wei Liu Acked-by: Samuel Thibault Acked-by: Ian Campbell --- stubdom/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index f339b20..d9e7e40 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -1,6 +1,7 @@ XEN_ROOT = $(CURDIR)/.. MINI_OS = $(XEN_ROOT)/extras/mini-os +export XEN_ROOT export XEN_OS=MiniOS export stubdom=y -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:36:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:36: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 1YYfJB-00026Z-RQ; Thu, 19 Mar 2015 18:36:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJA-00026J-KX for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:40 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 97/9E-14983-7371B055; Thu, 19 Mar 2015 18:36:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1426790198!13863900!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26911 invoked from network); 19 Mar 2015 18:36:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:36:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJ7-0002Q4-Pb for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfJ7-0008IM-Oj for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:37 +0000 Date: Thu, 19 Mar 2015 18:36:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add Xilinx ZynqMP platform 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 ed6f3aec05f9328411b74c9deb1207377574477c Author: Edgar E. Iglesias AuthorDate: Wed Mar 11 11:19:32 2015 +1000 Commit: Ian Campbell CommitDate: Wed Mar 11 12:38:43 2015 +0000 xen/arm: Add Xilinx ZynqMP platform support Signed-off-by: Edgar E. Iglesias Reviewed-by: Julien Grall Acked-by: Ian Campbell [ ijc -- resorted list in Makefile, moving thunderx entry ] --- xen/arch/arm/platforms/Makefile | 3 +- xen/arch/arm/platforms/xilinx-zynqmp.c | 41 ++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/platforms/Makefile b/xen/arch/arm/platforms/Makefile index d9f98f9..e7f2a43 100644 --- a/xen/arch/arm/platforms/Makefile +++ b/xen/arch/arm/platforms/Makefile @@ -6,5 +6,6 @@ obj-$(CONFIG_ARM_32) += omap5.o obj-$(CONFIG_ARM_32) += sunxi.o obj-$(CONFIG_ARM_32) += rcar2.o obj-$(CONFIG_ARM_64) += seattle.o -obj-$(CONFIG_ARM_64) += xgene-storm.o obj-$(CONFIG_ARM_64) += thunderx.o +obj-$(CONFIG_ARM_64) += xgene-storm.o +obj-$(CONFIG_ARM_64) += xilinx-zynqmp.o diff --git a/xen/arch/arm/platforms/xilinx-zynqmp.c b/xen/arch/arm/platforms/xilinx-zynqmp.c new file mode 100644 index 0000000..d03fb36 --- /dev/null +++ b/xen/arch/arm/platforms/xilinx-zynqmp.c @@ -0,0 +1,41 @@ +/* + * xen/arch/arm/platforms/xilinx-zynqmp.c + * + * Xilinx ZynqMP setup + * + * Copyright (c) 2015 Xilinx Inc. + * Written by Edgar E. Iglesias + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include + +static const char * const zynqmp_dt_compat[] __initconst = +{ + "xlnx,zynqmp", + NULL +}; + +PLATFORM_START(xgene_storm, "Xilinx ZynqMP") + .compatible = zynqmp_dt_compat, + .dom0_gnttab_start = 0xf0000000, + .dom0_gnttab_size = 0x20000, +PLATFORM_END + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * 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 Mar 19 18:36:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:36: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 1YYfJB-00026Z-RQ; Thu, 19 Mar 2015 18:36:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJA-00026J-KX for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:40 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 97/9E-14983-7371B055; Thu, 19 Mar 2015 18:36:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1426790198!13863900!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26911 invoked from network); 19 Mar 2015 18:36:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:36:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJ7-0002Q4-Pb for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfJ7-0008IM-Oj for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:37 +0000 Date: Thu, 19 Mar 2015 18:36:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add Xilinx ZynqMP platform 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 ed6f3aec05f9328411b74c9deb1207377574477c Author: Edgar E. Iglesias AuthorDate: Wed Mar 11 11:19:32 2015 +1000 Commit: Ian Campbell CommitDate: Wed Mar 11 12:38:43 2015 +0000 xen/arm: Add Xilinx ZynqMP platform support Signed-off-by: Edgar E. Iglesias Reviewed-by: Julien Grall Acked-by: Ian Campbell [ ijc -- resorted list in Makefile, moving thunderx entry ] --- xen/arch/arm/platforms/Makefile | 3 +- xen/arch/arm/platforms/xilinx-zynqmp.c | 41 ++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/platforms/Makefile b/xen/arch/arm/platforms/Makefile index d9f98f9..e7f2a43 100644 --- a/xen/arch/arm/platforms/Makefile +++ b/xen/arch/arm/platforms/Makefile @@ -6,5 +6,6 @@ obj-$(CONFIG_ARM_32) += omap5.o obj-$(CONFIG_ARM_32) += sunxi.o obj-$(CONFIG_ARM_32) += rcar2.o obj-$(CONFIG_ARM_64) += seattle.o -obj-$(CONFIG_ARM_64) += xgene-storm.o obj-$(CONFIG_ARM_64) += thunderx.o +obj-$(CONFIG_ARM_64) += xgene-storm.o +obj-$(CONFIG_ARM_64) += xilinx-zynqmp.o diff --git a/xen/arch/arm/platforms/xilinx-zynqmp.c b/xen/arch/arm/platforms/xilinx-zynqmp.c new file mode 100644 index 0000000..d03fb36 --- /dev/null +++ b/xen/arch/arm/platforms/xilinx-zynqmp.c @@ -0,0 +1,41 @@ +/* + * xen/arch/arm/platforms/xilinx-zynqmp.c + * + * Xilinx ZynqMP setup + * + * Copyright (c) 2015 Xilinx Inc. + * Written by Edgar E. Iglesias + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include + +static const char * const zynqmp_dt_compat[] __initconst = +{ + "xlnx,zynqmp", + NULL +}; + +PLATFORM_START(xgene_storm, "Xilinx ZynqMP") + .compatible = zynqmp_dt_compat, + .dom0_gnttab_start = 0xf0000000, + .dom0_gnttab_size = 0x20000, +PLATFORM_END + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * 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 Mar 19 18:36:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:36: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 1YYfJL-00028A-UB; Thu, 19 Mar 2015 18:36:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJK-00027u-P9 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:50 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id B8/FC-24916-2471B055; Thu, 19 Mar 2015 18:36:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1426790208!8608593!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9457 invoked from network); 19 Mar 2015 18:36:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:36:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJH-0002QA-VR for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfJH-0008Ii-Th for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:47 +0000 Date: Thu, 19 Mar 2015 18:36:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add Cadence UART driver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 18ead12298fa8b54b5818b28463d6e21b66be6fd Author: Edgar E. Iglesias AuthorDate: Wed Mar 11 11:19:33 2015 +1000 Commit: Ian Campbell CommitDate: Wed Mar 11 12:39:09 2015 +0000 xen/arm: Add Cadence UART driver Reviewed-by: Julien Grall Signed-off-by: Edgar E. Iglesias Acked-by: Ian Campbell --- config/arm64.mk | 1 + xen/drivers/char/Makefile | 1 + xen/drivers/char/cadence-uart.c | 224 ++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/cadence-uart.h | 55 +++++++++ 4 files changed, 281 insertions(+), 0 deletions(-) diff --git a/config/arm64.mk b/config/arm64.mk index 6eafda2..df6ad0a 100644 --- a/config/arm64.mk +++ b/config/arm64.mk @@ -7,6 +7,7 @@ CONFIG_XEN_INSTALL_SUFFIX := CFLAGS += #-marm -march= -mcpu= etc HAS_PL011 := y +HAS_CADENCE_UART := y HAS_NS16550 := y # Use only if calling $(LD) directly. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index 9e94195..47fc3f9 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -1,5 +1,6 @@ obj-y += console.o obj-$(HAS_NS16550) += ns16550.o +obj-$(HAS_CADENCE_UART) += cadence-uart.o obj-$(HAS_PL011) += pl011.o obj-$(HAS_EXYNOS4210) += exynos4210-uart.o obj-$(HAS_OMAP) += omap-uart.o diff --git a/xen/drivers/char/cadence-uart.c b/xen/drivers/char/cadence-uart.c new file mode 100644 index 0000000..933672f --- /dev/null +++ b/xen/drivers/char/cadence-uart.c @@ -0,0 +1,224 @@ +/* + * xen/drivers/char/cadence-uart.c + * + * Driver for Cadence UART in Xilinx ZynqMP. + * + * Written by Edgar E. Iglesias + * Copyright (c) 2015 Xilinx Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static struct cuart { + unsigned int irq; + void __iomem *regs; + /* UART with IRQ line: interrupt-driven I/O. */ + struct irqaction irqaction; + struct vuart_info vuart; +} cuart_com = {0}; + +#define cuart_read(uart, off) readl((uart)->regs + (off)) +#define cuart_write(uart, off,val) writel((val), (uart)->regs + (off)) + +static void cuart_interrupt(int irq, void *data, struct cpu_user_regs *regs) +{ + struct serial_port *port = data; + struct cuart *uart = port->uart; + unsigned int status; + + do { + status = cuart_read(uart, R_UART_SR); + /* ACK. */ + if ( status & UART_SR_INTR_RTRIG ) + { + serial_rx_interrupt(port, regs); + cuart_write(uart, R_UART_CISR, UART_SR_INTR_RTRIG); + } + } while ( status & UART_SR_INTR_RTRIG ); +} + +static void __init cuart_init_preirq(struct serial_port *port) +{ + struct cuart *uart = port->uart; + + cuart_write(uart, R_UART_MR, UART_MR_NO_PARITY); + /* Enable and Reset both the RX and TX paths. */ + cuart_write(uart, R_UART_CR, UART_CR_RX_RST | UART_CR_TX_RST | + UART_CR_RX_ENABLE | UART_CR_TX_ENABLE); +} + +static void __init cuart_init_postirq(struct serial_port *port) +{ + struct cuart *uart = port->uart; + int rc; + + if ( uart->irq > 0 ) + { + uart->irqaction.handler = cuart_interrupt; + uart->irqaction.name = "cadence-uart"; + uart->irqaction.dev_id = port; + if ( (rc = setup_irq(uart->irq, 0, &uart->irqaction)) != 0 ) + printk("ERROR: Failed to allocate cadence-uart IRQ %d\n", uart->irq); + } + + /* Clear pending error interrupts */ + cuart_write(uart, R_UART_RTRIG, 1); + cuart_write(uart, R_UART_CISR, ~0); + + /* Unmask interrupts */ + cuart_write(uart, R_UART_IDR, ~0); + cuart_write(uart, R_UART_IER, UART_SR_INTR_RTRIG); +} + +static void cuart_suspend(struct serial_port *port) +{ + BUG(); +} + +static void cuart_resume(struct serial_port *port) +{ + BUG(); +} + +static int cuart_tx_ready(struct serial_port *port) +{ + struct cuart *uart = port->uart; + unsigned int status = cuart_read(uart, R_UART_SR); + + return !( status & UART_SR_INTR_TFUL ); +} + +static void cuart_putc(struct serial_port *port, char c) +{ + struct cuart *uart = port->uart; + + cuart_write(uart, R_UART_TX, (uint32_t)(unsigned char)c); +} + +static int cuart_getc(struct serial_port *port, char *pc) +{ + struct cuart *uart = port->uart; + + if ( cuart_read(uart, R_UART_SR) & UART_SR_INTR_REMPTY ) + return 0; + + *pc = cuart_read(uart, R_UART_RX) & 0xff; + return 1; +} + +static int __init cuart_irq(struct serial_port *port) +{ + struct cuart *uart = port->uart; + + return ( (uart->irq > 0) ? uart->irq : -1 ); +} + +static const struct vuart_info *cuart_vuart(struct serial_port *port) +{ + struct cuart *uart = port->uart; + + return &uart->vuart; +} + +static struct uart_driver __read_mostly cuart_driver = { + .init_preirq = cuart_init_preirq, + .init_postirq = cuart_init_postirq, + .endboot = NULL, + .suspend = cuart_suspend, + .resume = cuart_resume, + .tx_ready = cuart_tx_ready, + .putc = cuart_putc, + .getc = cuart_getc, + .irq = cuart_irq, + .vuart_info = cuart_vuart, +}; + +static int __init cuart_init(struct dt_device_node *dev, const void *data) +{ + const char *config = data; + struct cuart *uart; + int res; + u64 addr, size; + + if ( strcmp(config, "") ) + printk("WARNING: UART configuration is not supported\n"); + + uart = &cuart_com; + + res = dt_device_get_address(dev, 0, &addr, &size); + if ( res ) + { + printk("cadence: Unable to retrieve the base" + " address of the UART\n"); + return res; + } + + res = platform_get_irq(dev, 0); + if ( res < 0 ) + { + printk("cadence: Unable to retrieve the IRQ\n"); + return -EINVAL; + } + uart->irq = res; + + uart->regs = ioremap_nocache(addr, size); + if ( !uart->regs ) + { + printk("cadence: Unable to map the UART memory\n"); + return -ENOMEM; + } + + uart->vuart.base_addr = addr; + uart->vuart.size = size; + uart->vuart.data_off = R_UART_RX; + uart->vuart.status_off = R_UART_SR; + uart->vuart.status = UART_SR_INTR_TEMPTY; + + /* Register with generic serial driver. */ + serial_register_uart(SERHND_DTUART, &cuart_driver, uart); + + dt_device_set_used_by(dev, DOMID_XEN); + + return 0; +} + +static const struct dt_device_match cuart_dt_match[] __initconst = +{ + DT_MATCH_COMPATIBLE("cdns,uart-r1p8"), + { /* sentinel */ }, +}; + +DT_DEVICE_START(cuart, "Cadence UART", DEVICE_SERIAL) + .dt_match = cuart_dt_match, + .init = cuart_init, +DT_DEVICE_END + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/cadence-uart.h b/xen/include/asm-arm/cadence-uart.h new file mode 100644 index 0000000..48680ee --- /dev/null +++ b/xen/include/asm-arm/cadence-uart.h @@ -0,0 +1,55 @@ +/* + * xen/include/asm-arm/cadence-uart.h + * + * Written by Edgar E. Iglesias + * Copyright (C) 2015 Xilinx Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __ASM_ARM_CADENCE_UART_H__ +#define __ASM_ARM_CADENCE_UART_H__ + +#define R_UART_CR 0x00 +#define UART_CR_RX_RST 0x01 +#define UART_CR_TX_RST 0x02 +#define UART_CR_RX_ENABLE 0x04 +#define UART_CR_RX_DISABLE 0x08 +#define UART_CR_TX_ENABLE 0x10 +#define UART_CR_TX_DISABLE 0x20 + +#define R_UART_MR 0x04 +#define UART_MR_NO_PARITY 0x20 + +#define R_UART_IER 0x08 +#define R_UART_IDR 0x0C +#define R_UART_IMR 0x10 +#define R_UART_CISR 0x14 +#define R_UART_RTRIG 0x20 +#define R_UART_SR 0x2C +#define UART_SR_INTR_RTRIG 0x01 +#define UART_SR_INTR_REMPTY 0x02 +#define UART_SR_INTR_TEMPTY 0x08 +#define UART_SR_INTR_TFUL 0x10 + +#define R_UART_TX 0x30 +#define R_UART_RX 0x30 + +#endif /* __ASM_ARM_CADENCE_UART_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * 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 Mar 19 18:36:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:36: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 1YYfJL-00028A-UB; Thu, 19 Mar 2015 18:36:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJK-00027u-P9 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:50 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id B8/FC-24916-2471B055; Thu, 19 Mar 2015 18:36:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1426790208!8608593!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9457 invoked from network); 19 Mar 2015 18:36:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:36:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJH-0002QA-VR for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfJH-0008Ii-Th for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:47 +0000 Date: Thu, 19 Mar 2015 18:36:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add Cadence UART driver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 18ead12298fa8b54b5818b28463d6e21b66be6fd Author: Edgar E. Iglesias AuthorDate: Wed Mar 11 11:19:33 2015 +1000 Commit: Ian Campbell CommitDate: Wed Mar 11 12:39:09 2015 +0000 xen/arm: Add Cadence UART driver Reviewed-by: Julien Grall Signed-off-by: Edgar E. Iglesias Acked-by: Ian Campbell --- config/arm64.mk | 1 + xen/drivers/char/Makefile | 1 + xen/drivers/char/cadence-uart.c | 224 ++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/cadence-uart.h | 55 +++++++++ 4 files changed, 281 insertions(+), 0 deletions(-) diff --git a/config/arm64.mk b/config/arm64.mk index 6eafda2..df6ad0a 100644 --- a/config/arm64.mk +++ b/config/arm64.mk @@ -7,6 +7,7 @@ CONFIG_XEN_INSTALL_SUFFIX := CFLAGS += #-marm -march= -mcpu= etc HAS_PL011 := y +HAS_CADENCE_UART := y HAS_NS16550 := y # Use only if calling $(LD) directly. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index 9e94195..47fc3f9 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -1,5 +1,6 @@ obj-y += console.o obj-$(HAS_NS16550) += ns16550.o +obj-$(HAS_CADENCE_UART) += cadence-uart.o obj-$(HAS_PL011) += pl011.o obj-$(HAS_EXYNOS4210) += exynos4210-uart.o obj-$(HAS_OMAP) += omap-uart.o diff --git a/xen/drivers/char/cadence-uart.c b/xen/drivers/char/cadence-uart.c new file mode 100644 index 0000000..933672f --- /dev/null +++ b/xen/drivers/char/cadence-uart.c @@ -0,0 +1,224 @@ +/* + * xen/drivers/char/cadence-uart.c + * + * Driver for Cadence UART in Xilinx ZynqMP. + * + * Written by Edgar E. Iglesias + * Copyright (c) 2015 Xilinx Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static struct cuart { + unsigned int irq; + void __iomem *regs; + /* UART with IRQ line: interrupt-driven I/O. */ + struct irqaction irqaction; + struct vuart_info vuart; +} cuart_com = {0}; + +#define cuart_read(uart, off) readl((uart)->regs + (off)) +#define cuart_write(uart, off,val) writel((val), (uart)->regs + (off)) + +static void cuart_interrupt(int irq, void *data, struct cpu_user_regs *regs) +{ + struct serial_port *port = data; + struct cuart *uart = port->uart; + unsigned int status; + + do { + status = cuart_read(uart, R_UART_SR); + /* ACK. */ + if ( status & UART_SR_INTR_RTRIG ) + { + serial_rx_interrupt(port, regs); + cuart_write(uart, R_UART_CISR, UART_SR_INTR_RTRIG); + } + } while ( status & UART_SR_INTR_RTRIG ); +} + +static void __init cuart_init_preirq(struct serial_port *port) +{ + struct cuart *uart = port->uart; + + cuart_write(uart, R_UART_MR, UART_MR_NO_PARITY); + /* Enable and Reset both the RX and TX paths. */ + cuart_write(uart, R_UART_CR, UART_CR_RX_RST | UART_CR_TX_RST | + UART_CR_RX_ENABLE | UART_CR_TX_ENABLE); +} + +static void __init cuart_init_postirq(struct serial_port *port) +{ + struct cuart *uart = port->uart; + int rc; + + if ( uart->irq > 0 ) + { + uart->irqaction.handler = cuart_interrupt; + uart->irqaction.name = "cadence-uart"; + uart->irqaction.dev_id = port; + if ( (rc = setup_irq(uart->irq, 0, &uart->irqaction)) != 0 ) + printk("ERROR: Failed to allocate cadence-uart IRQ %d\n", uart->irq); + } + + /* Clear pending error interrupts */ + cuart_write(uart, R_UART_RTRIG, 1); + cuart_write(uart, R_UART_CISR, ~0); + + /* Unmask interrupts */ + cuart_write(uart, R_UART_IDR, ~0); + cuart_write(uart, R_UART_IER, UART_SR_INTR_RTRIG); +} + +static void cuart_suspend(struct serial_port *port) +{ + BUG(); +} + +static void cuart_resume(struct serial_port *port) +{ + BUG(); +} + +static int cuart_tx_ready(struct serial_port *port) +{ + struct cuart *uart = port->uart; + unsigned int status = cuart_read(uart, R_UART_SR); + + return !( status & UART_SR_INTR_TFUL ); +} + +static void cuart_putc(struct serial_port *port, char c) +{ + struct cuart *uart = port->uart; + + cuart_write(uart, R_UART_TX, (uint32_t)(unsigned char)c); +} + +static int cuart_getc(struct serial_port *port, char *pc) +{ + struct cuart *uart = port->uart; + + if ( cuart_read(uart, R_UART_SR) & UART_SR_INTR_REMPTY ) + return 0; + + *pc = cuart_read(uart, R_UART_RX) & 0xff; + return 1; +} + +static int __init cuart_irq(struct serial_port *port) +{ + struct cuart *uart = port->uart; + + return ( (uart->irq > 0) ? uart->irq : -1 ); +} + +static const struct vuart_info *cuart_vuart(struct serial_port *port) +{ + struct cuart *uart = port->uart; + + return &uart->vuart; +} + +static struct uart_driver __read_mostly cuart_driver = { + .init_preirq = cuart_init_preirq, + .init_postirq = cuart_init_postirq, + .endboot = NULL, + .suspend = cuart_suspend, + .resume = cuart_resume, + .tx_ready = cuart_tx_ready, + .putc = cuart_putc, + .getc = cuart_getc, + .irq = cuart_irq, + .vuart_info = cuart_vuart, +}; + +static int __init cuart_init(struct dt_device_node *dev, const void *data) +{ + const char *config = data; + struct cuart *uart; + int res; + u64 addr, size; + + if ( strcmp(config, "") ) + printk("WARNING: UART configuration is not supported\n"); + + uart = &cuart_com; + + res = dt_device_get_address(dev, 0, &addr, &size); + if ( res ) + { + printk("cadence: Unable to retrieve the base" + " address of the UART\n"); + return res; + } + + res = platform_get_irq(dev, 0); + if ( res < 0 ) + { + printk("cadence: Unable to retrieve the IRQ\n"); + return -EINVAL; + } + uart->irq = res; + + uart->regs = ioremap_nocache(addr, size); + if ( !uart->regs ) + { + printk("cadence: Unable to map the UART memory\n"); + return -ENOMEM; + } + + uart->vuart.base_addr = addr; + uart->vuart.size = size; + uart->vuart.data_off = R_UART_RX; + uart->vuart.status_off = R_UART_SR; + uart->vuart.status = UART_SR_INTR_TEMPTY; + + /* Register with generic serial driver. */ + serial_register_uart(SERHND_DTUART, &cuart_driver, uart); + + dt_device_set_used_by(dev, DOMID_XEN); + + return 0; +} + +static const struct dt_device_match cuart_dt_match[] __initconst = +{ + DT_MATCH_COMPATIBLE("cdns,uart-r1p8"), + { /* sentinel */ }, +}; + +DT_DEVICE_START(cuart, "Cadence UART", DEVICE_SERIAL) + .dt_match = cuart_dt_match, + .init = cuart_init, +DT_DEVICE_END + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/cadence-uart.h b/xen/include/asm-arm/cadence-uart.h new file mode 100644 index 0000000..48680ee --- /dev/null +++ b/xen/include/asm-arm/cadence-uart.h @@ -0,0 +1,55 @@ +/* + * xen/include/asm-arm/cadence-uart.h + * + * Written by Edgar E. Iglesias + * Copyright (C) 2015 Xilinx Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __ASM_ARM_CADENCE_UART_H__ +#define __ASM_ARM_CADENCE_UART_H__ + +#define R_UART_CR 0x00 +#define UART_CR_RX_RST 0x01 +#define UART_CR_TX_RST 0x02 +#define UART_CR_RX_ENABLE 0x04 +#define UART_CR_RX_DISABLE 0x08 +#define UART_CR_TX_ENABLE 0x10 +#define UART_CR_TX_DISABLE 0x20 + +#define R_UART_MR 0x04 +#define UART_MR_NO_PARITY 0x20 + +#define R_UART_IER 0x08 +#define R_UART_IDR 0x0C +#define R_UART_IMR 0x10 +#define R_UART_CISR 0x14 +#define R_UART_RTRIG 0x20 +#define R_UART_SR 0x2C +#define UART_SR_INTR_RTRIG 0x01 +#define UART_SR_INTR_REMPTY 0x02 +#define UART_SR_INTR_TEMPTY 0x08 +#define UART_SR_INTR_TFUL 0x10 + +#define R_UART_TX 0x30 +#define R_UART_RX 0x30 + +#endif /* __ASM_ARM_CADENCE_UART_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * 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 Mar 19 18:37:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:37: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 1YYfJX-0002AC-EL; Thu, 19 Mar 2015 18:37:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJV-00029u-DY for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:01 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 9C/56-32332-C471B055; Thu, 19 Mar 2015 18:37:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1426790218!4378434!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6165 invoked from network); 19 Mar 2015 18:36:59 -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; 19 Mar 2015 18:36:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJS-0002QJ-40 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfJS-0008Lt-2r for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:58 +0000 Date: Thu, 19 Mar 2015 18:36:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add Xilinx ZynqMP early printk 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 d6ccfe6ba053159b0e9c14850de2c5e6a703208c Author: Edgar E. Iglesias AuthorDate: Wed Mar 11 11:19:34 2015 +1000 Commit: Ian Campbell CommitDate: Wed Mar 11 12:39:10 2015 +0000 xen/arm: Add Xilinx ZynqMP early printk support Reviewed-by: Julien Grall Signed-off-by: Edgar E. Iglesias Acked-by: Ian Campbell --- docs/misc/arm/early-printk.txt | 1 + xen/arch/arm/Rules.mk | 6 ++++ xen/arch/arm/arm64/debug-cadence.inc | 45 ++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 0 deletions(-) diff --git a/docs/misc/arm/early-printk.txt b/docs/misc/arm/early-printk.txt index 859c635..710f07e 100644 --- a/docs/misc/arm/early-printk.txt +++ b/docs/misc/arm/early-printk.txt @@ -21,6 +21,7 @@ where mach is the name of the machine: - seattle: printk with pl011 for AMD Seattle processor - lager: printk with SCIF0 on Renesas R-Car H2 processors - thunderx: printk with pl011 for Cavium ThunderX processor + - zynqmp: printk with Cadence UART for Xilinx ZynqMP SoCs The base address and baud rate is hardcoded in xen/arch/arm/Rules.mk, see there when adding support for new machines. diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 54efa91..818a5bc 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -118,6 +118,12 @@ EARLY_PRINTK_INC := pl011 EARLY_UART_BASE_ADDRESS := 0x87e024000000 endif +ifeq ($(CONFIG_EARLY_PRINTK), zynqmp) +EARLY_PRINTK_INC := cadence +EARLY_PRINTK_BAUD := 115200 +EARLY_UART_BASE_ADDRESS := 0xff000000 +endif + ifneq ($(EARLY_PRINTK_INC),) EARLY_PRINTK := y endif diff --git a/xen/arch/arm/arm64/debug-cadence.inc b/xen/arch/arm/arm64/debug-cadence.inc new file mode 100644 index 0000000..84dee4c --- /dev/null +++ b/xen/arch/arm/arm64/debug-cadence.inc @@ -0,0 +1,45 @@ +/* + * xen/arch/arm/arm64/debug-cadence.S + * + * Cadence UART specific debug code + * + * Copyright (c) 2015 Xilinx Inc. + * Written by Edgar E. Iglesias. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include + +/* Cadence UART wait UART to be ready to transmit + * xb: register which contains the UART base address + * c: scratch register number */ +.macro early_uart_ready xb, c +1: + ldrh w\c, [\xb, #R_UART_SR] + tst w\c, #UART_SR_INTR_TFUL + b.ne 1b +.endm + +/* Cadence UART transmit character + * xb: register which contains the UART base address + * wt: register which contains the character to transmit */ +.macro early_uart_transmit xb, wt + strb \wt, [\xb, #R_UART_TX] +.endm + +/* + * Local variables: + * mode: ASM + * 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 Mar 19 18:37:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:37: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 1YYfJX-0002AC-EL; Thu, 19 Mar 2015 18:37:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJV-00029u-DY for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:01 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 9C/56-32332-C471B055; Thu, 19 Mar 2015 18:37:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1426790218!4378434!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6165 invoked from network); 19 Mar 2015 18:36:59 -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; 19 Mar 2015 18:36:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJS-0002QJ-40 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfJS-0008Lt-2r for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:36:58 +0000 Date: Thu, 19 Mar 2015 18:36:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add Xilinx ZynqMP early printk 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 d6ccfe6ba053159b0e9c14850de2c5e6a703208c Author: Edgar E. Iglesias AuthorDate: Wed Mar 11 11:19:34 2015 +1000 Commit: Ian Campbell CommitDate: Wed Mar 11 12:39:10 2015 +0000 xen/arm: Add Xilinx ZynqMP early printk support Reviewed-by: Julien Grall Signed-off-by: Edgar E. Iglesias Acked-by: Ian Campbell --- docs/misc/arm/early-printk.txt | 1 + xen/arch/arm/Rules.mk | 6 ++++ xen/arch/arm/arm64/debug-cadence.inc | 45 ++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 0 deletions(-) diff --git a/docs/misc/arm/early-printk.txt b/docs/misc/arm/early-printk.txt index 859c635..710f07e 100644 --- a/docs/misc/arm/early-printk.txt +++ b/docs/misc/arm/early-printk.txt @@ -21,6 +21,7 @@ where mach is the name of the machine: - seattle: printk with pl011 for AMD Seattle processor - lager: printk with SCIF0 on Renesas R-Car H2 processors - thunderx: printk with pl011 for Cavium ThunderX processor + - zynqmp: printk with Cadence UART for Xilinx ZynqMP SoCs The base address and baud rate is hardcoded in xen/arch/arm/Rules.mk, see there when adding support for new machines. diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 54efa91..818a5bc 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -118,6 +118,12 @@ EARLY_PRINTK_INC := pl011 EARLY_UART_BASE_ADDRESS := 0x87e024000000 endif +ifeq ($(CONFIG_EARLY_PRINTK), zynqmp) +EARLY_PRINTK_INC := cadence +EARLY_PRINTK_BAUD := 115200 +EARLY_UART_BASE_ADDRESS := 0xff000000 +endif + ifneq ($(EARLY_PRINTK_INC),) EARLY_PRINTK := y endif diff --git a/xen/arch/arm/arm64/debug-cadence.inc b/xen/arch/arm/arm64/debug-cadence.inc new file mode 100644 index 0000000..84dee4c --- /dev/null +++ b/xen/arch/arm/arm64/debug-cadence.inc @@ -0,0 +1,45 @@ +/* + * xen/arch/arm/arm64/debug-cadence.S + * + * Cadence UART specific debug code + * + * Copyright (c) 2015 Xilinx Inc. + * Written by Edgar E. Iglesias. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include + +/* Cadence UART wait UART to be ready to transmit + * xb: register which contains the UART base address + * c: scratch register number */ +.macro early_uart_ready xb, c +1: + ldrh w\c, [\xb, #R_UART_SR] + tst w\c, #UART_SR_INTR_TFUL + b.ne 1b +.endm + +/* Cadence UART transmit character + * xb: register which contains the UART base address + * wt: register which contains the character to transmit */ +.macro early_uart_transmit xb, wt + strb \wt, [\xb, #R_UART_TX] +.endm + +/* + * Local variables: + * mode: ASM + * 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 Mar 19 18:37:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:37: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 1YYfJg-0002DL-Gr; Thu, 19 Mar 2015 18:37:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJe-0002Cb-OJ for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:10 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id E0/83-29186-6571B055; Thu, 19 Mar 2015 18:37:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1426790228!4378465!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6694 invoked from network); 19 Mar 2015 18:37:09 -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; 19 Mar 2015 18:37:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJc-0002Qs-8i for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfJc-0008Pg-7P for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:08 +0000 Date: Thu, 19 Mar 2015 18:37:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Remove warning for platforms without platform specific code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1eb56fb6bbc6cc466338fe86f01d95fc73e124f Author: Edgar E. Iglesias AuthorDate: Mon Mar 9 15:23:23 2015 +1000 Commit: Ian Campbell CommitDate: Wed Mar 11 12:57:53 2015 +0000 xen/arm: Remove warning for platforms without platform specific code Replace the warning with an info message stating that the platform is generic. Suggested-by: Ian Campbell Signed-off-by: Edgar E. Iglesias Reviewed-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/platform.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c index 86daf2b..70c1388 100644 --- a/xen/arch/arm/platform.c +++ b/xen/arch/arm/platform.c @@ -44,17 +44,6 @@ static bool_t __init platform_is_compatible(const struct platform_desc *plat) return 0; } -/* List of possible platform */ -static void dump_platform_table(void) -{ - const struct platform_desc *p; - - printk("Available platform support:\n"); - - for ( p = _splatform; p != _eplatform; p++ ) - printk(" - %s\n", p->name); -} - void __init platform_init(void) { int res = 0; @@ -72,9 +61,7 @@ void __init platform_init(void) if ( platform == _eplatform ) { /* TODO: dump DT machine compatible node */ - printk(XENLOG_WARNING "WARNING: Unrecognized/unsupported device tree " - "compatible list\n"); - dump_platform_table(); + printk(XENLOG_INFO "Platform: Generic System\n"); platform = NULL; } 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 Mar 19 18:37:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:37: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 1YYfJg-0002DL-Gr; Thu, 19 Mar 2015 18:37:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJe-0002Cb-OJ for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:10 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id E0/83-29186-6571B055; Thu, 19 Mar 2015 18:37:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1426790228!4378465!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6694 invoked from network); 19 Mar 2015 18:37:09 -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; 19 Mar 2015 18:37:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJc-0002Qs-8i for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfJc-0008Pg-7P for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:08 +0000 Date: Thu, 19 Mar 2015 18:37:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Remove warning for platforms without platform specific code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1eb56fb6bbc6cc466338fe86f01d95fc73e124f Author: Edgar E. Iglesias AuthorDate: Mon Mar 9 15:23:23 2015 +1000 Commit: Ian Campbell CommitDate: Wed Mar 11 12:57:53 2015 +0000 xen/arm: Remove warning for platforms without platform specific code Replace the warning with an info message stating that the platform is generic. Suggested-by: Ian Campbell Signed-off-by: Edgar E. Iglesias Reviewed-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/platform.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c index 86daf2b..70c1388 100644 --- a/xen/arch/arm/platform.c +++ b/xen/arch/arm/platform.c @@ -44,17 +44,6 @@ static bool_t __init platform_is_compatible(const struct platform_desc *plat) return 0; } -/* List of possible platform */ -static void dump_platform_table(void) -{ - const struct platform_desc *p; - - printk("Available platform support:\n"); - - for ( p = _splatform; p != _eplatform; p++ ) - printk(" - %s\n", p->name); -} - void __init platform_init(void) { int res = 0; @@ -72,9 +61,7 @@ void __init platform_init(void) if ( platform == _eplatform ) { /* TODO: dump DT machine compatible node */ - printk(XENLOG_WARNING "WARNING: Unrecognized/unsupported device tree " - "compatible list\n"); - dump_platform_table(); + printk(XENLOG_INFO "Platform: Generic System\n"); platform = NULL; } 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 Mar 19 18:37:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:37: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 1YYfJq-0002H2-Ko; Thu, 19 Mar 2015 18:37:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJp-0002Gh-6K for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:21 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 65/16-18861-0671B055; Thu, 19 Mar 2015 18:37:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1426790238!4378493!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7911 invoked from network); 19 Mar 2015 18:37:19 -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; 19 Mar 2015 18:37:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJm-0002Qy-FJ for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfJm-0008QM-EJ for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:18 +0000 Date: Thu, 19 Mar 2015 18:37:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: xl: handle unspecified extra= when dealing with root= X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 49ab17a3a615e1ab4ccc46d6942f925cf841df4b Author: Ian Campbell AuthorDate: Mon Mar 9 12:48:56 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 12:58:49 2015 +0000 tools: xl: handle unspecified extra= when dealing with root= If the cfg file includes root= but not extra= (nor cmdline=, which supercedes both) then the command line will end up with an extra "(null)" on it (at least with glibc's implementation of asprintf). Signed-off-by: Ian Campbell Cc: Chunyan Liu Acked-by: Wei Liu --- tools/libxl/xl_cmdimpl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 399b6b6..a27ac9e 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -813,9 +813,11 @@ static char *parse_cmdline(XLU_Config *config) fprintf(stderr, "Warning: ignoring root= and extra= " "in favour of cmdline=\n"); } else { - if (root) { + if (root && extra) { if (asprintf(&cmdline, "root=%s %s", root, extra) == -1) cmdline = NULL; + } else if (root) { + cmdline = strdup(root); } else if (extra) { cmdline = strdup(extra); } -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:37:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:37: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 1YYfJq-0002H2-Ko; Thu, 19 Mar 2015 18:37:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJp-0002Gh-6K for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:21 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 65/16-18861-0671B055; Thu, 19 Mar 2015 18:37:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1426790238!4378493!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7911 invoked from network); 19 Mar 2015 18:37:19 -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; 19 Mar 2015 18:37:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJm-0002Qy-FJ for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfJm-0008QM-EJ for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:18 +0000 Date: Thu, 19 Mar 2015 18:37:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: xl: handle unspecified extra= when dealing with root= X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 49ab17a3a615e1ab4ccc46d6942f925cf841df4b Author: Ian Campbell AuthorDate: Mon Mar 9 12:48:56 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 12:58:49 2015 +0000 tools: xl: handle unspecified extra= when dealing with root= If the cfg file includes root= but not extra= (nor cmdline=, which supercedes both) then the command line will end up with an extra "(null)" on it (at least with glibc's implementation of asprintf). Signed-off-by: Ian Campbell Cc: Chunyan Liu Acked-by: Wei Liu --- tools/libxl/xl_cmdimpl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 399b6b6..a27ac9e 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -813,9 +813,11 @@ static char *parse_cmdline(XLU_Config *config) fprintf(stderr, "Warning: ignoring root= and extra= " "in favour of cmdline=\n"); } else { - if (root) { + if (root && extra) { if (asprintf(&cmdline, "root=%s %s", root, extra) == -1) cmdline = NULL; + } else if (root) { + cmdline = strdup(root); } else if (extra) { cmdline = strdup(extra); } -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:37:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:37: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 1YYfJz-0002Km-RX; Thu, 19 Mar 2015 18:37:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJz-0002KB-HX for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:31 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id D9/AD-05122-A671B055; Thu, 19 Mar 2015 18:37:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1426790249!14395220!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2639 invoked from network); 19 Mar 2015 18:37:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:37:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJx-0002R6-27 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfJw-0008Rk-TS for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:29 +0000 Date: Thu, 19 Mar 2015 18:37:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] passthrough: share_p2m: fix build failure on ARM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9bac5f5ccd8920d6a0ed624d54880677b10dc1a7 Author: Julien Grall AuthorDate: Wed Mar 11 14:05:25 2015 +0100 Commit: Jan Beulich CommitDate: Wed Mar 11 14:05:25 2015 +0100 passthrough: share_p2m: fix build failure on ARM The commit 7978429 "iommu: fix usage of shared EPT/IOMMU page tables on PVH guests" breaks the hypervisor compilation on ARM. This is because the macro hap_enabled is not defined on ARM. On x86, the P2M can only be shared when hap is enabled and the user didn't deny it (via the command line). Those checks are done by iommu_use_hap_pt(). On ARM, the macro iommu_use_hap_pt() is also defined. So move the if ( iommu_use_hap_pt(d) ) from the IOMMU drivers up to iommu_share_p2m_table. Suggested-by: Jan Beulich Signed-off-by: Julien Grall Reviewed-by: Ian Campbell --- xen/drivers/passthrough/amd/iommu_map.c | 3 --- xen/drivers/passthrough/iommu.c | 3 +-- xen/drivers/passthrough/vtd/iommu.c | 3 --- 3 files changed, 1 insertions(+), 8 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_map.c b/xen/drivers/passthrough/amd/iommu_map.c index 31dc05d..495ff5c 100644 --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -785,9 +785,6 @@ void amd_iommu_share_p2m(struct domain *d) struct page_info *p2m_table; mfn_t pgd_mfn; - if ( !iommu_use_hap_pt(d) ) - return; - pgd_mfn = pagetable_get_mfn(p2m_get_pagetable(p2m_get_hostp2m(d))); p2m_table = mfn_to_page(mfn_x(pgd_mfn)); diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 7fcbbb1..92ea26f 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -332,8 +332,7 @@ void iommu_share_p2m_table(struct domain* d) { const struct iommu_ops *ops = iommu_get_ops(); - ASSERT( hap_enabled(d) ); - if ( iommu_enabled ) + if ( iommu_enabled && iommu_use_hap_pt(d) ) ops->share_p2m(d); } diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 48676c5..891b9e3 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1789,9 +1789,6 @@ static void iommu_set_pgd(struct domain *d) struct hvm_iommu *hd = domain_hvm_iommu(d); mfn_t pgd_mfn; - if ( !iommu_use_hap_pt(d) ) - return; - pgd_mfn = pagetable_get_mfn(p2m_get_pagetable(p2m_get_hostp2m(d))); hd->arch.pgd_maddr = pagetable_get_paddr(pagetable_from_mfn(pgd_mfn)); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:37:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:37: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 1YYfJz-0002Km-RX; Thu, 19 Mar 2015 18:37:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJz-0002KB-HX for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:31 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id D9/AD-05122-A671B055; Thu, 19 Mar 2015 18:37:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1426790249!14395220!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2639 invoked from network); 19 Mar 2015 18:37:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:37:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfJx-0002R6-27 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfJw-0008Rk-TS for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:29 +0000 Date: Thu, 19 Mar 2015 18:37:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] passthrough: share_p2m: fix build failure on ARM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9bac5f5ccd8920d6a0ed624d54880677b10dc1a7 Author: Julien Grall AuthorDate: Wed Mar 11 14:05:25 2015 +0100 Commit: Jan Beulich CommitDate: Wed Mar 11 14:05:25 2015 +0100 passthrough: share_p2m: fix build failure on ARM The commit 7978429 "iommu: fix usage of shared EPT/IOMMU page tables on PVH guests" breaks the hypervisor compilation on ARM. This is because the macro hap_enabled is not defined on ARM. On x86, the P2M can only be shared when hap is enabled and the user didn't deny it (via the command line). Those checks are done by iommu_use_hap_pt(). On ARM, the macro iommu_use_hap_pt() is also defined. So move the if ( iommu_use_hap_pt(d) ) from the IOMMU drivers up to iommu_share_p2m_table. Suggested-by: Jan Beulich Signed-off-by: Julien Grall Reviewed-by: Ian Campbell --- xen/drivers/passthrough/amd/iommu_map.c | 3 --- xen/drivers/passthrough/iommu.c | 3 +-- xen/drivers/passthrough/vtd/iommu.c | 3 --- 3 files changed, 1 insertions(+), 8 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_map.c b/xen/drivers/passthrough/amd/iommu_map.c index 31dc05d..495ff5c 100644 --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -785,9 +785,6 @@ void amd_iommu_share_p2m(struct domain *d) struct page_info *p2m_table; mfn_t pgd_mfn; - if ( !iommu_use_hap_pt(d) ) - return; - pgd_mfn = pagetable_get_mfn(p2m_get_pagetable(p2m_get_hostp2m(d))); p2m_table = mfn_to_page(mfn_x(pgd_mfn)); diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 7fcbbb1..92ea26f 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -332,8 +332,7 @@ void iommu_share_p2m_table(struct domain* d) { const struct iommu_ops *ops = iommu_get_ops(); - ASSERT( hap_enabled(d) ); - if ( iommu_enabled ) + if ( iommu_enabled && iommu_use_hap_pt(d) ) ops->share_p2m(d); } diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 48676c5..891b9e3 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1789,9 +1789,6 @@ static void iommu_set_pgd(struct domain *d) struct hvm_iommu *hd = domain_hvm_iommu(d); mfn_t pgd_mfn; - if ( !iommu_use_hap_pt(d) ) - return; - pgd_mfn = pagetable_get_mfn(p2m_get_pagetable(p2m_get_hostp2m(d))); hd->arch.pgd_maddr = pagetable_get_paddr(pagetable_from_mfn(pgd_mfn)); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:37:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:37: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 1YYfKA-0002NI-UV; Thu, 19 Mar 2015 18:37:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfK9-0002N5-O6 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:41 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 31/4F-17310-5771B055; Thu, 19 Mar 2015 18:37:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1426790259!14424671!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19806 invoked from network); 19 Mar 2015 18:37:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:37:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfK7-0002RD-8j for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfK7-0008SB-70 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:39 +0000 Date: Thu, 19 Mar 2015 18:37:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86emul: drop unused "bigval" fields from 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 b0044ac393dd29f7f36d803288198cebe16294eb Author: Jan Beulich AuthorDate: Wed Mar 11 14:08:02 2015 +0100 Commit: Jan Beulich CommitDate: Wed Mar 11 14:08:02 2015 +0100 x86emul: drop unused "bigval" fields from struct operand Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/x86_emulate/x86_emulate.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 0c73695..abb5bc7 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -313,17 +313,11 @@ struct operand { enum { OP_REG, OP_MEM, OP_IMM, OP_NONE } type; unsigned int bytes; - /* Up to 128-byte operand value, addressable as ulong or uint32_t[]. */ - union { - unsigned long val; - uint32_t bigval[4]; - }; + /* Operand value. */ + unsigned long val; - /* Up to 128-byte operand value, addressable as ulong or uint32_t[]. */ - union { - unsigned long orig_val; - uint32_t orig_bigval[4]; - }; + /* Original operand value. */ + unsigned long orig_val; union { /* OP_REG: Pointer to register field. */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:37:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:37: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 1YYfKA-0002NI-UV; Thu, 19 Mar 2015 18:37:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfK9-0002N5-O6 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:41 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 31/4F-17310-5771B055; Thu, 19 Mar 2015 18:37:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1426790259!14424671!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19806 invoked from network); 19 Mar 2015 18:37:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:37:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfK7-0002RD-8j for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfK7-0008SB-70 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:39 +0000 Date: Thu, 19 Mar 2015 18:37:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86emul: drop unused "bigval" fields from 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 b0044ac393dd29f7f36d803288198cebe16294eb Author: Jan Beulich AuthorDate: Wed Mar 11 14:08:02 2015 +0100 Commit: Jan Beulich CommitDate: Wed Mar 11 14:08:02 2015 +0100 x86emul: drop unused "bigval" fields from struct operand Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/x86_emulate/x86_emulate.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 0c73695..abb5bc7 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -313,17 +313,11 @@ struct operand { enum { OP_REG, OP_MEM, OP_IMM, OP_NONE } type; unsigned int bytes; - /* Up to 128-byte operand value, addressable as ulong or uint32_t[]. */ - union { - unsigned long val; - uint32_t bigval[4]; - }; + /* Operand value. */ + unsigned long val; - /* Up to 128-byte operand value, addressable as ulong or uint32_t[]. */ - union { - unsigned long orig_val; - uint32_t orig_bigval[4]; - }; + /* Original operand value. */ + unsigned long orig_val; union { /* OP_REG: Pointer to register field. */ -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:37:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:37: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 1YYfKM-0002Oh-99; Thu, 19 Mar 2015 18:37:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKK-0002OU-LR for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:52 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id D2/BA-17064-F771B055; Thu, 19 Mar 2015 18:37:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1426790269!13789461!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19084 invoked from network); 19 Mar 2015 18:37:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:37:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKH-0002RJ-EK for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfKH-0008SY-CM for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:49 +0000 Date: Thu, 19 Mar 2015 18:37:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit2: use curr_on_cpu(cpu) in place of `per_cpu(s, c).curr X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72c7e0ffd15f48f346e1b740d074679d5207e5d1 Author: Dario Faggioli AuthorDate: Wed Mar 11 14:08:33 2015 +0100 Commit: Jan Beulich CommitDate: Wed Mar 11 14:08:33 2015 +0100 credit2: use curr_on_cpu(cpu) in place of `per_cpu(s, c).curr as 0bba5747f4bee4ddd ("xen: sched_credit: define and use curr_on_cpu(cpu)") did for Credit1, hence making the code more consistent and easier to read. Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap --- xen/common/sched_credit2.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index ad0a5d4..f0e2c82 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -493,7 +493,7 @@ runq_tickle(const struct scheduler *ops, unsigned int cpu, struct csched2_vcpu * BUG_ON(new->rqd != rqd); /* Look at the cpu it's running on first */ - cur = CSCHED2_VCPU(per_cpu(schedule_data, cpu).curr); + cur = CSCHED2_VCPU(curr_on_cpu(cpu)); burn_credits(rqd, cur, now); if ( cur->credit < new->credit ) @@ -526,7 +526,7 @@ runq_tickle(const struct scheduler *ops, unsigned int cpu, struct csched2_vcpu * if ( i == cpu ) continue; - cur = CSCHED2_VCPU(per_cpu(schedule_data, i).curr); + cur = CSCHED2_VCPU(curr_on_cpu(i)); BUG_ON(is_idle_vcpu(cur->vcpu)); @@ -658,7 +658,7 @@ void burn_credits(struct csched2_runqueue_data *rqd, struct csched2_vcpu *svc, s s_time_t delta; /* Assert svc is current */ - ASSERT(svc==CSCHED2_VCPU(per_cpu(schedule_data, svc->vcpu->processor).curr)); + ASSERT(svc==CSCHED2_VCPU(curr_on_cpu(svc->vcpu->processor))); if ( is_idle_vcpu(svc->vcpu) ) { @@ -932,7 +932,7 @@ csched2_vcpu_sleep(const struct scheduler *ops, struct vcpu *vc) BUG_ON( is_idle_vcpu(vc) ); - if ( per_cpu(schedule_data, vc->processor).curr == vc ) + if ( curr_on_cpu(vc->processor) == vc ) cpu_raise_softirq(vc->processor, SCHEDULE_SOFTIRQ); else if ( __vcpu_on_runq(svc) ) { @@ -957,7 +957,7 @@ csched2_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) BUG_ON( is_idle_vcpu(vc) ); /* Make sure svc priority mod happens before runq check */ - if ( unlikely(per_cpu(schedule_data, vc->processor).curr == vc) ) + if ( unlikely(curr_on_cpu(vc->processor) == vc) ) { goto out; } @@ -1815,7 +1815,7 @@ csched2_dump_pcpu(const struct scheduler *ops, int cpu) printk("core=%s\n", cpustr); /* current VCPU */ - svc = CSCHED2_VCPU(per_cpu(schedule_data, cpu).curr); + svc = CSCHED2_VCPU(curr_on_cpu(cpu)); if ( svc ) { printk("\trun: "); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:37:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:37: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 1YYfKM-0002Oh-99; Thu, 19 Mar 2015 18:37:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKK-0002OU-LR for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:52 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id D2/BA-17064-F771B055; Thu, 19 Mar 2015 18:37:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1426790269!13789461!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19084 invoked from network); 19 Mar 2015 18:37:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:37:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKH-0002RJ-EK for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfKH-0008SY-CM for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:49 +0000 Date: Thu, 19 Mar 2015 18:37:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit2: use curr_on_cpu(cpu) in place of `per_cpu(s, c).curr X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72c7e0ffd15f48f346e1b740d074679d5207e5d1 Author: Dario Faggioli AuthorDate: Wed Mar 11 14:08:33 2015 +0100 Commit: Jan Beulich CommitDate: Wed Mar 11 14:08:33 2015 +0100 credit2: use curr_on_cpu(cpu) in place of `per_cpu(s, c).curr as 0bba5747f4bee4ddd ("xen: sched_credit: define and use curr_on_cpu(cpu)") did for Credit1, hence making the code more consistent and easier to read. Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap --- xen/common/sched_credit2.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index ad0a5d4..f0e2c82 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -493,7 +493,7 @@ runq_tickle(const struct scheduler *ops, unsigned int cpu, struct csched2_vcpu * BUG_ON(new->rqd != rqd); /* Look at the cpu it's running on first */ - cur = CSCHED2_VCPU(per_cpu(schedule_data, cpu).curr); + cur = CSCHED2_VCPU(curr_on_cpu(cpu)); burn_credits(rqd, cur, now); if ( cur->credit < new->credit ) @@ -526,7 +526,7 @@ runq_tickle(const struct scheduler *ops, unsigned int cpu, struct csched2_vcpu * if ( i == cpu ) continue; - cur = CSCHED2_VCPU(per_cpu(schedule_data, i).curr); + cur = CSCHED2_VCPU(curr_on_cpu(i)); BUG_ON(is_idle_vcpu(cur->vcpu)); @@ -658,7 +658,7 @@ void burn_credits(struct csched2_runqueue_data *rqd, struct csched2_vcpu *svc, s s_time_t delta; /* Assert svc is current */ - ASSERT(svc==CSCHED2_VCPU(per_cpu(schedule_data, svc->vcpu->processor).curr)); + ASSERT(svc==CSCHED2_VCPU(curr_on_cpu(svc->vcpu->processor))); if ( is_idle_vcpu(svc->vcpu) ) { @@ -932,7 +932,7 @@ csched2_vcpu_sleep(const struct scheduler *ops, struct vcpu *vc) BUG_ON( is_idle_vcpu(vc) ); - if ( per_cpu(schedule_data, vc->processor).curr == vc ) + if ( curr_on_cpu(vc->processor) == vc ) cpu_raise_softirq(vc->processor, SCHEDULE_SOFTIRQ); else if ( __vcpu_on_runq(svc) ) { @@ -957,7 +957,7 @@ csched2_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) BUG_ON( is_idle_vcpu(vc) ); /* Make sure svc priority mod happens before runq check */ - if ( unlikely(per_cpu(schedule_data, vc->processor).curr == vc) ) + if ( unlikely(curr_on_cpu(vc->processor) == vc) ) { goto out; } @@ -1815,7 +1815,7 @@ csched2_dump_pcpu(const struct scheduler *ops, int cpu) printk("core=%s\n", cpustr); /* current VCPU */ - svc = CSCHED2_VCPU(per_cpu(schedule_data, cpu).curr); + svc = CSCHED2_VCPU(curr_on_cpu(cpu)); if ( svc ) { printk("\trun: "); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:38:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:38: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 1YYfKV-0002Q6-EK; Thu, 19 Mar 2015 18:38:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKU-0002Pv-9s for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:02 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 8D/C6-02005-9871B055; Thu, 19 Mar 2015 18:38:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1426790279!13836900!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11000 invoked from network); 19 Mar 2015 18:38:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:38:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKR-0002RS-KA for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfKR-0008Sv-Ib for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:59 +0000 Date: Thu, 19 Mar 2015 18:37:59 +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 636306f825ca2356762c4494526667b7da7a3dfd Merge: 49ab17a3a615e1ab4ccc46d6942f925cf841df4b 72c7e0ffd15f48f346e1b740d074679d5207e5d1 Author: Ian Campbell AuthorDate: Wed Mar 11 13:12:25 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 13:12:25 2015 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/arch/x86/x86_emulate/x86_emulate.c | 14 ++++---------- xen/common/sched_credit2.c | 12 ++++++------ xen/drivers/passthrough/amd/iommu_map.c | 3 --- xen/drivers/passthrough/iommu.c | 3 +-- xen/drivers/passthrough/vtd/iommu.c | 3 --- 5 files changed, 11 insertions(+), 24 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:38:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:38: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 1YYfKV-0002Q6-EK; Thu, 19 Mar 2015 18:38:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKU-0002Pv-9s for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:02 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 8D/C6-02005-9871B055; Thu, 19 Mar 2015 18:38:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1426790279!13836900!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11000 invoked from network); 19 Mar 2015 18:38:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:38:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKR-0002RS-KA for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfKR-0008Sv-Ib for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:37:59 +0000 Date: Thu, 19 Mar 2015 18:37:59 +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 636306f825ca2356762c4494526667b7da7a3dfd Merge: 49ab17a3a615e1ab4ccc46d6942f925cf841df4b 72c7e0ffd15f48f346e1b740d074679d5207e5d1 Author: Ian Campbell AuthorDate: Wed Mar 11 13:12:25 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 13:12:25 2015 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/arch/x86/x86_emulate/x86_emulate.c | 14 ++++---------- xen/common/sched_credit2.c | 12 ++++++------ xen/drivers/passthrough/amd/iommu_map.c | 3 --- xen/drivers/passthrough/iommu.c | 3 +-- xen/drivers/passthrough/vtd/iommu.c | 3 --- 5 files changed, 11 insertions(+), 24 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:38:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:38: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 1YYfKf-0002Ri-Ht; Thu, 19 Mar 2015 18:38:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKe-0002RY-3W for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:12 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id CD/84-29186-3971B055; Thu, 19 Mar 2015 18:38:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1426790290!6668902!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17365 invoked from network); 19 Mar 2015 18:38:10 -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; 19 Mar 2015 18:38:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKb-0002S4-Qt for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfKb-0008TU-Oy for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:09 +0000 Date: Thu, 19 Mar 2015 18:38:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: RTDS is a valid alternative as a scheduler for a cpupool X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c3c8dad5250715f7024ff38ec9ff8170335aab1 Author: Dario Faggioli AuthorDate: Fri Mar 6 18:20:57 2015 +0100 Commit: Ian Campbell CommitDate: Wed Mar 11 14:53:53 2015 +0000 docs: RTDS is a valid alternative as a scheduler for a cpupool so update the relevant manpage and the example file. Signed-off-by: Dario Faggioli Cc: Ian Campbell Cc: Ian Jackson Cc: Stefano Stabellini Cc: Wei Liu Cc: Juergen Gross Cc: Meng Xu Reviewed-by: Meng Xu Acked-by: Wei Liu --- docs/man/xlcpupool.cfg.pod.5 | 4 ++++ tools/examples/cpupool | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/docs/man/xlcpupool.cfg.pod.5 b/docs/man/xlcpupool.cfg.pod.5 index e32ce17..bb15cbe 100644 --- a/docs/man/xlcpupool.cfg.pod.5 +++ b/docs/man/xlcpupool.cfg.pod.5 @@ -74,6 +74,10 @@ the credit scheduler the credit2 scheduler +=item B + +the RTDS scheduler + =item B the SEDF scheduler diff --git a/tools/examples/cpupool b/tools/examples/cpupool index 01e62c8..73368e6 100644 --- a/tools/examples/cpupool +++ b/tools/examples/cpupool @@ -9,7 +9,7 @@ # the name of the new cpupool name = "Example-Cpupool" -# the scheduler to use: valid are e.g. credit, sedf, credit2 +# the scheduler to use: valid are e.g. credit, credit2, rtds and sedf sched = "credit" # list of cpus to use -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:38:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:38: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 1YYfKf-0002Ri-Ht; Thu, 19 Mar 2015 18:38:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKe-0002RY-3W for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:12 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id CD/84-29186-3971B055; Thu, 19 Mar 2015 18:38:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1426790290!6668902!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17365 invoked from network); 19 Mar 2015 18:38:10 -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; 19 Mar 2015 18:38:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKb-0002S4-Qt for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfKb-0008TU-Oy for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:09 +0000 Date: Thu, 19 Mar 2015 18:38:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: RTDS is a valid alternative as a scheduler for a cpupool X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c3c8dad5250715f7024ff38ec9ff8170335aab1 Author: Dario Faggioli AuthorDate: Fri Mar 6 18:20:57 2015 +0100 Commit: Ian Campbell CommitDate: Wed Mar 11 14:53:53 2015 +0000 docs: RTDS is a valid alternative as a scheduler for a cpupool so update the relevant manpage and the example file. Signed-off-by: Dario Faggioli Cc: Ian Campbell Cc: Ian Jackson Cc: Stefano Stabellini Cc: Wei Liu Cc: Juergen Gross Cc: Meng Xu Reviewed-by: Meng Xu Acked-by: Wei Liu --- docs/man/xlcpupool.cfg.pod.5 | 4 ++++ tools/examples/cpupool | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/docs/man/xlcpupool.cfg.pod.5 b/docs/man/xlcpupool.cfg.pod.5 index e32ce17..bb15cbe 100644 --- a/docs/man/xlcpupool.cfg.pod.5 +++ b/docs/man/xlcpupool.cfg.pod.5 @@ -74,6 +74,10 @@ the credit scheduler the credit2 scheduler +=item B + +the RTDS scheduler + =item B the SEDF scheduler diff --git a/tools/examples/cpupool b/tools/examples/cpupool index 01e62c8..73368e6 100644 --- a/tools/examples/cpupool +++ b/tools/examples/cpupool @@ -9,7 +9,7 @@ # the name of the new cpupool name = "Example-Cpupool" -# the scheduler to use: valid are e.g. credit, sedf, credit2 +# the scheduler to use: valid are e.g. credit, credit2, rtds and sedf sched = "credit" # list of cpus to use -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:38:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:38: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 1YYfKp-0002Ta-M8; Thu, 19 Mar 2015 18:38:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKo-0002TO-GS for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:22 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id AB/CA-01563-D971B055; Thu, 19 Mar 2015 18:38:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1426790300!13760811!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26581 invoked from network); 19 Mar 2015 18:38: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; 19 Mar 2015 18:38:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKm-0002SA-02 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfKl-0008UZ-Ux for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:19 +0000 Date: Thu, 19 Mar 2015 18:38:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: fix `xl list' manpage entry X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1a7607fc41978c2a8775ff3c048017ae09701c8 Author: Dario Faggioli AuthorDate: Fri Mar 6 18:21:07 2015 +0100 Commit: Ian Campbell CommitDate: Wed Mar 11 14:54:29 2015 +0000 docs: fix `xl list' manpage entry as it was not covering the '-n' option, which is present since d743a223 ("xl: add node-affinity to the output of `xl list`"). Signed-off-by: Dario Faggioli Cc: Ian Campbell Cc: Ian Jackson Cc: Stefano Stabellini Cc: Wei Liu Acked-by: Wei Liu --- 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 198ee2b..b016272 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -304,6 +304,10 @@ Also prints the security labels. Also prints the domain UUIDs, the shutdown reason and security labels. +=item B<-n>, <--numa> + +Also prints the domain NUMA node affinity. + =back 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 Mar 19 18:38:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:38: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 1YYfKp-0002Ta-M8; Thu, 19 Mar 2015 18:38:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKo-0002TO-GS for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:22 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id AB/CA-01563-D971B055; Thu, 19 Mar 2015 18:38:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1426790300!13760811!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26581 invoked from network); 19 Mar 2015 18:38: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; 19 Mar 2015 18:38:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKm-0002SA-02 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfKl-0008UZ-Ux for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:19 +0000 Date: Thu, 19 Mar 2015 18:38:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: fix `xl list' manpage entry X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1a7607fc41978c2a8775ff3c048017ae09701c8 Author: Dario Faggioli AuthorDate: Fri Mar 6 18:21:07 2015 +0100 Commit: Ian Campbell CommitDate: Wed Mar 11 14:54:29 2015 +0000 docs: fix `xl list' manpage entry as it was not covering the '-n' option, which is present since d743a223 ("xl: add node-affinity to the output of `xl list`"). Signed-off-by: Dario Faggioli Cc: Ian Campbell Cc: Ian Jackson Cc: Stefano Stabellini Cc: Wei Liu Acked-by: Wei Liu --- 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 198ee2b..b016272 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -304,6 +304,10 @@ Also prints the security labels. Also prints the domain UUIDs, the shutdown reason and security labels. +=item B<-n>, <--numa> + +Also prints the domain NUMA node affinity. + =back 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 Mar 19 18:38:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:38: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 1YYfL1-0002YI-Oe; Thu, 19 Mar 2015 18:38:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfL0-0002Xm-KE for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:34 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 31/70-23320-9A71B055; Thu, 19 Mar 2015 18:38:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1426790310!9775376!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17099 invoked from network); 19 Mar 2015 18:38:31 -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; 19 Mar 2015 18:38:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKw-0002SI-5k for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfKw-0008VB-4J for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:30 +0000 Date: Thu, 19 Mar 2015 18:38:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: OVMF parallel build X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 81574744b1eea05382cded62cf9328c2d5a94755 Author: Wei Liu AuthorDate: Mon Mar 2 10:52:20 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 15:39:07 2015 +0000 tools: OVMF parallel build Though it doesn't work with make's "-j" option, the build system of OVMF has an option to specify parallel threads used to run the build. Using 4 threads to build OVMF looks like a sensible default. Signed-off-by: Wei Liu Cc: Anthony Perard Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/firmware/ovmf-makefile | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile index 1ad041f..2838744 100644 --- a/tools/firmware/ovmf-makefile +++ b/tools/firmware/ovmf-makefile @@ -1,6 +1,3 @@ -# OVMF building system is not ready yet to run in parallel. -# Force it to be serial in order to exploit parallelism for neighbors. - XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk @@ -10,6 +7,7 @@ else TARGET=RELEASE endif +# OVMF build system has its own parallel building support. .NOTPARALLEL: MAKEFLAGS += -j1 @@ -18,7 +16,7 @@ all: build .PHONY: build build: - OvmfPkg/build.sh -a X64 -b $(TARGET) + OvmfPkg/build.sh -a X64 -b $(TARGET) -n 4 cp Build/OvmfX64/$(TARGET)_GCC*/FV/OVMF.fd ovmf.bin .PHONY: 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 Mar 19 18:38:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:38: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 1YYfL1-0002YI-Oe; Thu, 19 Mar 2015 18:38:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfL0-0002Xm-KE for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:34 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 31/70-23320-9A71B055; Thu, 19 Mar 2015 18:38:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1426790310!9775376!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17099 invoked from network); 19 Mar 2015 18:38:31 -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; 19 Mar 2015 18:38:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfKw-0002SI-5k for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfKw-0008VB-4J for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:30 +0000 Date: Thu, 19 Mar 2015 18:38:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: OVMF parallel build X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 81574744b1eea05382cded62cf9328c2d5a94755 Author: Wei Liu AuthorDate: Mon Mar 2 10:52:20 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 15:39:07 2015 +0000 tools: OVMF parallel build Though it doesn't work with make's "-j" option, the build system of OVMF has an option to specify parallel threads used to run the build. Using 4 threads to build OVMF looks like a sensible default. Signed-off-by: Wei Liu Cc: Anthony Perard Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/firmware/ovmf-makefile | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile index 1ad041f..2838744 100644 --- a/tools/firmware/ovmf-makefile +++ b/tools/firmware/ovmf-makefile @@ -1,6 +1,3 @@ -# OVMF building system is not ready yet to run in parallel. -# Force it to be serial in order to exploit parallelism for neighbors. - XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk @@ -10,6 +7,7 @@ else TARGET=RELEASE endif +# OVMF build system has its own parallel building support. .NOTPARALLEL: MAKEFLAGS += -j1 @@ -18,7 +16,7 @@ all: build .PHONY: build build: - OvmfPkg/build.sh -a X64 -b $(TARGET) + OvmfPkg/build.sh -a X64 -b $(TARGET) -n 4 cp Build/OvmfX64/$(TARGET)_GCC*/FV/OVMF.fd ovmf.bin .PHONY: 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 Mar 19 18:38:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:38: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 1YYfLA-0002d4-R5; Thu, 19 Mar 2015 18:38:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfL9-0002ca-7Q for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:43 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 5A/7E-05122-2B71B055; Thu, 19 Mar 2015 18:38:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1426790320!14424853!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24807 invoked from network); 19 Mar 2015 18:38:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:38:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfL6-0002SO-BS for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfL6-0008Vy-AT for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:40 +0000 Date: Thu, 19 Mar 2015 18:38:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/firmware: fix OVMF clean and distclean X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae79d11ec93dc6a3c4bb63eac2a38c3800fbf3ce Author: Wei Liu AuthorDate: Wed Mar 11 16:48:36 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 16:54:03 2015 +0000 tools/firmware: fix OVMF clean and distclean They should have used "-ovmf-dir" suffix instead of "-ovmf", as the directory in question is ovmf-dir. Signed-off-by: Wei Liu Cc: Anthony Perard Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/firmware/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index ca5df42..6cc86ce 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -55,7 +55,7 @@ distclean: subdirs-distclean subdir-distclean-etherboot: .phony $(MAKE) -C etherboot distclean -subdir-distclean-ovmf: .phony +subdir-distclean-ovmf-dir: .phony rm -rf ovmf-dir ovmf-dir-remote subdir-distclean-seabios-dir: .phony @@ -70,7 +70,7 @@ ovmf-dir-force-update: ovmf-dir $(GIT) reset --hard $(OVMF_UPSTREAM_REVISION); \ fi -subdir-clean-ovmf: +subdir-clean-ovmf-dir: set -e; if test -d ovmf-dir/.; then \ $(MAKE) -C ovmf-dir clean; \ fi -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:38:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:38: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 1YYfLA-0002d4-R5; Thu, 19 Mar 2015 18:38:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfL9-0002ca-7Q for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:43 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 5A/7E-05122-2B71B055; Thu, 19 Mar 2015 18:38:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1426790320!14424853!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24807 invoked from network); 19 Mar 2015 18:38:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:38:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfL6-0002SO-BS for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfL6-0008Vy-AT for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:40 +0000 Date: Thu, 19 Mar 2015 18:38:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/firmware: fix OVMF clean and distclean X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae79d11ec93dc6a3c4bb63eac2a38c3800fbf3ce Author: Wei Liu AuthorDate: Wed Mar 11 16:48:36 2015 +0000 Commit: Ian Campbell CommitDate: Wed Mar 11 16:54:03 2015 +0000 tools/firmware: fix OVMF clean and distclean They should have used "-ovmf-dir" suffix instead of "-ovmf", as the directory in question is ovmf-dir. Signed-off-by: Wei Liu Cc: Anthony Perard Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/firmware/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index ca5df42..6cc86ce 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -55,7 +55,7 @@ distclean: subdirs-distclean subdir-distclean-etherboot: .phony $(MAKE) -C etherboot distclean -subdir-distclean-ovmf: .phony +subdir-distclean-ovmf-dir: .phony rm -rf ovmf-dir ovmf-dir-remote subdir-distclean-seabios-dir: .phony @@ -70,7 +70,7 @@ ovmf-dir-force-update: ovmf-dir $(GIT) reset --hard $(OVMF_UPSTREAM_REVISION); \ fi -subdir-clean-ovmf: +subdir-clean-ovmf-dir: set -e; if test -d ovmf-dir/.; then \ $(MAKE) -C ovmf-dir clean; \ fi -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:38:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:38: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 1YYfLK-0002h4-Tf; Thu, 19 Mar 2015 18:38:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLJ-0002fl-8k for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:53 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id D2/6A-22535-CB71B055; Thu, 19 Mar 2015 18:38:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1426790330!13739067!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15024 invoked from network); 19 Mar 2015 18:38:51 -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; 19 Mar 2015 18:38:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLG-0002SX-HP for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfLG-0008WV-Fq for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:50 +0000 Date: Thu, 19 Mar 2015 18:38:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: don't use C++ keyword 'private' in public 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 156e90e8f9ad74c7f91633630a882bdbb6caf5ff Author: Tim Deegan AuthorDate: Thu Mar 5 12:11:25 2015 +0000 Commit: Tim Deegan CommitDate: Thu Mar 12 11:08:23 2015 +0000 xen: don't use C++ keyword 'private' in public headers. The 'private' field in io/ring.h (for blktap2, see 1b9cecdb) is the last thing in the Xen public headers that a C++ compiler will object to. Rename it to pvt, update the only in-tree user, and remove the workaround in the C++ compatibility check. Signed-off-by: Tim Deegan Acked-by: Ian Campbell --- tools/blktap2/drivers/tapdisk-vbd.c | 2 +- xen/include/Makefile | 3 +-- xen/include/public/io/ring.h | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/blktap2/drivers/tapdisk-vbd.c b/tools/blktap2/drivers/tapdisk-vbd.c index c665f27..6d1d94a 100644 --- a/tools/blktap2/drivers/tapdisk-vbd.c +++ b/tools/blktap2/drivers/tapdisk-vbd.c @@ -1684,7 +1684,7 @@ tapdisk_vbd_check_ring_message(td_vbd_t *vbd) if (!vbd->ring.sring) return -EINVAL; - switch (vbd->ring.sring->private.tapif_user.msg) { + switch (vbd->ring.sring->pvt.tapif_user.msg) { case 0: return 0; diff --git a/xen/include/Makefile b/xen/include/Makefile index d48a642..c7a1d52 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -104,8 +104,7 @@ headers.chk: $(PUBLIC_ANSI_HEADERS) Makefile headers++.chk: $(PUBLIC_HEADERS) Makefile if $(CXX) -v >/dev/null 2>&1; then \ for i in $(filter %.h,$^); do \ - $(CXX) -x c++ -std=gnu++98 -Wall -Werror \ - -D__XEN_TOOLS__ -Dprivate=private_is_a_keyword_in_cpp \ + $(CXX) -x c++ -std=gnu++98 -Wall -Werror -D__XEN_TOOLS__ \ -include stdint.h -include public/xen.h \ -S -o /dev/null $$i || exit 1; \ echo $$i; \ diff --git a/xen/include/public/io/ring.h b/xen/include/public/io/ring.h index 73e13d7..ba9401b 100644 --- a/xen/include/public/io/ring.h +++ b/xen/include/public/io/ring.h @@ -111,7 +111,7 @@ struct __name##_sring { \ uint8_t msg; \ } tapif_user; \ uint8_t pvt_pad[4]; \ - } private; \ + } pvt; \ uint8_t __pad[44]; \ union __name##_sring_entry ring[1]; /* variable-length */ \ }; \ @@ -156,7 +156,7 @@ typedef struct __name##_back_ring __name##_back_ring_t #define SHARED_RING_INIT(_s) do { \ (_s)->req_prod = (_s)->rsp_prod = 0; \ (_s)->req_event = (_s)->rsp_event = 1; \ - (void)memset((_s)->private.pvt_pad, 0, sizeof((_s)->private.pvt_pad)); \ + (void)memset((_s)->pvt.pvt_pad, 0, sizeof((_s)->pvt.pvt_pad)); \ (void)memset((_s)->__pad, 0, sizeof((_s)->__pad)); \ } while(0) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:38:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:38: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 1YYfLK-0002h4-Tf; Thu, 19 Mar 2015 18:38:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLJ-0002fl-8k for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:53 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id D2/6A-22535-CB71B055; Thu, 19 Mar 2015 18:38:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1426790330!13739067!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15024 invoked from network); 19 Mar 2015 18:38:51 -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; 19 Mar 2015 18:38:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLG-0002SX-HP for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfLG-0008WV-Fq for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:38:50 +0000 Date: Thu, 19 Mar 2015 18:38:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: don't use C++ keyword 'private' in public 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 156e90e8f9ad74c7f91633630a882bdbb6caf5ff Author: Tim Deegan AuthorDate: Thu Mar 5 12:11:25 2015 +0000 Commit: Tim Deegan CommitDate: Thu Mar 12 11:08:23 2015 +0000 xen: don't use C++ keyword 'private' in public headers. The 'private' field in io/ring.h (for blktap2, see 1b9cecdb) is the last thing in the Xen public headers that a C++ compiler will object to. Rename it to pvt, update the only in-tree user, and remove the workaround in the C++ compatibility check. Signed-off-by: Tim Deegan Acked-by: Ian Campbell --- tools/blktap2/drivers/tapdisk-vbd.c | 2 +- xen/include/Makefile | 3 +-- xen/include/public/io/ring.h | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/blktap2/drivers/tapdisk-vbd.c b/tools/blktap2/drivers/tapdisk-vbd.c index c665f27..6d1d94a 100644 --- a/tools/blktap2/drivers/tapdisk-vbd.c +++ b/tools/blktap2/drivers/tapdisk-vbd.c @@ -1684,7 +1684,7 @@ tapdisk_vbd_check_ring_message(td_vbd_t *vbd) if (!vbd->ring.sring) return -EINVAL; - switch (vbd->ring.sring->private.tapif_user.msg) { + switch (vbd->ring.sring->pvt.tapif_user.msg) { case 0: return 0; diff --git a/xen/include/Makefile b/xen/include/Makefile index d48a642..c7a1d52 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -104,8 +104,7 @@ headers.chk: $(PUBLIC_ANSI_HEADERS) Makefile headers++.chk: $(PUBLIC_HEADERS) Makefile if $(CXX) -v >/dev/null 2>&1; then \ for i in $(filter %.h,$^); do \ - $(CXX) -x c++ -std=gnu++98 -Wall -Werror \ - -D__XEN_TOOLS__ -Dprivate=private_is_a_keyword_in_cpp \ + $(CXX) -x c++ -std=gnu++98 -Wall -Werror -D__XEN_TOOLS__ \ -include stdint.h -include public/xen.h \ -S -o /dev/null $$i || exit 1; \ echo $$i; \ diff --git a/xen/include/public/io/ring.h b/xen/include/public/io/ring.h index 73e13d7..ba9401b 100644 --- a/xen/include/public/io/ring.h +++ b/xen/include/public/io/ring.h @@ -111,7 +111,7 @@ struct __name##_sring { \ uint8_t msg; \ } tapif_user; \ uint8_t pvt_pad[4]; \ - } private; \ + } pvt; \ uint8_t __pad[44]; \ union __name##_sring_entry ring[1]; /* variable-length */ \ }; \ @@ -156,7 +156,7 @@ typedef struct __name##_back_ring __name##_back_ring_t #define SHARED_RING_INIT(_s) do { \ (_s)->req_prod = (_s)->rsp_prod = 0; \ (_s)->req_event = (_s)->rsp_event = 1; \ - (void)memset((_s)->private.pvt_pad, 0, sizeof((_s)->private.pvt_pad)); \ + (void)memset((_s)->pvt.pvt_pad, 0, sizeof((_s)->pvt.pvt_pad)); \ (void)memset((_s)->__pad, 0, sizeof((_s)->__pad)); \ } while(0) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:39:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:39:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLX-0002lR-01; Thu, 19 Mar 2015 18:39:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLV-0002ku-I4 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:05 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id B0/FC-13528-8C71B055; Thu, 19 Mar 2015 18:39:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1426790340!11940683!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1138 invoked from network); 19 Mar 2015 18:39:01 -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; 19 Mar 2015 18:39:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLQ-0002Sg-Nq for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfLQ-00005L-MV for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:00 +0000 Date: Thu, 19 Mar 2015 18:39:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: Explicitly disable graphics backends on qemu cmdline X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 91b0ae9db33f72468b1d411a07f53085c893c097 Author: Ian Campbell AuthorDate: Fri Feb 20 14:41:09 2015 +0000 Commit: Ian Jackson CommitDate: Thu Mar 12 13:45:13 2015 +0000 tools: libxl: Explicitly disable graphics backends on qemu cmdline By default qemu will try to create some sort of backend for the emulated VGA device, either SDL or VNC. However when the user specifies sdl=0 and vnc=0 in their configuration libxl was not explicitly disabling either backend, which could lead to one unexpectedly running. If either sdl=1 or vnc=1 is configured then both before and after this change only the backends which are explicitly enabled are configured, i.e. this issue only occurs when all backends are supposed to have been disabled. This affects qemu-xen and qemu-xen-traditional differently. If qemu-xen was compiled with SDL support then this would result in an SDL window being opened if $DISPLAY is valid, or a failure to start the guest if not. Passing "-display none" to qemu before any further -sdl options disables this default behaviour and ensures that SDL is only started if the libxl configuration demands it. If qemu-xen was compiled without SDL support then qemu would instead start a VNC server listening on ::1 (IPv6 localhost) or 127.0.0.1 (IPv4 localhost) with IPv6 preferred if available. Explicitly pass "-vnc none" when vnc is not enabled in the libxl configuration to remove this possibility. qemu-xen-traditional would never start a vnc backend unless asked. However by default it will start an SDL backend, the way to disable this is to pass a -vnc option. In other words passing "-vnc none" will disable both vnc and sdl by default. sdl can then be reenabled if configured by subsequent use of the -sdl option. Tested with both qemu-xen and qemu-xen-traditional built with SDL support and: xl cr # defaults xl cr sdl=0 vnc=0 xl cr sdl=1 vnc=0 xl cr sdl=0 vnc=1 xl cr sdl=0 vnc=0 vga=\"none\" xl cr sdl=0 vnc=0 nographic=1 with both valid and invalid $DISPLAY. This is XSA-119 / CVE-2015-2152. Reported-by: Sander Eikelenboom Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index cb006df..a8b08f2 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -180,7 +180,14 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if (libxl_defbool_val(vnc->findunused)) { flexarray_append(dm_args, "-vncunused"); } - } + } else + /* + * VNC is not enabled by default by qemu-xen-traditional, + * however passing -vnc none causes SDL to not be + * (unexpectedly) enabled by default. This is overridden by + * explicitly passing -sdl below as required. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); if (sdl) { flexarray_append(dm_args, "-sdl"); @@ -522,7 +529,17 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, } flexarray_append(dm_args, vncarg); - } + } else + /* + * Ensure that by default no vnc server is created. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); + + /* + * Ensure that by default no display backend is created. Further + * options given below might then enable more. + */ + flexarray_append_pair(dm_args, "-display", "none"); if (sdl) { flexarray_append(dm_args, "-sdl"); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:39:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:39:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLX-0002lR-01; Thu, 19 Mar 2015 18:39:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLV-0002ku-I4 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:05 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id B0/FC-13528-8C71B055; Thu, 19 Mar 2015 18:39:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1426790340!11940683!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1138 invoked from network); 19 Mar 2015 18:39:01 -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; 19 Mar 2015 18:39:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLQ-0002Sg-Nq for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfLQ-00005L-MV for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:00 +0000 Date: Thu, 19 Mar 2015 18:39:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: Explicitly disable graphics backends on qemu cmdline X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 91b0ae9db33f72468b1d411a07f53085c893c097 Author: Ian Campbell AuthorDate: Fri Feb 20 14:41:09 2015 +0000 Commit: Ian Jackson CommitDate: Thu Mar 12 13:45:13 2015 +0000 tools: libxl: Explicitly disable graphics backends on qemu cmdline By default qemu will try to create some sort of backend for the emulated VGA device, either SDL or VNC. However when the user specifies sdl=0 and vnc=0 in their configuration libxl was not explicitly disabling either backend, which could lead to one unexpectedly running. If either sdl=1 or vnc=1 is configured then both before and after this change only the backends which are explicitly enabled are configured, i.e. this issue only occurs when all backends are supposed to have been disabled. This affects qemu-xen and qemu-xen-traditional differently. If qemu-xen was compiled with SDL support then this would result in an SDL window being opened if $DISPLAY is valid, or a failure to start the guest if not. Passing "-display none" to qemu before any further -sdl options disables this default behaviour and ensures that SDL is only started if the libxl configuration demands it. If qemu-xen was compiled without SDL support then qemu would instead start a VNC server listening on ::1 (IPv6 localhost) or 127.0.0.1 (IPv4 localhost) with IPv6 preferred if available. Explicitly pass "-vnc none" when vnc is not enabled in the libxl configuration to remove this possibility. qemu-xen-traditional would never start a vnc backend unless asked. However by default it will start an SDL backend, the way to disable this is to pass a -vnc option. In other words passing "-vnc none" will disable both vnc and sdl by default. sdl can then be reenabled if configured by subsequent use of the -sdl option. Tested with both qemu-xen and qemu-xen-traditional built with SDL support and: xl cr # defaults xl cr sdl=0 vnc=0 xl cr sdl=1 vnc=0 xl cr sdl=0 vnc=1 xl cr sdl=0 vnc=0 vga=\"none\" xl cr sdl=0 vnc=0 nographic=1 with both valid and invalid $DISPLAY. This is XSA-119 / CVE-2015-2152. Reported-by: Sander Eikelenboom Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index cb006df..a8b08f2 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -180,7 +180,14 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if (libxl_defbool_val(vnc->findunused)) { flexarray_append(dm_args, "-vncunused"); } - } + } else + /* + * VNC is not enabled by default by qemu-xen-traditional, + * however passing -vnc none causes SDL to not be + * (unexpectedly) enabled by default. This is overridden by + * explicitly passing -sdl below as required. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); if (sdl) { flexarray_append(dm_args, "-sdl"); @@ -522,7 +529,17 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, } flexarray_append(dm_args, vncarg); - } + } else + /* + * Ensure that by default no vnc server is created. + */ + flexarray_append_pair(dm_args, "-vnc", "none"); + + /* + * Ensure that by default no display backend is created. Further + * options given below might then enable more. + */ + flexarray_append_pair(dm_args, "-display", "none"); if (sdl) { flexarray_append(dm_args, "-sdl"); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:39:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:39: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 1YYfLh-0002qV-4F; Thu, 19 Mar 2015 18:39:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLe-0002pg-U5 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:15 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id BC/5E-30447-2D71B055; Thu, 19 Mar 2015 18:39:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1426790351!14394762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9277 invoked from network); 19 Mar 2015 18:39:12 -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; 19 Mar 2015 18:39:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLa-0002TI-UK for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfLa-000060-SP for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:10 +0000 Date: Thu, 19 Mar 2015 18:39:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86emul: simplify asm() constraints X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 879b181f38b0e4e3c7314de980289f4ecd1c5982 Author: Jan Beulich AuthorDate: Fri Mar 13 11:23:14 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 13 11:23:14 2015 +0100 x86emul: simplify asm() constraints Use + on outputs instead of = and a matching input. Allow not just memory for the _eflags operand (it turns out that recent gcc produces worse code when also doing this for _dst.val, so the latter is being avoided). Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/arch/x86/x86_emulate/x86_emulate.c | 58 ++++++++++++++------------------ 1 files changed, 25 insertions(+), 33 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index abb5bc7..c082c9e 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -428,7 +428,7 @@ typedef union { /* Before executing instruction: restore necessary bits in EFLAGS. */ #define _PRE_EFLAGS(_sav, _msk, _tmp) \ /* EFLAGS = (_sav & _msk) | (EFLAGS & ~_msk); _sav &= ~_msk; */ \ -"movl %"_sav",%"_LO32 _tmp"; " \ +"movl %"_LO32 _sav",%"_LO32 _tmp"; " \ "push %"_tmp"; " \ "push %"_tmp"; " \ "movl %"_msk",%"_LO32 _tmp"; " \ @@ -448,7 +448,7 @@ typedef union { "pushf; " \ "pop %"_tmp"; " \ "andl %"_msk",%"_LO32 _tmp"; " \ -"orl %"_LO32 _tmp",%"_sav"; " +"orl %"_LO32 _tmp",%"_LO32 _sav"; " /* Raw emulation: instruction has two explicit operands. */ #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy)\ @@ -460,18 +460,16 @@ do{ unsigned long _tmp; \ _PRE_EFLAGS("0","4","2") \ _op"w %"_wx"3,%1; " \ _POST_EFLAGS("0","4","2") \ - : "=m" (_eflags), "=m" ((_dst).val), "=&r" (_tmp) \ - : _wy ((_src).val), "i" (EFLAGS_MASK), \ - "m" (_eflags), "m" ((_dst).val) ); \ + : "+g" (_eflags), "+m" ((_dst).val), "=&r" (_tmp) \ + : _wy ((_src).val), "i" (EFLAGS_MASK) ); \ break; \ case 4: \ asm volatile ( \ _PRE_EFLAGS("0","4","2") \ _op"l %"_lx"3,%1; " \ _POST_EFLAGS("0","4","2") \ - : "=m" (_eflags), "=m" ((_dst).val), "=&r" (_tmp) \ - : _ly ((_src).val), "i" (EFLAGS_MASK), \ - "m" (_eflags), "m" ((_dst).val) ); \ + : "+g" (_eflags), "+m" ((_dst).val), "=&r" (_tmp) \ + : _ly ((_src).val), "i" (EFLAGS_MASK) ); \ break; \ case 8: \ __emulate_2op_8byte(_op, _src, _dst, _eflags, _qx, _qy); \ @@ -487,9 +485,8 @@ do{ unsigned long _tmp; \ _PRE_EFLAGS("0","4","2") \ _op"b %"_bx"3,%1; " \ _POST_EFLAGS("0","4","2") \ - : "=m" (_eflags), "=m" ((_dst).val), "=&r" (_tmp) \ - : _by ((_src).val), "i" (EFLAGS_MASK), \ - "m" (_eflags), "m" ((_dst).val) ); \ + : "+g" (_eflags), "+m" ((_dst).val), "=&r" (_tmp) \ + : _by ((_src).val), "i" (EFLAGS_MASK) ); \ break; \ default: \ __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy);\ @@ -519,24 +516,24 @@ do{ unsigned long _tmp; \ _PRE_EFLAGS("0","3","2") \ _op"b %1; " \ _POST_EFLAGS("0","3","2") \ - : "=m" (_eflags), "=m" ((_dst).val), "=&r" (_tmp) \ - : "i" (EFLAGS_MASK), "m" (_eflags), "m" ((_dst).val) ); \ + : "+g" (_eflags), "+m" ((_dst).val), "=&r" (_tmp) \ + : "i" (EFLAGS_MASK) ); \ break; \ case 2: \ asm volatile ( \ _PRE_EFLAGS("0","3","2") \ _op"w %1; " \ _POST_EFLAGS("0","3","2") \ - : "=m" (_eflags), "=m" ((_dst).val), "=&r" (_tmp) \ - : "i" (EFLAGS_MASK), "m" (_eflags), "m" ((_dst).val) ); \ + : "+g" (_eflags), "+m" ((_dst).val), "=&r" (_tmp) \ + : "i" (EFLAGS_MASK) ); \ break; \ case 4: \ asm volatile ( \ _PRE_EFLAGS("0","3","2") \ _op"l %1; " \ _POST_EFLAGS("0","3","2") \ - : "=m" (_eflags), "=m" ((_dst).val), "=&r" (_tmp) \ - : "i" (EFLAGS_MASK), "m" (_eflags), "m" ((_dst).val) ); \ + : "+g" (_eflags), "+m" ((_dst).val), "=&r" (_tmp) \ + : "i" (EFLAGS_MASK) ); \ break; \ case 8: \ __emulate_1op_8byte(_op, _dst, _eflags); \ @@ -551,17 +548,16 @@ do{ asm volatile ( \ _PRE_EFLAGS("0","4","2") \ _op"q %"_qx"3,%1; " \ _POST_EFLAGS("0","4","2") \ - : "=m" (_eflags), "=m" ((_dst).val), "=&r" (_tmp) \ - : _qy ((_src).val), "i" (EFLAGS_MASK), \ - "m" (_eflags), "m" ((_dst).val) ); \ + : "+g" (_eflags), "+m" ((_dst).val), "=&r" (_tmp) \ + : _qy ((_src).val), "i" (EFLAGS_MASK) ); \ } while (0) #define __emulate_1op_8byte(_op, _dst, _eflags) \ do{ asm volatile ( \ _PRE_EFLAGS("0","3","2") \ _op"q %1; " \ _POST_EFLAGS("0","3","2") \ - : "=m" (_eflags), "=m" ((_dst).val), "=&r" (_tmp) \ - : "i" (EFLAGS_MASK), "m" (_eflags), "m" ((_dst).val) ); \ + : "+g" (_eflags), "+m" ((_dst).val), "=&r" (_tmp) \ + : "i" (EFLAGS_MASK) ); \ } while (0) #elif defined(__i386__) #define __emulate_2op_8byte(_op, _src, _dst, _eflags, _qx, _qy) @@ -806,10 +802,9 @@ static int read_ulong( */ static bool_t mul_dbl(unsigned long m[2]) { - bool_t rc; - asm ( "mul %4; seto %b2" - : "=a" (m[0]), "=d" (m[1]), "=q" (rc) - : "0" (m[0]), "1" (m[1]), "2" (0) ); + bool_t rc = 0; + asm ( "mul %1; seto %b2" + : "+a" (m[0]), "+d" (m[1]), "+q" (rc) ); return rc; } @@ -820,10 +815,9 @@ static bool_t mul_dbl(unsigned long m[2]) */ static bool_t imul_dbl(unsigned long m[2]) { - bool_t rc; - asm ( "imul %4; seto %b2" - : "=a" (m[0]), "=d" (m[1]), "=q" (rc) - : "0" (m[0]), "1" (m[1]), "2" (0) ); + bool_t rc = 0; + asm ( "imul %1; seto %b2" + : "+a" (m[0]), "+d" (m[1]), "+q" (rc) ); return rc; } @@ -837,9 +831,7 @@ static bool_t div_dbl(unsigned long u[2], unsigned long v) { if ( (v == 0) || (u[1] >= v) ) return 1; - asm ( "div %4" - : "=a" (u[0]), "=d" (u[1]) - : "0" (u[0]), "1" (u[1]), "r" (v) ); + asm ( "div %2" : "+a" (u[0]), "+d" (u[1]) : "r" (v) ); 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 Mar 19 18:39:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:39: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 1YYfLh-0002qV-4F; Thu, 19 Mar 2015 18:39:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLe-0002pg-U5 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:15 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id BC/5E-30447-2D71B055; Thu, 19 Mar 2015 18:39:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1426790351!14394762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9277 invoked from network); 19 Mar 2015 18:39:12 -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; 19 Mar 2015 18:39:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLa-0002TI-UK for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfLa-000060-SP for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:10 +0000 Date: Thu, 19 Mar 2015 18:39:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86emul: simplify asm() constraints X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 879b181f38b0e4e3c7314de980289f4ecd1c5982 Author: Jan Beulich AuthorDate: Fri Mar 13 11:23:14 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 13 11:23:14 2015 +0100 x86emul: simplify asm() constraints Use + on outputs instead of = and a matching input. Allow not just memory for the _eflags operand (it turns out that recent gcc produces worse code when also doing this for _dst.val, so the latter is being avoided). Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/arch/x86/x86_emulate/x86_emulate.c | 58 ++++++++++++++------------------ 1 files changed, 25 insertions(+), 33 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index abb5bc7..c082c9e 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -428,7 +428,7 @@ typedef union { /* Before executing instruction: restore necessary bits in EFLAGS. */ #define _PRE_EFLAGS(_sav, _msk, _tmp) \ /* EFLAGS = (_sav & _msk) | (EFLAGS & ~_msk); _sav &= ~_msk; */ \ -"movl %"_sav",%"_LO32 _tmp"; " \ +"movl %"_LO32 _sav",%"_LO32 _tmp"; " \ "push %"_tmp"; " \ "push %"_tmp"; " \ "movl %"_msk",%"_LO32 _tmp"; " \ @@ -448,7 +448,7 @@ typedef union { "pushf; " \ "pop %"_tmp"; " \ "andl %"_msk",%"_LO32 _tmp"; " \ -"orl %"_LO32 _tmp",%"_sav"; " +"orl %"_LO32 _tmp",%"_LO32 _sav"; " /* Raw emulation: instruction has two explicit operands. */ #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy)\ @@ -460,18 +460,16 @@ do{ unsigned long _tmp; \ _PRE_EFLAGS("0","4","2") \ _op"w %"_wx"3,%1; " \ _POST_EFLAGS("0","4","2") \ - : "=m" (_eflags), "=m" ((_dst).val), "=&r" (_tmp) \ - : _wy ((_src).val), "i" (EFLAGS_MASK), \ - "m" (_eflags), "m" ((_dst).val) ); \ + : "+g" (_eflags), "+m" ((_dst).val), "=&r" (_tmp) \ + : _wy ((_src).val), "i" (EFLAGS_MASK) ); \ break; \ case 4: \ asm volatile ( \ _PRE_EFLAGS("0","4","2") \ _op"l %"_lx"3,%1; " \ _POST_EFLAGS("0","4","2") \ - : "=m" (_eflags), "=m" ((_dst).val), "=&r" (_tmp) \ - : _ly ((_src).val), "i" (EFLAGS_MASK), \ - "m" (_eflags), "m" ((_dst).val) ); \ + : "+g" (_eflags), "+m" ((_dst).val), "=&r" (_tmp) \ + : _ly ((_src).val), "i" (EFLAGS_MASK) ); \ break; \ case 8: \ __emulate_2op_8byte(_op, _src, _dst, _eflags, _qx, _qy); \ @@ -487,9 +485,8 @@ do{ unsigned long _tmp; \ _PRE_EFLAGS("0","4","2") \ _op"b %"_bx"3,%1; " \ _POST_EFLAGS("0","4","2") \ - : "=m" (_eflags), "=m" ((_dst).val), "=&r" (_tmp) \ - : _by ((_src).val), "i" (EFLAGS_MASK), \ - "m" (_eflags), "m" ((_dst).val) ); \ + : "+g" (_eflags), "+m" ((_dst).val), "=&r" (_tmp) \ + : _by ((_src).val), "i" (EFLAGS_MASK) ); \ break; \ default: \ __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy);\ @@ -519,24 +516,24 @@ do{ unsigned long _tmp; \ _PRE_EFLAGS("0","3","2") \ _op"b %1; " \ _POST_EFLAGS("0","3","2") \ - : "=m" (_eflags), "=m" ((_dst).val), "=&r" (_tmp) \ - : "i" (EFLAGS_MASK), "m" (_eflags), "m" ((_dst).val) ); \ + : "+g" (_eflags), "+m" ((_dst).val), "=&r" (_tmp) \ + : "i" (EFLAGS_MASK) ); \ break; \ case 2: \ asm volatile ( \ _PRE_EFLAGS("0","3","2") \ _op"w %1; " \ _POST_EFLAGS("0","3","2") \ - : "=m" (_eflags), "=m" ((_dst).val), "=&r" (_tmp) \ - : "i" (EFLAGS_MASK), "m" (_eflags), "m" ((_dst).val) ); \ + : "+g" (_eflags), "+m" ((_dst).val), "=&r" (_tmp) \ + : "i" (EFLAGS_MASK) ); \ break; \ case 4: \ asm volatile ( \ _PRE_EFLAGS("0","3","2") \ _op"l %1; " \ _POST_EFLAGS("0","3","2") \ - : "=m" (_eflags), "=m" ((_dst).val), "=&r" (_tmp) \ - : "i" (EFLAGS_MASK), "m" (_eflags), "m" ((_dst).val) ); \ + : "+g" (_eflags), "+m" ((_dst).val), "=&r" (_tmp) \ + : "i" (EFLAGS_MASK) ); \ break; \ case 8: \ __emulate_1op_8byte(_op, _dst, _eflags); \ @@ -551,17 +548,16 @@ do{ asm volatile ( \ _PRE_EFLAGS("0","4","2") \ _op"q %"_qx"3,%1; " \ _POST_EFLAGS("0","4","2") \ - : "=m" (_eflags), "=m" ((_dst).val), "=&r" (_tmp) \ - : _qy ((_src).val), "i" (EFLAGS_MASK), \ - "m" (_eflags), "m" ((_dst).val) ); \ + : "+g" (_eflags), "+m" ((_dst).val), "=&r" (_tmp) \ + : _qy ((_src).val), "i" (EFLAGS_MASK) ); \ } while (0) #define __emulate_1op_8byte(_op, _dst, _eflags) \ do{ asm volatile ( \ _PRE_EFLAGS("0","3","2") \ _op"q %1; " \ _POST_EFLAGS("0","3","2") \ - : "=m" (_eflags), "=m" ((_dst).val), "=&r" (_tmp) \ - : "i" (EFLAGS_MASK), "m" (_eflags), "m" ((_dst).val) ); \ + : "+g" (_eflags), "+m" ((_dst).val), "=&r" (_tmp) \ + : "i" (EFLAGS_MASK) ); \ } while (0) #elif defined(__i386__) #define __emulate_2op_8byte(_op, _src, _dst, _eflags, _qx, _qy) @@ -806,10 +802,9 @@ static int read_ulong( */ static bool_t mul_dbl(unsigned long m[2]) { - bool_t rc; - asm ( "mul %4; seto %b2" - : "=a" (m[0]), "=d" (m[1]), "=q" (rc) - : "0" (m[0]), "1" (m[1]), "2" (0) ); + bool_t rc = 0; + asm ( "mul %1; seto %b2" + : "+a" (m[0]), "+d" (m[1]), "+q" (rc) ); return rc; } @@ -820,10 +815,9 @@ static bool_t mul_dbl(unsigned long m[2]) */ static bool_t imul_dbl(unsigned long m[2]) { - bool_t rc; - asm ( "imul %4; seto %b2" - : "=a" (m[0]), "=d" (m[1]), "=q" (rc) - : "0" (m[0]), "1" (m[1]), "2" (0) ); + bool_t rc = 0; + asm ( "imul %1; seto %b2" + : "+a" (m[0]), "+d" (m[1]), "+q" (rc) ); return rc; } @@ -837,9 +831,7 @@ static bool_t div_dbl(unsigned long u[2], unsigned long v) { if ( (v == 0) || (u[1] >= v) ) return 1; - asm ( "div %4" - : "=a" (u[0]), "=d" (u[1]) - : "0" (u[0]), "1" (u[1]), "r" (v) ); + asm ( "div %2" : "+a" (u[0]), "+d" (u[1]) : "r" (v) ); 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 Mar 19 18:39:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:39: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 1YYfLp-0002xW-H8; Thu, 19 Mar 2015 18:39:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLo-0002wI-0A for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:24 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id A2/38-31237-BD71B055; Thu, 19 Mar 2015 18:39:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1426790361!14408003!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4632 invoked from network); 19 Mar 2015 18:39:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:39:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLl-0002TO-EX for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfLl-00007N-Bi for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:21 +0000 Date: Thu, 19 Mar 2015 18:39:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MINIOS_UPSTREAM_REVISION 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 4c9a14a08e86809b1c521033443ee0fca35f9d9d Author: Ian Campbell AuthorDate: Fri Mar 13 10:01:43 2015 +0000 Commit: Ian Campbell CommitDate: Fri Mar 13 10:02:29 2015 +0000 MINIOS_UPSTREAM_REVISION Update Signed-off-by: Ian Campbell --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index f457b5d..b243fac 100644 --- a/Config.mk +++ b/Config.mk @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= a065efc7c7ce8bb3e5cb3e463099d023d4a92927 QEMU_UPSTREAM_REVISION ?= master -MINIOS_UPSTREAM_REVISION ?= d0b7f0f62fd0e1154d29849b9f2e6de3783742ce -# Tue Mar 10 13:14:38 2015 +0000 -# mini-os: replace XEN_TARGET_ARCH with MINIOS_TARGET_ARCH +MINIOS_UPSTREAM_REVISION ?= edfd5aae6ec5ba7d0a8834a3e9dfe5e69424150a +# Thu Mar 12 19:08:05 2015 +0100 +# Fix accidentally removed brace causing a build error. SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 # Wed Feb 18 12:49:59 2015 -0500 -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:39:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:39: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 1YYfLp-0002xW-H8; Thu, 19 Mar 2015 18:39:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLo-0002wI-0A for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:24 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id A2/38-31237-BD71B055; Thu, 19 Mar 2015 18:39:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1426790361!14408003!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4632 invoked from network); 19 Mar 2015 18:39:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:39:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLl-0002TO-EX for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfLl-00007N-Bi for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:21 +0000 Date: Thu, 19 Mar 2015 18:39:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MINIOS_UPSTREAM_REVISION 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 4c9a14a08e86809b1c521033443ee0fca35f9d9d Author: Ian Campbell AuthorDate: Fri Mar 13 10:01:43 2015 +0000 Commit: Ian Campbell CommitDate: Fri Mar 13 10:02:29 2015 +0000 MINIOS_UPSTREAM_REVISION Update Signed-off-by: Ian Campbell --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index f457b5d..b243fac 100644 --- a/Config.mk +++ b/Config.mk @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= a065efc7c7ce8bb3e5cb3e463099d023d4a92927 QEMU_UPSTREAM_REVISION ?= master -MINIOS_UPSTREAM_REVISION ?= d0b7f0f62fd0e1154d29849b9f2e6de3783742ce -# Tue Mar 10 13:14:38 2015 +0000 -# mini-os: replace XEN_TARGET_ARCH with MINIOS_TARGET_ARCH +MINIOS_UPSTREAM_REVISION ?= edfd5aae6ec5ba7d0a8834a3e9dfe5e69424150a +# Thu Mar 12 19:08:05 2015 +0100 +# Fix accidentally removed brace causing a build error. SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 # Wed Feb 18 12:49:59 2015 -0500 -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:39:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:39: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 1YYfLz-00033B-MP; Thu, 19 Mar 2015 18:39:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLy-00032n-DM for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:34 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id BD/0A-15508-5E71B055; Thu, 19 Mar 2015 18:39:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1426790372!8609016!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22069 invoked from network); 19 Mar 2015 18:39:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:39:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLv-0002TW-QV for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfLv-00007u-Iq for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:31 +0000 Date: Thu, 19 Mar 2015 18:39:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: xl: prepend root= to root field on command line with no extra X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cde92647ea4f5c487059a3c89f2e3f1aec9a42d3 Author: Ian Campbell AuthorDate: Thu Mar 12 17:56:47 2015 +0000 Commit: Ian Campbell CommitDate: Fri Mar 13 10:22:22 2015 +0000 tools: xl: prepend root= to root field on command line with no extra This was broken in 49ab17a3a615 "tools: xl: handle unspecified extra= when dealing with root=". Reported-by: Sander Eikelenboom Signed-off-by: Ian Campbell Tested-by: Sander Eikelenboom Acked-by: Wei Liu --- tools/libxl/xl_cmdimpl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index a27ac9e..04faf98 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -817,7 +817,8 @@ static char *parse_cmdline(XLU_Config *config) if (asprintf(&cmdline, "root=%s %s", root, extra) == -1) cmdline = NULL; } else if (root) { - cmdline = strdup(root); + if (asprintf(&cmdline, "root=%s", root) == -1) + cmdline = NULL; } else if (extra) { cmdline = strdup(extra); } -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:39:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:39: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 1YYfLz-00033B-MP; Thu, 19 Mar 2015 18:39:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLy-00032n-DM for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:34 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id BD/0A-15508-5E71B055; Thu, 19 Mar 2015 18:39:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1426790372!8609016!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22069 invoked from network); 19 Mar 2015 18:39:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:39:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfLv-0002TW-QV for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfLv-00007u-Iq for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:31 +0000 Date: Thu, 19 Mar 2015 18:39:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: xl: prepend root= to root field on command line with no extra X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cde92647ea4f5c487059a3c89f2e3f1aec9a42d3 Author: Ian Campbell AuthorDate: Thu Mar 12 17:56:47 2015 +0000 Commit: Ian Campbell CommitDate: Fri Mar 13 10:22:22 2015 +0000 tools: xl: prepend root= to root field on command line with no extra This was broken in 49ab17a3a615 "tools: xl: handle unspecified extra= when dealing with root=". Reported-by: Sander Eikelenboom Signed-off-by: Ian Campbell Tested-by: Sander Eikelenboom Acked-by: Wei Liu --- tools/libxl/xl_cmdimpl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index a27ac9e..04faf98 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -817,7 +817,8 @@ static char *parse_cmdline(XLU_Config *config) if (asprintf(&cmdline, "root=%s %s", root, extra) == -1) cmdline = NULL; } else if (root) { - cmdline = strdup(root); + if (asprintf(&cmdline, "root=%s", root) == -1) + cmdline = NULL; } else if (extra) { cmdline = strdup(extra); } -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:39:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:39: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 1YYfM9-00035s-P7; Thu, 19 Mar 2015 18:39:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfM8-00035i-TJ for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:45 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 8E/5C-17064-0F71B055; Thu, 19 Mar 2015 18:39:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1426790382!11384641!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16242 invoked from network); 19 Mar 2015 18:39:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:39:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfM6-0002Tc-8w for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfM6-00008W-5b for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:42 +0000 Date: Thu, 19 Mar 2015 18:39:42 +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 38007d325a4ddfa8da47e02ad01994eec96e9a06 Merge: cde92647ea4f5c487059a3c89f2e3f1aec9a42d3 91b0ae9db33f72468b1d411a07f53085c893c097 Author: Ian Campbell AuthorDate: Fri Mar 13 10:22:48 2015 +0000 Commit: Ian Campbell CommitDate: Fri Mar 13 10:22:48 2015 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging tools/blktap2/drivers/tapdisk-vbd.c | 2 +- tools/libxl/libxl_dm.c | 21 +++++++++++++++++++-- xen/include/Makefile | 3 +-- xen/include/public/io/ring.h | 4 ++-- 4 files changed, 23 insertions(+), 7 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:39:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:39: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 1YYfM9-00035s-P7; Thu, 19 Mar 2015 18:39:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfM8-00035i-TJ for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:45 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 8E/5C-17064-0F71B055; Thu, 19 Mar 2015 18:39:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1426790382!11384641!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16242 invoked from network); 19 Mar 2015 18:39:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:39:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfM6-0002Tc-8w for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfM6-00008W-5b for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:42 +0000 Date: Thu, 19 Mar 2015 18:39:42 +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 38007d325a4ddfa8da47e02ad01994eec96e9a06 Merge: cde92647ea4f5c487059a3c89f2e3f1aec9a42d3 91b0ae9db33f72468b1d411a07f53085c893c097 Author: Ian Campbell AuthorDate: Fri Mar 13 10:22:48 2015 +0000 Commit: Ian Campbell CommitDate: Fri Mar 13 10:22:48 2015 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging tools/blktap2/drivers/tapdisk-vbd.c | 2 +- tools/libxl/libxl_dm.c | 21 +++++++++++++++++++-- xen/include/Makefile | 3 +-- xen/include/public/io/ring.h | 4 ++-- 4 files changed, 23 insertions(+), 7 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:39:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:39: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 1YYfMJ-00038G-Rh; Thu, 19 Mar 2015 18:39:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfMI-00037k-Px for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:54 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 64/CB-11927-AF71B055; Thu, 19 Mar 2015 18:39:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1426790392!9081535!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20340 invoked from network); 19 Mar 2015 18:39:53 -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; 19 Mar 2015 18:39:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfMG-0002Ti-HF for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfMG-00008t-Dg for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:52 +0000 Date: Thu, 19 Mar 2015 18:39:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of 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 7f34f30abef53e3eee92cadc35253b80eeb48e56 Merge: 879b181f38b0e4e3c7314de980289f4ecd1c5982 38007d325a4ddfa8da47e02ad01994eec96e9a06 Author: Jan Beulich AuthorDate: Fri Mar 13 11:24:29 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 13 11:24:29 2015 +0100 Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging Config.mk | 6 +++--- tools/libxl/xl_cmdimpl.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:39:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:39: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 1YYfMJ-00038G-Rh; Thu, 19 Mar 2015 18:39:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfMI-00037k-Px for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:54 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 64/CB-11927-AF71B055; Thu, 19 Mar 2015 18:39:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1426790392!9081535!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20340 invoked from network); 19 Mar 2015 18:39:53 -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; 19 Mar 2015 18:39:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfMG-0002Ti-HF for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfMG-00008t-Dg for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:39:52 +0000 Date: Thu, 19 Mar 2015 18:39:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of 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 7f34f30abef53e3eee92cadc35253b80eeb48e56 Merge: 879b181f38b0e4e3c7314de980289f4ecd1c5982 38007d325a4ddfa8da47e02ad01994eec96e9a06 Author: Jan Beulich AuthorDate: Fri Mar 13 11:24:29 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 13 11:24:29 2015 +0100 Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging Config.mk | 6 +++--- tools/libxl/xl_cmdimpl.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:40:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:40: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 1YYfMZ-0003Dg-UR; Thu, 19 Mar 2015 18:40:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfMY-0003DQ-EW for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:10 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id CA/F8-02005-9081B055; Thu, 19 Mar 2015 18:40:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1426790408!13683018!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32253 invoked from network); 19 Mar 2015 18:40:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:40:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfMV-0002UK-Oh for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfMQ-00009V-MF for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:02 +0000 Date: Thu, 19 Mar 2015 18:40:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] prune unused ASSERT/BUG/WARN infrastructure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit daf525ab15e337fe09b4f2d95442ccd37bc51525 Author: Andrew Cooper AuthorDate: Fri Mar 13 11:24:52 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 13 11:24:52 2015 +0100 prune unused ASSERT/BUG/WARN infrastructure Signed-off-by: Andrew Cooper Acked-by: Tim Deegan --- xen/drivers/char/console.c | 15 --------------- xen/include/xen/lib.h | 12 ------------ 2 files changed, 0 insertions(+), 27 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index cb0c2d6..fce4cc8 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1150,21 +1150,6 @@ void panic(const char *fmt, ...) machine_restart(5000); } -void __bug(const char *file, int line) -{ - console_start_sync(); - printk("Xen BUG at %s:%d\n", file, line); - dump_execution_state(); - panic("Xen BUG at %s:%d", file, line); -} - -void __warn(const char *file, int line) -{ - printk("Xen WARN at %s:%d\n", file, line); - dump_execution_state(); -} - - /* * ************************************************************** * ****************** Console suspend/resume ******************** diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index ca3916b..6c8dd86 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -8,9 +8,6 @@ #include #include -void noreturn __bug(const char *file, int line); -void __warn(const char *file, int line); - #define BUG_ON(p) do { if (unlikely(p)) BUG(); } while (0) #define WARN_ON(p) do { if (unlikely(p)) WARN(); } while (0) @@ -29,15 +26,6 @@ void __warn(const char *file, int line); #define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond)) #endif -#ifndef assert_failed -#define assert_failed(p) \ -do { \ - printk("Assertion '%s' failed, line %d, file %s\n", p , \ - __LINE__, __FILE__); \ - BUG(); \ -} while (0) -#endif - #ifndef NDEBUG #define ASSERT(p) \ do { if ( unlikely(!(p)) ) assert_failed(#p); } while (0) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:40:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:40: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 1YYfMZ-0003Dg-UR; Thu, 19 Mar 2015 18:40:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfMY-0003DQ-EW for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:10 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id CA/F8-02005-9081B055; Thu, 19 Mar 2015 18:40:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1426790408!13683018!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32253 invoked from network); 19 Mar 2015 18:40:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:40:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfMV-0002UK-Oh for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfMQ-00009V-MF for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:02 +0000 Date: Thu, 19 Mar 2015 18:40:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] prune unused ASSERT/BUG/WARN infrastructure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit daf525ab15e337fe09b4f2d95442ccd37bc51525 Author: Andrew Cooper AuthorDate: Fri Mar 13 11:24:52 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 13 11:24:52 2015 +0100 prune unused ASSERT/BUG/WARN infrastructure Signed-off-by: Andrew Cooper Acked-by: Tim Deegan --- xen/drivers/char/console.c | 15 --------------- xen/include/xen/lib.h | 12 ------------ 2 files changed, 0 insertions(+), 27 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index cb0c2d6..fce4cc8 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1150,21 +1150,6 @@ void panic(const char *fmt, ...) machine_restart(5000); } -void __bug(const char *file, int line) -{ - console_start_sync(); - printk("Xen BUG at %s:%d\n", file, line); - dump_execution_state(); - panic("Xen BUG at %s:%d", file, line); -} - -void __warn(const char *file, int line) -{ - printk("Xen WARN at %s:%d\n", file, line); - dump_execution_state(); -} - - /* * ************************************************************** * ****************** Console suspend/resume ******************** diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index ca3916b..6c8dd86 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -8,9 +8,6 @@ #include #include -void noreturn __bug(const char *file, int line); -void __warn(const char *file, int line); - #define BUG_ON(p) do { if (unlikely(p)) BUG(); } while (0) #define WARN_ON(p) do { if (unlikely(p)) WARN(); } while (0) @@ -29,15 +26,6 @@ void __warn(const char *file, int line); #define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond)) #endif -#ifndef assert_failed -#define assert_failed(p) \ -do { \ - printk("Assertion '%s' failed, line %d, file %s\n", p , \ - __LINE__, __FILE__); \ - BUG(); \ -} while (0) -#endif - #ifndef NDEBUG #define ASSERT(p) \ do { if ( unlikely(!(p)) ) assert_failed(#p); } while (0) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:40:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:40: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 1YYfMk-0003GK-0t; Thu, 19 Mar 2015 18:40:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfMi-0003Fz-Ut for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:21 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id F4/CC-01563-4181B055; Thu, 19 Mar 2015 18:40:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1426790418!13683064!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 742 invoked from network); 19 Mar 2015 18:40: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; 19 Mar 2015 18:40:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfMg-0002UQ-0T for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfMf-0000A4-VR for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:17 +0000 Date: Thu, 19 Mar 2015 18:40:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EFI: allow reboot= overrides when running under EFI X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c643fb110a51693e82a36ca9178d54f0b9744024 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Mar 13 11:25:52 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 13 11:25:52 2015 +0100 x86/EFI: allow reboot= overrides when running under EFI By default we will always use EFI reboot mechanism when running under EFI platforms. However some EFI platforms are buggy and need to use the ACPI mechanism to reboot (such as Lenovo ThinkCentre M57). As such respect the 'reboot=' override and DMI overrides for EFI platforms. Signed-off-by: Konrad Rzeszutek Wilk - BOOT_INVALID is just zero - also consider acpi_disabled in BOOT_INVALID resolution - duplicate BOOT_INVALID resolution in machine_restart() - don't fall back from BOOT_ACPI to BOOT_EFI (if it was overridden, it surely was for a reason) - adjust doc change formatting Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 5 ++++- xen/arch/x86/shutdown.c | 33 ++++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 5044da1..f0a3112 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1145,7 +1145,7 @@ The following resources are available: Technology. ### reboot -> `= t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old]` +> `= t[riple] | k[bd] | a[cpi] | p[ci] | e[fi] | n[o] [, [w]arm | [c]old]` > Default: `0` @@ -1165,6 +1165,9 @@ Specify the host reboot method. `pci` instructs Xen to reboot the host using PCI reset register (port CF9). +'efi' instructs Xen to reboot using the EFI reboot call (in EFI mode by + default it will use that method first). + ### ro-hpet > `= ` diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 21f6cf5..d2bb24b 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -28,16 +28,18 @@ #include enum reboot_type { + BOOT_INVALID, BOOT_TRIPLE = 't', BOOT_KBD = 'k', BOOT_ACPI = 'a', BOOT_CF9 = 'p', + BOOT_EFI = 'e', }; static int reboot_mode; /* - * reboot=t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old] + * reboot=t[riple] | k[bd] | a[cpi] | p[ci] | n[o] | [e]fi [, [w]arm | [c]old] * warm Don't set the cold reboot flag * cold Set the cold reboot flag * no Suppress automatic reboot after panics or crashes @@ -45,8 +47,9 @@ static int reboot_mode; * kbd Use the keyboard controller. cold reset (default) * acpi Use the RESET_REG in the FADT * pci Use the so-called "PCI reset register", CF9 + * efi Use the EFI reboot (if running under EFI) */ -static enum reboot_type reboot_type = BOOT_ACPI; +static enum reboot_type reboot_type = BOOT_INVALID; static void __init set_reboot_type(char *str) { for ( ; ; ) @@ -63,6 +66,7 @@ static void __init set_reboot_type(char *str) reboot_mode = 0x0; break; case 'a': + case 'e': case 'k': case 't': case 'p': @@ -106,6 +110,14 @@ void machine_halt(void) __machine_halt(NULL); } +static void default_reboot_type(void) +{ + if ( reboot_type == BOOT_INVALID ) + reboot_type = efi_enabled ? BOOT_EFI + : acpi_disabled ? BOOT_KBD + : BOOT_ACPI; +} + static int __init override_reboot(struct dmi_system_id *d) { enum reboot_type type = (long)d->driver_data; @@ -452,6 +464,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { static int __init reboot_init(void) { + default_reboot_type(); dmi_check_system(reboot_dmi_table); return 0; } @@ -465,7 +478,7 @@ static void noreturn __machine_restart(void *pdelay) void machine_restart(unsigned int delay_millisecs) { unsigned int i, attempt; - enum reboot_type orig_reboot_type = reboot_type; + enum reboot_type orig_reboot_type; const struct desc_ptr no_idt = { 0 }; watchdog_disable(); @@ -504,15 +517,20 @@ void machine_restart(unsigned int delay_millisecs) tboot_shutdown(TB_SHUTDOWN_REBOOT); } - efi_reset_system(reboot_mode != 0); + /* Just in case reboot_init() didn't run yet. */ + default_reboot_type(); + orig_reboot_type = reboot_type; /* Rebooting needs to touch the page at absolute address 0. */ - *((unsigned short *)__va(0x472)) = reboot_mode; + if ( reboot_type != BOOT_EFI ) + *((unsigned short *)__va(0x472)) = reboot_mode; for ( attempt = 0; ; attempt++ ) { switch ( reboot_type ) { + case BOOT_INVALID: + ASSERT_UNREACHABLE(); case BOOT_KBD: /* Pulse the keyboard reset line. */ for ( i = 0; i < 100; i++ ) @@ -532,6 +550,11 @@ void machine_restart(unsigned int delay_millisecs) reboot_type = (((attempt == 1) && (orig_reboot_type == BOOT_ACPI)) ? BOOT_ACPI : BOOT_TRIPLE); break; + case BOOT_EFI: + reboot_type = acpi_disabled ? BOOT_KBD : BOOT_ACPI; + efi_reset_system(reboot_mode != 0); + *((unsigned short *)__va(0x472)) = reboot_mode; + break; case BOOT_TRIPLE: asm volatile ("lidt %0; int3" : : "m" (no_idt)); reboot_type = BOOT_KBD; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:40:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:40: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 1YYfMk-0003GK-0t; Thu, 19 Mar 2015 18:40:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfMi-0003Fz-Ut for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:21 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id F4/CC-01563-4181B055; Thu, 19 Mar 2015 18:40:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1426790418!13683064!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 742 invoked from network); 19 Mar 2015 18:40: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; 19 Mar 2015 18:40:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfMg-0002UQ-0T for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfMf-0000A4-VR for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:17 +0000 Date: Thu, 19 Mar 2015 18:40:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EFI: allow reboot= overrides when running under EFI X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c643fb110a51693e82a36ca9178d54f0b9744024 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Mar 13 11:25:52 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 13 11:25:52 2015 +0100 x86/EFI: allow reboot= overrides when running under EFI By default we will always use EFI reboot mechanism when running under EFI platforms. However some EFI platforms are buggy and need to use the ACPI mechanism to reboot (such as Lenovo ThinkCentre M57). As such respect the 'reboot=' override and DMI overrides for EFI platforms. Signed-off-by: Konrad Rzeszutek Wilk - BOOT_INVALID is just zero - also consider acpi_disabled in BOOT_INVALID resolution - duplicate BOOT_INVALID resolution in machine_restart() - don't fall back from BOOT_ACPI to BOOT_EFI (if it was overridden, it surely was for a reason) - adjust doc change formatting Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 5 ++++- xen/arch/x86/shutdown.c | 33 ++++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 5044da1..f0a3112 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1145,7 +1145,7 @@ The following resources are available: Technology. ### reboot -> `= t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old]` +> `= t[riple] | k[bd] | a[cpi] | p[ci] | e[fi] | n[o] [, [w]arm | [c]old]` > Default: `0` @@ -1165,6 +1165,9 @@ Specify the host reboot method. `pci` instructs Xen to reboot the host using PCI reset register (port CF9). +'efi' instructs Xen to reboot using the EFI reboot call (in EFI mode by + default it will use that method first). + ### ro-hpet > `= ` diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 21f6cf5..d2bb24b 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -28,16 +28,18 @@ #include enum reboot_type { + BOOT_INVALID, BOOT_TRIPLE = 't', BOOT_KBD = 'k', BOOT_ACPI = 'a', BOOT_CF9 = 'p', + BOOT_EFI = 'e', }; static int reboot_mode; /* - * reboot=t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old] + * reboot=t[riple] | k[bd] | a[cpi] | p[ci] | n[o] | [e]fi [, [w]arm | [c]old] * warm Don't set the cold reboot flag * cold Set the cold reboot flag * no Suppress automatic reboot after panics or crashes @@ -45,8 +47,9 @@ static int reboot_mode; * kbd Use the keyboard controller. cold reset (default) * acpi Use the RESET_REG in the FADT * pci Use the so-called "PCI reset register", CF9 + * efi Use the EFI reboot (if running under EFI) */ -static enum reboot_type reboot_type = BOOT_ACPI; +static enum reboot_type reboot_type = BOOT_INVALID; static void __init set_reboot_type(char *str) { for ( ; ; ) @@ -63,6 +66,7 @@ static void __init set_reboot_type(char *str) reboot_mode = 0x0; break; case 'a': + case 'e': case 'k': case 't': case 'p': @@ -106,6 +110,14 @@ void machine_halt(void) __machine_halt(NULL); } +static void default_reboot_type(void) +{ + if ( reboot_type == BOOT_INVALID ) + reboot_type = efi_enabled ? BOOT_EFI + : acpi_disabled ? BOOT_KBD + : BOOT_ACPI; +} + static int __init override_reboot(struct dmi_system_id *d) { enum reboot_type type = (long)d->driver_data; @@ -452,6 +464,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { static int __init reboot_init(void) { + default_reboot_type(); dmi_check_system(reboot_dmi_table); return 0; } @@ -465,7 +478,7 @@ static void noreturn __machine_restart(void *pdelay) void machine_restart(unsigned int delay_millisecs) { unsigned int i, attempt; - enum reboot_type orig_reboot_type = reboot_type; + enum reboot_type orig_reboot_type; const struct desc_ptr no_idt = { 0 }; watchdog_disable(); @@ -504,15 +517,20 @@ void machine_restart(unsigned int delay_millisecs) tboot_shutdown(TB_SHUTDOWN_REBOOT); } - efi_reset_system(reboot_mode != 0); + /* Just in case reboot_init() didn't run yet. */ + default_reboot_type(); + orig_reboot_type = reboot_type; /* Rebooting needs to touch the page at absolute address 0. */ - *((unsigned short *)__va(0x472)) = reboot_mode; + if ( reboot_type != BOOT_EFI ) + *((unsigned short *)__va(0x472)) = reboot_mode; for ( attempt = 0; ; attempt++ ) { switch ( reboot_type ) { + case BOOT_INVALID: + ASSERT_UNREACHABLE(); case BOOT_KBD: /* Pulse the keyboard reset line. */ for ( i = 0; i < 100; i++ ) @@ -532,6 +550,11 @@ void machine_restart(unsigned int delay_millisecs) reboot_type = (((attempt == 1) && (orig_reboot_type == BOOT_ACPI)) ? BOOT_ACPI : BOOT_TRIPLE); break; + case BOOT_EFI: + reboot_type = acpi_disabled ? BOOT_KBD : BOOT_ACPI; + efi_reset_system(reboot_mode != 0); + *((unsigned short *)__va(0x472)) = reboot_mode; + break; case BOOT_TRIPLE: asm volatile ("lidt %0; int3" : : "m" (no_idt)); reboot_type = BOOT_KBD; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:40:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:40: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 1YYfMu-0003JX-3U; Thu, 19 Mar 2015 18:40:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfMs-0003J7-Q9 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:30 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id DC/1C-22535-E181B055; Thu, 19 Mar 2015 18:40:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1426790428!13683092!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1324 invoked from network); 19 Mar 2015 18:40:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:40:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfMq-0002UY-6L for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfMq-0000B9-4N for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:28 +0000 Date: Thu, 19 Mar 2015 18:40:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "cpupools: update domU's node-affinity on the cpupool_unassign_cpu() path" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8395b67ab0b8a8623b2fa46d84c1796d3aa5b2d7 Author: Jan Beulich AuthorDate: Fri Mar 13 12:40:01 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 13 12:40:01 2015 +0100 Revert "cpupools: update domU's node-affinity on the cpupool_unassign_cpu() path" This reverts commit 93be8285a79c6cbbf66c8681fec1d1bfb71d84cc. At the point this patch calls domain_update_node_affinity(), the vcpu hard affinities have not yet been updated; so calling it at this point can in some circumstances trigger an ASSERT(). domain_update_node_affinity() is already called in cpu_disable_scheduler(), so adding it to cpupool_unassign_cpu() is redundant. Simply reverting the patch is sufficient. Acked-by: George Dunlap --- xen/common/cpupool.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index a758a8b..cd6aab9 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -379,12 +379,6 @@ static int cpupool_unassign_cpu(struct cpupool *c, unsigned int cpu) atomic_inc(&c->refcnt); cpupool_cpu_moving = c; cpumask_clear_cpu(cpu, c->cpu_valid); - - rcu_read_lock(&domlist_read_lock); - for_each_domain_in_cpupool(d, c) - domain_update_node_affinity(d); - rcu_read_unlock(&domlist_read_lock); - spin_unlock(&cpupool_lock); work_cpu = smp_processor_id(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:40:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:40: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 1YYfMu-0003JX-3U; Thu, 19 Mar 2015 18:40:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfMs-0003J7-Q9 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:30 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id DC/1C-22535-E181B055; Thu, 19 Mar 2015 18:40:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1426790428!13683092!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1324 invoked from network); 19 Mar 2015 18:40:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:40:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfMq-0002UY-6L for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfMq-0000B9-4N for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:28 +0000 Date: Thu, 19 Mar 2015 18:40:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "cpupools: update domU's node-affinity on the cpupool_unassign_cpu() path" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8395b67ab0b8a8623b2fa46d84c1796d3aa5b2d7 Author: Jan Beulich AuthorDate: Fri Mar 13 12:40:01 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 13 12:40:01 2015 +0100 Revert "cpupools: update domU's node-affinity on the cpupool_unassign_cpu() path" This reverts commit 93be8285a79c6cbbf66c8681fec1d1bfb71d84cc. At the point this patch calls domain_update_node_affinity(), the vcpu hard affinities have not yet been updated; so calling it at this point can in some circumstances trigger an ASSERT(). domain_update_node_affinity() is already called in cpu_disable_scheduler(), so adding it to cpupool_unassign_cpu() is redundant. Simply reverting the patch is sufficient. Acked-by: George Dunlap --- xen/common/cpupool.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index a758a8b..cd6aab9 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -379,12 +379,6 @@ static int cpupool_unassign_cpu(struct cpupool *c, unsigned int cpu) atomic_inc(&c->refcnt); cpupool_cpu_moving = c; cpumask_clear_cpu(cpu, c->cpu_valid); - - rcu_read_lock(&domlist_read_lock); - for_each_domain_in_cpupool(d, c) - domain_update_node_affinity(d); - rcu_read_unlock(&domlist_read_lock); - spin_unlock(&cpupool_lock); work_cpu = smp_processor_id(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:40:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:40: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 1YYfN5-0003O8-6M; Thu, 19 Mar 2015 18:40:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfN3-0003NX-FC for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:41 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 40/81-17310-8281B055; Thu, 19 Mar 2015 18:40:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1426790438!14410109!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3487 invoked from network); 19 Mar 2015 18:40:39 -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; 19 Mar 2015 18:40:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfN0-0002Ue-B9 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfN0-0000BZ-AJ for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:38 +0000 Date: Thu, 19 Mar 2015 18:40:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't apply reboot quirks if reboot set by user X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9832f5e8e3575f8affceb2751f7422704bf7b446 Author: Ross Lagerwall AuthorDate: Fri Mar 13 12:41:51 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 13 12:41:51 2015 +0100 x86: don't apply reboot quirks if reboot set by user If reboot= is specified on the command-line, don't apply reboot quirks to allow the command-line option to take precedence. This is a port of Linux commit 5955633e91bf ("x86/reboot: Skip DMI checks if reboot set by user"). Signed-off-by: Ross Lagerwall Leverage (and make apply on top of) c643fb110a ("x86/EFI: allow reboot= overrides when running under EFI"). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/shutdown.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index d2bb24b..9ec8f97 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -464,6 +464,13 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { static int __init reboot_init(void) { + /* + * Only do the DMI check if reboot_type hasn't been overridden + * on the command line + */ + if ( reboot_type != BOOT_INVALID ) + return 0; + default_reboot_type(); dmi_check_system(reboot_dmi_table); 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 Mar 19 18:40:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:40: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 1YYfN5-0003O8-6M; Thu, 19 Mar 2015 18:40:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfN3-0003NX-FC for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:41 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 40/81-17310-8281B055; Thu, 19 Mar 2015 18:40:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1426790438!14410109!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3487 invoked from network); 19 Mar 2015 18:40:39 -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; 19 Mar 2015 18:40:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfN0-0002Ue-B9 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfN0-0000BZ-AJ for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:38 +0000 Date: Thu, 19 Mar 2015 18:40:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't apply reboot quirks if reboot set by user X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9832f5e8e3575f8affceb2751f7422704bf7b446 Author: Ross Lagerwall AuthorDate: Fri Mar 13 12:41:51 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 13 12:41:51 2015 +0100 x86: don't apply reboot quirks if reboot set by user If reboot= is specified on the command-line, don't apply reboot quirks to allow the command-line option to take precedence. This is a port of Linux commit 5955633e91bf ("x86/reboot: Skip DMI checks if reboot set by user"). Signed-off-by: Ross Lagerwall Leverage (and make apply on top of) c643fb110a ("x86/EFI: allow reboot= overrides when running under EFI"). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/shutdown.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index d2bb24b..9ec8f97 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -464,6 +464,13 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { static int __init reboot_init(void) { + /* + * Only do the DMI check if reboot_type hasn't been overridden + * on the command line + */ + if ( reboot_type != BOOT_INVALID ) + return 0; + default_reboot_type(); dmi_check_system(reboot_dmi_table); 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 Mar 19 18:40:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:40: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 1YYfNE-0003UB-CE; Thu, 19 Mar 2015 18:40:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfND-0003Sp-0M for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:51 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 06/12-23320-2381B055; Thu, 19 Mar 2015 18:40:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1426790448!14410143!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4357 invoked from network); 19 Mar 2015 18:40:49 -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; 19 Mar 2015 18:40:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNA-0002Ul-Gn for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfNA-0000Bx-FC for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:48 +0000 Date: Thu, 19 Mar 2015 18:40:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correct arm64 version of gva_to_ma_par X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c1245e9d5bf311b5a3267ea4b077a16561fcf439 Author: Ian Campbell AuthorDate: Fri Mar 13 10:39:50 2015 +0000 Commit: Ian Campbell CommitDate: Fri Mar 13 12:07:48 2015 +0000 xen: arm: correct arm64 version of gva_to_ma_par The implementation was backwards and checked that the guest could read when asked about write and vice versa. This is an update to the fix for XSA-98. Reported-by: Tamas K Lengyel Signed-off-by: Ian Campbell --- xen/include/asm-arm/arm64/page.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/arm64/page.h b/xen/include/asm-arm/arm64/page.h index 1fd416d..e7a761d 100644 --- a/xen/include/asm-arm/arm64/page.h +++ b/xen/include/asm-arm/arm64/page.h @@ -89,9 +89,9 @@ static inline uint64_t gva_to_ma_par(vaddr_t va, unsigned int flags) uint64_t par, tmp = READ_SYSREG64(PAR_EL1); if ( (flags & GV2M_WRITE) == GV2M_WRITE ) - asm volatile ("at s12e1r, %0;" : : "r" (va)); - else asm volatile ("at s12e1w, %0;" : : "r" (va)); + else + asm volatile ("at s12e1r, %0;" : : "r" (va)); isb(); par = READ_SYSREG64(PAR_EL1); WRITE_SYSREG64(tmp, PAR_EL1); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:40:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:40: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 1YYfNE-0003UB-CE; Thu, 19 Mar 2015 18:40:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfND-0003Sp-0M for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:51 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 06/12-23320-2381B055; Thu, 19 Mar 2015 18:40:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1426790448!14410143!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4357 invoked from network); 19 Mar 2015 18:40:49 -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; 19 Mar 2015 18:40:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNA-0002Ul-Gn for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfNA-0000Bx-FC for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:48 +0000 Date: Thu, 19 Mar 2015 18:40:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correct arm64 version of gva_to_ma_par X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c1245e9d5bf311b5a3267ea4b077a16561fcf439 Author: Ian Campbell AuthorDate: Fri Mar 13 10:39:50 2015 +0000 Commit: Ian Campbell CommitDate: Fri Mar 13 12:07:48 2015 +0000 xen: arm: correct arm64 version of gva_to_ma_par The implementation was backwards and checked that the guest could read when asked about write and vice versa. This is an update to the fix for XSA-98. Reported-by: Tamas K Lengyel Signed-off-by: Ian Campbell --- xen/include/asm-arm/arm64/page.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/arm64/page.h b/xen/include/asm-arm/arm64/page.h index 1fd416d..e7a761d 100644 --- a/xen/include/asm-arm/arm64/page.h +++ b/xen/include/asm-arm/arm64/page.h @@ -89,9 +89,9 @@ static inline uint64_t gva_to_ma_par(vaddr_t va, unsigned int flags) uint64_t par, tmp = READ_SYSREG64(PAR_EL1); if ( (flags & GV2M_WRITE) == GV2M_WRITE ) - asm volatile ("at s12e1r, %0;" : : "r" (va)); - else asm volatile ("at s12e1w, %0;" : : "r" (va)); + else + asm volatile ("at s12e1r, %0;" : : "r" (va)); isb(); par = READ_SYSREG64(PAR_EL1); WRITE_SYSREG64(tmp, PAR_EL1); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:41:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:41: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 1YYfNP-0003Z3-GL; Thu, 19 Mar 2015 18:41:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNO-0003Yq-AB for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:02 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 96/83-01069-D381B055; Thu, 19 Mar 2015 18:41:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1426790459!14408308!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12567 invoked from network); 19 Mar 2015 18:41:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:41:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNK-0002Uu-VM for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfNK-0000Cc-TO for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:58 +0000 Date: Thu, 19 Mar 2015 18:40:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/domctl: improve XEN_DOMCTL_hypercall_init 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 fd7124d03c2d06715d2ba54eb443285c51cef9e0 Author: Andrew Cooper AuthorDate: Fri Mar 13 16:31:27 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 13 16:31:27 2015 +0100 x86/domctl: improve XEN_DOMCTL_hypercall_init error handling EACCES cannot be distinguished against an incorrect DOMCTL_INTERFACE_VERSION, and will cause an incorrect "need to rebuild the user-space tool set?" message from libxc. On the libxc side, put the useful piece of information in the error message, rathe than the -1 from do_domctl(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Wei Liu --- tools/libxc/xc_dom_boot.c | 6 +++--- xen/arch/x86/domctl.c | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xc_dom_boot.c b/tools/libxc/xc_dom_boot.c index a141eb5..f82db2d 100644 --- a/tools/libxc/xc_dom_boot.c +++ b/tools/libxc/xc_dom_boot.c @@ -57,9 +57,9 @@ static int setup_hypercall_page(struct xc_dom_image *dom) domctl.u.hypercall_init.gmfn = xc_dom_p2m_guest(dom, pfn); rc = do_domctl(dom->xch, &domctl); if ( rc != 0 ) - xc_dom_panic(dom->xch, - XC_INTERNAL_ERROR, "%s: HYPERCALL_INIT failed (rc=%d)", - __FUNCTION__, rc); + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: HYPERCALL_INIT failed: %d - %s)", + __FUNCTION__, errno, strerror(errno)); return rc; } diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 3e5bef1..d4f6ccf 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -386,16 +386,18 @@ long arch_do_domctl( page = get_page_from_gfn(d, gmfn, NULL, P2M_ALLOC); - ret = -EACCES; if ( !page || !get_page_type(page, PGT_writable_page) ) { if ( page ) + { + ret = -EPERM; put_page(page); + } + else + ret = -EINVAL; break; } - ret = 0; - hypercall_page = __map_domain_page(page); hypercall_page_initialise(d, hypercall_page); unmap_domain_page(hypercall_page); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:41:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:41: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 1YYfNP-0003Z3-GL; Thu, 19 Mar 2015 18:41:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNO-0003Yq-AB for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:02 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 96/83-01069-D381B055; Thu, 19 Mar 2015 18:41:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1426790459!14408308!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12567 invoked from network); 19 Mar 2015 18:41:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:41:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNK-0002Uu-VM for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfNK-0000Cc-TO for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:40:58 +0000 Date: Thu, 19 Mar 2015 18:40:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/domctl: improve XEN_DOMCTL_hypercall_init 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 fd7124d03c2d06715d2ba54eb443285c51cef9e0 Author: Andrew Cooper AuthorDate: Fri Mar 13 16:31:27 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 13 16:31:27 2015 +0100 x86/domctl: improve XEN_DOMCTL_hypercall_init error handling EACCES cannot be distinguished against an incorrect DOMCTL_INTERFACE_VERSION, and will cause an incorrect "need to rebuild the user-space tool set?" message from libxc. On the libxc side, put the useful piece of information in the error message, rathe than the -1 from do_domctl(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Wei Liu --- tools/libxc/xc_dom_boot.c | 6 +++--- xen/arch/x86/domctl.c | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xc_dom_boot.c b/tools/libxc/xc_dom_boot.c index a141eb5..f82db2d 100644 --- a/tools/libxc/xc_dom_boot.c +++ b/tools/libxc/xc_dom_boot.c @@ -57,9 +57,9 @@ static int setup_hypercall_page(struct xc_dom_image *dom) domctl.u.hypercall_init.gmfn = xc_dom_p2m_guest(dom, pfn); rc = do_domctl(dom->xch, &domctl); if ( rc != 0 ) - xc_dom_panic(dom->xch, - XC_INTERNAL_ERROR, "%s: HYPERCALL_INIT failed (rc=%d)", - __FUNCTION__, rc); + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: HYPERCALL_INIT failed: %d - %s)", + __FUNCTION__, errno, strerror(errno)); return rc; } diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 3e5bef1..d4f6ccf 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -386,16 +386,18 @@ long arch_do_domctl( page = get_page_from_gfn(d, gmfn, NULL, P2M_ALLOC); - ret = -EACCES; if ( !page || !get_page_type(page, PGT_writable_page) ) { if ( page ) + { + ret = -EPERM; put_page(page); + } + else + ret = -EINVAL; break; } - ret = 0; - hypercall_page = __map_domain_page(page); hypercall_page_initialise(d, hypercall_page); unmap_domain_page(hypercall_page); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:41:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:41: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 1YYfNZ-0003bq-7d; Thu, 19 Mar 2015 18:41:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNX-0003av-OS for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:11 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 20/72-01814-6481B055; Thu, 19 Mar 2015 18:41:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1426790469!11384972!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24827 invoked from network); 19 Mar 2015 18:41:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:41:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNV-0002VS-55 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfNV-0000DB-3M for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:09 +0000 Date: Thu, 19 Mar 2015 18:41:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: improve "PCI reset register" rebooting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2bd6add4f5fa4ea2ba9297d6139e9dea42ea70a9 Author: Jan Beulich AuthorDate: Fri Mar 13 16:33:57 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 13 16:33:57 2015 +0100 x86: improve "PCI reset register" rebooting The way this method works allows for honoring "warm" reboot requested by the user and additionally has a way to power-cycle the machine. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 4 +++- xen/arch/x86/shutdown.c | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index f0a3112..1dda1f0 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1145,7 +1145,7 @@ The following resources are available: Technology. ### reboot -> `= t[riple] | k[bd] | a[cpi] | p[ci] | e[fi] | n[o] [, [w]arm | [c]old]` +> `= t[riple] | k[bd] | a[cpi] | p[ci] | P[ower] | e[fi] | n[o] [, [w]arm | [c]old]` > Default: `0` @@ -1165,6 +1165,8 @@ Specify the host reboot method. `pci` instructs Xen to reboot the host using PCI reset register (port CF9). +`Power` instructs Xen to power-cycle the host using PCI reset register (port CF9). + 'efi' instructs Xen to reboot using the EFI reboot call (in EFI mode by default it will use that method first). diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 9ec8f97..0e1499d 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -33,6 +33,7 @@ enum reboot_type { BOOT_KBD = 'k', BOOT_ACPI = 'a', BOOT_CF9 = 'p', + BOOT_CF9_PWR = 'P', BOOT_EFI = 'e', }; @@ -47,6 +48,7 @@ static int reboot_mode; * kbd Use the keyboard controller. cold reset (default) * acpi Use the RESET_REG in the FADT * pci Use the so-called "PCI reset register", CF9 + * Power Like 'pci' but for a full power-cyle reset * efi Use the EFI reboot (if running under EFI) */ static enum reboot_type reboot_type = BOOT_INVALID; @@ -68,8 +70,9 @@ static void __init set_reboot_type(char *str) case 'a': case 'e': case 'k': - case 't': + case 'P': case 'p': + case 't': reboot_type = *str; break; } @@ -571,11 +574,18 @@ void machine_restart(unsigned int delay_millisecs) reboot_type = BOOT_KBD; break; case BOOT_CF9: + case BOOT_CF9_PWR: { - u8 cf9 = inb(0xcf9) & ~6; - outb(cf9|2, 0xcf9); /* Request hard reset */ + u8 cf9 = inb(0xcf9) & ~0x0e; + + /* Request warm, hard, or power-cycle reset. */ + if ( reboot_type == BOOT_CF9_PWR ) + cf9 |= 0x0a; + else if ( reboot_mode == 0 ) + cf9 |= 0x02; + outb(cf9, 0xcf9); udelay(50); - outb(cf9|6, 0xcf9); /* Actually do the reset */ + outb(cf9 | 0x04, 0xcf9); /* Actually do the reset. */ udelay(50); } reboot_type = BOOT_ACPI; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:41:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:41: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 1YYfNZ-0003bq-7d; Thu, 19 Mar 2015 18:41:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNX-0003av-OS for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:11 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 20/72-01814-6481B055; Thu, 19 Mar 2015 18:41:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1426790469!11384972!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24827 invoked from network); 19 Mar 2015 18:41:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:41:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNV-0002VS-55 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfNV-0000DB-3M for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:09 +0000 Date: Thu, 19 Mar 2015 18:41:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: improve "PCI reset register" rebooting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2bd6add4f5fa4ea2ba9297d6139e9dea42ea70a9 Author: Jan Beulich AuthorDate: Fri Mar 13 16:33:57 2015 +0100 Commit: Jan Beulich CommitDate: Fri Mar 13 16:33:57 2015 +0100 x86: improve "PCI reset register" rebooting The way this method works allows for honoring "warm" reboot requested by the user and additionally has a way to power-cycle the machine. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 4 +++- xen/arch/x86/shutdown.c | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index f0a3112..1dda1f0 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1145,7 +1145,7 @@ The following resources are available: Technology. ### reboot -> `= t[riple] | k[bd] | a[cpi] | p[ci] | e[fi] | n[o] [, [w]arm | [c]old]` +> `= t[riple] | k[bd] | a[cpi] | p[ci] | P[ower] | e[fi] | n[o] [, [w]arm | [c]old]` > Default: `0` @@ -1165,6 +1165,8 @@ Specify the host reboot method. `pci` instructs Xen to reboot the host using PCI reset register (port CF9). +`Power` instructs Xen to power-cycle the host using PCI reset register (port CF9). + 'efi' instructs Xen to reboot using the EFI reboot call (in EFI mode by default it will use that method first). diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 9ec8f97..0e1499d 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -33,6 +33,7 @@ enum reboot_type { BOOT_KBD = 'k', BOOT_ACPI = 'a', BOOT_CF9 = 'p', + BOOT_CF9_PWR = 'P', BOOT_EFI = 'e', }; @@ -47,6 +48,7 @@ static int reboot_mode; * kbd Use the keyboard controller. cold reset (default) * acpi Use the RESET_REG in the FADT * pci Use the so-called "PCI reset register", CF9 + * Power Like 'pci' but for a full power-cyle reset * efi Use the EFI reboot (if running under EFI) */ static enum reboot_type reboot_type = BOOT_INVALID; @@ -68,8 +70,9 @@ static void __init set_reboot_type(char *str) case 'a': case 'e': case 'k': - case 't': + case 'P': case 'p': + case 't': reboot_type = *str; break; } @@ -571,11 +574,18 @@ void machine_restart(unsigned int delay_millisecs) reboot_type = BOOT_KBD; break; case BOOT_CF9: + case BOOT_CF9_PWR: { - u8 cf9 = inb(0xcf9) & ~6; - outb(cf9|2, 0xcf9); /* Request hard reset */ + u8 cf9 = inb(0xcf9) & ~0x0e; + + /* Request warm, hard, or power-cycle reset. */ + if ( reboot_type == BOOT_CF9_PWR ) + cf9 |= 0x0a; + else if ( reboot_mode == 0 ) + cf9 |= 0x02; + outb(cf9, 0xcf9); udelay(50); - outb(cf9|6, 0xcf9); /* Actually do the reset */ + outb(cf9 | 0x04, 0xcf9); /* Actually do the reset. */ udelay(50); } reboot_type = BOOT_ACPI; -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:41:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:41: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 1YYfNj-0003gf-Ag; Thu, 19 Mar 2015 18:41:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNh-0003gK-SA for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:21 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 8F/F1-17310-1581B055; Thu, 19 Mar 2015 18:41:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1426790479!14416655!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28614 invoked from network); 19 Mar 2015 18:41:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:41:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNf-0002VY-BY for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfNf-0000EG-9Q for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:19 +0000 Date: Thu, 19 Mar 2015 18:41:19 +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 32f2d494a6e4d490856614fd6be892ae26f28707 Merge: c1245e9d5bf311b5a3267ea4b077a16561fcf439 2bd6add4f5fa4ea2ba9297d6139e9dea42ea70a9 Author: Ian Campbell AuthorDate: Fri Mar 13 16:20:37 2015 +0000 Commit: Ian Campbell CommitDate: Fri Mar 13 16:20:37 2015 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging docs/misc/xen-command-line.markdown | 4 +++- tools/libxc/xc_dom_boot.c | 6 +++--- xen/arch/x86/domctl.c | 8 +++++--- xen/arch/x86/shutdown.c | 18 ++++++++++++++---- 4 files changed, 25 insertions(+), 11 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:41:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:41: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 1YYfNj-0003gf-Ag; Thu, 19 Mar 2015 18:41:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNh-0003gK-SA for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:21 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 8F/F1-17310-1581B055; Thu, 19 Mar 2015 18:41:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1426790479!14416655!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28614 invoked from network); 19 Mar 2015 18:41:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:41:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNf-0002VY-BY for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfNf-0000EG-9Q for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:19 +0000 Date: Thu, 19 Mar 2015 18:41:19 +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 32f2d494a6e4d490856614fd6be892ae26f28707 Merge: c1245e9d5bf311b5a3267ea4b077a16561fcf439 2bd6add4f5fa4ea2ba9297d6139e9dea42ea70a9 Author: Ian Campbell AuthorDate: Fri Mar 13 16:20:37 2015 +0000 Commit: Ian Campbell CommitDate: Fri Mar 13 16:20:37 2015 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging docs/misc/xen-command-line.markdown | 4 +++- tools/libxc/xc_dom_boot.c | 6 +++--- xen/arch/x86/domctl.c | 8 +++++--- xen/arch/x86/shutdown.c | 18 ++++++++++++++---- 4 files changed, 25 insertions(+), 11 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:41:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:41: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 1YYfNt-0003j6-DY; Thu, 19 Mar 2015 18:41:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNr-0003is-Uz for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:32 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 9D/08-29186-B581B055; Thu, 19 Mar 2015 18:41:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1426790489!8609336!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31467 invoked from network); 19 Mar 2015 18:41:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:41:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNp-0002Vj-H1 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfNp-0000Ed-G5 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:29 +0000 Date: Thu, 19 Mar 2015 18:41:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched: honour generic perf conuters in the RTDS scheduler X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 48c5d4e11c3428a894a400ce15727d023955e1e3 Author: Dario Faggioli AuthorDate: Tue Mar 17 10:55:49 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 17 10:55:49 2015 +0100 sched: honour generic perf conuters in the RTDS scheduler more specifically, about vCPU initialization and destruction events, in line with adb26c09f26e ("xen: sched: introduce a couple of counters in credit2 and SEDF"). Signed-off-by: Dario Faggioli Reviewed-by: Meng Xu Reviewed-by: George Dunlap --- xen/common/sched_rt.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index df4adac..58dd646 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -525,6 +525,8 @@ rt_alloc_vdata(const struct scheduler *ops, struct vcpu *vc, void *dd) if ( !is_idle_vcpu(vc) ) svc->budget = RTDS_DEFAULT_BUDGET; + SCHED_STAT_CRANK(vcpu_init); + return svc; } @@ -574,6 +576,8 @@ rt_vcpu_remove(const struct scheduler *ops, struct vcpu *vc) struct rt_dom * const sdom = svc->sdom; spinlock_t *lock; + SCHED_STAT_CRANK(vcpu_destroy); + BUG_ON( sdom == NULL ); lock = vcpu_schedule_lock_irq(vc); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:41:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:41: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 1YYfNt-0003j6-DY; Thu, 19 Mar 2015 18:41:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNr-0003is-Uz for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:32 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 9D/08-29186-B581B055; Thu, 19 Mar 2015 18:41:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1426790489!8609336!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31467 invoked from network); 19 Mar 2015 18:41:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:41:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNp-0002Vj-H1 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfNp-0000Ed-G5 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:29 +0000 Date: Thu, 19 Mar 2015 18:41:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched: honour generic perf conuters in the RTDS scheduler X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 48c5d4e11c3428a894a400ce15727d023955e1e3 Author: Dario Faggioli AuthorDate: Tue Mar 17 10:55:49 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 17 10:55:49 2015 +0100 sched: honour generic perf conuters in the RTDS scheduler more specifically, about vCPU initialization and destruction events, in line with adb26c09f26e ("xen: sched: introduce a couple of counters in credit2 and SEDF"). Signed-off-by: Dario Faggioli Reviewed-by: Meng Xu Reviewed-by: George Dunlap --- xen/common/sched_rt.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index df4adac..58dd646 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -525,6 +525,8 @@ rt_alloc_vdata(const struct scheduler *ops, struct vcpu *vc, void *dd) if ( !is_idle_vcpu(vc) ) svc->budget = RTDS_DEFAULT_BUDGET; + SCHED_STAT_CRANK(vcpu_init); + return svc; } @@ -574,6 +576,8 @@ rt_vcpu_remove(const struct scheduler *ops, struct vcpu *vc) struct rt_dom * const sdom = svc->sdom; spinlock_t *lock; + SCHED_STAT_CRANK(vcpu_destroy); + BUG_ON( sdom == NULL ); lock = vcpu_schedule_lock_irq(vc); -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:41:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:41: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 1YYfO3-0003mx-GC; Thu, 19 Mar 2015 18:41:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfO2-0003mc-Bv for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:42 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 72/36-31605-5681B055; Thu, 19 Mar 2015 18:41:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1426790499!13793566!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3627 invoked from network); 19 Mar 2015 18:41:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:41:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNz-0002Vp-Lu for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfNz-0000F9-L6 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:39 +0000 Date: Thu, 19 Mar 2015 18:41:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched: make counters for vCPU sleep and wakeup generic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8b0e94da0e23221a6d7ea19bfbd24a407db44de8 Author: Dario Faggioli AuthorDate: Tue Mar 17 10:56:48 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 17 10:56:48 2015 +0100 sched: make counters for vCPU sleep and wakeup generic and update them from Credit2 and RTDS. In Credit2, while there, remove some stale comments too. Signed-off-by: Dario Faggioli Reviewed-by: Meng Xu Acked-by: Jan Beulich Acked-by: George Dunlap --- xen/common/sched_credit2.c | 11 ++++++++--- xen/common/sched_rt.c | 12 ++++++++++++ xen/include/xen/perfc_defn.h | 10 +++++----- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index f0e2c82..7655ad4 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -931,6 +931,7 @@ csched2_vcpu_sleep(const struct scheduler *ops, struct vcpu *vc) struct csched2_vcpu * const svc = CSCHED2_VCPU(vc); BUG_ON( is_idle_vcpu(vc) ); + SCHED_STAT_CRANK(vcpu_sleep); if ( curr_on_cpu(vc->processor) == vc ) cpu_raise_softirq(vc->processor, SCHEDULE_SOFTIRQ); @@ -956,19 +957,23 @@ csched2_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) BUG_ON( is_idle_vcpu(vc) ); - /* Make sure svc priority mod happens before runq check */ if ( unlikely(curr_on_cpu(vc->processor) == vc) ) { + SCHED_STAT_CRANK(vcpu_wake_running); goto out; } if ( unlikely(__vcpu_on_runq(svc)) ) { - /* If we've boosted someone that's already on a runqueue, prioritize - * it and inform the cpu in question. */ + SCHED_STAT_CRANK(vcpu_wake_onrunq); goto out; } + if ( likely(vcpu_runnable(vc)) ) + SCHED_STAT_CRANK(vcpu_wake_runnable); + else + SCHED_STAT_CRANK(vcpu_wake_not_runnable); + /* If the context hasn't been saved for this vcpu yet, we can't put it on * another runqueue. Instead, we set a flag so that it will be put on the runqueue * after the context has been saved. */ diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 58dd646..49d1b83 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -851,6 +851,7 @@ rt_vcpu_sleep(const struct scheduler *ops, struct vcpu *vc) struct rt_vcpu * const svc = rt_vcpu(vc); BUG_ON( is_idle_vcpu(vc) ); + SCHED_STAT_CRANK(vcpu_sleep); if ( curr_on_cpu(vc->processor) == vc ) cpu_raise_softirq(vc->processor, SCHEDULE_SOFTIRQ); @@ -966,11 +967,22 @@ rt_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) BUG_ON( is_idle_vcpu(vc) ); if ( unlikely(curr_on_cpu(vc->processor) == vc) ) + { + SCHED_STAT_CRANK(vcpu_wake_running); return; + } /* on RunQ/DepletedQ, just update info is ok */ if ( unlikely(__vcpu_on_q(svc)) ) + { + SCHED_STAT_CRANK(vcpu_wake_onrunq); return; + } + + if ( likely(vcpu_runnable(vc)) ) + SCHED_STAT_CRANK(vcpu_wake_runnable); + else + SCHED_STAT_CRANK(vcpu_wake_not_runnable); /* If context hasn't been saved for this vcpu yet, we can't put it on * the Runqueue/DepletedQ. Instead, we set a flag so that it will be diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h index 3ac7b45..2dc78fe 100644 --- a/xen/include/xen/perfc_defn.h +++ b/xen/include/xen/perfc_defn.h @@ -21,6 +21,11 @@ PERFCOUNTER(dom_init, "sched: dom_init") PERFCOUNTER(dom_destroy, "sched: dom_destroy") PERFCOUNTER(vcpu_init, "sched: vcpu_init") PERFCOUNTER(vcpu_destroy, "sched: vcpu_destroy") +PERFCOUNTER(vcpu_sleep, "sched: vcpu_sleep") +PERFCOUNTER(vcpu_wake_running, "sched: vcpu_wake_running") +PERFCOUNTER(vcpu_wake_onrunq, "sched: vcpu_wake_onrunq") +PERFCOUNTER(vcpu_wake_runnable, "sched: vcpu_wake_runnable") +PERFCOUNTER(vcpu_wake_not_runnable, "sched: vcpu_wake_not_runnable") /* credit specific counters */ PERFCOUNTER(delay_ms, "csched: delay") @@ -32,11 +37,6 @@ PERFCOUNTER(acct_reorder, "csched: acct_reorder") PERFCOUNTER(acct_min_credit, "csched: acct_min_credit") PERFCOUNTER(acct_vcpu_active, "csched: acct_vcpu_active") PERFCOUNTER(acct_vcpu_idle, "csched: acct_vcpu_idle") -PERFCOUNTER(vcpu_sleep, "csched: vcpu_sleep") -PERFCOUNTER(vcpu_wake_running, "csched: vcpu_wake_running") -PERFCOUNTER(vcpu_wake_onrunq, "csched: vcpu_wake_onrunq") -PERFCOUNTER(vcpu_wake_runnable, "csched: vcpu_wake_runnable") -PERFCOUNTER(vcpu_wake_not_runnable, "csched: vcpu_wake_not_runnable") PERFCOUNTER(vcpu_park, "csched: vcpu_park") PERFCOUNTER(vcpu_unpark, "csched: vcpu_unpark") PERFCOUNTER(tickle_idlers_none, "csched: tickle_idlers_none") -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:41:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:41: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 1YYfO3-0003mx-GC; Thu, 19 Mar 2015 18:41:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfO2-0003mc-Bv for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:42 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 72/36-31605-5681B055; Thu, 19 Mar 2015 18:41:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1426790499!13793566!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3627 invoked from network); 19 Mar 2015 18:41:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:41:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfNz-0002Vp-Lu for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfNz-0000F9-L6 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:39 +0000 Date: Thu, 19 Mar 2015 18:41:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched: make counters for vCPU sleep and wakeup generic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8b0e94da0e23221a6d7ea19bfbd24a407db44de8 Author: Dario Faggioli AuthorDate: Tue Mar 17 10:56:48 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 17 10:56:48 2015 +0100 sched: make counters for vCPU sleep and wakeup generic and update them from Credit2 and RTDS. In Credit2, while there, remove some stale comments too. Signed-off-by: Dario Faggioli Reviewed-by: Meng Xu Acked-by: Jan Beulich Acked-by: George Dunlap --- xen/common/sched_credit2.c | 11 ++++++++--- xen/common/sched_rt.c | 12 ++++++++++++ xen/include/xen/perfc_defn.h | 10 +++++----- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index f0e2c82..7655ad4 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -931,6 +931,7 @@ csched2_vcpu_sleep(const struct scheduler *ops, struct vcpu *vc) struct csched2_vcpu * const svc = CSCHED2_VCPU(vc); BUG_ON( is_idle_vcpu(vc) ); + SCHED_STAT_CRANK(vcpu_sleep); if ( curr_on_cpu(vc->processor) == vc ) cpu_raise_softirq(vc->processor, SCHEDULE_SOFTIRQ); @@ -956,19 +957,23 @@ csched2_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) BUG_ON( is_idle_vcpu(vc) ); - /* Make sure svc priority mod happens before runq check */ if ( unlikely(curr_on_cpu(vc->processor) == vc) ) { + SCHED_STAT_CRANK(vcpu_wake_running); goto out; } if ( unlikely(__vcpu_on_runq(svc)) ) { - /* If we've boosted someone that's already on a runqueue, prioritize - * it and inform the cpu in question. */ + SCHED_STAT_CRANK(vcpu_wake_onrunq); goto out; } + if ( likely(vcpu_runnable(vc)) ) + SCHED_STAT_CRANK(vcpu_wake_runnable); + else + SCHED_STAT_CRANK(vcpu_wake_not_runnable); + /* If the context hasn't been saved for this vcpu yet, we can't put it on * another runqueue. Instead, we set a flag so that it will be put on the runqueue * after the context has been saved. */ diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 58dd646..49d1b83 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -851,6 +851,7 @@ rt_vcpu_sleep(const struct scheduler *ops, struct vcpu *vc) struct rt_vcpu * const svc = rt_vcpu(vc); BUG_ON( is_idle_vcpu(vc) ); + SCHED_STAT_CRANK(vcpu_sleep); if ( curr_on_cpu(vc->processor) == vc ) cpu_raise_softirq(vc->processor, SCHEDULE_SOFTIRQ); @@ -966,11 +967,22 @@ rt_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) BUG_ON( is_idle_vcpu(vc) ); if ( unlikely(curr_on_cpu(vc->processor) == vc) ) + { + SCHED_STAT_CRANK(vcpu_wake_running); return; + } /* on RunQ/DepletedQ, just update info is ok */ if ( unlikely(__vcpu_on_q(svc)) ) + { + SCHED_STAT_CRANK(vcpu_wake_onrunq); return; + } + + if ( likely(vcpu_runnable(vc)) ) + SCHED_STAT_CRANK(vcpu_wake_runnable); + else + SCHED_STAT_CRANK(vcpu_wake_not_runnable); /* If context hasn't been saved for this vcpu yet, we can't put it on * the Runqueue/DepletedQ. Instead, we set a flag so that it will be diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h index 3ac7b45..2dc78fe 100644 --- a/xen/include/xen/perfc_defn.h +++ b/xen/include/xen/perfc_defn.h @@ -21,6 +21,11 @@ PERFCOUNTER(dom_init, "sched: dom_init") PERFCOUNTER(dom_destroy, "sched: dom_destroy") PERFCOUNTER(vcpu_init, "sched: vcpu_init") PERFCOUNTER(vcpu_destroy, "sched: vcpu_destroy") +PERFCOUNTER(vcpu_sleep, "sched: vcpu_sleep") +PERFCOUNTER(vcpu_wake_running, "sched: vcpu_wake_running") +PERFCOUNTER(vcpu_wake_onrunq, "sched: vcpu_wake_onrunq") +PERFCOUNTER(vcpu_wake_runnable, "sched: vcpu_wake_runnable") +PERFCOUNTER(vcpu_wake_not_runnable, "sched: vcpu_wake_not_runnable") /* credit specific counters */ PERFCOUNTER(delay_ms, "csched: delay") @@ -32,11 +37,6 @@ PERFCOUNTER(acct_reorder, "csched: acct_reorder") PERFCOUNTER(acct_min_credit, "csched: acct_min_credit") PERFCOUNTER(acct_vcpu_active, "csched: acct_vcpu_active") PERFCOUNTER(acct_vcpu_idle, "csched: acct_vcpu_idle") -PERFCOUNTER(vcpu_sleep, "csched: vcpu_sleep") -PERFCOUNTER(vcpu_wake_running, "csched: vcpu_wake_running") -PERFCOUNTER(vcpu_wake_onrunq, "csched: vcpu_wake_onrunq") -PERFCOUNTER(vcpu_wake_runnable, "csched: vcpu_wake_runnable") -PERFCOUNTER(vcpu_wake_not_runnable, "csched: vcpu_wake_not_runnable") PERFCOUNTER(vcpu_park, "csched: vcpu_park") PERFCOUNTER(vcpu_unpark, "csched: vcpu_unpark") PERFCOUNTER(tickle_idlers_none, "csched: tickle_idlers_none") -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:41:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:41: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 1YYfOE-0003r4-Im; Thu, 19 Mar 2015 18:41:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOC-0003qA-Se for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:53 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id BC/BE-17064-F681B055; Thu, 19 Mar 2015 18:41:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1426790510!13761523!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13184 invoked from network); 19 Mar 2015 18:41:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:41:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfO9-0002Vv-TW for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfO9-0000FV-PF for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:49 +0000 Date: Thu, 19 Mar 2015 18:41:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched: make counters for vCPU tickling generic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c1dcf7feb7d1eca12689911358d1950d57928510 Author: Dario Faggioli AuthorDate: Tue Mar 17 10:57:23 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 17 10:57:23 2015 +0100 sched: make counters for vCPU tickling generic and update them from Credit2 and RTDS schedulers. Signed-off-by: Dario Faggioli Reviewed-by: Meng Xu Acked-by: Jan Beulich Acked-by: George Dunlap --- xen/common/sched_credit2.c | 4 ++++ xen/common/sched_rt.c | 2 ++ xen/include/xen/perfc_defn.h | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 7655ad4..14abbb6 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -556,7 +556,10 @@ runq_tickle(const struct scheduler *ops, unsigned int cpu, struct csched2_vcpu * /* Only switch to another processor if the credit difference is greater * than the migrate resistance */ if ( ipid == -1 || lowest + CSCHED2_MIGRATE_RESIST > new->credit ) + { + SCHED_STAT_CRANK(tickle_idlers_none); goto no_tickle; + } tickle: BUG_ON(ipid == -1); @@ -571,6 +574,7 @@ tickle: (unsigned char *)&d); } cpumask_set_cpu(ipid, &rqd->tickled); + SCHED_STAT_CRANK(tickle_idlers_some); cpu_raise_softirq(ipid, SCHEDULE_SOFTIRQ); no_tickle: diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 49d1b83..2ad0c68 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -929,6 +929,7 @@ runq_tickle(const struct scheduler *ops, struct rt_vcpu *new) } /* didn't tickle any cpu */ + SCHED_STAT_CRANK(tickle_idlers_none); return; out: /* TRACE */ @@ -944,6 +945,7 @@ out: } cpumask_set_cpu(cpu_to_tickle, &prv->tickled); + SCHED_STAT_CRANK(tickle_idlers_some); cpu_raise_softirq(cpu_to_tickle, SCHEDULE_SOFTIRQ); return; } diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h index 2dc78fe..f754331 100644 --- a/xen/include/xen/perfc_defn.h +++ b/xen/include/xen/perfc_defn.h @@ -26,6 +26,8 @@ PERFCOUNTER(vcpu_wake_running, "sched: vcpu_wake_running") PERFCOUNTER(vcpu_wake_onrunq, "sched: vcpu_wake_onrunq") PERFCOUNTER(vcpu_wake_runnable, "sched: vcpu_wake_runnable") PERFCOUNTER(vcpu_wake_not_runnable, "sched: vcpu_wake_not_runnable") +PERFCOUNTER(tickle_idlers_none, "sched: tickle_idlers_none") +PERFCOUNTER(tickle_idlers_some, "sched: tickle_idlers_some") /* credit specific counters */ PERFCOUNTER(delay_ms, "csched: delay") @@ -39,8 +41,6 @@ PERFCOUNTER(acct_vcpu_active, "csched: acct_vcpu_active") PERFCOUNTER(acct_vcpu_idle, "csched: acct_vcpu_idle") PERFCOUNTER(vcpu_park, "csched: vcpu_park") PERFCOUNTER(vcpu_unpark, "csched: vcpu_unpark") -PERFCOUNTER(tickle_idlers_none, "csched: tickle_idlers_none") -PERFCOUNTER(tickle_idlers_some, "csched: tickle_idlers_some") PERFCOUNTER(load_balance_idle, "csched: load_balance_idle") PERFCOUNTER(load_balance_over, "csched: load_balance_over") PERFCOUNTER(load_balance_other, "csched: load_balance_other") -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:41:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:41: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 1YYfOE-0003r4-Im; Thu, 19 Mar 2015 18:41:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOC-0003qA-Se for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:53 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id BC/BE-17064-F681B055; Thu, 19 Mar 2015 18:41:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1426790510!13761523!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13184 invoked from network); 19 Mar 2015 18:41:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:41:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfO9-0002Vv-TW for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfO9-0000FV-PF for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:41:49 +0000 Date: Thu, 19 Mar 2015 18:41:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched: make counters for vCPU tickling generic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c1dcf7feb7d1eca12689911358d1950d57928510 Author: Dario Faggioli AuthorDate: Tue Mar 17 10:57:23 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 17 10:57:23 2015 +0100 sched: make counters for vCPU tickling generic and update them from Credit2 and RTDS schedulers. Signed-off-by: Dario Faggioli Reviewed-by: Meng Xu Acked-by: Jan Beulich Acked-by: George Dunlap --- xen/common/sched_credit2.c | 4 ++++ xen/common/sched_rt.c | 2 ++ xen/include/xen/perfc_defn.h | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 7655ad4..14abbb6 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -556,7 +556,10 @@ runq_tickle(const struct scheduler *ops, unsigned int cpu, struct csched2_vcpu * /* Only switch to another processor if the credit difference is greater * than the migrate resistance */ if ( ipid == -1 || lowest + CSCHED2_MIGRATE_RESIST > new->credit ) + { + SCHED_STAT_CRANK(tickle_idlers_none); goto no_tickle; + } tickle: BUG_ON(ipid == -1); @@ -571,6 +574,7 @@ tickle: (unsigned char *)&d); } cpumask_set_cpu(ipid, &rqd->tickled); + SCHED_STAT_CRANK(tickle_idlers_some); cpu_raise_softirq(ipid, SCHEDULE_SOFTIRQ); no_tickle: diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 49d1b83..2ad0c68 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -929,6 +929,7 @@ runq_tickle(const struct scheduler *ops, struct rt_vcpu *new) } /* didn't tickle any cpu */ + SCHED_STAT_CRANK(tickle_idlers_none); return; out: /* TRACE */ @@ -944,6 +945,7 @@ out: } cpumask_set_cpu(cpu_to_tickle, &prv->tickled); + SCHED_STAT_CRANK(tickle_idlers_some); cpu_raise_softirq(cpu_to_tickle, SCHEDULE_SOFTIRQ); return; } diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h index 2dc78fe..f754331 100644 --- a/xen/include/xen/perfc_defn.h +++ b/xen/include/xen/perfc_defn.h @@ -26,6 +26,8 @@ PERFCOUNTER(vcpu_wake_running, "sched: vcpu_wake_running") PERFCOUNTER(vcpu_wake_onrunq, "sched: vcpu_wake_onrunq") PERFCOUNTER(vcpu_wake_runnable, "sched: vcpu_wake_runnable") PERFCOUNTER(vcpu_wake_not_runnable, "sched: vcpu_wake_not_runnable") +PERFCOUNTER(tickle_idlers_none, "sched: tickle_idlers_none") +PERFCOUNTER(tickle_idlers_some, "sched: tickle_idlers_some") /* credit specific counters */ PERFCOUNTER(delay_ms, "csched: delay") @@ -39,8 +41,6 @@ PERFCOUNTER(acct_vcpu_active, "csched: acct_vcpu_active") PERFCOUNTER(acct_vcpu_idle, "csched: acct_vcpu_idle") PERFCOUNTER(vcpu_park, "csched: vcpu_park") PERFCOUNTER(vcpu_unpark, "csched: vcpu_unpark") -PERFCOUNTER(tickle_idlers_none, "csched: tickle_idlers_none") -PERFCOUNTER(tickle_idlers_some, "csched: tickle_idlers_some") PERFCOUNTER(load_balance_idle, "csched: load_balance_idle") PERFCOUNTER(load_balance_over, "csched: load_balance_over") PERFCOUNTER(load_balance_other, "csched: load_balance_other") -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:42:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:42:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOQ-0003xU-Pe; Thu, 19 Mar 2015 18:42:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOO-0003wr-Uv for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:05 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id F3/DD-22535-C781B055; Thu, 19 Mar 2015 18:42:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1426790520!13865066!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17125 invoked from network); 19 Mar 2015 18:42:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:42:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOK-0002W4-3U for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfOK-0000Fu-1d for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:00 +0000 Date: Thu, 19 Mar 2015 18:42:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit2: add a few performance counters X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 55d8c9c082e700a95077fe9005c6d179fccb4820 Author: Dario Faggioli AuthorDate: Tue Mar 17 10:57:58 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 17 10:57:58 2015 +0100 credit2: add a few performance counters for events that are specific to Credit2 (as it happens for Credit1 already). Re-use Credit1's vcpu_check counter by making it generic. Signed-off-by: Dario Faggioli Acked-by: Jan Beulich Acked-by: George Dunlap --- xen/common/sched_credit2.c | 23 +++++++++++++++++++++++ xen/include/xen/perfc_defn.h | 15 ++++++++++++++- 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 14abbb6..be6859a 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -654,6 +654,8 @@ static void reset_credit(const struct scheduler *ops, int cpu, s_time_t now, } } + SCHED_STAT_CRANK(credit_reset); + /* No need to resort runqueue, as everyone's order should be the same. */ } @@ -673,6 +675,7 @@ void burn_credits(struct csched2_runqueue_data *rqd, struct csched2_vcpu *svc, s delta = now - svc->start_time; if ( delta > 0 ) { + SCHED_STAT_CRANK(burn_credits_t2c); t2c_update(rqd, delta, svc); svc->start_time = now; @@ -713,6 +716,7 @@ static void update_max_weight(struct csched2_runqueue_data *rqd, int new_weight, { rqd->max_weight = new_weight; d2printk("%s: Runqueue id %d max weight %d\n", __func__, rqd->id, rqd->max_weight); + SCHED_STAT_CRANK(upd_max_weight_quick); } else if ( old_weight == rqd->max_weight ) { @@ -729,6 +733,7 @@ static void update_max_weight(struct csched2_runqueue_data *rqd, int new_weight, rqd->max_weight = max_weight; d2printk("%s: Runqueue %d max weight %d\n", __func__, rqd->id, rqd->max_weight); + SCHED_STAT_CRANK(upd_max_weight_full); } } @@ -750,6 +755,7 @@ __csched2_vcpu_check(struct vcpu *vc) { BUG_ON( !is_idle_vcpu(vc) ); } + SCHED_STAT_CRANK(vcpu_check); } #define CSCHED2_VCPU_CHECK(_vc) (__csched2_vcpu_check(_vc)) #else @@ -1204,6 +1210,7 @@ static void migrate(const struct scheduler *ops, svc->migrate_rqd = trqd; set_bit(_VPF_migrating, &svc->vcpu->pause_flags); set_bit(__CSFLAG_runq_migrate_request, &svc->flags); + SCHED_STAT_CRANK(migrate_requested); } else { @@ -1224,7 +1231,10 @@ static void migrate(const struct scheduler *ops, update_load(ops, svc->rqd, svc, 1, now); runq_insert(ops, svc->vcpu->processor, svc); runq_tickle(ops, svc->vcpu->processor, svc, now); + SCHED_STAT_CRANK(migrate_on_runq); } + else + SCHED_STAT_CRANK(migrate_no_runq); } } @@ -1578,7 +1588,10 @@ csched2_runtime(const struct scheduler *ops, int cpu, struct csched2_vcpu *snext /* The next guy may actually have a higher credit, if we've tried to * avoid migrating him from a different cpu. DTRT. */ if ( rt_credit <= 0 ) + { time = CSCHED2_MIN_TIMER; + SCHED_STAT_CRANK(runtime_min_timer); + } else { /* FIXME: See if we can eliminate this conversion if we know time @@ -1589,9 +1602,15 @@ csched2_runtime(const struct scheduler *ops, int cpu, struct csched2_vcpu *snext /* Check limits */ if ( time < CSCHED2_MIN_TIMER ) + { time = CSCHED2_MIN_TIMER; + SCHED_STAT_CRANK(runtime_min_timer); + } else if ( time > CSCHED2_MAX_TIMER ) + { time = CSCHED2_MAX_TIMER; + SCHED_STAT_CRANK(runtime_max_timer); + } } return time; @@ -1624,7 +1643,10 @@ runq_candidate(struct csched2_runqueue_data *rqd, * its credit is at least CSCHED2_MIGRATE_RESIST higher. */ if ( svc->vcpu->processor != cpu && snext->credit + CSCHED2_MIGRATE_RESIST > svc->credit ) + { + SCHED_STAT_CRANK(migrate_resisted); continue; + } /* If the next one on the list has more credit than current * (or idle, if current is not runnable), choose it. */ @@ -1769,6 +1791,7 @@ csched2_schedule( { snext->credit += CSCHED2_MIGRATE_COMPENSATION; snext->vcpu->processor = cpu; + SCHED_STAT_CRANK(migrated); ret.migrated = 1; } } diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h index f754331..526002d 100644 --- a/xen/include/xen/perfc_defn.h +++ b/xen/include/xen/perfc_defn.h @@ -28,10 +28,10 @@ PERFCOUNTER(vcpu_wake_runnable, "sched: vcpu_wake_runnable") PERFCOUNTER(vcpu_wake_not_runnable, "sched: vcpu_wake_not_runnable") PERFCOUNTER(tickle_idlers_none, "sched: tickle_idlers_none") PERFCOUNTER(tickle_idlers_some, "sched: tickle_idlers_some") +PERFCOUNTER(vcpu_check, "sched: vcpu_check") /* credit specific counters */ PERFCOUNTER(delay_ms, "csched: delay") -PERFCOUNTER(vcpu_check, "csched: vcpu_check") PERFCOUNTER(acct_run, "csched: acct_run") PERFCOUNTER(acct_no_work, "csched: acct_no_work") PERFCOUNTER(acct_balance, "csched: acct_balance") @@ -51,6 +51,19 @@ PERFCOUNTER(migrate_running, "csched: migrate_running") PERFCOUNTER(migrate_kicked_away, "csched: migrate_kicked_away") PERFCOUNTER(vcpu_hot, "csched: vcpu_hot") +/* credit2 specific counters */ +PERFCOUNTER(burn_credits_t2c, "csched2: burn_credits_t2c") +PERFCOUNTER(upd_max_weight_quick, "csched2: update_max_weight_quick") +PERFCOUNTER(upd_max_weight_full, "csched2: update_max_weight_full") +PERFCOUNTER(migrate_requested, "csched2: migrate_requested") +PERFCOUNTER(migrate_on_runq, "csched2: migrate_on_runq") +PERFCOUNTER(migrate_no_runq, "csched2: migrate_no_runq") +PERFCOUNTER(runtime_min_timer, "csched2: runtime_min_timer") +PERFCOUNTER(runtime_max_timer, "csched2: runtime_max_timer") +PERFCOUNTER(migrated, "csched2: migrated") +PERFCOUNTER(migrate_resisted, "csched2: migrate_resisted") +PERFCOUNTER(credit_reset, "csched2: credit_reset") + PERFCOUNTER(need_flush_tlb_flush, "PG_need_flush tlb flushes") /*#endif*/ /* __XEN_PERFC_DEFN_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 Mar 19 18:42:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:42:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOQ-0003xU-Pe; Thu, 19 Mar 2015 18:42:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOO-0003wr-Uv for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:05 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id F3/DD-22535-C781B055; Thu, 19 Mar 2015 18:42:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1426790520!13865066!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17125 invoked from network); 19 Mar 2015 18:42:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:42:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOK-0002W4-3U for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfOK-0000Fu-1d for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:00 +0000 Date: Thu, 19 Mar 2015 18:42:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit2: add a few performance counters X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 55d8c9c082e700a95077fe9005c6d179fccb4820 Author: Dario Faggioli AuthorDate: Tue Mar 17 10:57:58 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 17 10:57:58 2015 +0100 credit2: add a few performance counters for events that are specific to Credit2 (as it happens for Credit1 already). Re-use Credit1's vcpu_check counter by making it generic. Signed-off-by: Dario Faggioli Acked-by: Jan Beulich Acked-by: George Dunlap --- xen/common/sched_credit2.c | 23 +++++++++++++++++++++++ xen/include/xen/perfc_defn.h | 15 ++++++++++++++- 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 14abbb6..be6859a 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -654,6 +654,8 @@ static void reset_credit(const struct scheduler *ops, int cpu, s_time_t now, } } + SCHED_STAT_CRANK(credit_reset); + /* No need to resort runqueue, as everyone's order should be the same. */ } @@ -673,6 +675,7 @@ void burn_credits(struct csched2_runqueue_data *rqd, struct csched2_vcpu *svc, s delta = now - svc->start_time; if ( delta > 0 ) { + SCHED_STAT_CRANK(burn_credits_t2c); t2c_update(rqd, delta, svc); svc->start_time = now; @@ -713,6 +716,7 @@ static void update_max_weight(struct csched2_runqueue_data *rqd, int new_weight, { rqd->max_weight = new_weight; d2printk("%s: Runqueue id %d max weight %d\n", __func__, rqd->id, rqd->max_weight); + SCHED_STAT_CRANK(upd_max_weight_quick); } else if ( old_weight == rqd->max_weight ) { @@ -729,6 +733,7 @@ static void update_max_weight(struct csched2_runqueue_data *rqd, int new_weight, rqd->max_weight = max_weight; d2printk("%s: Runqueue %d max weight %d\n", __func__, rqd->id, rqd->max_weight); + SCHED_STAT_CRANK(upd_max_weight_full); } } @@ -750,6 +755,7 @@ __csched2_vcpu_check(struct vcpu *vc) { BUG_ON( !is_idle_vcpu(vc) ); } + SCHED_STAT_CRANK(vcpu_check); } #define CSCHED2_VCPU_CHECK(_vc) (__csched2_vcpu_check(_vc)) #else @@ -1204,6 +1210,7 @@ static void migrate(const struct scheduler *ops, svc->migrate_rqd = trqd; set_bit(_VPF_migrating, &svc->vcpu->pause_flags); set_bit(__CSFLAG_runq_migrate_request, &svc->flags); + SCHED_STAT_CRANK(migrate_requested); } else { @@ -1224,7 +1231,10 @@ static void migrate(const struct scheduler *ops, update_load(ops, svc->rqd, svc, 1, now); runq_insert(ops, svc->vcpu->processor, svc); runq_tickle(ops, svc->vcpu->processor, svc, now); + SCHED_STAT_CRANK(migrate_on_runq); } + else + SCHED_STAT_CRANK(migrate_no_runq); } } @@ -1578,7 +1588,10 @@ csched2_runtime(const struct scheduler *ops, int cpu, struct csched2_vcpu *snext /* The next guy may actually have a higher credit, if we've tried to * avoid migrating him from a different cpu. DTRT. */ if ( rt_credit <= 0 ) + { time = CSCHED2_MIN_TIMER; + SCHED_STAT_CRANK(runtime_min_timer); + } else { /* FIXME: See if we can eliminate this conversion if we know time @@ -1589,9 +1602,15 @@ csched2_runtime(const struct scheduler *ops, int cpu, struct csched2_vcpu *snext /* Check limits */ if ( time < CSCHED2_MIN_TIMER ) + { time = CSCHED2_MIN_TIMER; + SCHED_STAT_CRANK(runtime_min_timer); + } else if ( time > CSCHED2_MAX_TIMER ) + { time = CSCHED2_MAX_TIMER; + SCHED_STAT_CRANK(runtime_max_timer); + } } return time; @@ -1624,7 +1643,10 @@ runq_candidate(struct csched2_runqueue_data *rqd, * its credit is at least CSCHED2_MIGRATE_RESIST higher. */ if ( svc->vcpu->processor != cpu && snext->credit + CSCHED2_MIGRATE_RESIST > svc->credit ) + { + SCHED_STAT_CRANK(migrate_resisted); continue; + } /* If the next one on the list has more credit than current * (or idle, if current is not runnable), choose it. */ @@ -1769,6 +1791,7 @@ csched2_schedule( { snext->credit += CSCHED2_MIGRATE_COMPENSATION; snext->vcpu->processor = cpu; + SCHED_STAT_CRANK(migrated); ret.migrated = 1; } } diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h index f754331..526002d 100644 --- a/xen/include/xen/perfc_defn.h +++ b/xen/include/xen/perfc_defn.h @@ -28,10 +28,10 @@ PERFCOUNTER(vcpu_wake_runnable, "sched: vcpu_wake_runnable") PERFCOUNTER(vcpu_wake_not_runnable, "sched: vcpu_wake_not_runnable") PERFCOUNTER(tickle_idlers_none, "sched: tickle_idlers_none") PERFCOUNTER(tickle_idlers_some, "sched: tickle_idlers_some") +PERFCOUNTER(vcpu_check, "sched: vcpu_check") /* credit specific counters */ PERFCOUNTER(delay_ms, "csched: delay") -PERFCOUNTER(vcpu_check, "csched: vcpu_check") PERFCOUNTER(acct_run, "csched: acct_run") PERFCOUNTER(acct_no_work, "csched: acct_no_work") PERFCOUNTER(acct_balance, "csched: acct_balance") @@ -51,6 +51,19 @@ PERFCOUNTER(migrate_running, "csched: migrate_running") PERFCOUNTER(migrate_kicked_away, "csched: migrate_kicked_away") PERFCOUNTER(vcpu_hot, "csched: vcpu_hot") +/* credit2 specific counters */ +PERFCOUNTER(burn_credits_t2c, "csched2: burn_credits_t2c") +PERFCOUNTER(upd_max_weight_quick, "csched2: update_max_weight_quick") +PERFCOUNTER(upd_max_weight_full, "csched2: update_max_weight_full") +PERFCOUNTER(migrate_requested, "csched2: migrate_requested") +PERFCOUNTER(migrate_on_runq, "csched2: migrate_on_runq") +PERFCOUNTER(migrate_no_runq, "csched2: migrate_no_runq") +PERFCOUNTER(runtime_min_timer, "csched2: runtime_min_timer") +PERFCOUNTER(runtime_max_timer, "csched2: runtime_max_timer") +PERFCOUNTER(migrated, "csched2: migrated") +PERFCOUNTER(migrate_resisted, "csched2: migrate_resisted") +PERFCOUNTER(credit_reset, "csched2: credit_reset") + PERFCOUNTER(need_flush_tlb_flush, "PG_need_flush tlb flushes") /*#endif*/ /* __XEN_PERFC_DEFN_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 Mar 19 18:42:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:42: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 1YYfOZ-00042v-Sb; Thu, 19 Mar 2015 18:42:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOX-00041q-Ul for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:14 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 74/C3-21221-5881B055; Thu, 19 Mar 2015 18:42:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1426790530!8996206!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23753 invoked from network); 19 Mar 2015 18:42:11 -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; 19 Mar 2015 18:42:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOU-0002Wd-9B for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfOU-0000Ga-75 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:10 +0000 Date: Thu, 19 Mar 2015 18:42:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm: add device tree labeling 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 525ee49e2c3a3ec18a9b7cb8a93526777952e502 Author: Daniel De Graaf AuthorDate: Tue Mar 17 10:58:40 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 17 10:58:40 2015 +0100 xsm: add device tree labeling support This adds support in the hypervisor and policy build toolchain for Xen/Flask policy version 30, which adds the ability to label ARM device tree nodes and expands the IOMEM ocontext entries to 64 bits. Signed-off-by: Daniel De Graaf Tested-by: Julien Grall Acked-by: Ian Campbell --- tools/flask/policy/Makefile | 20 ++++-- xen/include/public/xsm/flask_op.h | 9 +++ xen/xsm/flask/flask_op.c | 28 ++++++++ xen/xsm/flask/include/security.h | 14 ++++- xen/xsm/flask/ss/policydb.c | 133 +++++++++++++++++++++++++++++++------ xen/xsm/flask/ss/policydb.h | 7 +- xen/xsm/flask/ss/services.c | 118 ++++++++++++++++++++++++++++++--- 7 files changed, 287 insertions(+), 42 deletions(-) diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile index 58d9ce1..7aa417c 100644 --- a/tools/flask/policy/Makefile +++ b/tools/flask/policy/Makefile @@ -20,21 +20,21 @@ MLS_CATS ?= 256 CHECKPOLICY ?= checkpolicy M4 ?= m4 +# Output security policy version. Leave unset to autodetect. +OUTPUT_POLICY ?= $(BEST_POLICY_VER) + ######################################## # # End of configuration options # ######################################## -# Policy version -# By default, checkpolicy creates the highest version policy it supports. Force -# the use of version 24 which is the highest that Xen supports, and the first to -# include the Xen policy type (needed for static device policy). -OUTPUT_POLICY = 24 - POLICY_FILENAME = xenpolicy-$(shell $(MAKE) -C $(XEN_ROOT)/xen xenversion --no-print-directory) POLICY_LOADPATH = /boot +# List of policy versions supported by the hypervisor +POLICY_VER_LIST_HV = 24 30 + # policy source layout POLDIR := policy MODDIR := $(POLDIR)/modules @@ -63,6 +63,14 @@ MOD_CONF := $(POLDIR)/modules.conf # checkpolicy can use the #line directives provided by -s for error reporting: M4PARAM := -D self_contained_policy -s + +# The output of checkpolicy -V is "30 (compatibility range 30-15)", and the +# first word of the output is the maximum policy version supported. +CHECKPOLICY_VER_MAX := $(firstword $(shell $(CHECKPOLICY) -V)) + +# Find the highest version supported by both the hypervisor and checkpolicy +BEST_POLICY_VER := $(shell best=24; for ver in $(POLICY_VER_LIST_HV); do if test $$ver -le $(CHECKPOLICY_VER_MAX); then best=$$ver; fi; done; echo $$best) + CHECKPOLICY_PARAM := -t Xen -c $(OUTPUT_POLICY) # enable MLS if requested. diff --git a/xen/include/public/xsm/flask_op.h b/xen/include/public/xsm/flask_op.h index f874589..c76359c 100644 --- a/xen/include/public/xsm/flask_op.h +++ b/xen/include/public/xsm/flask_op.h @@ -150,6 +150,13 @@ struct xen_flask_relabel { uint32_t sid; }; +struct xen_flask_devicetree_label { + /* IN */ + uint32_t sid; + uint32_t length; + XEN_GUEST_HANDLE(char) path; +}; + struct xen_flask_op { uint32_t cmd; #define FLASK_LOAD 1 @@ -176,6 +183,7 @@ struct xen_flask_op { #define FLASK_DEL_OCONTEXT 22 #define FLASK_GET_PEER_SID 23 #define FLASK_RELABEL_DOMAIN 24 +#define FLASK_DEVICETREE_LABEL 25 uint32_t interface_version; /* XEN_FLASK_INTERFACE_VERSION */ union { struct xen_flask_load load; @@ -195,6 +203,7 @@ struct xen_flask_op { struct xen_flask_ocontext ocontext; struct xen_flask_peersid peersid; struct xen_flask_relabel relabel; + struct xen_flask_devicetree_label devicetree_label; } u; }; typedef struct xen_flask_op xen_flask_op_t; diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 84c7fec..47aacc1 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -563,6 +563,27 @@ static int flask_security_load(struct xen_flask_load *load) return ret; } +static int flask_devicetree_label(struct xen_flask_devicetree_label *arg) +{ + int rv; + char *buf; + u32 sid = arg->sid; + u32 perm = sid ? SECURITY__ADD_OCONTEXT : SECURITY__DEL_OCONTEXT; + + rv = domain_has_security(current->domain, perm); + if ( rv ) + return rv; + + rv = flask_copyin_string(arg->path, &buf, arg->length, PAGE_SIZE); + if ( rv ) + return rv; + + /* buf is consumed or freed by this function */ + rv = security_devicetree_setlabel(buf, sid); + + return rv; +} + #ifndef COMPAT static int flask_ocontext_del(struct xen_flask_ocontext *arg) @@ -790,6 +811,10 @@ ret_t do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op) rv = flask_relabel_domain(&op.u.relabel); break; + case FLASK_DEVICETREE_LABEL: + rv = flask_devicetree_label(&op.u.devicetree_label); + break; + default: rv = -ENOSYS; } @@ -848,6 +873,9 @@ CHECK_flask_transition; #define flask_security_get_bool compat_security_get_bool #define flask_security_set_bool compat_security_set_bool +#define xen_flask_devicetree_label compat_flask_devicetree_label +#define flask_devicetree_label compat_devicetree_label + #define xen_flask_op_t compat_flask_op_t #undef ret_t #define ret_t int diff --git a/xen/xsm/flask/include/security.h b/xen/xsm/flask/include/security.h index d07bae0..34bbe62 100644 --- a/xen/xsm/flask/include/security.h +++ b/xen/xsm/flask/include/security.h @@ -30,10 +30,16 @@ #define POLICYDB_VERSION_POLCAP 22 #define POLICYDB_VERSION_PERMISSIVE 23 #define POLICYDB_VERSION_BOUNDARY 24 +#define POLICYDB_VERSION_FILENAME_TRANS 25 +#define POLICYDB_VERSION_ROLETRANS 26 +#define POLICYDB_VERSION_NEW_OBJECT_DEFAULTS 27 +#define POLICYDB_VERSION_DEFAULT_TYPE 28 +#define POLICYDB_VERSION_CONSTRAINT_NAMES 29 +#define POLICYDB_VERSION_XEN_DEVICETREE 30 /* Range of policy versions we understand*/ #define POLICYDB_VERSION_MIN POLICYDB_VERSION_BASE -#define POLICYDB_VERSION_MAX POLICYDB_VERSION_BOUNDARY +#define POLICYDB_VERSION_MAX POLICYDB_VERSION_XEN_DEVICETREE enum flask_bootparam_t { FLASK_BOOTPARAM_PERMISSIVE, @@ -82,6 +88,8 @@ int security_ioport_sid(u32 ioport, u32 *out_sid); int security_device_sid(u32 device, u32 *out_sid); +int security_devicetree_sid(const char *path, u32 *out_sid); + int security_validate_transition(u32 oldsid, u32 newsid, u32 tasksid, u16 tclass); @@ -96,5 +104,7 @@ int security_iterate_ioport_sids(u32 start, u32 end, int security_ocontext_add(u32 ocontext, unsigned long low, unsigned long high, u32 sid); -int security_ocontext_del(u32 ocontext, unsigned int low, unsigned int high); +int security_ocontext_del(u32 ocontext, unsigned long low, unsigned long high); + +int security_devicetree_setlabel(char *path, u32 sid); #endif /* _FLASK_SECURITY_H_ */ diff --git a/xen/xsm/flask/ss/policydb.c b/xen/xsm/flask/ss/policydb.c index b88ea56..a1060b1 100644 --- a/xen/xsm/flask/ss/policydb.c +++ b/xen/xsm/flask/ss/policydb.c @@ -74,55 +74,55 @@ static struct policydb_compat_info policydb_compat[] = { { .version = POLICYDB_VERSION_BASE, .sym_num = SYM_NUM - 3, - .ocon_num = OCON_NUM - 1, + .ocon_num = 4, .target_type = TARGET_XEN_OLD, }, { .version = POLICYDB_VERSION_BOOL, .sym_num = SYM_NUM - 2, - .ocon_num = OCON_NUM - 1, + .ocon_num = 4, .target_type = TARGET_XEN_OLD, }, { .version = POLICYDB_VERSION_IPV6, .sym_num = SYM_NUM - 2, - .ocon_num = OCON_NUM, + .ocon_num = 5, .target_type = TARGET_XEN_OLD, }, { .version = POLICYDB_VERSION_NLCLASS, .sym_num = SYM_NUM - 2, - .ocon_num = OCON_NUM, + .ocon_num = 5, .target_type = TARGET_XEN_OLD, }, { .version = POLICYDB_VERSION_MLS, .sym_num = SYM_NUM, - .ocon_num = OCON_NUM, + .ocon_num = 5, .target_type = TARGET_XEN_OLD, }, { .version = POLICYDB_VERSION_AVTAB, .sym_num = SYM_NUM, - .ocon_num = OCON_NUM, + .ocon_num = 5, .target_type = TARGET_XEN_OLD, }, { .version = POLICYDB_VERSION_RANGETRANS, .sym_num = SYM_NUM, - .ocon_num = OCON_NUM, + .ocon_num = 5, .target_type = TARGET_XEN_OLD, }, { .version = POLICYDB_VERSION_POLCAP, .sym_num = SYM_NUM, - .ocon_num = OCON_NUM, + .ocon_num = 5, .target_type = TARGET_XEN_OLD, }, { .version = POLICYDB_VERSION_PERMISSIVE, .sym_num = SYM_NUM, - .ocon_num = OCON_NUM, + .ocon_num = 5, .target_type = TARGET_XEN_OLD, }, { @@ -134,7 +134,13 @@ static struct policydb_compat_info policydb_compat[] = { { .version = POLICYDB_VERSION_BOUNDARY, .sym_num = SYM_NUM, - .ocon_num = OCON_NUM, + .ocon_num = OCON_DEVICE + 1, + .target_type = TARGET_XEN, + }, + { + .version = POLICYDB_VERSION_XEN_DEVICETREE, + .sym_num = SYM_NUM, + .ocon_num = OCON_DTREE + 1, .target_type = TARGET_XEN, }, }; @@ -634,7 +640,7 @@ static void ocontext_destroy(struct ocontext *c, int i) { context_destroy(&c->context[0]); context_destroy(&c->context[1]); - if ( i == OCON_ISID ) + if ( i == OCON_ISID || i == OCON_DTREE ) xfree(c->u.name); xfree(c); } @@ -1040,8 +1046,8 @@ bad: goto out; } -static int read_cons_helper(struct constraint_node **nodep, int ncons, - int allowxtarget, void *fp) +static int read_cons_helper(struct policydb *p, struct constraint_node **nodep, + int ncons, int allowxtarget, void *fp) { struct constraint_node *c, *lc; struct constraint_expr *e, *le; @@ -1115,6 +1121,23 @@ static int read_cons_helper(struct constraint_node **nodep, int ncons, depth++; if ( ebitmap_read(&e->names, fp) ) return -EINVAL; + if ( p->policyvers >= POLICYDB_VERSION_CONSTRAINT_NAMES ) + { + struct ebitmap dummy; + ebitmap_init(&dummy); + if ( ebitmap_read(&dummy, fp) ) + return -EINVAL; + ebitmap_destroy(&dummy); + + ebitmap_init(&dummy); + if ( ebitmap_read(&dummy, fp) ) + return -EINVAL; + ebitmap_destroy(&dummy); + + rc = next_entry(buf, fp, sizeof(u32)); + if ( rc < 0 ) + return rc; + } break; default: return -EINVAL; @@ -1184,7 +1207,7 @@ static int class_read(struct policydb *p, struct hashtab *h, void *fp) goto bad; } - rc = read_cons_helper(&cladatum->constraints, ncons, 0, fp); + rc = read_cons_helper(p, &cladatum->constraints, ncons, 0, fp); if ( rc ) goto bad; @@ -1195,11 +1218,27 @@ static int class_read(struct policydb *p, struct hashtab *h, void *fp) if ( rc < 0 ) goto bad; ncons = le32_to_cpu(buf[0]); - rc = read_cons_helper(&cladatum->validatetrans, ncons, 1, fp); + rc = read_cons_helper(p, &cladatum->validatetrans, ncons, 1, fp); if ( rc ) goto bad; } + if ( p->policyvers >= POLICYDB_VERSION_NEW_OBJECT_DEFAULTS ) + { + rc = next_entry(buf, fp, sizeof(u32) * 3); + if ( rc ) + goto bad; + /* these values are ignored by Xen */ + } + + if ( p->policyvers >= POLICYDB_VERSION_DEFAULT_TYPE ) + { + rc = next_entry(buf, fp, sizeof(u32) * 1); + if ( rc ) + goto bad; + /* ignored by Xen */ + } + rc = hashtab_insert(h, key, cladatum); if ( rc ) goto bad; @@ -1874,7 +1913,10 @@ int policydb_read(struct policydb *p, void *fp) ltr->next = tr; else p->role_tr = tr; - rc = next_entry(buf, fp, sizeof(u32)*3); + if ( p->policyvers >= POLICYDB_VERSION_ROLETRANS ) + rc = next_entry(buf, fp, sizeof(u32)*4); + else + rc = next_entry(buf, fp, sizeof(u32)*3); if ( rc < 0 ) goto bad; tr->role = le32_to_cpu(buf[0]); @@ -1921,6 +1963,20 @@ int policydb_read(struct policydb *p, void *fp) lra = ra; } + if ( p->policyvers >= POLICYDB_VERSION_FILENAME_TRANS ) + { + rc = next_entry(buf, fp, sizeof(u32)); + if ( rc ) + goto bad; + nel = le32_to_cpu(buf[0]); + if ( nel ) + { + printk(KERN_ERR "Flask: unsupported genfs config data\n"); + rc = -EINVAL; + goto bad; + } + } + rc = policydb_index_classes(p); if ( rc ) goto bad; @@ -1999,11 +2055,23 @@ int policydb_read(struct policydb *p, void *fp) "Old xen policy does not support iomemcon"); goto bad; } - rc = next_entry(buf, fp, sizeof(u32) *2); - if ( rc < 0 ) - goto bad; - c->u.iomem.low_iomem = le32_to_cpu(buf[0]); - c->u.iomem.high_iomem = le32_to_cpu(buf[1]); + if ( p->policyvers >= POLICYDB_VERSION_XEN_DEVICETREE ) + { + u64 b64[2]; + rc = next_entry(b64, fp, sizeof(u64) *2); + if ( rc < 0 ) + goto bad; + c->u.iomem.low_iomem = le64_to_cpu(b64[0]); + c->u.iomem.high_iomem = le64_to_cpu(b64[1]); + } + else + { + rc = next_entry(buf, fp, sizeof(u32) *2); + if ( rc < 0 ) + goto bad; + c->u.iomem.low_iomem = le32_to_cpu(buf[0]); + c->u.iomem.high_iomem = le32_to_cpu(buf[1]); + } rc = context_read_and_validate(&c->context[0], p, fp); if ( rc ) goto bad; @@ -2023,6 +2091,29 @@ int policydb_read(struct policydb *p, void *fp) if ( rc ) goto bad; break; + case OCON_DTREE: + if ( p->target_type != TARGET_XEN ) + { + printk(KERN_ERR + "Old xen policy does not support devicetreecon"); + goto bad; + } + rc = next_entry(buf, fp, sizeof(u32)); + if ( rc < 0 ) + goto bad; + len = le32_to_cpu(buf[0]); + rc = -ENOMEM; + c->u.name = xmalloc_array(char, len + 1); + if (!c->u.name) + goto bad; + rc = next_entry(c->u.name, fp, len); + if ( rc < 0 ) + goto bad; + c->u.name[len] = 0; + rc = context_read_and_validate(&c->context[0], p, fp); + if ( rc ) + goto bad; + break; default: printk(KERN_ERR "Flask: unsupported object context config data\n"); diff --git a/xen/xsm/flask/ss/policydb.h b/xen/xsm/flask/ss/policydb.h index b176300..30be71a 100644 --- a/xen/xsm/flask/ss/policydb.h +++ b/xen/xsm/flask/ss/policydb.h @@ -154,8 +154,8 @@ struct ocontext { u32 high_ioport; } ioport; struct { - u32 low_iomem; - u32 high_iomem; + u64 low_iomem; + u64 high_iomem; } iomem; } u; struct context context[2]; /* security context(s) */ @@ -180,7 +180,8 @@ struct ocontext { #define OCON_IOPORT 2 /* io ports */ #define OCON_IOMEM 3 /* io memory */ #define OCON_DEVICE 4 /* pci devices */ -#define OCON_NUM 5 +#define OCON_DTREE 5 /* device tree nodes */ +#define OCON_NUM 6 #define OCON_NUM_OLD 7 /* The policy database */ diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index f0e459a..f31d7d7 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1831,6 +1831,41 @@ out: return rc; } +int security_devicetree_sid(const char *path, u32 *out_sid) +{ + struct ocontext *c; + int rc = 0; + + POLICY_RDLOCK; + + c = policydb.ocontexts[OCON_DTREE]; + while ( c ) + { + if ( strcmp(c->u.name, path) == 0 ) + break; + c = c->next; + } + + if ( c ) + { + if ( !c->sid[0] ) + { + rc = sidtab_context_to_sid(&sidtab, &c->context[0], &c->sid[0]); + if ( rc ) + goto out; + } + *out_sid = c->sid[0]; + } + else + { + *out_sid = SECINITSID_DEVICE; + } + +out: + POLICY_RDUNLOCK; + return rc; +} + int security_find_bool(const char *name) { int i, rv = -ENOENT; @@ -2131,9 +2166,8 @@ int security_ocontext_add( u32 ocon, unsigned long low, unsigned long high c->u.iomem.high_iomem == high && c->sid[0] == sid) break; - printk("%s: IO Memory overlap with entry %#x - %#x\n", - __FUNCTION__, c->u.iomem.low_iomem, - c->u.iomem.high_iomem); + printk("%s: IO Memory overlap with entry %#"PRIx64" - %#"PRIx64"\n", + __FUNCTION__, c->u.iomem.low_iomem, c->u.iomem.high_iomem); ret = -EEXIST; break; } @@ -2188,7 +2222,7 @@ int security_ocontext_add( u32 ocon, unsigned long low, unsigned long high return ret; } -int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) +int security_ocontext_del( u32 ocon, unsigned long low, unsigned long high ) { int ret = 0; struct ocontext *c, *before_c; @@ -2217,7 +2251,7 @@ int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) } } - printk("%s: ocontext not found: pirq %d\n", __FUNCTION__, low); + printk("%s: ocontext not found: pirq %ld\n", __FUNCTION__, low); ret = -ENOENT; break; @@ -2243,8 +2277,8 @@ int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) } } - printk("%s: ocontext not found: ioport %#x - %#x\n", __FUNCTION__, - low, high); + printk("%s: ocontext not found: ioport %#lx - %#lx\n", + __FUNCTION__, low, high); ret = -ENOENT; break; @@ -2270,8 +2304,8 @@ int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) } } - printk("%s: ocontext not found: iomem %#x - %#x\n", __FUNCTION__, - low, high); + printk("%s: ocontext not found: iomem %#lx - %#lx\n", + __FUNCTION__, low, high); ret = -ENOENT; break; @@ -2296,7 +2330,7 @@ int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) } } - printk("%s: ocontext not found: pcidevice %#x\n", __FUNCTION__, low); + printk("%s: ocontext not found: pcidevice %#lx\n", __FUNCTION__, low); ret = -ENOENT; break; @@ -2308,3 +2342,67 @@ int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) POLICY_WRUNLOCK; return ret; } + +int security_devicetree_setlabel(char *path, u32 sid) +{ + int ret = 0; + struct ocontext *c; + struct ocontext **pcurr; + struct ocontext *add = NULL; + + if ( sid ) + { + add = xzalloc(struct ocontext); + if ( add == NULL ) + { + xfree(path); + return -ENOMEM; + } + add->sid[0] = sid; + add->u.name = path; + } + else + { + ret = -ENOENT; + } + + POLICY_WRLOCK; + + pcurr = &policydb.ocontexts[OCON_DTREE]; + c = *pcurr; + while ( c ) + { + if ( strcmp(c->u.name, path) == 0 ) + { + if ( sid ) + { + ret = -EEXIST; + break; + } + else + { + *pcurr = c->next; + xfree(c->u.name); + xfree(c); + ret = 0; + break; + } + } + pcurr = &c->next; + c = *pcurr; + } + + if ( add && ret == 0 ) + { + add->next = policydb.ocontexts[OCON_DTREE]; + policydb.ocontexts[OCON_DTREE] = add; + add = NULL; + path = NULL; + } + + POLICY_WRUNLOCK; + + xfree(add); + xfree(path); + return ret; +} -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:42:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:42: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 1YYfOZ-00042v-Sb; Thu, 19 Mar 2015 18:42:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOX-00041q-Ul for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:14 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 74/C3-21221-5881B055; Thu, 19 Mar 2015 18:42:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1426790530!8996206!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23753 invoked from network); 19 Mar 2015 18:42:11 -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; 19 Mar 2015 18:42:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOU-0002Wd-9B for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfOU-0000Ga-75 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:10 +0000 Date: Thu, 19 Mar 2015 18:42:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm: add device tree labeling 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 525ee49e2c3a3ec18a9b7cb8a93526777952e502 Author: Daniel De Graaf AuthorDate: Tue Mar 17 10:58:40 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 17 10:58:40 2015 +0100 xsm: add device tree labeling support This adds support in the hypervisor and policy build toolchain for Xen/Flask policy version 30, which adds the ability to label ARM device tree nodes and expands the IOMEM ocontext entries to 64 bits. Signed-off-by: Daniel De Graaf Tested-by: Julien Grall Acked-by: Ian Campbell --- tools/flask/policy/Makefile | 20 ++++-- xen/include/public/xsm/flask_op.h | 9 +++ xen/xsm/flask/flask_op.c | 28 ++++++++ xen/xsm/flask/include/security.h | 14 ++++- xen/xsm/flask/ss/policydb.c | 133 +++++++++++++++++++++++++++++++------ xen/xsm/flask/ss/policydb.h | 7 +- xen/xsm/flask/ss/services.c | 118 ++++++++++++++++++++++++++++++--- 7 files changed, 287 insertions(+), 42 deletions(-) diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile index 58d9ce1..7aa417c 100644 --- a/tools/flask/policy/Makefile +++ b/tools/flask/policy/Makefile @@ -20,21 +20,21 @@ MLS_CATS ?= 256 CHECKPOLICY ?= checkpolicy M4 ?= m4 +# Output security policy version. Leave unset to autodetect. +OUTPUT_POLICY ?= $(BEST_POLICY_VER) + ######################################## # # End of configuration options # ######################################## -# Policy version -# By default, checkpolicy creates the highest version policy it supports. Force -# the use of version 24 which is the highest that Xen supports, and the first to -# include the Xen policy type (needed for static device policy). -OUTPUT_POLICY = 24 - POLICY_FILENAME = xenpolicy-$(shell $(MAKE) -C $(XEN_ROOT)/xen xenversion --no-print-directory) POLICY_LOADPATH = /boot +# List of policy versions supported by the hypervisor +POLICY_VER_LIST_HV = 24 30 + # policy source layout POLDIR := policy MODDIR := $(POLDIR)/modules @@ -63,6 +63,14 @@ MOD_CONF := $(POLDIR)/modules.conf # checkpolicy can use the #line directives provided by -s for error reporting: M4PARAM := -D self_contained_policy -s + +# The output of checkpolicy -V is "30 (compatibility range 30-15)", and the +# first word of the output is the maximum policy version supported. +CHECKPOLICY_VER_MAX := $(firstword $(shell $(CHECKPOLICY) -V)) + +# Find the highest version supported by both the hypervisor and checkpolicy +BEST_POLICY_VER := $(shell best=24; for ver in $(POLICY_VER_LIST_HV); do if test $$ver -le $(CHECKPOLICY_VER_MAX); then best=$$ver; fi; done; echo $$best) + CHECKPOLICY_PARAM := -t Xen -c $(OUTPUT_POLICY) # enable MLS if requested. diff --git a/xen/include/public/xsm/flask_op.h b/xen/include/public/xsm/flask_op.h index f874589..c76359c 100644 --- a/xen/include/public/xsm/flask_op.h +++ b/xen/include/public/xsm/flask_op.h @@ -150,6 +150,13 @@ struct xen_flask_relabel { uint32_t sid; }; +struct xen_flask_devicetree_label { + /* IN */ + uint32_t sid; + uint32_t length; + XEN_GUEST_HANDLE(char) path; +}; + struct xen_flask_op { uint32_t cmd; #define FLASK_LOAD 1 @@ -176,6 +183,7 @@ struct xen_flask_op { #define FLASK_DEL_OCONTEXT 22 #define FLASK_GET_PEER_SID 23 #define FLASK_RELABEL_DOMAIN 24 +#define FLASK_DEVICETREE_LABEL 25 uint32_t interface_version; /* XEN_FLASK_INTERFACE_VERSION */ union { struct xen_flask_load load; @@ -195,6 +203,7 @@ struct xen_flask_op { struct xen_flask_ocontext ocontext; struct xen_flask_peersid peersid; struct xen_flask_relabel relabel; + struct xen_flask_devicetree_label devicetree_label; } u; }; typedef struct xen_flask_op xen_flask_op_t; diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 84c7fec..47aacc1 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -563,6 +563,27 @@ static int flask_security_load(struct xen_flask_load *load) return ret; } +static int flask_devicetree_label(struct xen_flask_devicetree_label *arg) +{ + int rv; + char *buf; + u32 sid = arg->sid; + u32 perm = sid ? SECURITY__ADD_OCONTEXT : SECURITY__DEL_OCONTEXT; + + rv = domain_has_security(current->domain, perm); + if ( rv ) + return rv; + + rv = flask_copyin_string(arg->path, &buf, arg->length, PAGE_SIZE); + if ( rv ) + return rv; + + /* buf is consumed or freed by this function */ + rv = security_devicetree_setlabel(buf, sid); + + return rv; +} + #ifndef COMPAT static int flask_ocontext_del(struct xen_flask_ocontext *arg) @@ -790,6 +811,10 @@ ret_t do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op) rv = flask_relabel_domain(&op.u.relabel); break; + case FLASK_DEVICETREE_LABEL: + rv = flask_devicetree_label(&op.u.devicetree_label); + break; + default: rv = -ENOSYS; } @@ -848,6 +873,9 @@ CHECK_flask_transition; #define flask_security_get_bool compat_security_get_bool #define flask_security_set_bool compat_security_set_bool +#define xen_flask_devicetree_label compat_flask_devicetree_label +#define flask_devicetree_label compat_devicetree_label + #define xen_flask_op_t compat_flask_op_t #undef ret_t #define ret_t int diff --git a/xen/xsm/flask/include/security.h b/xen/xsm/flask/include/security.h index d07bae0..34bbe62 100644 --- a/xen/xsm/flask/include/security.h +++ b/xen/xsm/flask/include/security.h @@ -30,10 +30,16 @@ #define POLICYDB_VERSION_POLCAP 22 #define POLICYDB_VERSION_PERMISSIVE 23 #define POLICYDB_VERSION_BOUNDARY 24 +#define POLICYDB_VERSION_FILENAME_TRANS 25 +#define POLICYDB_VERSION_ROLETRANS 26 +#define POLICYDB_VERSION_NEW_OBJECT_DEFAULTS 27 +#define POLICYDB_VERSION_DEFAULT_TYPE 28 +#define POLICYDB_VERSION_CONSTRAINT_NAMES 29 +#define POLICYDB_VERSION_XEN_DEVICETREE 30 /* Range of policy versions we understand*/ #define POLICYDB_VERSION_MIN POLICYDB_VERSION_BASE -#define POLICYDB_VERSION_MAX POLICYDB_VERSION_BOUNDARY +#define POLICYDB_VERSION_MAX POLICYDB_VERSION_XEN_DEVICETREE enum flask_bootparam_t { FLASK_BOOTPARAM_PERMISSIVE, @@ -82,6 +88,8 @@ int security_ioport_sid(u32 ioport, u32 *out_sid); int security_device_sid(u32 device, u32 *out_sid); +int security_devicetree_sid(const char *path, u32 *out_sid); + int security_validate_transition(u32 oldsid, u32 newsid, u32 tasksid, u16 tclass); @@ -96,5 +104,7 @@ int security_iterate_ioport_sids(u32 start, u32 end, int security_ocontext_add(u32 ocontext, unsigned long low, unsigned long high, u32 sid); -int security_ocontext_del(u32 ocontext, unsigned int low, unsigned int high); +int security_ocontext_del(u32 ocontext, unsigned long low, unsigned long high); + +int security_devicetree_setlabel(char *path, u32 sid); #endif /* _FLASK_SECURITY_H_ */ diff --git a/xen/xsm/flask/ss/policydb.c b/xen/xsm/flask/ss/policydb.c index b88ea56..a1060b1 100644 --- a/xen/xsm/flask/ss/policydb.c +++ b/xen/xsm/flask/ss/policydb.c @@ -74,55 +74,55 @@ static struct policydb_compat_info policydb_compat[] = { { .version = POLICYDB_VERSION_BASE, .sym_num = SYM_NUM - 3, - .ocon_num = OCON_NUM - 1, + .ocon_num = 4, .target_type = TARGET_XEN_OLD, }, { .version = POLICYDB_VERSION_BOOL, .sym_num = SYM_NUM - 2, - .ocon_num = OCON_NUM - 1, + .ocon_num = 4, .target_type = TARGET_XEN_OLD, }, { .version = POLICYDB_VERSION_IPV6, .sym_num = SYM_NUM - 2, - .ocon_num = OCON_NUM, + .ocon_num = 5, .target_type = TARGET_XEN_OLD, }, { .version = POLICYDB_VERSION_NLCLASS, .sym_num = SYM_NUM - 2, - .ocon_num = OCON_NUM, + .ocon_num = 5, .target_type = TARGET_XEN_OLD, }, { .version = POLICYDB_VERSION_MLS, .sym_num = SYM_NUM, - .ocon_num = OCON_NUM, + .ocon_num = 5, .target_type = TARGET_XEN_OLD, }, { .version = POLICYDB_VERSION_AVTAB, .sym_num = SYM_NUM, - .ocon_num = OCON_NUM, + .ocon_num = 5, .target_type = TARGET_XEN_OLD, }, { .version = POLICYDB_VERSION_RANGETRANS, .sym_num = SYM_NUM, - .ocon_num = OCON_NUM, + .ocon_num = 5, .target_type = TARGET_XEN_OLD, }, { .version = POLICYDB_VERSION_POLCAP, .sym_num = SYM_NUM, - .ocon_num = OCON_NUM, + .ocon_num = 5, .target_type = TARGET_XEN_OLD, }, { .version = POLICYDB_VERSION_PERMISSIVE, .sym_num = SYM_NUM, - .ocon_num = OCON_NUM, + .ocon_num = 5, .target_type = TARGET_XEN_OLD, }, { @@ -134,7 +134,13 @@ static struct policydb_compat_info policydb_compat[] = { { .version = POLICYDB_VERSION_BOUNDARY, .sym_num = SYM_NUM, - .ocon_num = OCON_NUM, + .ocon_num = OCON_DEVICE + 1, + .target_type = TARGET_XEN, + }, + { + .version = POLICYDB_VERSION_XEN_DEVICETREE, + .sym_num = SYM_NUM, + .ocon_num = OCON_DTREE + 1, .target_type = TARGET_XEN, }, }; @@ -634,7 +640,7 @@ static void ocontext_destroy(struct ocontext *c, int i) { context_destroy(&c->context[0]); context_destroy(&c->context[1]); - if ( i == OCON_ISID ) + if ( i == OCON_ISID || i == OCON_DTREE ) xfree(c->u.name); xfree(c); } @@ -1040,8 +1046,8 @@ bad: goto out; } -static int read_cons_helper(struct constraint_node **nodep, int ncons, - int allowxtarget, void *fp) +static int read_cons_helper(struct policydb *p, struct constraint_node **nodep, + int ncons, int allowxtarget, void *fp) { struct constraint_node *c, *lc; struct constraint_expr *e, *le; @@ -1115,6 +1121,23 @@ static int read_cons_helper(struct constraint_node **nodep, int ncons, depth++; if ( ebitmap_read(&e->names, fp) ) return -EINVAL; + if ( p->policyvers >= POLICYDB_VERSION_CONSTRAINT_NAMES ) + { + struct ebitmap dummy; + ebitmap_init(&dummy); + if ( ebitmap_read(&dummy, fp) ) + return -EINVAL; + ebitmap_destroy(&dummy); + + ebitmap_init(&dummy); + if ( ebitmap_read(&dummy, fp) ) + return -EINVAL; + ebitmap_destroy(&dummy); + + rc = next_entry(buf, fp, sizeof(u32)); + if ( rc < 0 ) + return rc; + } break; default: return -EINVAL; @@ -1184,7 +1207,7 @@ static int class_read(struct policydb *p, struct hashtab *h, void *fp) goto bad; } - rc = read_cons_helper(&cladatum->constraints, ncons, 0, fp); + rc = read_cons_helper(p, &cladatum->constraints, ncons, 0, fp); if ( rc ) goto bad; @@ -1195,11 +1218,27 @@ static int class_read(struct policydb *p, struct hashtab *h, void *fp) if ( rc < 0 ) goto bad; ncons = le32_to_cpu(buf[0]); - rc = read_cons_helper(&cladatum->validatetrans, ncons, 1, fp); + rc = read_cons_helper(p, &cladatum->validatetrans, ncons, 1, fp); if ( rc ) goto bad; } + if ( p->policyvers >= POLICYDB_VERSION_NEW_OBJECT_DEFAULTS ) + { + rc = next_entry(buf, fp, sizeof(u32) * 3); + if ( rc ) + goto bad; + /* these values are ignored by Xen */ + } + + if ( p->policyvers >= POLICYDB_VERSION_DEFAULT_TYPE ) + { + rc = next_entry(buf, fp, sizeof(u32) * 1); + if ( rc ) + goto bad; + /* ignored by Xen */ + } + rc = hashtab_insert(h, key, cladatum); if ( rc ) goto bad; @@ -1874,7 +1913,10 @@ int policydb_read(struct policydb *p, void *fp) ltr->next = tr; else p->role_tr = tr; - rc = next_entry(buf, fp, sizeof(u32)*3); + if ( p->policyvers >= POLICYDB_VERSION_ROLETRANS ) + rc = next_entry(buf, fp, sizeof(u32)*4); + else + rc = next_entry(buf, fp, sizeof(u32)*3); if ( rc < 0 ) goto bad; tr->role = le32_to_cpu(buf[0]); @@ -1921,6 +1963,20 @@ int policydb_read(struct policydb *p, void *fp) lra = ra; } + if ( p->policyvers >= POLICYDB_VERSION_FILENAME_TRANS ) + { + rc = next_entry(buf, fp, sizeof(u32)); + if ( rc ) + goto bad; + nel = le32_to_cpu(buf[0]); + if ( nel ) + { + printk(KERN_ERR "Flask: unsupported genfs config data\n"); + rc = -EINVAL; + goto bad; + } + } + rc = policydb_index_classes(p); if ( rc ) goto bad; @@ -1999,11 +2055,23 @@ int policydb_read(struct policydb *p, void *fp) "Old xen policy does not support iomemcon"); goto bad; } - rc = next_entry(buf, fp, sizeof(u32) *2); - if ( rc < 0 ) - goto bad; - c->u.iomem.low_iomem = le32_to_cpu(buf[0]); - c->u.iomem.high_iomem = le32_to_cpu(buf[1]); + if ( p->policyvers >= POLICYDB_VERSION_XEN_DEVICETREE ) + { + u64 b64[2]; + rc = next_entry(b64, fp, sizeof(u64) *2); + if ( rc < 0 ) + goto bad; + c->u.iomem.low_iomem = le64_to_cpu(b64[0]); + c->u.iomem.high_iomem = le64_to_cpu(b64[1]); + } + else + { + rc = next_entry(buf, fp, sizeof(u32) *2); + if ( rc < 0 ) + goto bad; + c->u.iomem.low_iomem = le32_to_cpu(buf[0]); + c->u.iomem.high_iomem = le32_to_cpu(buf[1]); + } rc = context_read_and_validate(&c->context[0], p, fp); if ( rc ) goto bad; @@ -2023,6 +2091,29 @@ int policydb_read(struct policydb *p, void *fp) if ( rc ) goto bad; break; + case OCON_DTREE: + if ( p->target_type != TARGET_XEN ) + { + printk(KERN_ERR + "Old xen policy does not support devicetreecon"); + goto bad; + } + rc = next_entry(buf, fp, sizeof(u32)); + if ( rc < 0 ) + goto bad; + len = le32_to_cpu(buf[0]); + rc = -ENOMEM; + c->u.name = xmalloc_array(char, len + 1); + if (!c->u.name) + goto bad; + rc = next_entry(c->u.name, fp, len); + if ( rc < 0 ) + goto bad; + c->u.name[len] = 0; + rc = context_read_and_validate(&c->context[0], p, fp); + if ( rc ) + goto bad; + break; default: printk(KERN_ERR "Flask: unsupported object context config data\n"); diff --git a/xen/xsm/flask/ss/policydb.h b/xen/xsm/flask/ss/policydb.h index b176300..30be71a 100644 --- a/xen/xsm/flask/ss/policydb.h +++ b/xen/xsm/flask/ss/policydb.h @@ -154,8 +154,8 @@ struct ocontext { u32 high_ioport; } ioport; struct { - u32 low_iomem; - u32 high_iomem; + u64 low_iomem; + u64 high_iomem; } iomem; } u; struct context context[2]; /* security context(s) */ @@ -180,7 +180,8 @@ struct ocontext { #define OCON_IOPORT 2 /* io ports */ #define OCON_IOMEM 3 /* io memory */ #define OCON_DEVICE 4 /* pci devices */ -#define OCON_NUM 5 +#define OCON_DTREE 5 /* device tree nodes */ +#define OCON_NUM 6 #define OCON_NUM_OLD 7 /* The policy database */ diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index f0e459a..f31d7d7 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1831,6 +1831,41 @@ out: return rc; } +int security_devicetree_sid(const char *path, u32 *out_sid) +{ + struct ocontext *c; + int rc = 0; + + POLICY_RDLOCK; + + c = policydb.ocontexts[OCON_DTREE]; + while ( c ) + { + if ( strcmp(c->u.name, path) == 0 ) + break; + c = c->next; + } + + if ( c ) + { + if ( !c->sid[0] ) + { + rc = sidtab_context_to_sid(&sidtab, &c->context[0], &c->sid[0]); + if ( rc ) + goto out; + } + *out_sid = c->sid[0]; + } + else + { + *out_sid = SECINITSID_DEVICE; + } + +out: + POLICY_RDUNLOCK; + return rc; +} + int security_find_bool(const char *name) { int i, rv = -ENOENT; @@ -2131,9 +2166,8 @@ int security_ocontext_add( u32 ocon, unsigned long low, unsigned long high c->u.iomem.high_iomem == high && c->sid[0] == sid) break; - printk("%s: IO Memory overlap with entry %#x - %#x\n", - __FUNCTION__, c->u.iomem.low_iomem, - c->u.iomem.high_iomem); + printk("%s: IO Memory overlap with entry %#"PRIx64" - %#"PRIx64"\n", + __FUNCTION__, c->u.iomem.low_iomem, c->u.iomem.high_iomem); ret = -EEXIST; break; } @@ -2188,7 +2222,7 @@ int security_ocontext_add( u32 ocon, unsigned long low, unsigned long high return ret; } -int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) +int security_ocontext_del( u32 ocon, unsigned long low, unsigned long high ) { int ret = 0; struct ocontext *c, *before_c; @@ -2217,7 +2251,7 @@ int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) } } - printk("%s: ocontext not found: pirq %d\n", __FUNCTION__, low); + printk("%s: ocontext not found: pirq %ld\n", __FUNCTION__, low); ret = -ENOENT; break; @@ -2243,8 +2277,8 @@ int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) } } - printk("%s: ocontext not found: ioport %#x - %#x\n", __FUNCTION__, - low, high); + printk("%s: ocontext not found: ioport %#lx - %#lx\n", + __FUNCTION__, low, high); ret = -ENOENT; break; @@ -2270,8 +2304,8 @@ int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) } } - printk("%s: ocontext not found: iomem %#x - %#x\n", __FUNCTION__, - low, high); + printk("%s: ocontext not found: iomem %#lx - %#lx\n", + __FUNCTION__, low, high); ret = -ENOENT; break; @@ -2296,7 +2330,7 @@ int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) } } - printk("%s: ocontext not found: pcidevice %#x\n", __FUNCTION__, low); + printk("%s: ocontext not found: pcidevice %#lx\n", __FUNCTION__, low); ret = -ENOENT; break; @@ -2308,3 +2342,67 @@ int security_ocontext_del( u32 ocon, unsigned int low, unsigned int high ) POLICY_WRUNLOCK; return ret; } + +int security_devicetree_setlabel(char *path, u32 sid) +{ + int ret = 0; + struct ocontext *c; + struct ocontext **pcurr; + struct ocontext *add = NULL; + + if ( sid ) + { + add = xzalloc(struct ocontext); + if ( add == NULL ) + { + xfree(path); + return -ENOMEM; + } + add->sid[0] = sid; + add->u.name = path; + } + else + { + ret = -ENOENT; + } + + POLICY_WRLOCK; + + pcurr = &policydb.ocontexts[OCON_DTREE]; + c = *pcurr; + while ( c ) + { + if ( strcmp(c->u.name, path) == 0 ) + { + if ( sid ) + { + ret = -EEXIST; + break; + } + else + { + *pcurr = c->next; + xfree(c->u.name); + xfree(c); + ret = 0; + break; + } + } + pcurr = &c->next; + c = *pcurr; + } + + if ( add && ret == 0 ) + { + add->next = policydb.ocontexts[OCON_DTREE]; + policydb.ocontexts[OCON_DTREE] = add; + add = NULL; + path = NULL; + } + + POLICY_WRUNLOCK; + + xfree(add); + xfree(path); + return ret; +} -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:42:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:42: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 1YYfOj-00048s-1x; Thu, 19 Mar 2015 18:42:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOg-00047i-UP for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:23 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id E6/C6-30396-E881B055; Thu, 19 Mar 2015 18:42:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1426790540!6669543!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5661 invoked from network); 19 Mar 2015 18:42:21 -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; 19 Mar 2015 18:42:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOe-0002Wj-F3 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfOe-0000Hf-Dp for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:20 +0000 Date: Thu, 19 Mar 2015 18:42:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] make two memory hypercalls vNUMA-aware X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 319442762f6438188105282c71648b460e61a80a Author: Wei Liu AuthorDate: Tue Mar 17 11:03:29 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 17 11:03:29 2015 +0100 make two memory hypercalls vNUMA-aware Make XENMEM_increase_reservation and XENMEM_populate_physmap vNUMA-aware. That is, if guest requests Xen to allocate memory for specific vnode, Xen can translate vnode to pnode using vNUMA information of that guest. XENMEMF_vnode is introduced for the guest to mark the node number is in fact virtual node number and should be translated by Xen. XENFEAT_memory_op_vnode_supported is introduced to indicate that Xen is able to translate virtual node to physical node. Signed-off-by: Wei Liu Hand struct domain via struct memops_arg's respective field to construct_memop_from_reservation(). Signed-off-by: Jan Beulich --- xen/common/kernel.c | 2 +- xen/common/memory.c | 51 +++++++++++++++++++++++++++++++++-------- xen/include/public/features.h | 3 ++ xen/include/public/memory.h | 2 + 4 files changed, 47 insertions(+), 11 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index f63de10..d8c31bc 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -305,7 +305,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) switch ( fi.submap_idx ) { case 0: - fi.submap = 0; + fi.submap = (1U << XENFEAT_memory_op_vnode_supported); if ( VM_ASSIST(d, VMASST_TYPE_pae_extended_cr3) ) fi.submap |= (1U << XENFEAT_pae_pgdir_above_4gb); if ( paging_mode_translate(d) ) diff --git a/xen/common/memory.c b/xen/common/memory.c index 60432ec..063a1c5 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -713,9 +713,37 @@ static int construct_memop_from_reservation( a->memflags = MEMF_bits(address_bits); } - a->memflags |= MEMF_node(XENMEMF_get_node(r->mem_flags)); - if ( r->mem_flags & XENMEMF_exact_node_request ) - a->memflags |= MEMF_exact_node; + if ( r->mem_flags & XENMEMF_vnode ) + { + nodeid_t vnode, pnode; + struct domain *d = a->domain; + + read_lock(&d->vnuma_rwlock); + if ( d->vnuma ) + { + vnode = XENMEMF_get_node(r->mem_flags); + if ( vnode >= d->vnuma->nr_vnodes ) + { + read_unlock(&d->vnuma_rwlock); + return -EINVAL; + } + + pnode = d->vnuma->vnode_to_pnode[vnode]; + if ( pnode != NUMA_NO_NODE ) + { + a->memflags |= MEMF_node(pnode); + if ( r->mem_flags & XENMEMF_exact_node_request ) + a->memflags |= MEMF_exact_node; + } + } + read_unlock(&d->vnuma_rwlock); + } + else + { + a->memflags |= MEMF_node(XENMEMF_get_node(r->mem_flags)); + if ( r->mem_flags & XENMEMF_exact_node_request ) + a->memflags |= MEMF_exact_node; + } return 0; } @@ -745,21 +773,24 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( unlikely(start_extent >= reservation.nr_extents) ) return start_extent; + d = rcu_lock_domain_by_any_id(reservation.domid); + if ( d == NULL ) + return start_extent; + args.domain = d; + if ( construct_memop_from_reservation(&reservation, &args) ) + { + rcu_unlock_domain(d); return start_extent; - args.nr_done = start_extent; - args.preempted = 0; + } + args.nr_done = start_extent; + args.preempted = 0; if ( op == XENMEM_populate_physmap && (reservation.mem_flags & XENMEMF_populate_on_demand) ) args.memflags |= MEMF_populate_on_demand; - d = rcu_lock_domain_by_any_id(reservation.domid); - if ( d == NULL ) - return start_extent; - args.domain = d; - if ( xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d) ) { rcu_unlock_domain(d); diff --git a/xen/include/public/features.h b/xen/include/public/features.h index 16d92aa..2110b04 100644 --- a/xen/include/public/features.h +++ b/xen/include/public/features.h @@ -99,6 +99,9 @@ #define XENFEAT_grant_map_identity 12 */ +/* Guest can use XENMEMF_vnode to specify virtual node for memory op. */ +#define XENFEAT_memory_op_vnode_supported 13 + #define XENFEAT_NR_SUBMAPS 1 #endif /* __XEN_PUBLIC_FEATURES_H__ */ diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index 595f953..2b5206b 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -55,6 +55,8 @@ /* Flag to request allocation only from the node specified */ #define XENMEMF_exact_node_request (1<<17) #define XENMEMF_exact_node(n) (XENMEMF_node(n) | XENMEMF_exact_node_request) +/* Flag to indicate the node specified is virtual node */ +#define XENMEMF_vnode (1<<18) #endif struct xen_memory_reservation { -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:42:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:42: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 1YYfOj-00048s-1x; Thu, 19 Mar 2015 18:42:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOg-00047i-UP for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:23 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id E6/C6-30396-E881B055; Thu, 19 Mar 2015 18:42:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1426790540!6669543!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5661 invoked from network); 19 Mar 2015 18:42:21 -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; 19 Mar 2015 18:42:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOe-0002Wj-F3 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfOe-0000Hf-Dp for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:20 +0000 Date: Thu, 19 Mar 2015 18:42:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] make two memory hypercalls vNUMA-aware X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 319442762f6438188105282c71648b460e61a80a Author: Wei Liu AuthorDate: Tue Mar 17 11:03:29 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 17 11:03:29 2015 +0100 make two memory hypercalls vNUMA-aware Make XENMEM_increase_reservation and XENMEM_populate_physmap vNUMA-aware. That is, if guest requests Xen to allocate memory for specific vnode, Xen can translate vnode to pnode using vNUMA information of that guest. XENMEMF_vnode is introduced for the guest to mark the node number is in fact virtual node number and should be translated by Xen. XENFEAT_memory_op_vnode_supported is introduced to indicate that Xen is able to translate virtual node to physical node. Signed-off-by: Wei Liu Hand struct domain via struct memops_arg's respective field to construct_memop_from_reservation(). Signed-off-by: Jan Beulich --- xen/common/kernel.c | 2 +- xen/common/memory.c | 51 +++++++++++++++++++++++++++++++++-------- xen/include/public/features.h | 3 ++ xen/include/public/memory.h | 2 + 4 files changed, 47 insertions(+), 11 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index f63de10..d8c31bc 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -305,7 +305,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) switch ( fi.submap_idx ) { case 0: - fi.submap = 0; + fi.submap = (1U << XENFEAT_memory_op_vnode_supported); if ( VM_ASSIST(d, VMASST_TYPE_pae_extended_cr3) ) fi.submap |= (1U << XENFEAT_pae_pgdir_above_4gb); if ( paging_mode_translate(d) ) diff --git a/xen/common/memory.c b/xen/common/memory.c index 60432ec..063a1c5 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -713,9 +713,37 @@ static int construct_memop_from_reservation( a->memflags = MEMF_bits(address_bits); } - a->memflags |= MEMF_node(XENMEMF_get_node(r->mem_flags)); - if ( r->mem_flags & XENMEMF_exact_node_request ) - a->memflags |= MEMF_exact_node; + if ( r->mem_flags & XENMEMF_vnode ) + { + nodeid_t vnode, pnode; + struct domain *d = a->domain; + + read_lock(&d->vnuma_rwlock); + if ( d->vnuma ) + { + vnode = XENMEMF_get_node(r->mem_flags); + if ( vnode >= d->vnuma->nr_vnodes ) + { + read_unlock(&d->vnuma_rwlock); + return -EINVAL; + } + + pnode = d->vnuma->vnode_to_pnode[vnode]; + if ( pnode != NUMA_NO_NODE ) + { + a->memflags |= MEMF_node(pnode); + if ( r->mem_flags & XENMEMF_exact_node_request ) + a->memflags |= MEMF_exact_node; + } + } + read_unlock(&d->vnuma_rwlock); + } + else + { + a->memflags |= MEMF_node(XENMEMF_get_node(r->mem_flags)); + if ( r->mem_flags & XENMEMF_exact_node_request ) + a->memflags |= MEMF_exact_node; + } return 0; } @@ -745,21 +773,24 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( unlikely(start_extent >= reservation.nr_extents) ) return start_extent; + d = rcu_lock_domain_by_any_id(reservation.domid); + if ( d == NULL ) + return start_extent; + args.domain = d; + if ( construct_memop_from_reservation(&reservation, &args) ) + { + rcu_unlock_domain(d); return start_extent; - args.nr_done = start_extent; - args.preempted = 0; + } + args.nr_done = start_extent; + args.preempted = 0; if ( op == XENMEM_populate_physmap && (reservation.mem_flags & XENMEMF_populate_on_demand) ) args.memflags |= MEMF_populate_on_demand; - d = rcu_lock_domain_by_any_id(reservation.domid); - if ( d == NULL ) - return start_extent; - args.domain = d; - if ( xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d) ) { rcu_unlock_domain(d); diff --git a/xen/include/public/features.h b/xen/include/public/features.h index 16d92aa..2110b04 100644 --- a/xen/include/public/features.h +++ b/xen/include/public/features.h @@ -99,6 +99,9 @@ #define XENFEAT_grant_map_identity 12 */ +/* Guest can use XENMEMF_vnode to specify virtual node for memory op. */ +#define XENFEAT_memory_op_vnode_supported 13 + #define XENFEAT_NR_SUBMAPS 1 #endif /* __XEN_PUBLIC_FEATURES_H__ */ diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index 595f953..2b5206b 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -55,6 +55,8 @@ /* Flag to request allocation only from the node specified */ #define XENMEMF_exact_node_request (1<<17) #define XENMEMF_exact_node(n) (XENMEMF_node(n) | XENMEMF_exact_node_request) +/* Flag to indicate the node specified is virtual node */ +#define XENMEMF_vnode (1<<18) #endif struct xen_memory_reservation { -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:42:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:42: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 1YYfOt-0004Dl-4Y; Thu, 19 Mar 2015 18:42:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOr-0004Cu-6e for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:33 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 44/67-10587-8981B055; Thu, 19 Mar 2015 18:42:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1426790550!11953296!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26052 invoked from network); 19 Mar 2015 18:42:31 -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; 19 Mar 2015 18:42:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOo-0002Wr-L5 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfOo-0000I3-IU for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:30 +0000 Date: Thu, 19 Mar 2015 18:42:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched_rt: implement the .free_pdata hook X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3c1eee047296bfe968ca1b62463d7eae698ed697 Author: Dario Faggioli AuthorDate: Tue Mar 17 15:11:05 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 17 15:11:05 2015 +0100 sched_rt: implement the .free_pdata hook which is called by cpu_schedule_down(), and is necessary for resetting the spinlock pointers in schedule_data from the RTDS global runqueue lock, back to the default _lock fields in the struct. Not doing so causes Xen to explode, e.g., when removing pCPUs from an RTDS cpupool and assigning them to another one. Signed-off-by: Dario Faggioli Reviewed-by: Meng Xu Reviewed-by: George Dunlap --- xen/common/sched_rt.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 2ad0c68..ffc5107 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -444,6 +444,23 @@ rt_alloc_pdata(const struct scheduler *ops, int cpu) return (void *)1; } +static void +rt_free_pdata(const struct scheduler *ops, void *pcpu, int cpu) +{ + struct rt_private *prv = rt_priv(ops); + struct schedule_data *sd = &per_cpu(schedule_data, cpu); + unsigned long flags; + + spin_lock_irqsave(&prv->lock, flags); + + /* Move spinlock back to the default lock */ + ASSERT(sd->schedule_lock == &prv->lock); + ASSERT(!spin_is_locked(&sd->_lock)); + sd->schedule_lock = &sd->_lock; + + spin_unlock_irqrestore(&prv->lock, flags); +} + static void * rt_alloc_domdata(const struct scheduler *ops, struct domain *dom) { @@ -1108,6 +1125,7 @@ const struct scheduler sched_rtds_def = { .init = rt_init, .deinit = rt_deinit, .alloc_pdata = rt_alloc_pdata, + .free_pdata = rt_free_pdata, .alloc_domdata = rt_alloc_domdata, .free_domdata = rt_free_domdata, .init_domain = rt_dom_init, -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:42:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:42: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 1YYfOt-0004Dl-4Y; Thu, 19 Mar 2015 18:42:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOr-0004Cu-6e for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:33 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 44/67-10587-8981B055; Thu, 19 Mar 2015 18:42:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1426790550!11953296!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26052 invoked from network); 19 Mar 2015 18:42:31 -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; 19 Mar 2015 18:42:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOo-0002Wr-L5 for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfOo-0000I3-IU for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:30 +0000 Date: Thu, 19 Mar 2015 18:42:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched_rt: implement the .free_pdata hook X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3c1eee047296bfe968ca1b62463d7eae698ed697 Author: Dario Faggioli AuthorDate: Tue Mar 17 15:11:05 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 17 15:11:05 2015 +0100 sched_rt: implement the .free_pdata hook which is called by cpu_schedule_down(), and is necessary for resetting the spinlock pointers in schedule_data from the RTDS global runqueue lock, back to the default _lock fields in the struct. Not doing so causes Xen to explode, e.g., when removing pCPUs from an RTDS cpupool and assigning them to another one. Signed-off-by: Dario Faggioli Reviewed-by: Meng Xu Reviewed-by: George Dunlap --- xen/common/sched_rt.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 2ad0c68..ffc5107 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -444,6 +444,23 @@ rt_alloc_pdata(const struct scheduler *ops, int cpu) return (void *)1; } +static void +rt_free_pdata(const struct scheduler *ops, void *pcpu, int cpu) +{ + struct rt_private *prv = rt_priv(ops); + struct schedule_data *sd = &per_cpu(schedule_data, cpu); + unsigned long flags; + + spin_lock_irqsave(&prv->lock, flags); + + /* Move spinlock back to the default lock */ + ASSERT(sd->schedule_lock == &prv->lock); + ASSERT(!spin_is_locked(&sd->_lock)); + sd->schedule_lock = &sd->_lock; + + spin_unlock_irqrestore(&prv->lock, flags); +} + static void * rt_alloc_domdata(const struct scheduler *ops, struct domain *dom) { @@ -1108,6 +1125,7 @@ const struct scheduler sched_rtds_def = { .init = rt_init, .deinit = rt_deinit, .alloc_pdata = rt_alloc_pdata, + .free_pdata = rt_free_pdata, .alloc_domdata = rt_alloc_domdata, .free_domdata = rt_free_domdata, .init_domain = rt_dom_init, -- generated by git-patchbot for /home/xen/git/xen.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 Mar 19 18:42:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:42: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 1YYfP3-0004JU-8P; Thu, 19 Mar 2015 18:42:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfP1-0004IE-AB for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:43 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 04/61-01116-2A81B055; Thu, 19 Mar 2015 18:42:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1426790561!8609503!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4594 invoked from network); 19 Mar 2015 18:42:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:42:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOy-0002Wx-Qi for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfOy-0000Id-Ox for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:40 +0000 Date: Thu, 19 Mar 2015 18:42:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] make dumping vcpu info look better X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3a28f760508fb35c430edac17a9efde5aff6d1d5 Author: Dario Faggioli AuthorDate: Tue Mar 17 15:11:33 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 17 15:11:33 2015 +0100 make dumping vcpu info look better and more consistent. In fact, before this changes, it looks like this: (XEN) VCPU information and callbacks for domain 0: (XEN) VCPU0: CPU4 [has=F] poll=0 upcall_pend = 00, upcall_mask = 00 dirty_cpus={4} cpu_affinity={0-15} (XEN) cpu_soft_affinity={0-15} (XEN) pause_count=0 pause_flags=1 (XEN) No periodic timer After, it looks like this: (XEN) VCPU information and callbacks for domain 0: (XEN) VCPU0: CPU4 [has=F] poll=0 upcall_pend=00 upcall_mask=00 dirty_cpus={4} (XEN) cpu_hard_affinity={0-15} cpu_soft_affinity={0-15} (XEN) pause_count=0 pause_flags=1 (XEN) No periodic timer So, consistently _not_ put space between fields and '=', and consistently _not_ use ',' as separator. Also, put the info about affinity on the same, properly indented. Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap Reviewed-by: Meng Xu --- xen/common/keyhandler.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index a917726..5d21e48 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -294,15 +294,15 @@ static void dump_domains(unsigned char key) process_pending_softirqs(); printk(" VCPU%d: CPU%d [has=%c] poll=%d " - "upcall_pend = %02x, upcall_mask = %02x ", + "upcall_pend=%02x upcall_mask=%02x ", v->vcpu_id, v->processor, v->is_running ? 'T':'F', v->poll_evtchn, vcpu_info(v, evtchn_upcall_pending), !vcpu_event_delivery_is_enabled(v)); cpuset_print(tmpstr, sizeof(tmpstr), v->vcpu_dirty_cpumask); - printk("dirty_cpus=%s ", tmpstr); + printk("dirty_cpus=%s\n", tmpstr); cpuset_print(tmpstr, sizeof(tmpstr), v->cpu_hard_affinity); - printk("cpu_affinity=%s\n", tmpstr); + printk(" cpu_hard_affinity=%s ", tmpstr); cpuset_print(tmpstr, sizeof(tmpstr), v->cpu_soft_affinity); printk("cpu_soft_affinity=%s\n", tmpstr); printk(" pause_count=%d pause_flags=%lx\n", -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 19 18:42:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Mar 2015 18:42: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 1YYfP3-0004JU-8P; Thu, 19 Mar 2015 18:42:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfP1-0004IE-AB for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:43 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 04/61-01116-2A81B055; Thu, 19 Mar 2015 18:42:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1426790561!8609503!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4594 invoked from network); 19 Mar 2015 18:42:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Mar 2015 18:42:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYfOy-0002Wx-Qi for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YYfOy-0000Id-Ox for xen-changelog@lists.xensource.com; Thu, 19 Mar 2015 18:42:40 +0000 Date: Thu, 19 Mar 2015 18:42:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] make dumping vcpu info look better X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3a28f760508fb35c430edac17a9efde5aff6d1d5 Author: Dario Faggioli AuthorDate: Tue Mar 17 15:11:33 2015 +0100 Commit: Jan Beulich CommitDate: Tue Mar 17 15:11:33 2015 +0100 make dumping vcpu info look better and more consistent. In fact, before this changes, it looks like this: (XEN) VCPU information and callbacks for domain 0: (XEN) VCPU0: CPU4 [has=F] poll=0 upcall_pend = 00, upcall_mask = 00 dirty_cpus={4} cpu_affinity={0-15} (XEN) cpu_soft_affinity={0-15} (XEN) pause_count=0 pause_flags=1 (XEN) No periodic timer After, it looks like this: (XEN) VCPU information and callbacks for domain 0: (XEN) VCPU0: CPU4 [has=F] poll=0 upcall_pend=00 upcall_mask=00 dirty_cpus={4} (XEN) cpu_hard_affinity={0-15} cpu_soft_affinity={0-15} (XEN) pause_count=0 pause_flags=1 (XEN) No periodic timer So, consistently _not_ put space between fields and '=', and consistently _not_ use ',' as separator. Also, put the info about affinity on the same, properly indented. Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap Reviewed-by: Meng Xu --- xen/common/keyhandler.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index a917726..5d21e48 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -294,15 +294,15 @@ static void dump_domains(unsigned char key) process_pending_softirqs(); printk(" VCPU%d: CPU%d [has=%c] poll=%d " - "upcall_pend = %02x, upcall_mask = %02x ", + "upcall_pend=%02x upcall_mask=%02x ", v->vcpu_id, v->processor, v->is_running ? 'T':'F', v->poll_evtchn, vcpu_info(v, evtchn_upcall_pending), !vcpu_event_delivery_is_enabled(v)); cpuset_print(tmpstr, sizeof(tmpstr), v->vcpu_dirty_cpumask); - printk("dirty_cpus=%s ", tmpstr); + printk("dirty_cpus=%s\n", tmpstr); cpuset_print(tmpstr, sizeof(tmpstr), v->cpu_hard_affinity); - printk("cpu_affinity=%s\n", tmpstr); + printk(" cpu_hard_affinity=%s ", tmpstr); cpuset_print(tmpstr, sizeof(tmpstr), v->cpu_soft_affinity); printk("cpu_soft_affinity=%s\n", tmpstr); printk(" pause_count=%d pause_flags=%lx\n", -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 21 00:55:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Mar 2015 00:55:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YZ7gw-0005VI-Ts; Sat, 21 Mar 2015 00:55:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YZ7gv-0005VC-VL for xen-changelog@lists.xensource.com; Sat, 21 Mar 2015 00:55:06 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 13/A1-19639-961CC055; Sat, 21 Mar 2015 00:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1426899303!14222824!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17038 invoked from network); 21 Mar 2015 00:55:04 -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; 21 Mar 2015 00:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YZ7gt-0005tI-2N for xen-changelog@lists.xensource.com; Sat, 21 Mar 2015 00:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YZ7gs-0007Ug-Us for xen-changelog@lists.xensource.com; Sat, 21 Mar 2015 00:55:03 +0000 Date: Sat, 21 Mar 2015 00:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] update Xen version to 4.4.2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 39f513ba5dd45c80575ab68ea234d94d358736f6 Author: Jan Beulich AuthorDate: Thu Mar 19 16:06:48 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 19 16:06:48 2015 +0100 update Xen version to 4.4.2 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 4918a74..4a73ef9 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-rc1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.2 SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.4.2-rc2 +QEMU_TAG ?= xen-4.4.2 # Mon Feb 2 16:49:59 2015 +0000 # cirrus: fix an uninitialized variable diff --git a/xen/Makefile b/xen/Makefile index 7947de8..c5c40df 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= .2-rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Mar 21 00:55:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Mar 2015 00:55:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YZ7gw-0005VI-Ts; Sat, 21 Mar 2015 00:55:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YZ7gv-0005VC-VL for xen-changelog@lists.xensource.com; Sat, 21 Mar 2015 00:55:06 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 13/A1-19639-961CC055; Sat, 21 Mar 2015 00:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1426899303!14222824!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17038 invoked from network); 21 Mar 2015 00:55:04 -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; 21 Mar 2015 00:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YZ7gt-0005tI-2N for xen-changelog@lists.xensource.com; Sat, 21 Mar 2015 00:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YZ7gs-0007Ug-Us for xen-changelog@lists.xensource.com; Sat, 21 Mar 2015 00:55:03 +0000 Date: Sat, 21 Mar 2015 00:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] update Xen version to 4.4.2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 39f513ba5dd45c80575ab68ea234d94d358736f6 Author: Jan Beulich AuthorDate: Thu Mar 19 16:06:48 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 19 16:06:48 2015 +0100 update Xen version to 4.4.2 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 4918a74..4a73ef9 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-rc1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.2 SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.4.2-rc2 +QEMU_TAG ?= xen-4.4.2 # Mon Feb 2 16:49:59 2015 +0000 # cirrus: fix an uninitialized variable diff --git a/xen/Makefile b/xen/Makefile index 7947de8..c5c40df 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= .2-rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXYO-0006fe-Qo; Tue, 24 Mar 2015 22: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 1YaXYN-0006fZ-Ut for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:08 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id C7/17-31677-7B8E1155; Tue, 24 Mar 2015 22:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1427237045!15176602!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1678 invoked from network); 24 Mar 2015 22: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; 24 Mar 2015 22:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXYJ-00074V-UV for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXYJ-0004Ec-Mq for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:03 +0000 Date: Tue, 24 Mar 2015 22:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen-hvm: increase maxmem before calling xc_domain_populate_physmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 901230fd8ce053cc21312a2eca2f3ba9f1d103f2 Author: Stefano Stabellini AuthorDate: Wed Dec 3 08:15:19 2014 -0500 Commit: Stefano Stabellini CommitDate: Tue Jan 27 13:50:50 2015 +0000 xen-hvm: increase maxmem before calling xc_domain_populate_physmap Increase maxmem before calling xc_domain_populate_physmap_exact to avoid the risk of running out of guest memory. This way we can also avoid complex memory calculations in libxl at domain construction time. This patch fixes an abort() when assigning more than 4 NICs to a VM. upstream-commit-id: c1d322e6048796296555dd36fdd102d7fa2f50bf Signed-off-by: Stefano Stabellini Signed-off-by: Don Slutz --- xen-hvm.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/xen-hvm.c b/xen-hvm.c index 7548794..e2e575b 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -90,6 +90,12 @@ static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu) #endif #define BUFFER_IO_MAX_DELAY 100 +/* Leave some slack so that hvmloader does not complain about lack of + * memory at boot time ("Could not allocate order=0 extent"). + * Once hvmloader is modified to cope with that situation without + * printing warning messages, QEMU_SPARE_PAGES can be removed. + */ +#define QEMU_SPARE_PAGES 16 typedef struct XenPhysmap { hwaddr start_addr; @@ -244,6 +250,8 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr) unsigned long nr_pfn; xen_pfn_t *pfn_list; int i; + xc_domaininfo_t info; + unsigned long free_pages; if (runstate_check(RUN_STATE_INMIGRATE)) { /* RAM already populated in Xen */ @@ -266,6 +274,22 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr) pfn_list[i] = (ram_addr >> TARGET_PAGE_BITS) + i; } + if ((xc_domain_getinfolist(xen_xc, xen_domid, 1, &info) != 1) || + (info.domain != xen_domid)) { + hw_error("xc_domain_getinfolist failed"); + } + free_pages = info.max_pages - info.tot_pages; + if (free_pages > QEMU_SPARE_PAGES) { + free_pages -= QEMU_SPARE_PAGES; + } else { + free_pages = 0; + } + if ((free_pages < nr_pfn) && + (xc_domain_setmaxmem(xen_xc, xen_domid, + ((info.max_pages + nr_pfn - free_pages) + << (XC_PAGE_SHIFT - 10))) < 0)) { + hw_error("xc_domain_setmaxmem failed"); + } if (xc_domain_populate_physmap_exact(xen_xc, xen_domid, nr_pfn, 0, 0, pfn_list)) { hw_error("xen: failed to populate ram at " RAM_ADDR_FMT, ram_addr); } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXYO-0006fe-Qo; Tue, 24 Mar 2015 22: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 1YaXYN-0006fZ-Ut for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:08 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id C7/17-31677-7B8E1155; Tue, 24 Mar 2015 22:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1427237045!15176602!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1678 invoked from network); 24 Mar 2015 22: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; 24 Mar 2015 22:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXYJ-00074V-UV for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXYJ-0004Ec-Mq for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:03 +0000 Date: Tue, 24 Mar 2015 22:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen-hvm: increase maxmem before calling xc_domain_populate_physmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 901230fd8ce053cc21312a2eca2f3ba9f1d103f2 Author: Stefano Stabellini AuthorDate: Wed Dec 3 08:15:19 2014 -0500 Commit: Stefano Stabellini CommitDate: Tue Jan 27 13:50:50 2015 +0000 xen-hvm: increase maxmem before calling xc_domain_populate_physmap Increase maxmem before calling xc_domain_populate_physmap_exact to avoid the risk of running out of guest memory. This way we can also avoid complex memory calculations in libxl at domain construction time. This patch fixes an abort() when assigning more than 4 NICs to a VM. upstream-commit-id: c1d322e6048796296555dd36fdd102d7fa2f50bf Signed-off-by: Stefano Stabellini Signed-off-by: Don Slutz --- xen-hvm.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/xen-hvm.c b/xen-hvm.c index 7548794..e2e575b 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -90,6 +90,12 @@ static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu) #endif #define BUFFER_IO_MAX_DELAY 100 +/* Leave some slack so that hvmloader does not complain about lack of + * memory at boot time ("Could not allocate order=0 extent"). + * Once hvmloader is modified to cope with that situation without + * printing warning messages, QEMU_SPARE_PAGES can be removed. + */ +#define QEMU_SPARE_PAGES 16 typedef struct XenPhysmap { hwaddr start_addr; @@ -244,6 +250,8 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr) unsigned long nr_pfn; xen_pfn_t *pfn_list; int i; + xc_domaininfo_t info; + unsigned long free_pages; if (runstate_check(RUN_STATE_INMIGRATE)) { /* RAM already populated in Xen */ @@ -266,6 +274,22 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr) pfn_list[i] = (ram_addr >> TARGET_PAGE_BITS) + i; } + if ((xc_domain_getinfolist(xen_xc, xen_domid, 1, &info) != 1) || + (info.domain != xen_domid)) { + hw_error("xc_domain_getinfolist failed"); + } + free_pages = info.max_pages - info.tot_pages; + if (free_pages > QEMU_SPARE_PAGES) { + free_pages -= QEMU_SPARE_PAGES; + } else { + free_pages = 0; + } + if ((free_pages < nr_pfn) && + (xc_domain_setmaxmem(xen_xc, xen_domid, + ((info.max_pages + nr_pfn - free_pages) + << (XC_PAGE_SHIFT - 10))) < 0)) { + hw_error("xc_domain_setmaxmem failed"); + } if (xc_domain_populate_physmap_exact(xen_xc, xen_domid, nr_pfn, 0, 0, pfn_list)) { hw_error("xen: failed to populate ram at " RAM_ADDR_FMT, ram_addr); } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:44:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:44:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXYa-0006gW-49; Tue, 24 Mar 2015 22:44:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXYY-0006gJ-Iv for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:18 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 23/B6-29186-1C8E1155; Tue, 24 Mar 2015 22:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1427237055!11385273!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10738 invoked from network); 24 Mar 2015 22:44:16 -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; 24 Mar 2015 22:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXYV-00074Y-Oz for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXYV-0004F5-Eu for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:15 +0000 Date: Tue, 24 Mar 2015 22:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Add device listener interface X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9026dca821a61b72983778e3dcd92cfc34b02e8b Author: Paul Durrant AuthorDate: Tue Jan 20 11:05:07 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jan 27 13:52:19 2015 +0000 Add device listener interface The Xen ioreq-server API, introduced in Xen 4.5, requires that PCI device models explicitly register with Xen for config space accesses. This patch adds a listener interface into qdev-core which can be used by the Xen interface code to monitor for arrival and departure of PCI devices. upstream-commit-id: 707ff80021ccd7a68f4b3d2c44eebf87efbb41c4 Signed-off-by: Paul Durrant Signed-off-by: Stefano Stabellini Reviewed-by: Paolo Bonzini Conflicts: include/qemu/typedefs.h --- hw/core/qdev.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++ include/hw/qdev-core.h | 10 ++++++++ include/qemu/typedefs.h | 1 + 3 files changed, 64 insertions(+), 0 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 35fd00d..76ff9ef 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -189,6 +189,56 @@ int qdev_init(DeviceState *dev) return 0; } +static QTAILQ_HEAD(device_listeners, DeviceListener) device_listeners + = QTAILQ_HEAD_INITIALIZER(device_listeners); + +enum ListenerDirection { Forward, Reverse }; + +#define DEVICE_LISTENER_CALL(_callback, _direction, _args...) \ + do { \ + DeviceListener *_listener; \ + \ + switch (_direction) { \ + case Forward: \ + QTAILQ_FOREACH(_listener, &device_listeners, link) { \ + if (_listener->_callback) { \ + _listener->_callback(_listener, ##_args); \ + } \ + } \ + break; \ + case Reverse: \ + QTAILQ_FOREACH_REVERSE(_listener, &device_listeners, \ + device_listeners, link) { \ + if (_listener->_callback) { \ + _listener->_callback(_listener, ##_args); \ + } \ + } \ + break; \ + default: \ + abort(); \ + } \ + } while (0) + +static int device_listener_add(DeviceState *dev, void *opaque) +{ + DEVICE_LISTENER_CALL(realize, Forward, dev); + + return 0; +} + +void device_listener_register(DeviceListener *listener) +{ + QTAILQ_INSERT_TAIL(&device_listeners, listener, link); + + qbus_walk_children(sysbus_get_default(), NULL, NULL, device_listener_add, + NULL, NULL); +} + +void device_listener_unregister(DeviceListener *listener) +{ + QTAILQ_REMOVE(&device_listeners, listener, link); +} + static void device_realize(DeviceState *dev, Error **errp) { DeviceClass *dc = DEVICE_GET_CLASS(dev); @@ -994,6 +1044,8 @@ static void device_set_realized(Object *obj, bool value, Error **errp) goto fail; } + DEVICE_LISTENER_CALL(realize, Forward, dev); + hotplug_ctrl = qdev_get_hotplug_handler(dev); if (hotplug_ctrl) { hotplug_handler_plug(hotplug_ctrl, dev, &local_err); @@ -1035,6 +1087,7 @@ static void device_set_realized(Object *obj, bool value, Error **errp) dc->unrealize(dev, local_errp); } dev->pending_deleted_event = true; + DEVICE_LISTENER_CALL(unrealize, Reverse, dev); } if (local_err != NULL) { diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 589bbe7..15a226f 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -165,6 +165,12 @@ struct DeviceState { int alias_required_for_version; }; +struct DeviceListener { + void (*realize)(DeviceListener *listener, DeviceState *dev); + void (*unrealize)(DeviceListener *listener, DeviceState *dev); + QTAILQ_ENTRY(DeviceListener) link; +}; + #define TYPE_BUS "bus" #define BUS(obj) OBJECT_CHECK(BusState, (obj), TYPE_BUS) #define BUS_CLASS(klass) OBJECT_CLASS_CHECK(BusClass, (klass), TYPE_BUS) @@ -376,4 +382,8 @@ static inline bool qbus_is_hotpluggable(BusState *bus) { return bus->hotplug_handler; } + +void device_listener_register(DeviceListener *listener); +void device_listener_unregister(DeviceListener *listener); + #endif diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 3475177..cf1c7f5 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -39,6 +39,7 @@ typedef struct AudioState AudioState; typedef struct BlockBackend BlockBackend; typedef struct BlockDriverState BlockDriverState; typedef struct DriveInfo DriveInfo; +typedef struct DeviceListener DeviceListener; typedef struct DisplayState DisplayState; typedef struct DisplayChangeListener DisplayChangeListener; typedef struct DisplaySurface DisplaySurface; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:44:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:44:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXYa-0006gW-49; Tue, 24 Mar 2015 22:44:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXYY-0006gJ-Iv for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:18 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 23/B6-29186-1C8E1155; Tue, 24 Mar 2015 22:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1427237055!11385273!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10738 invoked from network); 24 Mar 2015 22:44:16 -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; 24 Mar 2015 22:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXYV-00074Y-Oz for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXYV-0004F5-Eu for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:15 +0000 Date: Tue, 24 Mar 2015 22:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Add device listener interface X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9026dca821a61b72983778e3dcd92cfc34b02e8b Author: Paul Durrant AuthorDate: Tue Jan 20 11:05:07 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jan 27 13:52:19 2015 +0000 Add device listener interface The Xen ioreq-server API, introduced in Xen 4.5, requires that PCI device models explicitly register with Xen for config space accesses. This patch adds a listener interface into qdev-core which can be used by the Xen interface code to monitor for arrival and departure of PCI devices. upstream-commit-id: 707ff80021ccd7a68f4b3d2c44eebf87efbb41c4 Signed-off-by: Paul Durrant Signed-off-by: Stefano Stabellini Reviewed-by: Paolo Bonzini Conflicts: include/qemu/typedefs.h --- hw/core/qdev.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++ include/hw/qdev-core.h | 10 ++++++++ include/qemu/typedefs.h | 1 + 3 files changed, 64 insertions(+), 0 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 35fd00d..76ff9ef 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -189,6 +189,56 @@ int qdev_init(DeviceState *dev) return 0; } +static QTAILQ_HEAD(device_listeners, DeviceListener) device_listeners + = QTAILQ_HEAD_INITIALIZER(device_listeners); + +enum ListenerDirection { Forward, Reverse }; + +#define DEVICE_LISTENER_CALL(_callback, _direction, _args...) \ + do { \ + DeviceListener *_listener; \ + \ + switch (_direction) { \ + case Forward: \ + QTAILQ_FOREACH(_listener, &device_listeners, link) { \ + if (_listener->_callback) { \ + _listener->_callback(_listener, ##_args); \ + } \ + } \ + break; \ + case Reverse: \ + QTAILQ_FOREACH_REVERSE(_listener, &device_listeners, \ + device_listeners, link) { \ + if (_listener->_callback) { \ + _listener->_callback(_listener, ##_args); \ + } \ + } \ + break; \ + default: \ + abort(); \ + } \ + } while (0) + +static int device_listener_add(DeviceState *dev, void *opaque) +{ + DEVICE_LISTENER_CALL(realize, Forward, dev); + + return 0; +} + +void device_listener_register(DeviceListener *listener) +{ + QTAILQ_INSERT_TAIL(&device_listeners, listener, link); + + qbus_walk_children(sysbus_get_default(), NULL, NULL, device_listener_add, + NULL, NULL); +} + +void device_listener_unregister(DeviceListener *listener) +{ + QTAILQ_REMOVE(&device_listeners, listener, link); +} + static void device_realize(DeviceState *dev, Error **errp) { DeviceClass *dc = DEVICE_GET_CLASS(dev); @@ -994,6 +1044,8 @@ static void device_set_realized(Object *obj, bool value, Error **errp) goto fail; } + DEVICE_LISTENER_CALL(realize, Forward, dev); + hotplug_ctrl = qdev_get_hotplug_handler(dev); if (hotplug_ctrl) { hotplug_handler_plug(hotplug_ctrl, dev, &local_err); @@ -1035,6 +1087,7 @@ static void device_set_realized(Object *obj, bool value, Error **errp) dc->unrealize(dev, local_errp); } dev->pending_deleted_event = true; + DEVICE_LISTENER_CALL(unrealize, Reverse, dev); } if (local_err != NULL) { diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 589bbe7..15a226f 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -165,6 +165,12 @@ struct DeviceState { int alias_required_for_version; }; +struct DeviceListener { + void (*realize)(DeviceListener *listener, DeviceState *dev); + void (*unrealize)(DeviceListener *listener, DeviceState *dev); + QTAILQ_ENTRY(DeviceListener) link; +}; + #define TYPE_BUS "bus" #define BUS(obj) OBJECT_CHECK(BusState, (obj), TYPE_BUS) #define BUS_CLASS(klass) OBJECT_CLASS_CHECK(BusClass, (klass), TYPE_BUS) @@ -376,4 +382,8 @@ static inline bool qbus_is_hotpluggable(BusState *bus) { return bus->hotplug_handler; } + +void device_listener_register(DeviceListener *listener); +void device_listener_unregister(DeviceListener *listener); + #endif diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 3475177..cf1c7f5 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -39,6 +39,7 @@ typedef struct AudioState AudioState; typedef struct BlockBackend BlockBackend; typedef struct BlockDriverState BlockDriverState; typedef struct DriveInfo DriveInfo; +typedef struct DeviceListener DeviceListener; typedef struct DisplayState DisplayState; typedef struct DisplayChangeListener DisplayChangeListener; typedef struct DisplaySurface DisplaySurface; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:44:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXYl-0006ho-8B; Tue, 24 Mar 2015 22:44:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXYj-0006he-Gh for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:29 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id E1/9F-11368-CC8E1155; Tue, 24 Mar 2015 22:44:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1427237066!15223650!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16403 invoked from network); 24 Mar 2015 22:44: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; 24 Mar 2015 22:44:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXYf-00074h-W7 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXYf-0004FS-UY for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:25 +0000 Date: Tue, 24 Mar 2015 22:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Xen: Use the ioreq-server API when available X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7665d6ba98e20fb05c420de947c1750fd47e5c07 Author: Paul Durrant AuthorDate: Tue Jan 20 11:06:19 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jan 27 13:56:38 2015 +0000 Xen: Use the ioreq-server API when available The ioreq-server API added to Xen 4.5 offers better security than the existing Xen/QEMU interface because the shared pages that are used to pass emulation request/results back and forth are removed from the guest's memory space before any requests are serviced. This prevents the guest from mapping these pages (they are in a well known location) and attempting to attack QEMU by synthesizing its own request structures. Hence, this patch modifies configure to detect whether the API is available, and adds the necessary code to use the API if it is. upstream-commit-id: 3996e85c1822e05c50250f8d2d1e57b6bea1229d Signed-off-by: Paul Durrant Signed-off-by: Stefano Stabellini Acked-by: Stefano Stabellini --- configure | 29 ++++++ include/hw/xen/xen_common.h | 223 +++++++++++++++++++++++++++++++++++++++++++ trace-events | 9 ++ xen-hvm.c | 160 ++++++++++++++++++++++++++---- 4 files changed, 399 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 47048f0..b1f8c2a 100755 --- a/configure +++ b/configure @@ -1877,6 +1877,32 @@ int main(void) { xc_gnttab_open(NULL, 0); xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0); xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000); + xc_hvm_create_ioreq_server(xc, 0, 0, NULL); + return 0; +} +EOF + compile_prog "" "$xen_libs" + then + xen_ctrl_version=450 + xen=yes + + elif + cat > $TMPC < +#include +#include +#include +#if !defined(HVM_MAX_VCPUS) +# error HVM_MAX_VCPUS not defined +#endif +int main(void) { + xc_interface *xc; + xs_daemon_open(); + xc = xc_interface_open(0, 0, 0); + xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0); + xc_gnttab_open(NULL, 0); + xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0); + xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000); return 0; } EOF @@ -4283,6 +4309,9 @@ if test -n "$sparc_cpu"; then echo "Target Sparc Arch $sparc_cpu" fi echo "xen support $xen" +if test "$xen" = "yes" ; then + echo "xen ctrl version $xen_ctrl_version" +fi echo "brlapi support $brlapi" echo "bluez support $bluez" echo "Documentation $docs" diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 95612a4..519696f 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -16,7 +16,9 @@ #include "hw/hw.h" #include "hw/xen/xen.h" +#include "hw/pci/pci.h" #include "qemu/queue.h" +#include "trace.h" /* * We don't support Xen prior to 3.3.0. @@ -179,4 +181,225 @@ static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom, } #endif +/* Xen before 4.5 */ +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 450 + +#ifndef HVM_PARAM_BUFIOREQ_EVTCHN +#define HVM_PARAM_BUFIOREQ_EVTCHN 26 +#endif + +#define IOREQ_TYPE_PCI_CONFIG 2 + +typedef uint32_t ioservid_t; + +static inline void xen_map_memory_section(XenXC xc, domid_t dom, + ioservid_t ioservid, + MemoryRegionSection *section) +{ +} + +static inline void xen_unmap_memory_section(XenXC xc, domid_t dom, + ioservid_t ioservid, + MemoryRegionSection *section) +{ +} + +static inline void xen_map_io_section(XenXC xc, domid_t dom, + ioservid_t ioservid, + MemoryRegionSection *section) +{ +} + +static inline void xen_unmap_io_section(XenXC xc, domid_t dom, + ioservid_t ioservid, + MemoryRegionSection *section) +{ +} + +static inline void xen_map_pcidev(XenXC xc, domid_t dom, + ioservid_t ioservid, + PCIDevice *pci_dev) +{ +} + +static inline void xen_unmap_pcidev(XenXC xc, domid_t dom, + ioservid_t ioservid, + PCIDevice *pci_dev) +{ +} + +static inline int xen_create_ioreq_server(XenXC xc, domid_t dom, + ioservid_t *ioservid) +{ + return 0; +} + +static inline void xen_destroy_ioreq_server(XenXC xc, domid_t dom, + ioservid_t ioservid) +{ +} + +static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom, + ioservid_t ioservid, + xen_pfn_t *ioreq_pfn, + xen_pfn_t *bufioreq_pfn, + evtchn_port_t *bufioreq_evtchn) +{ + unsigned long param; + int rc; + + rc = xc_get_hvm_param(xc, dom, HVM_PARAM_IOREQ_PFN, ¶m); + if (rc < 0) { + fprintf(stderr, "failed to get HVM_PARAM_IOREQ_PFN\n"); + return -1; + } + + *ioreq_pfn = param; + + rc = xc_get_hvm_param(xc, dom, HVM_PARAM_BUFIOREQ_PFN, ¶m); + if (rc < 0) { + fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_PFN\n"); + return -1; + } + + *bufioreq_pfn = param; + + rc = xc_get_hvm_param(xc, dom, HVM_PARAM_BUFIOREQ_EVTCHN, + ¶m); + if (rc < 0) { + fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_EVTCHN\n"); + return -1; + } + + *bufioreq_evtchn = param; + + return 0; +} + +static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom, + ioservid_t ioservid, + bool enable) +{ + return 0; +} + +/* Xen 4.5 */ +#else + +static inline void xen_map_memory_section(XenXC xc, domid_t dom, + ioservid_t ioservid, + MemoryRegionSection *section) +{ + hwaddr start_addr = section->offset_within_address_space; + ram_addr_t size = int128_get64(section->size); + hwaddr end_addr = start_addr + size - 1; + + trace_xen_map_mmio_range(ioservid, start_addr, end_addr); + xc_hvm_map_io_range_to_ioreq_server(xc, dom, ioservid, 1, + start_addr, end_addr); +} + +static inline void xen_unmap_memory_section(XenXC xc, domid_t dom, + ioservid_t ioservid, + MemoryRegionSection *section) +{ + hwaddr start_addr = section->offset_within_address_space; + ram_addr_t size = int128_get64(section->size); + hwaddr end_addr = start_addr + size - 1; + + trace_xen_unmap_mmio_range(ioservid, start_addr, end_addr); + xc_hvm_unmap_io_range_from_ioreq_server(xc, dom, ioservid, 1, + start_addr, end_addr); +} + +static inline void xen_map_io_section(XenXC xc, domid_t dom, + ioservid_t ioservid, + MemoryRegionSection *section) +{ + hwaddr start_addr = section->offset_within_address_space; + ram_addr_t size = int128_get64(section->size); + hwaddr end_addr = start_addr + size - 1; + + trace_xen_map_portio_range(ioservid, start_addr, end_addr); + xc_hvm_map_io_range_to_ioreq_server(xc, dom, ioservid, 0, + start_addr, end_addr); +} + +static inline void xen_unmap_io_section(XenXC xc, domid_t dom, + ioservid_t ioservid, + MemoryRegionSection *section) +{ + hwaddr start_addr = section->offset_within_address_space; + ram_addr_t size = int128_get64(section->size); + hwaddr end_addr = start_addr + size - 1; + + trace_xen_unmap_portio_range(ioservid, start_addr, end_addr); + xc_hvm_unmap_io_range_from_ioreq_server(xc, dom, ioservid, 0, + start_addr, end_addr); +} + +static inline void xen_map_pcidev(XenXC xc, domid_t dom, + ioservid_t ioservid, + PCIDevice *pci_dev) +{ + trace_xen_map_pcidev(ioservid, pci_bus_num(pci_dev->bus), + PCI_SLOT(pci_dev->devfn), PCI_FUNC(pci_dev->devfn)); + xc_hvm_map_pcidev_to_ioreq_server(xc, dom, ioservid, + 0, pci_bus_num(pci_dev->bus), + PCI_SLOT(pci_dev->devfn), + PCI_FUNC(pci_dev->devfn)); +} + +static inline void xen_unmap_pcidev(XenXC xc, domid_t dom, + ioservid_t ioservid, + PCIDevice *pci_dev) +{ + trace_xen_unmap_pcidev(ioservid, pci_bus_num(pci_dev->bus), + PCI_SLOT(pci_dev->devfn), PCI_FUNC(pci_dev->devfn)); + xc_hvm_unmap_pcidev_from_ioreq_server(xc, dom, ioservid, + 0, pci_bus_num(pci_dev->bus), + PCI_SLOT(pci_dev->devfn), + PCI_FUNC(pci_dev->devfn)); +} + +static inline int xen_create_ioreq_server(XenXC xc, domid_t dom, + ioservid_t *ioservid) +{ + int rc = xc_hvm_create_ioreq_server(xc, dom, 1, ioservid); + + if (rc == 0) { + trace_xen_ioreq_server_create(*ioservid); + } + + return rc; +} + +static inline void xen_destroy_ioreq_server(XenXC xc, domid_t dom, + ioservid_t ioservid) +{ + trace_xen_ioreq_server_destroy(ioservid); + xc_hvm_destroy_ioreq_server(xc, dom, ioservid); +} + +static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom, + ioservid_t ioservid, + xen_pfn_t *ioreq_pfn, + xen_pfn_t *bufioreq_pfn, + evtchn_port_t *bufioreq_evtchn) +{ + return xc_hvm_get_ioreq_server_info(xc, dom, ioservid, + ioreq_pfn, bufioreq_pfn, + bufioreq_evtchn); +} + +static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom, + ioservid_t ioservid, + bool enable) +{ + trace_xen_ioreq_server_state(ioservid, enable); + return xc_hvm_set_ioreq_server_state(xc, dom, ioservid, enable); +} + +#endif + #endif /* QEMU_HW_XEN_COMMON_H */ diff --git a/trace-events b/trace-events index b5722ea..abd1118 100644 --- a/trace-events +++ b/trace-events @@ -897,6 +897,15 @@ pvscsi_tx_rings_num_pages(const char* label, uint32_t num) "Number of %s pages: # xen-hvm.c xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: %#lx, size %#lx" xen_client_set_memory(uint64_t start_addr, unsigned long size, bool log_dirty) "%#"PRIx64" size %#lx, log_dirty %i" +xen_ioreq_server_create(uint32_t id) "id: %u" +xen_ioreq_server_destroy(uint32_t id) "id: %u" +xen_ioreq_server_state(uint32_t id, bool enable) "id: %u: enable: %i" +xen_map_mmio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64 +xen_unmap_mmio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64 +xen_map_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64 +xen_unmap_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64 +xen_map_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x" +xen_unmap_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x" # xen-mapcache.c xen_map_cache(uint64_t phys_addr) "want %#"PRIx64 diff --git a/xen-hvm.c b/xen-hvm.c index e2e575b..315864c 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -85,9 +85,6 @@ static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu) } # define FMT_ioreq_size "u" #endif -#ifndef HVM_PARAM_BUFIOREQ_EVTCHN -#define HVM_PARAM_BUFIOREQ_EVTCHN 26 -#endif #define BUFFER_IO_MAX_DELAY 100 /* Leave some slack so that hvmloader does not complain about lack of @@ -107,6 +104,7 @@ typedef struct XenPhysmap { } XenPhysmap; typedef struct XenIOState { + ioservid_t ioservid; shared_iopage_t *shared_page; shared_vmport_iopage_t *shared_vmport_page; buffered_iopage_t *buffered_io_page; @@ -123,6 +121,8 @@ typedef struct XenIOState { struct xs_handle *xenstore; MemoryListener memory_listener; + MemoryListener io_listener; + DeviceListener device_listener; QLIST_HEAD(, XenPhysmap) physmap; hwaddr free_phys_offset; const XenPhysmap *log_for_dirtybit; @@ -491,12 +491,23 @@ static void xen_set_memory(struct MemoryListener *listener, bool log_dirty = memory_region_is_logging(section->mr); hvmmem_type_t mem_type; + if (section->mr == &ram_memory) { + return; + } else { + if (add) { + xen_map_memory_section(xen_xc, xen_domid, state->ioservid, + section); + } else { + xen_unmap_memory_section(xen_xc, xen_domid, state->ioservid, + section); + } + } + if (!memory_region_is_ram(section->mr)) { return; } - if (!(section->mr != &ram_memory - && ( (log_dirty && add) || (!log_dirty && !add)))) { + if (log_dirty != add) { return; } @@ -539,6 +550,50 @@ static void xen_region_del(MemoryListener *listener, memory_region_unref(section->mr); } +static void xen_io_add(MemoryListener *listener, + MemoryRegionSection *section) +{ + XenIOState *state = container_of(listener, XenIOState, io_listener); + + memory_region_ref(section->mr); + + xen_map_io_section(xen_xc, xen_domid, state->ioservid, section); +} + +static void xen_io_del(MemoryListener *listener, + MemoryRegionSection *section) +{ + XenIOState *state = container_of(listener, XenIOState, io_listener); + + xen_unmap_io_section(xen_xc, xen_domid, state->ioservid, section); + + memory_region_unref(section->mr); +} + +static void xen_device_realize(DeviceListener *listener, + DeviceState *dev) +{ + XenIOState *state = container_of(listener, XenIOState, device_listener); + + if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) { + PCIDevice *pci_dev = PCI_DEVICE(dev); + + xen_map_pcidev(xen_xc, xen_domid, state->ioservid, pci_dev); + } +} + +static void xen_device_unrealize(DeviceListener *listener, + DeviceState *dev) +{ + XenIOState *state = container_of(listener, XenIOState, device_listener); + + if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) { + PCIDevice *pci_dev = PCI_DEVICE(dev); + + xen_unmap_pcidev(xen_xc, xen_domid, state->ioservid, pci_dev); + } +} + static void xen_sync_dirty_bitmap(XenIOState *state, hwaddr start_addr, ram_addr_t size) @@ -639,6 +694,17 @@ static MemoryListener xen_memory_listener = { .priority = 10, }; +static MemoryListener xen_io_listener = { + .region_add = xen_io_add, + .region_del = xen_io_del, + .priority = 10, +}; + +static DeviceListener xen_device_listener = { + .realize = xen_device_realize, + .unrealize = xen_device_unrealize, +}; + /* get the ioreq packets from share mem */ static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu) { @@ -887,6 +953,27 @@ static void handle_ioreq(XenIOState *state, ioreq_t *req) case IOREQ_TYPE_INVALIDATE: xen_invalidate_map_cache(); break; + case IOREQ_TYPE_PCI_CONFIG: { + uint32_t sbdf = req->addr >> 32; + uint32_t val; + + /* Fake a write to port 0xCF8 so that + * the config space access will target the + * correct device model. + */ + val = (1u << 31) | + ((req->addr & 0x0f00) << 16) | + ((sbdf & 0xffff) << 8) | + (req->addr & 0xfc); + do_outp(0xcf8, 4, val); + + /* Now issue the config space access via + * port 0xCFC + */ + req->addr = 0xcfc | (req->addr & 0x03); + cpu_ioreq_pio(req); + break; + } default: hw_error("Invalid ioreq type 0x%x\n", req->type); } @@ -1017,9 +1104,15 @@ static void xen_main_loop_prepare(XenIOState *state) static void xen_hvm_change_state_handler(void *opaque, int running, RunState rstate) { + XenIOState *state = opaque; + if (running) { - xen_main_loop_prepare((XenIOState *)opaque); + xen_main_loop_prepare(state); } + + xen_set_ioreq_server_state(xen_xc, xen_domid, + state->ioservid, + (rstate == RUN_STATE_RUNNING)); } static void xen_exit_notifier(Notifier *n, void *data) @@ -1088,8 +1181,9 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, MemoryRegion **ram_memory) { int i, rc; - unsigned long ioreq_pfn; - unsigned long bufioreq_evtchn; + xen_pfn_t ioreq_pfn; + xen_pfn_t bufioreq_pfn; + evtchn_port_t bufioreq_evtchn; XenIOState *state; state = g_malloc0(sizeof (XenIOState)); @@ -1106,6 +1200,12 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, return -1; } + rc = xen_create_ioreq_server(xen_xc, xen_domid, &state->ioservid); + if (rc < 0) { + perror("xen: ioreq server create"); + return -1; + } + state->exit.notify = xen_exit_notifier; qemu_add_exit_notifier(&state->exit); @@ -1115,8 +1215,18 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, state->wakeup.notify = xen_wakeup_notifier; qemu_register_wakeup_notifier(&state->wakeup); - xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_IOREQ_PFN, &ioreq_pfn); + rc = xen_get_ioreq_server_info(xen_xc, xen_domid, state->ioservid, + &ioreq_pfn, &bufioreq_pfn, + &bufioreq_evtchn); + if (rc < 0) { + hw_error("failed to get ioreq server info: error %d handle=" XC_INTERFACE_FMT, + errno, xen_xc); + } + DPRINTF("shared page at pfn %lx\n", ioreq_pfn); + DPRINTF("buffered io page at pfn %lx\n", bufioreq_pfn); + DPRINTF("buffered io evtchn is %x\n", bufioreq_evtchn); + state->shared_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE, PROT_READ|PROT_WRITE, ioreq_pfn); if (state->shared_page == NULL) { @@ -1138,10 +1248,10 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, hw_error("get vmport regs pfn returned error %d, rc=%d", errno, rc); } - xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_BUFIOREQ_PFN, &ioreq_pfn); - DPRINTF("buffered io page at pfn %lx\n", ioreq_pfn); - state->buffered_io_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE, - PROT_READ|PROT_WRITE, ioreq_pfn); + state->buffered_io_page = xc_map_foreign_range(xen_xc, xen_domid, + XC_PAGE_SIZE, + PROT_READ|PROT_WRITE, + bufioreq_pfn); if (state->buffered_io_page == NULL) { hw_error("map buffered IO page returned error %d", errno); } @@ -1149,6 +1259,12 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, /* Note: cpus is empty at this point in init */ state->cpu_by_vcpu_id = g_malloc0(max_cpus * sizeof(CPUState *)); + rc = xen_set_ioreq_server_state(xen_xc, xen_domid, state->ioservid, true); + if (rc < 0) { + hw_error("failed to enable ioreq server info: error %d handle=" XC_INTERFACE_FMT, + errno, xen_xc); + } + state->ioreq_local_port = g_malloc0(max_cpus * sizeof (evtchn_port_t)); /* FIXME: how about if we overflow the page here? */ @@ -1156,22 +1272,16 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid, xen_vcpu_eport(state->shared_page, i)); if (rc == -1) { - fprintf(stderr, "bind interdomain ioctl error %d\n", errno); + fprintf(stderr, "shared evtchn %d bind error %d\n", i, errno); return -1; } state->ioreq_local_port[i] = rc; } - rc = xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_BUFIOREQ_EVTCHN, - &bufioreq_evtchn); - if (rc < 0) { - fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_EVTCHN\n"); - return -1; - } rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid, - (uint32_t)bufioreq_evtchn); + bufioreq_evtchn); if (rc == -1) { - fprintf(stderr, "bind interdomain ioctl error %d\n", errno); + fprintf(stderr, "buffered evtchn bind error %d\n", errno); return -1; } state->bufioreq_local_port = rc; @@ -1187,6 +1297,12 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, memory_listener_register(&state->memory_listener, &address_space_memory); state->log_for_dirtybit = NULL; + state->io_listener = xen_io_listener; + memory_listener_register(&state->io_listener, &address_space_io); + + state->device_listener = xen_device_listener; + device_listener_register(&state->device_listener); + /* Initialize backend core & drivers */ if (xen_be_init() != 0) { fprintf(stderr, "%s: xen backend core setup failed\n", __FUNCTION__); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:44:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXYl-0006ho-8B; Tue, 24 Mar 2015 22:44:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXYj-0006he-Gh for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:29 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id E1/9F-11368-CC8E1155; Tue, 24 Mar 2015 22:44:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1427237066!15223650!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16403 invoked from network); 24 Mar 2015 22:44: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; 24 Mar 2015 22:44:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXYf-00074h-W7 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXYf-0004FS-UY for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:25 +0000 Date: Tue, 24 Mar 2015 22:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Xen: Use the ioreq-server API when available X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7665d6ba98e20fb05c420de947c1750fd47e5c07 Author: Paul Durrant AuthorDate: Tue Jan 20 11:06:19 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jan 27 13:56:38 2015 +0000 Xen: Use the ioreq-server API when available The ioreq-server API added to Xen 4.5 offers better security than the existing Xen/QEMU interface because the shared pages that are used to pass emulation request/results back and forth are removed from the guest's memory space before any requests are serviced. This prevents the guest from mapping these pages (they are in a well known location) and attempting to attack QEMU by synthesizing its own request structures. Hence, this patch modifies configure to detect whether the API is available, and adds the necessary code to use the API if it is. upstream-commit-id: 3996e85c1822e05c50250f8d2d1e57b6bea1229d Signed-off-by: Paul Durrant Signed-off-by: Stefano Stabellini Acked-by: Stefano Stabellini --- configure | 29 ++++++ include/hw/xen/xen_common.h | 223 +++++++++++++++++++++++++++++++++++++++++++ trace-events | 9 ++ xen-hvm.c | 160 ++++++++++++++++++++++++++---- 4 files changed, 399 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 47048f0..b1f8c2a 100755 --- a/configure +++ b/configure @@ -1877,6 +1877,32 @@ int main(void) { xc_gnttab_open(NULL, 0); xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0); xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000); + xc_hvm_create_ioreq_server(xc, 0, 0, NULL); + return 0; +} +EOF + compile_prog "" "$xen_libs" + then + xen_ctrl_version=450 + xen=yes + + elif + cat > $TMPC < +#include +#include +#include +#if !defined(HVM_MAX_VCPUS) +# error HVM_MAX_VCPUS not defined +#endif +int main(void) { + xc_interface *xc; + xs_daemon_open(); + xc = xc_interface_open(0, 0, 0); + xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0); + xc_gnttab_open(NULL, 0); + xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0); + xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000); return 0; } EOF @@ -4283,6 +4309,9 @@ if test -n "$sparc_cpu"; then echo "Target Sparc Arch $sparc_cpu" fi echo "xen support $xen" +if test "$xen" = "yes" ; then + echo "xen ctrl version $xen_ctrl_version" +fi echo "brlapi support $brlapi" echo "bluez support $bluez" echo "Documentation $docs" diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 95612a4..519696f 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -16,7 +16,9 @@ #include "hw/hw.h" #include "hw/xen/xen.h" +#include "hw/pci/pci.h" #include "qemu/queue.h" +#include "trace.h" /* * We don't support Xen prior to 3.3.0. @@ -179,4 +181,225 @@ static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom, } #endif +/* Xen before 4.5 */ +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 450 + +#ifndef HVM_PARAM_BUFIOREQ_EVTCHN +#define HVM_PARAM_BUFIOREQ_EVTCHN 26 +#endif + +#define IOREQ_TYPE_PCI_CONFIG 2 + +typedef uint32_t ioservid_t; + +static inline void xen_map_memory_section(XenXC xc, domid_t dom, + ioservid_t ioservid, + MemoryRegionSection *section) +{ +} + +static inline void xen_unmap_memory_section(XenXC xc, domid_t dom, + ioservid_t ioservid, + MemoryRegionSection *section) +{ +} + +static inline void xen_map_io_section(XenXC xc, domid_t dom, + ioservid_t ioservid, + MemoryRegionSection *section) +{ +} + +static inline void xen_unmap_io_section(XenXC xc, domid_t dom, + ioservid_t ioservid, + MemoryRegionSection *section) +{ +} + +static inline void xen_map_pcidev(XenXC xc, domid_t dom, + ioservid_t ioservid, + PCIDevice *pci_dev) +{ +} + +static inline void xen_unmap_pcidev(XenXC xc, domid_t dom, + ioservid_t ioservid, + PCIDevice *pci_dev) +{ +} + +static inline int xen_create_ioreq_server(XenXC xc, domid_t dom, + ioservid_t *ioservid) +{ + return 0; +} + +static inline void xen_destroy_ioreq_server(XenXC xc, domid_t dom, + ioservid_t ioservid) +{ +} + +static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom, + ioservid_t ioservid, + xen_pfn_t *ioreq_pfn, + xen_pfn_t *bufioreq_pfn, + evtchn_port_t *bufioreq_evtchn) +{ + unsigned long param; + int rc; + + rc = xc_get_hvm_param(xc, dom, HVM_PARAM_IOREQ_PFN, ¶m); + if (rc < 0) { + fprintf(stderr, "failed to get HVM_PARAM_IOREQ_PFN\n"); + return -1; + } + + *ioreq_pfn = param; + + rc = xc_get_hvm_param(xc, dom, HVM_PARAM_BUFIOREQ_PFN, ¶m); + if (rc < 0) { + fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_PFN\n"); + return -1; + } + + *bufioreq_pfn = param; + + rc = xc_get_hvm_param(xc, dom, HVM_PARAM_BUFIOREQ_EVTCHN, + ¶m); + if (rc < 0) { + fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_EVTCHN\n"); + return -1; + } + + *bufioreq_evtchn = param; + + return 0; +} + +static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom, + ioservid_t ioservid, + bool enable) +{ + return 0; +} + +/* Xen 4.5 */ +#else + +static inline void xen_map_memory_section(XenXC xc, domid_t dom, + ioservid_t ioservid, + MemoryRegionSection *section) +{ + hwaddr start_addr = section->offset_within_address_space; + ram_addr_t size = int128_get64(section->size); + hwaddr end_addr = start_addr + size - 1; + + trace_xen_map_mmio_range(ioservid, start_addr, end_addr); + xc_hvm_map_io_range_to_ioreq_server(xc, dom, ioservid, 1, + start_addr, end_addr); +} + +static inline void xen_unmap_memory_section(XenXC xc, domid_t dom, + ioservid_t ioservid, + MemoryRegionSection *section) +{ + hwaddr start_addr = section->offset_within_address_space; + ram_addr_t size = int128_get64(section->size); + hwaddr end_addr = start_addr + size - 1; + + trace_xen_unmap_mmio_range(ioservid, start_addr, end_addr); + xc_hvm_unmap_io_range_from_ioreq_server(xc, dom, ioservid, 1, + start_addr, end_addr); +} + +static inline void xen_map_io_section(XenXC xc, domid_t dom, + ioservid_t ioservid, + MemoryRegionSection *section) +{ + hwaddr start_addr = section->offset_within_address_space; + ram_addr_t size = int128_get64(section->size); + hwaddr end_addr = start_addr + size - 1; + + trace_xen_map_portio_range(ioservid, start_addr, end_addr); + xc_hvm_map_io_range_to_ioreq_server(xc, dom, ioservid, 0, + start_addr, end_addr); +} + +static inline void xen_unmap_io_section(XenXC xc, domid_t dom, + ioservid_t ioservid, + MemoryRegionSection *section) +{ + hwaddr start_addr = section->offset_within_address_space; + ram_addr_t size = int128_get64(section->size); + hwaddr end_addr = start_addr + size - 1; + + trace_xen_unmap_portio_range(ioservid, start_addr, end_addr); + xc_hvm_unmap_io_range_from_ioreq_server(xc, dom, ioservid, 0, + start_addr, end_addr); +} + +static inline void xen_map_pcidev(XenXC xc, domid_t dom, + ioservid_t ioservid, + PCIDevice *pci_dev) +{ + trace_xen_map_pcidev(ioservid, pci_bus_num(pci_dev->bus), + PCI_SLOT(pci_dev->devfn), PCI_FUNC(pci_dev->devfn)); + xc_hvm_map_pcidev_to_ioreq_server(xc, dom, ioservid, + 0, pci_bus_num(pci_dev->bus), + PCI_SLOT(pci_dev->devfn), + PCI_FUNC(pci_dev->devfn)); +} + +static inline void xen_unmap_pcidev(XenXC xc, domid_t dom, + ioservid_t ioservid, + PCIDevice *pci_dev) +{ + trace_xen_unmap_pcidev(ioservid, pci_bus_num(pci_dev->bus), + PCI_SLOT(pci_dev->devfn), PCI_FUNC(pci_dev->devfn)); + xc_hvm_unmap_pcidev_from_ioreq_server(xc, dom, ioservid, + 0, pci_bus_num(pci_dev->bus), + PCI_SLOT(pci_dev->devfn), + PCI_FUNC(pci_dev->devfn)); +} + +static inline int xen_create_ioreq_server(XenXC xc, domid_t dom, + ioservid_t *ioservid) +{ + int rc = xc_hvm_create_ioreq_server(xc, dom, 1, ioservid); + + if (rc == 0) { + trace_xen_ioreq_server_create(*ioservid); + } + + return rc; +} + +static inline void xen_destroy_ioreq_server(XenXC xc, domid_t dom, + ioservid_t ioservid) +{ + trace_xen_ioreq_server_destroy(ioservid); + xc_hvm_destroy_ioreq_server(xc, dom, ioservid); +} + +static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom, + ioservid_t ioservid, + xen_pfn_t *ioreq_pfn, + xen_pfn_t *bufioreq_pfn, + evtchn_port_t *bufioreq_evtchn) +{ + return xc_hvm_get_ioreq_server_info(xc, dom, ioservid, + ioreq_pfn, bufioreq_pfn, + bufioreq_evtchn); +} + +static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom, + ioservid_t ioservid, + bool enable) +{ + trace_xen_ioreq_server_state(ioservid, enable); + return xc_hvm_set_ioreq_server_state(xc, dom, ioservid, enable); +} + +#endif + #endif /* QEMU_HW_XEN_COMMON_H */ diff --git a/trace-events b/trace-events index b5722ea..abd1118 100644 --- a/trace-events +++ b/trace-events @@ -897,6 +897,15 @@ pvscsi_tx_rings_num_pages(const char* label, uint32_t num) "Number of %s pages: # xen-hvm.c xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: %#lx, size %#lx" xen_client_set_memory(uint64_t start_addr, unsigned long size, bool log_dirty) "%#"PRIx64" size %#lx, log_dirty %i" +xen_ioreq_server_create(uint32_t id) "id: %u" +xen_ioreq_server_destroy(uint32_t id) "id: %u" +xen_ioreq_server_state(uint32_t id, bool enable) "id: %u: enable: %i" +xen_map_mmio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64 +xen_unmap_mmio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64 +xen_map_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64 +xen_unmap_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64 +xen_map_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x" +xen_unmap_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x" # xen-mapcache.c xen_map_cache(uint64_t phys_addr) "want %#"PRIx64 diff --git a/xen-hvm.c b/xen-hvm.c index e2e575b..315864c 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -85,9 +85,6 @@ static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu) } # define FMT_ioreq_size "u" #endif -#ifndef HVM_PARAM_BUFIOREQ_EVTCHN -#define HVM_PARAM_BUFIOREQ_EVTCHN 26 -#endif #define BUFFER_IO_MAX_DELAY 100 /* Leave some slack so that hvmloader does not complain about lack of @@ -107,6 +104,7 @@ typedef struct XenPhysmap { } XenPhysmap; typedef struct XenIOState { + ioservid_t ioservid; shared_iopage_t *shared_page; shared_vmport_iopage_t *shared_vmport_page; buffered_iopage_t *buffered_io_page; @@ -123,6 +121,8 @@ typedef struct XenIOState { struct xs_handle *xenstore; MemoryListener memory_listener; + MemoryListener io_listener; + DeviceListener device_listener; QLIST_HEAD(, XenPhysmap) physmap; hwaddr free_phys_offset; const XenPhysmap *log_for_dirtybit; @@ -491,12 +491,23 @@ static void xen_set_memory(struct MemoryListener *listener, bool log_dirty = memory_region_is_logging(section->mr); hvmmem_type_t mem_type; + if (section->mr == &ram_memory) { + return; + } else { + if (add) { + xen_map_memory_section(xen_xc, xen_domid, state->ioservid, + section); + } else { + xen_unmap_memory_section(xen_xc, xen_domid, state->ioservid, + section); + } + } + if (!memory_region_is_ram(section->mr)) { return; } - if (!(section->mr != &ram_memory - && ( (log_dirty && add) || (!log_dirty && !add)))) { + if (log_dirty != add) { return; } @@ -539,6 +550,50 @@ static void xen_region_del(MemoryListener *listener, memory_region_unref(section->mr); } +static void xen_io_add(MemoryListener *listener, + MemoryRegionSection *section) +{ + XenIOState *state = container_of(listener, XenIOState, io_listener); + + memory_region_ref(section->mr); + + xen_map_io_section(xen_xc, xen_domid, state->ioservid, section); +} + +static void xen_io_del(MemoryListener *listener, + MemoryRegionSection *section) +{ + XenIOState *state = container_of(listener, XenIOState, io_listener); + + xen_unmap_io_section(xen_xc, xen_domid, state->ioservid, section); + + memory_region_unref(section->mr); +} + +static void xen_device_realize(DeviceListener *listener, + DeviceState *dev) +{ + XenIOState *state = container_of(listener, XenIOState, device_listener); + + if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) { + PCIDevice *pci_dev = PCI_DEVICE(dev); + + xen_map_pcidev(xen_xc, xen_domid, state->ioservid, pci_dev); + } +} + +static void xen_device_unrealize(DeviceListener *listener, + DeviceState *dev) +{ + XenIOState *state = container_of(listener, XenIOState, device_listener); + + if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) { + PCIDevice *pci_dev = PCI_DEVICE(dev); + + xen_unmap_pcidev(xen_xc, xen_domid, state->ioservid, pci_dev); + } +} + static void xen_sync_dirty_bitmap(XenIOState *state, hwaddr start_addr, ram_addr_t size) @@ -639,6 +694,17 @@ static MemoryListener xen_memory_listener = { .priority = 10, }; +static MemoryListener xen_io_listener = { + .region_add = xen_io_add, + .region_del = xen_io_del, + .priority = 10, +}; + +static DeviceListener xen_device_listener = { + .realize = xen_device_realize, + .unrealize = xen_device_unrealize, +}; + /* get the ioreq packets from share mem */ static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu) { @@ -887,6 +953,27 @@ static void handle_ioreq(XenIOState *state, ioreq_t *req) case IOREQ_TYPE_INVALIDATE: xen_invalidate_map_cache(); break; + case IOREQ_TYPE_PCI_CONFIG: { + uint32_t sbdf = req->addr >> 32; + uint32_t val; + + /* Fake a write to port 0xCF8 so that + * the config space access will target the + * correct device model. + */ + val = (1u << 31) | + ((req->addr & 0x0f00) << 16) | + ((sbdf & 0xffff) << 8) | + (req->addr & 0xfc); + do_outp(0xcf8, 4, val); + + /* Now issue the config space access via + * port 0xCFC + */ + req->addr = 0xcfc | (req->addr & 0x03); + cpu_ioreq_pio(req); + break; + } default: hw_error("Invalid ioreq type 0x%x\n", req->type); } @@ -1017,9 +1104,15 @@ static void xen_main_loop_prepare(XenIOState *state) static void xen_hvm_change_state_handler(void *opaque, int running, RunState rstate) { + XenIOState *state = opaque; + if (running) { - xen_main_loop_prepare((XenIOState *)opaque); + xen_main_loop_prepare(state); } + + xen_set_ioreq_server_state(xen_xc, xen_domid, + state->ioservid, + (rstate == RUN_STATE_RUNNING)); } static void xen_exit_notifier(Notifier *n, void *data) @@ -1088,8 +1181,9 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, MemoryRegion **ram_memory) { int i, rc; - unsigned long ioreq_pfn; - unsigned long bufioreq_evtchn; + xen_pfn_t ioreq_pfn; + xen_pfn_t bufioreq_pfn; + evtchn_port_t bufioreq_evtchn; XenIOState *state; state = g_malloc0(sizeof (XenIOState)); @@ -1106,6 +1200,12 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, return -1; } + rc = xen_create_ioreq_server(xen_xc, xen_domid, &state->ioservid); + if (rc < 0) { + perror("xen: ioreq server create"); + return -1; + } + state->exit.notify = xen_exit_notifier; qemu_add_exit_notifier(&state->exit); @@ -1115,8 +1215,18 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, state->wakeup.notify = xen_wakeup_notifier; qemu_register_wakeup_notifier(&state->wakeup); - xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_IOREQ_PFN, &ioreq_pfn); + rc = xen_get_ioreq_server_info(xen_xc, xen_domid, state->ioservid, + &ioreq_pfn, &bufioreq_pfn, + &bufioreq_evtchn); + if (rc < 0) { + hw_error("failed to get ioreq server info: error %d handle=" XC_INTERFACE_FMT, + errno, xen_xc); + } + DPRINTF("shared page at pfn %lx\n", ioreq_pfn); + DPRINTF("buffered io page at pfn %lx\n", bufioreq_pfn); + DPRINTF("buffered io evtchn is %x\n", bufioreq_evtchn); + state->shared_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE, PROT_READ|PROT_WRITE, ioreq_pfn); if (state->shared_page == NULL) { @@ -1138,10 +1248,10 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, hw_error("get vmport regs pfn returned error %d, rc=%d", errno, rc); } - xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_BUFIOREQ_PFN, &ioreq_pfn); - DPRINTF("buffered io page at pfn %lx\n", ioreq_pfn); - state->buffered_io_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE, - PROT_READ|PROT_WRITE, ioreq_pfn); + state->buffered_io_page = xc_map_foreign_range(xen_xc, xen_domid, + XC_PAGE_SIZE, + PROT_READ|PROT_WRITE, + bufioreq_pfn); if (state->buffered_io_page == NULL) { hw_error("map buffered IO page returned error %d", errno); } @@ -1149,6 +1259,12 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, /* Note: cpus is empty at this point in init */ state->cpu_by_vcpu_id = g_malloc0(max_cpus * sizeof(CPUState *)); + rc = xen_set_ioreq_server_state(xen_xc, xen_domid, state->ioservid, true); + if (rc < 0) { + hw_error("failed to enable ioreq server info: error %d handle=" XC_INTERFACE_FMT, + errno, xen_xc); + } + state->ioreq_local_port = g_malloc0(max_cpus * sizeof (evtchn_port_t)); /* FIXME: how about if we overflow the page here? */ @@ -1156,22 +1272,16 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid, xen_vcpu_eport(state->shared_page, i)); if (rc == -1) { - fprintf(stderr, "bind interdomain ioctl error %d\n", errno); + fprintf(stderr, "shared evtchn %d bind error %d\n", i, errno); return -1; } state->ioreq_local_port[i] = rc; } - rc = xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_BUFIOREQ_EVTCHN, - &bufioreq_evtchn); - if (rc < 0) { - fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_EVTCHN\n"); - return -1; - } rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid, - (uint32_t)bufioreq_evtchn); + bufioreq_evtchn); if (rc == -1) { - fprintf(stderr, "bind interdomain ioctl error %d\n", errno); + fprintf(stderr, "buffered evtchn bind error %d\n", errno); return -1; } state->bufioreq_local_port = rc; @@ -1187,6 +1297,12 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, memory_listener_register(&state->memory_listener, &address_space_memory); state->log_for_dirtybit = NULL; + state->io_listener = xen_io_listener; + memory_listener_register(&state->io_listener, &address_space_io); + + state->device_listener = xen_device_listener; + device_listener_register(&state->device_listener); + /* Initialize backend core & drivers */ if (xen_be_init() != 0) { fprintf(stderr, "%s: xen backend core setup failed\n", __FUNCTION__); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:44:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXYu-0006jR-N0; Tue, 24 Mar 2015 22:44:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXYt-0006jC-7f for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:39 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id E3/15-25011-6D8E1155; Tue, 24 Mar 2015 22:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1427237076!5935449!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19034 invoked from network); 24 Mar 2015 22:44: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; 24 Mar 2015 22:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXYq-00074s-88 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXYq-0004GO-3N for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:36 +0000 Date: Tue, 24 Mar 2015 22:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] fix QEMU build on Xen/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 be11dc1e9172f91e798a8f831b30c14b479e08e8 Author: Stefano Stabellini AuthorDate: Fri Jan 23 12:09:47 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jan 27 13:57:04 2015 +0000 fix QEMU build on Xen/ARM xen_get_vmport_regs_pfn should take a xen_pfn_t argument, not an unsigned long argument (in fact xen_pfn_t is defined as uint64_t on ARM). Also use xc_hvm_param_get instead of the deprecated xc_get_hvm_param. upstream-commit-id: d01a5a3fe19645f3cdea1566f0e518ea2152a029 Signed-off-by: Stefano Stabellini Reviewed-by: Don Slutz --- include/hw/xen/xen_common.h | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 519696f..38f29fb 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -168,14 +168,19 @@ void xen_shutdown_fatal_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); #ifdef HVM_PARAM_VMPORT_REGS_PFN static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom, - unsigned long *vmport_regs_pfn) + xen_pfn_t *vmport_regs_pfn) { - return xc_get_hvm_param(xc, dom, HVM_PARAM_VMPORT_REGS_PFN, - vmport_regs_pfn); + int rc; + uint64_t value; + rc = xc_hvm_param_get(xc, dom, HVM_PARAM_VMPORT_REGS_PFN, &value); + if (rc >= 0) { + *vmport_regs_pfn = (xen_pfn_t) value; + } + return rc; } #else static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom, - unsigned long *vmport_regs_pfn) + xen_pfn_t *vmport_regs_pfn) { return -ENOSYS; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:44:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXYu-0006jR-N0; Tue, 24 Mar 2015 22:44:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXYt-0006jC-7f for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:39 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id E3/15-25011-6D8E1155; Tue, 24 Mar 2015 22:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1427237076!5935449!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19034 invoked from network); 24 Mar 2015 22:44: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; 24 Mar 2015 22:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXYq-00074s-88 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXYq-0004GO-3N for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:36 +0000 Date: Tue, 24 Mar 2015 22:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] fix QEMU build on Xen/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 be11dc1e9172f91e798a8f831b30c14b479e08e8 Author: Stefano Stabellini AuthorDate: Fri Jan 23 12:09:47 2015 +0000 Commit: Stefano Stabellini CommitDate: Tue Jan 27 13:57:04 2015 +0000 fix QEMU build on Xen/ARM xen_get_vmport_regs_pfn should take a xen_pfn_t argument, not an unsigned long argument (in fact xen_pfn_t is defined as uint64_t on ARM). Also use xc_hvm_param_get instead of the deprecated xc_get_hvm_param. upstream-commit-id: d01a5a3fe19645f3cdea1566f0e518ea2152a029 Signed-off-by: Stefano Stabellini Reviewed-by: Don Slutz --- include/hw/xen/xen_common.h | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 519696f..38f29fb 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -168,14 +168,19 @@ void xen_shutdown_fatal_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); #ifdef HVM_PARAM_VMPORT_REGS_PFN static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom, - unsigned long *vmport_regs_pfn) + xen_pfn_t *vmport_regs_pfn) { - return xc_get_hvm_param(xc, dom, HVM_PARAM_VMPORT_REGS_PFN, - vmport_regs_pfn); + int rc; + uint64_t value; + rc = xc_hvm_param_get(xc, dom, HVM_PARAM_VMPORT_REGS_PFN, &value); + if (rc >= 0) { + *vmport_regs_pfn = (xen_pfn_t) value; + } + return rc; } #else static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom, - unsigned long *vmport_regs_pfn) + xen_pfn_t *vmport_regs_pfn) { return -ENOSYS; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:44:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:44: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 1YaXZ7-0006lG-T3; Tue, 24 Mar 2015 22:44:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZ5-0006kv-JQ for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:51 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 2A/BF-11368-2E8E1155; Tue, 24 Mar 2015 22:44:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1427237088!15075421!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18552 invoked from network); 24 Mar 2015 22:44:49 -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; 24 Mar 2015 22:44:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZ2-00074y-Gv for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXZ2-0004N6-96 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:48 +0000 Date: Tue, 24 Mar 2015 22:44:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block: Make essential BlockDriver objects public X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7e213f853551c6d528af9f7bddb3ab1b7b03903f Author: Max Reitz AuthorDate: Tue Dec 2 18:32:41 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:03:18 2015 -0600 block: Make essential BlockDriver objects public There are some block drivers which are essential to QEMU and may not be removed: These are raw, file and qcow2 (as the default non-raw format). Make their BlockDriver objects public so they can be directly referenced throughout the block layer without needing to call bdrv_find_format() and having to deal with an error at runtime, while the real problem occurred during linking (where raw, file or qcow2 were not linked into qemu). Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Signed-off-by: Kevin Wolf (cherry picked from commit 5f535a941e52229d81e55603eb69b2bd449b937a) Signed-off-by: Michael Roth --- block/qcow2.c | 2 +- block/raw-posix.c | 2 +- block/raw-win32.c | 2 +- block/raw_bsd.c | 2 +- include/block/block_int.h | 8 ++++++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index d120494..48aca2a 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2847,7 +2847,7 @@ static QemuOptsList qcow2_create_opts = { } }; -static BlockDriver bdrv_qcow2 = { +BlockDriver bdrv_qcow2 = { .format_name = "qcow2", .instance_size = sizeof(BDRVQcowState), .bdrv_probe = qcow2_probe, diff --git a/block/raw-posix.c b/block/raw-posix.c index b1af77e..d8bbed0 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1684,7 +1684,7 @@ static QemuOptsList raw_create_opts = { } }; -static BlockDriver bdrv_file = { +BlockDriver bdrv_file = { .format_name = "file", .protocol_name = "file", .instance_size = sizeof(BDRVRawState), diff --git a/block/raw-win32.c b/block/raw-win32.c index 7b58881..06243d7 100644 --- a/block/raw-win32.c +++ b/block/raw-win32.c @@ -540,7 +540,7 @@ static QemuOptsList raw_create_opts = { } }; -static BlockDriver bdrv_file = { +BlockDriver bdrv_file = { .format_name = "file", .protocol_name = "file", .instance_size = sizeof(BDRVRawState), diff --git a/block/raw_bsd.c b/block/raw_bsd.c index 401b967..ea2b864 100644 --- a/block/raw_bsd.c +++ b/block/raw_bsd.c @@ -173,7 +173,7 @@ static int raw_probe(const uint8_t *buf, int buf_size, const char *filename) return 1; } -static BlockDriver bdrv_raw = { +BlockDriver bdrv_raw = { .format_name = "raw", .bdrv_probe = &raw_probe, .bdrv_reopen_prepare = &raw_reopen_prepare, diff --git a/include/block/block_int.h b/include/block/block_int.h index a1c17b9..2ae82c5 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -411,6 +411,14 @@ struct BlockDriverState { Error *backing_blocker; }; + +/* Essential block drivers which must always be statically linked into qemu, and + * which therefore can be accessed without using bdrv_find_format() */ +extern BlockDriver bdrv_file; +extern BlockDriver bdrv_raw; +extern BlockDriver bdrv_qcow2; + + int get_tmp_filename(char *filename, int size); void bdrv_set_io_limits(BlockDriverState *bs, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:44:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:44: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 1YaXZ7-0006lG-T3; Tue, 24 Mar 2015 22:44:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZ5-0006kv-JQ for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:51 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 2A/BF-11368-2E8E1155; Tue, 24 Mar 2015 22:44:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1427237088!15075421!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18552 invoked from network); 24 Mar 2015 22:44:49 -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; 24 Mar 2015 22:44:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZ2-00074y-Gv for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXZ2-0004N6-96 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:48 +0000 Date: Tue, 24 Mar 2015 22:44:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block: Make essential BlockDriver objects public X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7e213f853551c6d528af9f7bddb3ab1b7b03903f Author: Max Reitz AuthorDate: Tue Dec 2 18:32:41 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:03:18 2015 -0600 block: Make essential BlockDriver objects public There are some block drivers which are essential to QEMU and may not be removed: These are raw, file and qcow2 (as the default non-raw format). Make their BlockDriver objects public so they can be directly referenced throughout the block layer without needing to call bdrv_find_format() and having to deal with an error at runtime, while the real problem occurred during linking (where raw, file or qcow2 were not linked into qemu). Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Signed-off-by: Kevin Wolf (cherry picked from commit 5f535a941e52229d81e55603eb69b2bd449b937a) Signed-off-by: Michael Roth --- block/qcow2.c | 2 +- block/raw-posix.c | 2 +- block/raw-win32.c | 2 +- block/raw_bsd.c | 2 +- include/block/block_int.h | 8 ++++++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index d120494..48aca2a 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2847,7 +2847,7 @@ static QemuOptsList qcow2_create_opts = { } }; -static BlockDriver bdrv_qcow2 = { +BlockDriver bdrv_qcow2 = { .format_name = "qcow2", .instance_size = sizeof(BDRVQcowState), .bdrv_probe = qcow2_probe, diff --git a/block/raw-posix.c b/block/raw-posix.c index b1af77e..d8bbed0 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1684,7 +1684,7 @@ static QemuOptsList raw_create_opts = { } }; -static BlockDriver bdrv_file = { +BlockDriver bdrv_file = { .format_name = "file", .protocol_name = "file", .instance_size = sizeof(BDRVRawState), diff --git a/block/raw-win32.c b/block/raw-win32.c index 7b58881..06243d7 100644 --- a/block/raw-win32.c +++ b/block/raw-win32.c @@ -540,7 +540,7 @@ static QemuOptsList raw_create_opts = { } }; -static BlockDriver bdrv_file = { +BlockDriver bdrv_file = { .format_name = "file", .protocol_name = "file", .instance_size = sizeof(BDRVRawState), diff --git a/block/raw_bsd.c b/block/raw_bsd.c index 401b967..ea2b864 100644 --- a/block/raw_bsd.c +++ b/block/raw_bsd.c @@ -173,7 +173,7 @@ static int raw_probe(const uint8_t *buf, int buf_size, const char *filename) return 1; } -static BlockDriver bdrv_raw = { +BlockDriver bdrv_raw = { .format_name = "raw", .bdrv_probe = &raw_probe, .bdrv_reopen_prepare = &raw_reopen_prepare, diff --git a/include/block/block_int.h b/include/block/block_int.h index a1c17b9..2ae82c5 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -411,6 +411,14 @@ struct BlockDriverState { Error *backing_blocker; }; + +/* Essential block drivers which must always be statically linked into qemu, and + * which therefore can be accessed without using bdrv_find_format() */ +extern BlockDriver bdrv_file; +extern BlockDriver bdrv_raw; +extern BlockDriver bdrv_qcow2; + + int get_tmp_filename(char *filename, int size); void bdrv_set_io_limits(BlockDriverState *bs, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:45:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:45: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 1YaXZH-0006mY-0Q; Tue, 24 Mar 2015 22:45:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZF-0006mK-KA for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:02 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 4A/1F-21221-CE8E1155; Tue, 24 Mar 2015 22:45:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1427237099!12827665!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5316 invoked from network); 24 Mar 2015 22:44:59 -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; 24 Mar 2015 22:44:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZC-000757-Qd for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXZC-0004NS-Ld for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:58 +0000 Date: Tue, 24 Mar 2015 22:44:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block: Omit bdrv_find_format for essential drivers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e81703b42c7552e9f43701a3e7fd937b7fa3080b Author: Max Reitz AuthorDate: Tue Dec 2 18:32:42 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:03:25 2015 -0600 block: Omit bdrv_find_format for essential drivers We can always assume raw, file and qcow2 being available; so do not use bdrv_find_format() to locate their BlockDriver objects but statically reference the respective objects. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Signed-off-by: Kevin Wolf (cherry picked from commit ef8104378c4a0497be079e48ee5ac5a89c68f978) Signed-off-by: Michael Roth --- block.c | 17 +++++------------ block/qcow2.c | 7 +++---- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/block.c b/block.c index a612594..a6197da 100644 --- a/block.c +++ b/block.c @@ -629,7 +629,7 @@ BlockDriver *bdrv_find_protocol(const char *filename, } if (!path_has_protocol(filename) || !allow_protocol_prefix) { - return bdrv_find_format("file"); + return &bdrv_file; } p = strchr(filename, ':'); @@ -658,12 +658,7 @@ static int find_image_format(BlockDriverState *bs, const char *filename, /* Return the raw BlockDriver * to scsi-generic devices or empty drives */ if (bs->sg || !bdrv_is_inserted(bs) || bdrv_getlength(bs) == 0) { - drv = bdrv_find_format("raw"); - if (!drv) { - error_setg(errp, "Could not find raw image format"); - ret = -ENOENT; - } - *pdrv = drv; + *pdrv = &bdrv_raw; return ret; } @@ -1294,7 +1289,6 @@ int bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp) /* TODO: extra byte is a hack to ensure MAX_PATH space on Windows. */ char *tmp_filename = g_malloc0(PATH_MAX + 1); int64_t total_size; - BlockDriver *bdrv_qcow2; QemuOpts *opts = NULL; QDict *snapshot_options; BlockDriverState *bs_snapshot; @@ -1319,11 +1313,10 @@ int bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp) goto out; } - bdrv_qcow2 = bdrv_find_format("qcow2"); - opts = qemu_opts_create(bdrv_qcow2->create_opts, NULL, 0, + opts = qemu_opts_create(bdrv_qcow2.create_opts, NULL, 0, &error_abort); qemu_opt_set_number(opts, BLOCK_OPT_SIZE, total_size); - ret = bdrv_create(bdrv_qcow2, tmp_filename, opts, &local_err); + ret = bdrv_create(&bdrv_qcow2, tmp_filename, opts, &local_err); qemu_opts_del(opts); if (ret < 0) { error_setg_errno(errp, -ret, "Could not create temporary overlay " @@ -1343,7 +1336,7 @@ int bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp) bs_snapshot = bdrv_new(); ret = bdrv_open(&bs_snapshot, NULL, NULL, snapshot_options, - flags, bdrv_qcow2, &local_err); + flags, &bdrv_qcow2, &local_err); if (ret < 0) { error_propagate(errp, local_err); goto out; diff --git a/block/qcow2.c b/block/qcow2.c index 48aca2a..1d21a2a 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1915,10 +1915,9 @@ static int qcow2_create2(const char *filename, int64_t total_size, * refcount of the cluster that is occupied by the header and the refcount * table) */ - BlockDriver* drv = bdrv_find_format("qcow2"); - assert(drv != NULL); ret = bdrv_open(&bs, filename, NULL, NULL, - BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH, drv, &local_err); + BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH, + &bdrv_qcow2, &local_err); if (ret < 0) { error_propagate(errp, local_err); goto out; @@ -1970,7 +1969,7 @@ static int qcow2_create2(const char *filename, int64_t total_size, /* Reopen the image without BDRV_O_NO_FLUSH to flush it before returning */ ret = bdrv_open(&bs, filename, NULL, NULL, BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_BACKING, - drv, &local_err); + &bdrv_qcow2, &local_err); if (local_err) { error_propagate(errp, local_err); goto out; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:45:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:45: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 1YaXZH-0006mY-0Q; Tue, 24 Mar 2015 22:45:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZF-0006mK-KA for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:02 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 4A/1F-21221-CE8E1155; Tue, 24 Mar 2015 22:45:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1427237099!12827665!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5316 invoked from network); 24 Mar 2015 22:44:59 -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; 24 Mar 2015 22:44:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZC-000757-Qd for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXZC-0004NS-Ld for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:44:58 +0000 Date: Tue, 24 Mar 2015 22:44:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block: Omit bdrv_find_format for essential drivers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e81703b42c7552e9f43701a3e7fd937b7fa3080b Author: Max Reitz AuthorDate: Tue Dec 2 18:32:42 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:03:25 2015 -0600 block: Omit bdrv_find_format for essential drivers We can always assume raw, file and qcow2 being available; so do not use bdrv_find_format() to locate their BlockDriver objects but statically reference the respective objects. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Signed-off-by: Kevin Wolf (cherry picked from commit ef8104378c4a0497be079e48ee5ac5a89c68f978) Signed-off-by: Michael Roth --- block.c | 17 +++++------------ block/qcow2.c | 7 +++---- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/block.c b/block.c index a612594..a6197da 100644 --- a/block.c +++ b/block.c @@ -629,7 +629,7 @@ BlockDriver *bdrv_find_protocol(const char *filename, } if (!path_has_protocol(filename) || !allow_protocol_prefix) { - return bdrv_find_format("file"); + return &bdrv_file; } p = strchr(filename, ':'); @@ -658,12 +658,7 @@ static int find_image_format(BlockDriverState *bs, const char *filename, /* Return the raw BlockDriver * to scsi-generic devices or empty drives */ if (bs->sg || !bdrv_is_inserted(bs) || bdrv_getlength(bs) == 0) { - drv = bdrv_find_format("raw"); - if (!drv) { - error_setg(errp, "Could not find raw image format"); - ret = -ENOENT; - } - *pdrv = drv; + *pdrv = &bdrv_raw; return ret; } @@ -1294,7 +1289,6 @@ int bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp) /* TODO: extra byte is a hack to ensure MAX_PATH space on Windows. */ char *tmp_filename = g_malloc0(PATH_MAX + 1); int64_t total_size; - BlockDriver *bdrv_qcow2; QemuOpts *opts = NULL; QDict *snapshot_options; BlockDriverState *bs_snapshot; @@ -1319,11 +1313,10 @@ int bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp) goto out; } - bdrv_qcow2 = bdrv_find_format("qcow2"); - opts = qemu_opts_create(bdrv_qcow2->create_opts, NULL, 0, + opts = qemu_opts_create(bdrv_qcow2.create_opts, NULL, 0, &error_abort); qemu_opt_set_number(opts, BLOCK_OPT_SIZE, total_size); - ret = bdrv_create(bdrv_qcow2, tmp_filename, opts, &local_err); + ret = bdrv_create(&bdrv_qcow2, tmp_filename, opts, &local_err); qemu_opts_del(opts); if (ret < 0) { error_setg_errno(errp, -ret, "Could not create temporary overlay " @@ -1343,7 +1336,7 @@ int bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp) bs_snapshot = bdrv_new(); ret = bdrv_open(&bs_snapshot, NULL, NULL, snapshot_options, - flags, bdrv_qcow2, &local_err); + flags, &bdrv_qcow2, &local_err); if (ret < 0) { error_propagate(errp, local_err); goto out; diff --git a/block/qcow2.c b/block/qcow2.c index 48aca2a..1d21a2a 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1915,10 +1915,9 @@ static int qcow2_create2(const char *filename, int64_t total_size, * refcount of the cluster that is occupied by the header and the refcount * table) */ - BlockDriver* drv = bdrv_find_format("qcow2"); - assert(drv != NULL); ret = bdrv_open(&bs, filename, NULL, NULL, - BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH, drv, &local_err); + BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH, + &bdrv_qcow2, &local_err); if (ret < 0) { error_propagate(errp, local_err); goto out; @@ -1970,7 +1969,7 @@ static int qcow2_create2(const char *filename, int64_t total_size, /* Reopen the image without BDRV_O_NO_FLUSH to flush it before returning */ ret = bdrv_open(&bs, filename, NULL, NULL, BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_BACKING, - drv, &local_err); + &bdrv_qcow2, &local_err); if (local_err) { error_propagate(errp, local_err); goto out; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:45:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:45: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 1YaXZR-0006nz-Aw; Tue, 24 Mar 2015 22:45:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZQ-0006no-C6 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:12 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id D9/89-18377-7F8E1155; Tue, 24 Mar 2015 22:45:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1427237109!7433937!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30662 invoked from network); 24 Mar 2015 22:45:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2015 22:45:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZN-000766-L2 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXZM-0004Op-V3 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:09 +0000 Date: Tue, 24 Mar 2015 22:45:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block/vvfat: qcow driver may not be found X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1961d1c3474aa4d957f5eff4d122908250089fdb Author: Max Reitz AuthorDate: Tue Dec 2 18:32:43 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:03:31 2015 -0600 block/vvfat: qcow driver may not be found Although virtually impossible right now, bdrv_find_format("qcow") may fail. The vvfat block driver should heed that case. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit 1bcb15cf776a57e8963072c1919a59a90aea8e94) Signed-off-by: Michael Roth --- block/vvfat.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index cefe3a4..e34a789 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -2917,6 +2917,12 @@ static int enable_write_target(BDRVVVFATState *s, Error **errp) } bdrv_qcow = bdrv_find_format("qcow"); + if (!bdrv_qcow) { + error_setg(errp, "Failed to locate qcow driver"); + ret = -ENOENT; + goto err; + } + opts = qemu_opts_create(bdrv_qcow->create_opts, NULL, 0, &error_abort); qemu_opt_set_number(opts, BLOCK_OPT_SIZE, s->sector_count * 512); qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, "fat:"); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:45:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:45: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 1YaXZR-0006nz-Aw; Tue, 24 Mar 2015 22:45:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZQ-0006no-C6 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:12 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id D9/89-18377-7F8E1155; Tue, 24 Mar 2015 22:45:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1427237109!7433937!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30662 invoked from network); 24 Mar 2015 22:45:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2015 22:45:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZN-000766-L2 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXZM-0004Op-V3 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:09 +0000 Date: Tue, 24 Mar 2015 22:45:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block/vvfat: qcow driver may not be found X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1961d1c3474aa4d957f5eff4d122908250089fdb Author: Max Reitz AuthorDate: Tue Dec 2 18:32:43 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:03:31 2015 -0600 block/vvfat: qcow driver may not be found Although virtually impossible right now, bdrv_find_format("qcow") may fail. The vvfat block driver should heed that case. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit 1bcb15cf776a57e8963072c1919a59a90aea8e94) Signed-off-by: Michael Roth --- block/vvfat.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index cefe3a4..e34a789 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -2917,6 +2917,12 @@ static int enable_write_target(BDRVVVFATState *s, Error **errp) } bdrv_qcow = bdrv_find_format("qcow"); + if (!bdrv_qcow) { + error_setg(errp, "Failed to locate qcow driver"); + ret = -ENOENT; + goto err; + } + opts = qemu_opts_create(bdrv_qcow->create_opts, NULL, 0, &error_abort); qemu_opt_set_number(opts, BLOCK_OPT_SIZE, s->sector_count * 512); qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, "fat:"); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:45:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:45: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 1YaXZh-0006q3-0k; Tue, 24 Mar 2015 22:45:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZf-0006po-30 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:27 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 2D/E0-31982-609E1155; Tue, 24 Mar 2015 22:45:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1427237120!5935519!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28275 invoked from network); 24 Mar 2015 22:45:21 -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; 24 Mar 2015 22:45:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZX-00076E-Ri for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXZX-0004PI-Q1 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:19 +0000 Date: Tue, 24 Mar 2015 22:45:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block/nfs: Add create_opts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0fc9a06b565ceea71662f69391ee6d86634faf25 Author: Max Reitz AuthorDate: Tue Dec 2 18:32:44 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:03:37 2015 -0600 block/nfs: Add create_opts The nfs protocol driver is capable of creating images, but did not specify any creation options. Fix it. A way to test this issue is the following: $ qemu-img create -f nfs nfs://127.0.0.1/foo.qcow2 64M Without this patch, it segfaults. With this patch, it does not. However, this is not something that should really work; qemu-img should check whether the parameter for the -f option (and -O for convert) is indeed a format, and error out if it is not. Therefore, I am not making it an iotest. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit fd752801ae1cc729359a37f29e32265de6948d37) Signed-off-by: Michael Roth --- block/nfs.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/block/nfs.c b/block/nfs.c index c76e368..ca9e24e 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -409,6 +409,19 @@ out: return ret; } +static QemuOptsList nfs_create_opts = { + .name = "nfs-create-opts", + .head = QTAILQ_HEAD_INITIALIZER(nfs_create_opts.head), + .desc = { + { + .name = BLOCK_OPT_SIZE, + .type = QEMU_OPT_SIZE, + .help = "Virtual disk size" + }, + { /* end of list */ } + } +}; + static int nfs_file_create(const char *url, QemuOpts *opts, Error **errp) { int ret = 0; @@ -470,6 +483,8 @@ static BlockDriver bdrv_nfs = { .instance_size = sizeof(NFSClient), .bdrv_needs_filename = true, + .create_opts = &nfs_create_opts, + .bdrv_has_zero_init = nfs_has_zero_init, .bdrv_get_allocated_file_size = nfs_get_allocated_file_size, .bdrv_truncate = nfs_file_truncate, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:45:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:45: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 1YaXZh-0006q3-0k; Tue, 24 Mar 2015 22:45:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZf-0006po-30 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:27 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 2D/E0-31982-609E1155; Tue, 24 Mar 2015 22:45:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1427237120!5935519!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28275 invoked from network); 24 Mar 2015 22:45:21 -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; 24 Mar 2015 22:45:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZX-00076E-Ri for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXZX-0004PI-Q1 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:19 +0000 Date: Tue, 24 Mar 2015 22:45:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block/nfs: Add create_opts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0fc9a06b565ceea71662f69391ee6d86634faf25 Author: Max Reitz AuthorDate: Tue Dec 2 18:32:44 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:03:37 2015 -0600 block/nfs: Add create_opts The nfs protocol driver is capable of creating images, but did not specify any creation options. Fix it. A way to test this issue is the following: $ qemu-img create -f nfs nfs://127.0.0.1/foo.qcow2 64M Without this patch, it segfaults. With this patch, it does not. However, this is not something that should really work; qemu-img should check whether the parameter for the -f option (and -O for convert) is indeed a format, and error out if it is not. Therefore, I am not making it an iotest. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit fd752801ae1cc729359a37f29e32265de6948d37) Signed-off-by: Michael Roth --- block/nfs.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/block/nfs.c b/block/nfs.c index c76e368..ca9e24e 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -409,6 +409,19 @@ out: return ret; } +static QemuOptsList nfs_create_opts = { + .name = "nfs-create-opts", + .head = QTAILQ_HEAD_INITIALIZER(nfs_create_opts.head), + .desc = { + { + .name = BLOCK_OPT_SIZE, + .type = QEMU_OPT_SIZE, + .help = "Virtual disk size" + }, + { /* end of list */ } + } +}; + static int nfs_file_create(const char *url, QemuOpts *opts, Error **errp) { int ret = 0; @@ -470,6 +483,8 @@ static BlockDriver bdrv_nfs = { .instance_size = sizeof(NFSClient), .bdrv_needs_filename = true, + .create_opts = &nfs_create_opts, + .bdrv_has_zero_init = nfs_has_zero_init, .bdrv_get_allocated_file_size = nfs_get_allocated_file_size, .bdrv_truncate = nfs_file_truncate, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:45:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:45: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 1YaXZm-0006rR-37; Tue, 24 Mar 2015 22:45:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZk-0006qn-FS for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:32 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id F1/75-15508-B09E1155; Tue, 24 Mar 2015 22:45:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1427237130!3757609!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.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17442 invoked from network); 24 Mar 2015 22:45:31 -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; 24 Mar 2015 22:45:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZi-00076J-0Y for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXZh-0004Pe-VG for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:29 +0000 Date: Tue, 24 Mar 2015 22:45:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block: Check create_opts before image creation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6065d5484a092d55b274876d1fafb8223041842a Author: Max Reitz AuthorDate: Tue Dec 2 18:32:45 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:03:44 2015 -0600 block: Check create_opts before image creation If a driver supports image creation, it needs to set the .create_opts field. We can use that to make sure .create_opts for both drivers involved is not NULL in bdrv_img_create(), which is important so that the create_opts pointer in that function is not NULL after the qemu_opts_append() calls and when going into qemu_opts_create(). Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit c6149724080af7b3d5d61eac8942655e6d212783) Signed-off-by: Michael Roth --- block.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index a6197da..07f58fc 100644 --- a/block.c +++ b/block.c @@ -5534,6 +5534,18 @@ void bdrv_img_create(const char *filename, const char *fmt, return; } + if (!drv->create_opts) { + error_setg(errp, "Format driver '%s' does not support image creation", + drv->format_name); + return; + } + + if (!proto_drv->create_opts) { + error_setg(errp, "Protocol driver '%s' does not support image creation", + proto_drv->format_name); + return; + } + create_opts = qemu_opts_append(create_opts, drv->create_opts); create_opts = qemu_opts_append(create_opts, proto_drv->create_opts); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:45:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:45: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 1YaXZm-0006rR-37; Tue, 24 Mar 2015 22:45:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZk-0006qn-FS for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:32 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id F1/75-15508-B09E1155; Tue, 24 Mar 2015 22:45:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1427237130!3757609!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.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17442 invoked from network); 24 Mar 2015 22:45:31 -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; 24 Mar 2015 22:45:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZi-00076J-0Y for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXZh-0004Pe-VG for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:29 +0000 Date: Tue, 24 Mar 2015 22:45:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block: Check create_opts before image creation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6065d5484a092d55b274876d1fafb8223041842a Author: Max Reitz AuthorDate: Tue Dec 2 18:32:45 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:03:44 2015 -0600 block: Check create_opts before image creation If a driver supports image creation, it needs to set the .create_opts field. We can use that to make sure .create_opts for both drivers involved is not NULL in bdrv_img_create(), which is important so that the create_opts pointer in that function is not NULL after the qemu_opts_append() calls and when going into qemu_opts_create(). Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit c6149724080af7b3d5d61eac8942655e6d212783) Signed-off-by: Michael Roth --- block.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index a6197da..07f58fc 100644 --- a/block.c +++ b/block.c @@ -5534,6 +5534,18 @@ void bdrv_img_create(const char *filename, const char *fmt, return; } + if (!drv->create_opts) { + error_setg(errp, "Format driver '%s' does not support image creation", + drv->format_name); + return; + } + + if (!proto_drv->create_opts) { + error_setg(errp, "Protocol driver '%s' does not support image creation", + proto_drv->format_name); + return; + } + create_opts = qemu_opts_append(create_opts, drv->create_opts); create_opts = qemu_opts_append(create_opts, proto_drv->create_opts); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:45:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXZw-0006te-64; Tue, 24 Mar 2015 22: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 1YaXZu-0006tH-KM for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:42 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 6F/08-31677-519E1155; Tue, 24 Mar 2015 22:45:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1427237140!15176785!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7863 invoked from network); 24 Mar 2015 22:45:41 -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; 24 Mar 2015 22:45:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZs-00076S-6s for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXZs-0004Q5-4q for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:40 +0000 Date: Tue, 24 Mar 2015 22:45:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qemu-img: Check create_opts before image creation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 10be14ee7d1d82e439f0fab69e32c90427afa07c Author: Max Reitz AuthorDate: Tue Dec 2 18:32:46 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:03:51 2015 -0600 qemu-img: Check create_opts before image creation If a driver supports image creation, it needs to set the .create_opts field. We can use that to make sure .create_opts for both drivers involved is not NULL for the target image in qemu-img convert, which is important so that the create_opts pointer in img_convert() is not NULL after the qemu_opts_append() calls and when going into qemu_opts_create(). Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit f75613cf2488a37fb8019bc32a06ddbcd477d0ce) Signed-off-by: Michael Roth --- qemu-img.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index a42335c..8c4edf3 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1531,6 +1531,20 @@ static int img_convert(int argc, char **argv) goto out; } + if (!drv->create_opts) { + error_report("Format driver '%s' does not support image creation", + drv->format_name); + ret = -1; + goto out; + } + + if (!proto_drv->create_opts) { + error_report("Protocol driver '%s' does not support image creation", + proto_drv->format_name); + ret = -1; + goto out; + } + create_opts = qemu_opts_append(create_opts, drv->create_opts); create_opts = qemu_opts_append(create_opts, proto_drv->create_opts); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:45:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXZw-0006te-64; Tue, 24 Mar 2015 22: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 1YaXZu-0006tH-KM for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:42 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 6F/08-31677-519E1155; Tue, 24 Mar 2015 22:45:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1427237140!15176785!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7863 invoked from network); 24 Mar 2015 22:45:41 -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; 24 Mar 2015 22:45:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXZs-00076S-6s for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXZs-0004Q5-4q for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:40 +0000 Date: Tue, 24 Mar 2015 22:45:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qemu-img: Check create_opts before image creation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 10be14ee7d1d82e439f0fab69e32c90427afa07c Author: Max Reitz AuthorDate: Tue Dec 2 18:32:46 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:03:51 2015 -0600 qemu-img: Check create_opts before image creation If a driver supports image creation, it needs to set the .create_opts field. We can use that to make sure .create_opts for both drivers involved is not NULL for the target image in qemu-img convert, which is important so that the create_opts pointer in img_convert() is not NULL after the qemu_opts_append() calls and when going into qemu_opts_create(). Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit f75613cf2488a37fb8019bc32a06ddbcd477d0ce) Signed-off-by: Michael Roth --- qemu-img.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index a42335c..8c4edf3 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1531,6 +1531,20 @@ static int img_convert(int argc, char **argv) goto out; } + if (!drv->create_opts) { + error_report("Format driver '%s' does not support image creation", + drv->format_name); + ret = -1; + goto out; + } + + if (!proto_drv->create_opts) { + error_report("Protocol driver '%s' does not support image creation", + proto_drv->format_name); + ret = -1; + goto out; + } + create_opts = qemu_opts_append(create_opts, drv->create_opts); create_opts = qemu_opts_append(create_opts, proto_drv->create_opts); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:45:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:45: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 1YaXa8-0006wE-BX; Tue, 24 Mar 2015 22:45:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXa6-0006vy-SV for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:55 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 5A/F3-32332-229E1155; Tue, 24 Mar 2015 22:45:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1427237150!11333069!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.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19137 invoked from network); 24 Mar 2015 22:45:53 -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; 24 Mar 2015 22:45:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXa2-00076Y-Dg for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXa2-0004QV-B2 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:50 +0000 Date: Tue, 24 Mar 2015 22:45:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qemu-img: Check create_opts before image amendment X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b15bfd0558934703cfa860117a38d7f0a71645ae Author: Max Reitz AuthorDate: Tue Dec 2 18:32:47 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:03:58 2015 -0600 qemu-img: Check create_opts before image amendment The image options which can be amended are described by the .create_opts field for every driver. This field must therefore be non-NULL so that anything can be amended in the first place. Check that this holds true before going into qemu_opts_create() (because if .create_opts is NULL, the create_opts pointer in img_amend() will be NULL after qemu_opts_append()). Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit b2439d26f078c826e5e06b34d978a6f6d5c7c56f) Signed-off-by: Michael Roth --- qemu-img.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 8c4edf3..7876258 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2986,6 +2986,13 @@ static int img_amend(int argc, char **argv) goto out; } + if (!bs->drv->create_opts) { + error_report("Format driver '%s' does not support any options to amend", + fmt); + ret = -1; + goto out; + } + create_opts = qemu_opts_append(create_opts, bs->drv->create_opts); opts = qemu_opts_create(create_opts, NULL, 0, &error_abort); if (options && qemu_opts_do_parse(opts, options, NULL)) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:45:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:45: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 1YaXa8-0006wE-BX; Tue, 24 Mar 2015 22:45:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXa6-0006vy-SV for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:55 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 5A/F3-32332-229E1155; Tue, 24 Mar 2015 22:45:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1427237150!11333069!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.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19137 invoked from network); 24 Mar 2015 22:45:53 -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; 24 Mar 2015 22:45:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXa2-00076Y-Dg for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXa2-0004QV-B2 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:45:50 +0000 Date: Tue, 24 Mar 2015 22:45:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qemu-img: Check create_opts before image amendment X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b15bfd0558934703cfa860117a38d7f0a71645ae Author: Max Reitz AuthorDate: Tue Dec 2 18:32:47 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:03:58 2015 -0600 qemu-img: Check create_opts before image amendment The image options which can be amended are described by the .create_opts field for every driver. This field must therefore be non-NULL so that anything can be amended in the first place. Check that this holds true before going into qemu_opts_create() (because if .create_opts is NULL, the create_opts pointer in img_amend() will be NULL after qemu_opts_append()). Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit b2439d26f078c826e5e06b34d978a6f6d5c7c56f) Signed-off-by: Michael Roth --- qemu-img.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 8c4edf3..7876258 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2986,6 +2986,13 @@ static int img_amend(int argc, char **argv) goto out; } + if (!bs->drv->create_opts) { + error_report("Format driver '%s' does not support any options to amend", + fmt); + ret = -1; + goto out; + } + create_opts = qemu_opts_append(create_opts, bs->drv->create_opts); opts = qemu_opts_create(create_opts, NULL, 0, &error_abort); if (options && qemu_opts_do_parse(opts, options, NULL)) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:46:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:46: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 1YaXaG-0006xx-GX; Tue, 24 Mar 2015 22:46:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXaF-0006xb-1N for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:03 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 2A/67-31237-A29E1155; Tue, 24 Mar 2015 22:46:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1427237160!12854456!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13201 invoked from network); 24 Mar 2015 22:46:01 -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; 24 Mar 2015 22:46:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXaC-00076f-K0 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXaC-0004Qs-I4 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:00 +0000 Date: Tue, 24 Mar 2015 22:46:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] iotests: Only kill NBD server if it runs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0a0a9843524a80a632e827e5c2cfb7c6a496f8ba Author: Max Reitz AuthorDate: Tue Dec 2 18:32:48 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:04:13 2015 -0600 iotests: Only kill NBD server if it runs There may be NBD tests which do not create a sample image and simply test whether wrong usage of the protocol is rejected as expected. In this case, there will be no NBD server and trying to kill it during clean-up will fail. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit f798068c565918ead63218d083ff814b7635be72) Signed-off-by: Michael Roth --- tests/qemu-iotests/common.rc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 9c49deb..f2554ec 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -175,7 +175,9 @@ _cleanup_test_img() case "$IMGPROTO" in nbd) - kill $QEMU_NBD_PID + if [ -n "$QEMU_NBD_PID" ]; then + kill $QEMU_NBD_PID + fi rm -f "$TEST_IMG_FILE" ;; file) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:46:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:46: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 1YaXaG-0006xx-GX; Tue, 24 Mar 2015 22:46:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXaF-0006xb-1N for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:03 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 2A/67-31237-A29E1155; Tue, 24 Mar 2015 22:46:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1427237160!12854456!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13201 invoked from network); 24 Mar 2015 22:46:01 -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; 24 Mar 2015 22:46:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXaC-00076f-K0 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXaC-0004Qs-I4 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:00 +0000 Date: Tue, 24 Mar 2015 22:46:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] iotests: Only kill NBD server if it runs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0a0a9843524a80a632e827e5c2cfb7c6a496f8ba Author: Max Reitz AuthorDate: Tue Dec 2 18:32:48 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:04:13 2015 -0600 iotests: Only kill NBD server if it runs There may be NBD tests which do not create a sample image and simply test whether wrong usage of the protocol is rejected as expected. In this case, there will be no NBD server and trying to kill it during clean-up will fail. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit f798068c565918ead63218d083ff814b7635be72) Signed-off-by: Michael Roth --- tests/qemu-iotests/common.rc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 9c49deb..f2554ec 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -175,7 +175,9 @@ _cleanup_test_img() case "$IMGPROTO" in nbd) - kill $QEMU_NBD_PID + if [ -n "$QEMU_NBD_PID" ]; then + kill $QEMU_NBD_PID + fi rm -f "$TEST_IMG_FILE" ;; file) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:46:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:46: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 1YaXaS-00070N-KC; Tue, 24 Mar 2015 22:46:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXaR-000703-ML for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:15 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 8B/56-32337-639E1155; Tue, 24 Mar 2015 22:46:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1427237171!12753883!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14925 invoked from network); 24 Mar 2015 22:46:12 -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; 24 Mar 2015 22:46:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXaM-00077G-PL for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXaM-0004Rw-OB for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:10 +0000 Date: Tue, 24 Mar 2015 22:46:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] iotests: Add test for unsupported image creation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ff15187eca2d70cbd3f9352441920d9a545198e0 Author: Max Reitz AuthorDate: Tue Dec 2 18:32:49 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:08:24 2015 -0600 iotests: Add test for unsupported image creation Add a test for creating and amending images (amendment uses the creation options) with formats not supporting creation over protocols not supporting creation. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit 2247798d13e5295a097da0a42f9d0d70d88690a4) Conflicts: tests/qemu-iotests/group *removed context dependency on iotest group 114 Signed-off-by: Michael Roth --- tests/qemu-iotests/113 | 76 ++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/113.out | 15 +++++++++ tests/qemu-iotests/group | 1 + 3 files changed, 92 insertions(+), 0 deletions(-) diff --git a/tests/qemu-iotests/113 b/tests/qemu-iotests/113 new file mode 100755 index 0000000..a2cd96b --- /dev/null +++ b/tests/qemu-iotests/113 @@ -0,0 +1,76 @@ +#!/bin/bash +# +# Test case for accessing creation options on image formats and +# protocols not supporting image creation +# +# Copyright (C) 2014 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +# creator +owner=mreitz@redhat.com + +seq="$(basename $0)" +echo "QA output created by $seq" + +here="$PWD" +tmp=/tmp/$$ +status=1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter + +# We can only test one format here because we need its sample file +_supported_fmt bochs +_supported_proto nbd +_supported_os Linux + +echo +echo '=== Unsupported image creation in qemu-img create ===' +echo + +$QEMU_IMG create -f $IMGFMT nbd://example.com 2>&1 64M | _filter_imgfmt + +echo +echo '=== Unsupported image creation in qemu-img convert ===' +echo + +# We could use any input image format here, but this is a bochs test, so just +# use the bochs image +_use_sample_img empty.bochs.bz2 +$QEMU_IMG convert -f $IMGFMT -O $IMGFMT "$TEST_IMG" nbd://example.com 2>&1 \ + | _filter_imgfmt + +echo +echo '=== Unsupported format in qemu-img amend ===' +echo + +# The protocol does not matter here +_use_sample_img empty.bochs.bz2 +$QEMU_IMG amend -f $IMGFMT -o foo=bar "$TEST_IMG" 2>&1 | _filter_imgfmt + + +# success, all done +echo +echo '*** done' +rm -f $seq.full +status=0 diff --git a/tests/qemu-iotests/113.out b/tests/qemu-iotests/113.out new file mode 100644 index 0000000..00bdfd6 --- /dev/null +++ b/tests/qemu-iotests/113.out @@ -0,0 +1,15 @@ +QA output created by 113 + +=== Unsupported image creation in qemu-img create === + +qemu-img: nbd://example.com: Format driver 'IMGFMT' does not support image creation + +=== Unsupported image creation in qemu-img convert === + +qemu-img: Format driver 'IMGFMT' does not support image creation + +=== Unsupported format in qemu-img amend === + +qemu-img: Format driver 'IMGFMT' does not support any options to amend + +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 7dfe469..fd2c64a 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -112,3 +112,4 @@ 107 rw auto quick 108 rw auto quick 111 rw auto quick +113 rw auto quick -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:46:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:46: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 1YaXaS-00070N-KC; Tue, 24 Mar 2015 22:46:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXaR-000703-ML for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:15 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 8B/56-32337-639E1155; Tue, 24 Mar 2015 22:46:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1427237171!12753883!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14925 invoked from network); 24 Mar 2015 22:46:12 -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; 24 Mar 2015 22:46:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXaM-00077G-PL for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXaM-0004Rw-OB for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:10 +0000 Date: Tue, 24 Mar 2015 22:46:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] iotests: Add test for unsupported image creation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ff15187eca2d70cbd3f9352441920d9a545198e0 Author: Max Reitz AuthorDate: Tue Dec 2 18:32:49 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:08:24 2015 -0600 iotests: Add test for unsupported image creation Add a test for creating and amending images (amendment uses the creation options) with formats not supporting creation over protocols not supporting creation. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit 2247798d13e5295a097da0a42f9d0d70d88690a4) Conflicts: tests/qemu-iotests/group *removed context dependency on iotest group 114 Signed-off-by: Michael Roth --- tests/qemu-iotests/113 | 76 ++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/113.out | 15 +++++++++ tests/qemu-iotests/group | 1 + 3 files changed, 92 insertions(+), 0 deletions(-) diff --git a/tests/qemu-iotests/113 b/tests/qemu-iotests/113 new file mode 100755 index 0000000..a2cd96b --- /dev/null +++ b/tests/qemu-iotests/113 @@ -0,0 +1,76 @@ +#!/bin/bash +# +# Test case for accessing creation options on image formats and +# protocols not supporting image creation +# +# Copyright (C) 2014 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +# creator +owner=mreitz@redhat.com + +seq="$(basename $0)" +echo "QA output created by $seq" + +here="$PWD" +tmp=/tmp/$$ +status=1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter + +# We can only test one format here because we need its sample file +_supported_fmt bochs +_supported_proto nbd +_supported_os Linux + +echo +echo '=== Unsupported image creation in qemu-img create ===' +echo + +$QEMU_IMG create -f $IMGFMT nbd://example.com 2>&1 64M | _filter_imgfmt + +echo +echo '=== Unsupported image creation in qemu-img convert ===' +echo + +# We could use any input image format here, but this is a bochs test, so just +# use the bochs image +_use_sample_img empty.bochs.bz2 +$QEMU_IMG convert -f $IMGFMT -O $IMGFMT "$TEST_IMG" nbd://example.com 2>&1 \ + | _filter_imgfmt + +echo +echo '=== Unsupported format in qemu-img amend ===' +echo + +# The protocol does not matter here +_use_sample_img empty.bochs.bz2 +$QEMU_IMG amend -f $IMGFMT -o foo=bar "$TEST_IMG" 2>&1 | _filter_imgfmt + + +# success, all done +echo +echo '*** done' +rm -f $seq.full +status=0 diff --git a/tests/qemu-iotests/113.out b/tests/qemu-iotests/113.out new file mode 100644 index 0000000..00bdfd6 --- /dev/null +++ b/tests/qemu-iotests/113.out @@ -0,0 +1,15 @@ +QA output created by 113 + +=== Unsupported image creation in qemu-img create === + +qemu-img: nbd://example.com: Format driver 'IMGFMT' does not support image creation + +=== Unsupported image creation in qemu-img convert === + +qemu-img: Format driver 'IMGFMT' does not support image creation + +=== Unsupported format in qemu-img amend === + +qemu-img: Format driver 'IMGFMT' does not support any options to amend + +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 7dfe469..fd2c64a 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -112,3 +112,4 @@ 107 rw auto quick 108 rw auto quick 111 rw auto quick +113 rw auto quick -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:46:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXaa-00071j-Me; Tue, 24 Mar 2015 22: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 1YaXaZ-00071V-Mt for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:23 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id B9/A6-18529-E39E1155; Tue, 24 Mar 2015 22:46:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1427237181!15223840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22826 invoked from network); 24 Mar 2015 22:46:22 -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; 24 Mar 2015 22:46:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXaX-00077J-1F for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXaW-0004SM-Tb for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:21 +0000 Date: Tue, 24 Mar 2015 22:46:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qcow2: Prevent numerical overflow X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e85e69fd6972d1990c6309dfa273ccd8b12d92a Author: Max Reitz AuthorDate: Tue Dec 2 18:32:50 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:09:44 2015 -0600 qcow2: Prevent numerical overflow In qcow2_alloc_cluster_offset(), *num is limited to INT_MAX >> BDRV_SECTOR_BITS by all callers. However, since remaining is of type uint64_t, we might as well cast *num to that type before performing the shift. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit 11c89769dc3e638ef72915d97058411ddf79b64b) Signed-off-by: Michael Roth --- block/qcow2-cluster.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index df0b2c9..1fea514 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -1263,7 +1263,7 @@ int qcow2_alloc_cluster_offset(BlockDriverState *bs, uint64_t offset, again: start = offset; - remaining = *num << BDRV_SECTOR_BITS; + remaining = (uint64_t)*num << BDRV_SECTOR_BITS; cluster_offset = 0; *host_offset = 0; cur_bytes = 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 Tue Mar 24 22:46:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXaa-00071j-Me; Tue, 24 Mar 2015 22: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 1YaXaZ-00071V-Mt for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:23 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id B9/A6-18529-E39E1155; Tue, 24 Mar 2015 22:46:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1427237181!15223840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22826 invoked from network); 24 Mar 2015 22:46:22 -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; 24 Mar 2015 22:46:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXaX-00077J-1F for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXaW-0004SM-Tb for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:21 +0000 Date: Tue, 24 Mar 2015 22:46:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qcow2: Prevent numerical overflow X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e85e69fd6972d1990c6309dfa273ccd8b12d92a Author: Max Reitz AuthorDate: Tue Dec 2 18:32:50 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:09:44 2015 -0600 qcow2: Prevent numerical overflow In qcow2_alloc_cluster_offset(), *num is limited to INT_MAX >> BDRV_SECTOR_BITS by all callers. However, since remaining is of type uint64_t, we might as well cast *num to that type before performing the shift. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit 11c89769dc3e638ef72915d97058411ddf79b64b) Signed-off-by: Michael Roth --- block/qcow2-cluster.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index df0b2c9..1fea514 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -1263,7 +1263,7 @@ int qcow2_alloc_cluster_offset(BlockDriverState *bs, uint64_t offset, again: start = offset; - remaining = *num << BDRV_SECTOR_BITS; + remaining = (uint64_t)*num << BDRV_SECTOR_BITS; cluster_offset = 0; *host_offset = 0; cur_bytes = 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 Tue Mar 24 22:46:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:46: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 1YaXan-00074t-Pk; Tue, 24 Mar 2015 22:46:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXam-00074b-DQ for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:36 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 19/B7-28652-B49E1155; Tue, 24 Mar 2015 22:46:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1427237191!15101897!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30980 invoked from network); 24 Mar 2015 22:46:32 -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; 24 Mar 2015 22:46:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXah-00077U-8z for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXah-0004Sj-6s for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:31 +0000 Date: Tue, 24 Mar 2015 22:46:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qcow2: Flushing the caches in qcow2_close may fail X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6f45cda114497bafa4186d6395eb06d2b85c55c4 Author: Max Reitz AuthorDate: Tue Dec 2 18:32:51 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:09:50 2015 -0600 qcow2: Flushing the caches in qcow2_close may fail qcow2_cache_flush() may fail; if one of the caches failed to be flushed successfully to disk in qcow2_close() the image should not be marked clean, and we should emit a warning. This breaks the (qcow2-specific) iotests 026, 071 and 089; change their output accordingly. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit 3b5e14c76a6bb142bf250ddf99e24a0ac8c7bc12) Signed-off-by: Michael Roth --- block/qcow2.c | 19 ++++++- tests/qemu-iotests/026.out | 120 ++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/071.out | 8 +++ tests/qemu-iotests/089.out | 2 + 4 files changed, 146 insertions(+), 3 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 1d21a2a..a33e863 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1428,10 +1428,23 @@ static void qcow2_close(BlockDriverState *bs) s->l1_table = NULL; if (!(bs->open_flags & BDRV_O_INCOMING)) { - qcow2_cache_flush(bs, s->l2_table_cache); - qcow2_cache_flush(bs, s->refcount_block_cache); + int ret1, ret2; - qcow2_mark_clean(bs); + ret1 = qcow2_cache_flush(bs, s->l2_table_cache); + ret2 = qcow2_cache_flush(bs, s->refcount_block_cache); + + if (ret1) { + error_report("Failed to flush the L2 table cache: %s", + strerror(-ret1)); + } + if (ret2) { + error_report("Failed to flush the refcount block cache: %s", + strerror(-ret2)); + } + + if (!ret1 && !ret2) { + qcow2_mark_clean(bs); + } } qcow2_cache_destroy(bs, s->l2_table_cache); diff --git a/tests/qemu-iotests/026.out b/tests/qemu-iotests/026.out index f7c78e7..ad84ac2 100644 --- a/tests/qemu-iotests/026.out +++ b/tests/qemu-iotests/026.out @@ -14,6 +14,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_update; errno: 5; imm: off; once: off; write +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error 1 leaked clusters were found on the image. @@ -21,6 +23,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_update; errno: 5; imm: off; once: off; write -b +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error 1 leaked clusters were found on the image. @@ -38,6 +42,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_update; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 1 leaked clusters were found on the image. @@ -45,6 +51,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_update; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 1 leaked clusters were found on the image. @@ -70,7 +78,11 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_load; errno: 5; imm: off; once: off; write wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error read failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -78,7 +90,11 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_load; errno: 5; imm: off; once: off; write -b wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error read failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -102,7 +118,11 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_load; errno: 28; imm: off; once: off; write wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device read failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -110,12 +130,17 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_load; errno: 28; imm: off; once: off; write -b wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device read failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_update; errno: 5; imm: off; once: on; write +Failed to flush the L2 table cache: Input/output error write failed: Input/output error 127 leaked clusters were found on the image. @@ -123,6 +148,7 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_update; errno: 5; imm: off; once: on; write -b +Failed to flush the L2 table cache: Input/output error write failed: Input/output error 127 leaked clusters were found on the image. @@ -130,6 +156,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_update; errno: 5; imm: off; once: off; write +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error 127 leaked clusters were found on the image. @@ -137,6 +165,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_update; errno: 5; imm: off; once: off; write -b +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error 127 leaked clusters were found on the image. @@ -144,6 +174,7 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_update; errno: 28; imm: off; once: on; write +Failed to flush the L2 table cache: No space left on device write failed: No space left on device 127 leaked clusters were found on the image. @@ -151,6 +182,7 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_update; errno: 28; imm: off; once: on; write -b +Failed to flush the L2 table cache: No space left on device write failed: No space left on device 127 leaked clusters were found on the image. @@ -158,6 +190,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_update; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 127 leaked clusters were found on the image. @@ -165,6 +199,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_update; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 127 leaked clusters were found on the image. @@ -182,11 +218,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_alloc.write; errno: 5; imm: off; once: off; write +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_alloc.write; errno: 5; imm: off; once: off; write -b +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error 1 leaked clusters were found on the image. @@ -204,11 +244,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_alloc.write; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_alloc.write; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 1 leaked clusters were found on the image. @@ -226,11 +270,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: write_aio; errno: 5; imm: off; once: off; write +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: write_aio; errno: 5; imm: off; once: off; write -b +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -246,11 +294,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: write_aio; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: write_aio; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -266,11 +318,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_load; errno: 5; imm: off; once: off; write +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_load; errno: 5; imm: off; once: off; write -b +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -286,51 +342,67 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_load; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_load; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_update_part; errno: 5; imm: off; once: on; write +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_update_part; errno: 5; imm: off; once: on; write -b +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_update_part; errno: 5; imm: off; once: off; write +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_update_part; errno: 5; imm: off; once: off; write -b +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_update_part; errno: 28; imm: off; once: on; write +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_update_part; errno: 28; imm: off; once: on; write -b +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_update_part; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_update_part; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -346,11 +418,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc; errno: 5; imm: off; once: off; write +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc; errno: 5; imm: off; once: off; write -b +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -366,11 +442,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -386,11 +466,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: cluster_alloc; errno: 5; imm: off; once: off; write +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: cluster_alloc; errno: 5; imm: off; once: off; write -b +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -406,11 +490,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: cluster_alloc; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: cluster_alloc; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. @@ -429,6 +517,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.hookup; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 55 leaked clusters were found on the image. @@ -436,6 +526,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.hookup; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 251 leaked clusters were found on the image. @@ -453,11 +545,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.write; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.write; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -473,6 +569,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.write_blocks; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 11 leaked clusters were found on the image. @@ -480,6 +578,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.write_blocks; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 23 leaked clusters were found on the image. @@ -497,6 +597,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.write_table; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 11 leaked clusters were found on the image. @@ -504,6 +606,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.write_table; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 23 leaked clusters were found on the image. @@ -521,6 +625,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.switch_table; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 11 leaked clusters were found on the image. @@ -528,6 +634,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.switch_table; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 23 leaked clusters were found on the image. @@ -543,6 +651,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_grow.alloc_table; errno: 5; imm: off; once: off +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -553,6 +663,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_grow.alloc_table; errno: 28; imm: off; once: off +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -563,6 +675,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_grow.write_table; errno: 5; imm: off; once: off +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -573,6 +687,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_grow.write_table; errno: 28; imm: off; once: off +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -583,6 +699,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_grow.activate_table; errno: 5; imm: off; once: off +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error 96 leaked clusters were found on the image. @@ -595,6 +713,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_grow.activate_table; errno: 28; imm: off; once: off +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 96 leaked clusters were found on the image. diff --git a/tests/qemu-iotests/071.out b/tests/qemu-iotests/071.out index 5f840a9..0624581 100644 --- a/tests/qemu-iotests/071.out +++ b/tests/qemu-iotests/071.out @@ -30,10 +30,14 @@ blkverify: read sector_num=0 nb_sectors=4 contents mismatch in sector 0 === Testing blkdebug through filename === +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error read failed: Input/output error === Testing blkdebug through file blockref === +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error read failed: Input/output error === Testing blkdebug on existing block device === @@ -48,6 +52,8 @@ read failed: Input/output error {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": true}} +qemu-system-x86_64: Failed to flush the L2 table cache: Input/output error +qemu-system-x86_64: Failed to flush the refcount block cache: Input/output error === Testing blkverify on existing block device === @@ -86,5 +92,7 @@ read failed: Input/output error {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": true}} +qemu-system-x86_64: Failed to flush the L2 table cache: Input/output error +qemu-system-x86_64: Failed to flush the refcount block cache: Input/output error *** done diff --git a/tests/qemu-iotests/089.out b/tests/qemu-iotests/089.out index b2b0390..bf3b8a0 100644 --- a/tests/qemu-iotests/089.out +++ b/tests/qemu-iotests/089.out @@ -24,6 +24,8 @@ read 512/512 bytes at offset 0 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 wrote 512/512 bytes at offset 229376 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error read failed: Input/output error === Testing qemu-img info output === -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:46:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:46: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 1YaXan-00074t-Pk; Tue, 24 Mar 2015 22:46:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXam-00074b-DQ for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:36 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 19/B7-28652-B49E1155; Tue, 24 Mar 2015 22:46:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1427237191!15101897!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30980 invoked from network); 24 Mar 2015 22:46:32 -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; 24 Mar 2015 22:46:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXah-00077U-8z for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXah-0004Sj-6s for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:31 +0000 Date: Tue, 24 Mar 2015 22:46:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qcow2: Flushing the caches in qcow2_close may fail X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6f45cda114497bafa4186d6395eb06d2b85c55c4 Author: Max Reitz AuthorDate: Tue Dec 2 18:32:51 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:09:50 2015 -0600 qcow2: Flushing the caches in qcow2_close may fail qcow2_cache_flush() may fail; if one of the caches failed to be flushed successfully to disk in qcow2_close() the image should not be marked clean, and we should emit a warning. This breaks the (qcow2-specific) iotests 026, 071 and 089; change their output accordingly. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit 3b5e14c76a6bb142bf250ddf99e24a0ac8c7bc12) Signed-off-by: Michael Roth --- block/qcow2.c | 19 ++++++- tests/qemu-iotests/026.out | 120 ++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/071.out | 8 +++ tests/qemu-iotests/089.out | 2 + 4 files changed, 146 insertions(+), 3 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 1d21a2a..a33e863 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1428,10 +1428,23 @@ static void qcow2_close(BlockDriverState *bs) s->l1_table = NULL; if (!(bs->open_flags & BDRV_O_INCOMING)) { - qcow2_cache_flush(bs, s->l2_table_cache); - qcow2_cache_flush(bs, s->refcount_block_cache); + int ret1, ret2; - qcow2_mark_clean(bs); + ret1 = qcow2_cache_flush(bs, s->l2_table_cache); + ret2 = qcow2_cache_flush(bs, s->refcount_block_cache); + + if (ret1) { + error_report("Failed to flush the L2 table cache: %s", + strerror(-ret1)); + } + if (ret2) { + error_report("Failed to flush the refcount block cache: %s", + strerror(-ret2)); + } + + if (!ret1 && !ret2) { + qcow2_mark_clean(bs); + } } qcow2_cache_destroy(bs, s->l2_table_cache); diff --git a/tests/qemu-iotests/026.out b/tests/qemu-iotests/026.out index f7c78e7..ad84ac2 100644 --- a/tests/qemu-iotests/026.out +++ b/tests/qemu-iotests/026.out @@ -14,6 +14,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_update; errno: 5; imm: off; once: off; write +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error 1 leaked clusters were found on the image. @@ -21,6 +23,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_update; errno: 5; imm: off; once: off; write -b +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error 1 leaked clusters were found on the image. @@ -38,6 +42,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_update; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 1 leaked clusters were found on the image. @@ -45,6 +51,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_update; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 1 leaked clusters were found on the image. @@ -70,7 +78,11 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_load; errno: 5; imm: off; once: off; write wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error read failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -78,7 +90,11 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_load; errno: 5; imm: off; once: off; write -b wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error read failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -102,7 +118,11 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_load; errno: 28; imm: off; once: off; write wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device read failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -110,12 +130,17 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_load; errno: 28; imm: off; once: off; write -b wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device read failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_update; errno: 5; imm: off; once: on; write +Failed to flush the L2 table cache: Input/output error write failed: Input/output error 127 leaked clusters were found on the image. @@ -123,6 +148,7 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_update; errno: 5; imm: off; once: on; write -b +Failed to flush the L2 table cache: Input/output error write failed: Input/output error 127 leaked clusters were found on the image. @@ -130,6 +156,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_update; errno: 5; imm: off; once: off; write +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error 127 leaked clusters were found on the image. @@ -137,6 +165,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_update; errno: 5; imm: off; once: off; write -b +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error 127 leaked clusters were found on the image. @@ -144,6 +174,7 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_update; errno: 28; imm: off; once: on; write +Failed to flush the L2 table cache: No space left on device write failed: No space left on device 127 leaked clusters were found on the image. @@ -151,6 +182,7 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_update; errno: 28; imm: off; once: on; write -b +Failed to flush the L2 table cache: No space left on device write failed: No space left on device 127 leaked clusters were found on the image. @@ -158,6 +190,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_update; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 127 leaked clusters were found on the image. @@ -165,6 +199,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_update; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 127 leaked clusters were found on the image. @@ -182,11 +218,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_alloc.write; errno: 5; imm: off; once: off; write +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_alloc.write; errno: 5; imm: off; once: off; write -b +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error 1 leaked clusters were found on the image. @@ -204,11 +244,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_alloc.write; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l2_alloc.write; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 1 leaked clusters were found on the image. @@ -226,11 +270,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: write_aio; errno: 5; imm: off; once: off; write +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: write_aio; errno: 5; imm: off; once: off; write -b +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -246,11 +294,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: write_aio; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: write_aio; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -266,11 +318,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_load; errno: 5; imm: off; once: off; write +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_load; errno: 5; imm: off; once: off; write -b +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -286,51 +342,67 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_load; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_load; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_update_part; errno: 5; imm: off; once: on; write +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_update_part; errno: 5; imm: off; once: on; write -b +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_update_part; errno: 5; imm: off; once: off; write +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_update_part; errno: 5; imm: off; once: off; write -b +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_update_part; errno: 28; imm: off; once: on; write +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_update_part; errno: 28; imm: off; once: on; write -b +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_update_part; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_update_part; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -346,11 +418,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc; errno: 5; imm: off; once: off; write +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc; errno: 5; imm: off; once: off; write -b +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -366,11 +442,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -386,11 +466,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: cluster_alloc; errno: 5; imm: off; once: off; write +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: cluster_alloc; errno: 5; imm: off; once: off; write -b +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -406,11 +490,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: cluster_alloc; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: cluster_alloc; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. @@ -429,6 +517,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.hookup; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 55 leaked clusters were found on the image. @@ -436,6 +526,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.hookup; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 251 leaked clusters were found on the image. @@ -453,11 +545,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.write; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.write; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -473,6 +569,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.write_blocks; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 11 leaked clusters were found on the image. @@ -480,6 +578,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.write_blocks; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 23 leaked clusters were found on the image. @@ -497,6 +597,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.write_table; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 11 leaked clusters were found on the image. @@ -504,6 +606,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.write_table; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 23 leaked clusters were found on the image. @@ -521,6 +625,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.switch_table; errno: 28; imm: off; once: off; write +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 11 leaked clusters were found on the image. @@ -528,6 +634,8 @@ This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: refblock_alloc.switch_table; errno: 28; imm: off; once: off; write -b +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 23 leaked clusters were found on the image. @@ -543,6 +651,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_grow.alloc_table; errno: 5; imm: off; once: off +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -553,6 +663,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_grow.alloc_table; errno: 28; imm: off; once: off +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -563,6 +675,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_grow.write_table; errno: 5; imm: off; once: off +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -573,6 +687,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_grow.write_table; errno: 28; imm: off; once: off +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 @@ -583,6 +699,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_grow.activate_table; errno: 5; imm: off; once: off +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error 96 leaked clusters were found on the image. @@ -595,6 +713,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 Event: l1_grow.activate_table; errno: 28; imm: off; once: off +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device 96 leaked clusters were found on the image. diff --git a/tests/qemu-iotests/071.out b/tests/qemu-iotests/071.out index 5f840a9..0624581 100644 --- a/tests/qemu-iotests/071.out +++ b/tests/qemu-iotests/071.out @@ -30,10 +30,14 @@ blkverify: read sector_num=0 nb_sectors=4 contents mismatch in sector 0 === Testing blkdebug through filename === +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error read failed: Input/output error === Testing blkdebug through file blockref === +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error read failed: Input/output error === Testing blkdebug on existing block device === @@ -48,6 +52,8 @@ read failed: Input/output error {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": true}} +qemu-system-x86_64: Failed to flush the L2 table cache: Input/output error +qemu-system-x86_64: Failed to flush the refcount block cache: Input/output error === Testing blkverify on existing block device === @@ -86,5 +92,7 @@ read failed: Input/output error {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": true}} +qemu-system-x86_64: Failed to flush the L2 table cache: Input/output error +qemu-system-x86_64: Failed to flush the refcount block cache: Input/output error *** done diff --git a/tests/qemu-iotests/089.out b/tests/qemu-iotests/089.out index b2b0390..bf3b8a0 100644 --- a/tests/qemu-iotests/089.out +++ b/tests/qemu-iotests/089.out @@ -24,6 +24,8 @@ read 512/512 bytes at offset 0 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 wrote 512/512 bytes at offset 229376 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error read failed: Input/output error === Testing qemu-img info output === -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:46:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:46: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 1YaXau-00077Y-Uu; Tue, 24 Mar 2015 22:46:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXau-00077D-1a for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:44 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 9E/A0-11368-359E1155; Tue, 24 Mar 2015 22:46:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1427237201!15259735!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27070 invoked from network); 24 Mar 2015 22:46:42 -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; 24 Mar 2015 22:46:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXar-00077a-DP for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXar-0004TG-By for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:41 +0000 Date: Tue, 24 Mar 2015 22:46:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qcow2: Respect bdrv_truncate() error X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9b3f3d6da97727576b36958fa60f0b0faffb334a Author: Max Reitz AuthorDate: Tue Dec 2 18:32:52 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:09:55 2015 -0600 qcow2: Respect bdrv_truncate() error bdrv_truncate() may fail and qcow2_write_compressed() should return the error code in that case. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit 6a69b9620ac1562a067990d87284a85552bfd61b) Signed-off-by: Michael Roth --- block/qcow2.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index a33e863..c98d3b7 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2162,8 +2162,7 @@ static int qcow2_write_compressed(BlockDriverState *bs, int64_t sector_num, /* align end of file to a sector boundary to ease reading with sector based I/Os */ cluster_offset = bdrv_getlength(bs->file); - bdrv_truncate(bs->file, cluster_offset); - return 0; + return bdrv_truncate(bs->file, cluster_offset); } if (nb_sectors != s->cluster_sectors) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:46:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:46: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 1YaXau-00077Y-Uu; Tue, 24 Mar 2015 22:46:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXau-00077D-1a for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:44 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 9E/A0-11368-359E1155; Tue, 24 Mar 2015 22:46:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1427237201!15259735!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27070 invoked from network); 24 Mar 2015 22:46:42 -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; 24 Mar 2015 22:46:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXar-00077a-DP for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXar-0004TG-By for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:41 +0000 Date: Tue, 24 Mar 2015 22:46:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qcow2: Respect bdrv_truncate() error X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9b3f3d6da97727576b36958fa60f0b0faffb334a Author: Max Reitz AuthorDate: Tue Dec 2 18:32:52 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:09:55 2015 -0600 qcow2: Respect bdrv_truncate() error bdrv_truncate() may fail and qcow2_write_compressed() should return the error code in that case. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit 6a69b9620ac1562a067990d87284a85552bfd61b) Signed-off-by: Michael Roth --- block/qcow2.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index a33e863..c98d3b7 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2162,8 +2162,7 @@ static int qcow2_write_compressed(BlockDriverState *bs, int64_t sector_num, /* align end of file to a sector boundary to ease reading with sector based I/Os */ cluster_offset = bdrv_getlength(bs->file); - bdrv_truncate(bs->file, cluster_offset); - return 0; + return bdrv_truncate(bs->file, cluster_offset); } if (nb_sectors != s->cluster_sectors) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:46:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:46: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 1YaXb5-0007BS-Ls; Tue, 24 Mar 2015 22:46:55 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXb4-00079r-8L for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:54 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 4D/08-14870-D59E1155; Tue, 24 Mar 2015 22:46:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1427237211!12854537!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20126 invoked from network); 24 Mar 2015 22:46:52 -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; 24 Mar 2015 22:46:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXb1-00077g-IG for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXb1-0004Th-HA for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:51 +0000 Date: Tue, 24 Mar 2015 22:46:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block/raw-posix: Fix ret in raw_open_common() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6950b92765595fe3255f6127a517c3866c5df4bd Author: Max Reitz AuthorDate: Tue Dec 2 18:32:53 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:10:01 2015 -0600 block/raw-posix: Fix ret in raw_open_common() The return value must be negative on error; there is one place in raw_open_common() where errp is set, but ret remains 0. Fix it. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit 01212d4ed68fc8daa29062a9a38650cf8febe392) Signed-off-by: Michael Roth --- block/raw-posix.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index d8bbed0..ef21242 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -446,6 +446,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, } if (fstat(s->fd, &st) < 0) { + ret = -errno; error_setg_errno(errp, errno, "Could not stat file"); goto fail; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:46:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:46: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 1YaXb5-0007BS-Ls; Tue, 24 Mar 2015 22:46:55 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXb4-00079r-8L for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:54 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 4D/08-14870-D59E1155; Tue, 24 Mar 2015 22:46:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1427237211!12854537!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20126 invoked from network); 24 Mar 2015 22:46:52 -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; 24 Mar 2015 22:46:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXb1-00077g-IG for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXb1-0004Th-HA for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:46:51 +0000 Date: Tue, 24 Mar 2015 22:46:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block/raw-posix: Fix ret in raw_open_common() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6950b92765595fe3255f6127a517c3866c5df4bd Author: Max Reitz AuthorDate: Tue Dec 2 18:32:53 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:10:01 2015 -0600 block/raw-posix: Fix ret in raw_open_common() The return value must be negative on error; there is one place in raw_open_common() where errp is set, but ret remains 0. Fix it. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit 01212d4ed68fc8daa29062a9a38650cf8febe392) Signed-off-by: Michael Roth --- block/raw-posix.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index d8bbed0..ef21242 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -446,6 +446,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, } if (fstat(s->fd, &st) < 0) { + ret = -errno; error_setg_errno(errp, errno, "Could not stat file"); goto fail; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:47:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:47: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 1YaXbF-0007Ev-Ou; Tue, 24 Mar 2015 22:47:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbE-0007EO-KV for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:04 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id DD/A2-09199-769E1155; Tue, 24 Mar 2015 22:47:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1427237222!15206140!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13836 invoked from network); 24 Mar 2015 22:47:03 -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; 24 Mar 2015 22:47:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbB-00077p-QP for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXbB-0004Ub-N7 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:01 +0000 Date: Tue, 24 Mar 2015 22:47:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block migration: fix return value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9fc6075d289702fd6a169dfadc42a52f49f219df Author: Gary R Hook AuthorDate: Tue Nov 25 17:30:02 2014 -0600 Commit: Michael Roth CommitDate: Sun Feb 22 12:10:06 2015 -0600 block migration: fix return value Modify block_save_iterate() to return positive/zero/negative (success/not done/failure) return status. The computation of the blocks transferred (an int64_t) exceeds the size of an int return value. Signed-off-by: Gary R Hook Reviewed-by: ChenLiang Reviewed-by: Stefan Hajnoczi Message-id: 1416958202-15913-1-git-send-email-gary.hook@nimboxx.com Signed-off-by: Stefan Hajnoczi (cherry picked from commit ebd9fbd7e102c533143c2c8372312b75c2b2678a) Signed-off-by: Michael Roth --- block-migration.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/block-migration.c b/block-migration.c index 08db01a..74d9eb1 100644 --- a/block-migration.c +++ b/block-migration.c @@ -653,6 +653,7 @@ static int block_save_iterate(QEMUFile *f, void *opaque) { int ret; int64_t last_ftell = qemu_ftell(f); + int64_t delta_ftell; DPRINTF("Enter save live iterate submitted %d transferred %d\n", block_mig_state.submitted, block_mig_state.transferred); @@ -702,7 +703,14 @@ static int block_save_iterate(QEMUFile *f, void *opaque) } qemu_put_be64(f, BLK_MIG_FLAG_EOS); - return qemu_ftell(f) - last_ftell; + delta_ftell = qemu_ftell(f) - last_ftell; + if (delta_ftell > 0) { + return 1; + } else if (delta_ftell < 0) { + return -1; + } else { + return 0; + } } /* Called with iothread lock taken. */ -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:47:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:47: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 1YaXbF-0007Ev-Ou; Tue, 24 Mar 2015 22:47:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbE-0007EO-KV for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:04 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id DD/A2-09199-769E1155; Tue, 24 Mar 2015 22:47:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1427237222!15206140!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13836 invoked from network); 24 Mar 2015 22:47:03 -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; 24 Mar 2015 22:47:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbB-00077p-QP for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXbB-0004Ub-N7 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:01 +0000 Date: Tue, 24 Mar 2015 22:47:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block migration: fix return value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9fc6075d289702fd6a169dfadc42a52f49f219df Author: Gary R Hook AuthorDate: Tue Nov 25 17:30:02 2014 -0600 Commit: Michael Roth CommitDate: Sun Feb 22 12:10:06 2015 -0600 block migration: fix return value Modify block_save_iterate() to return positive/zero/negative (success/not done/failure) return status. The computation of the blocks transferred (an int64_t) exceeds the size of an int return value. Signed-off-by: Gary R Hook Reviewed-by: ChenLiang Reviewed-by: Stefan Hajnoczi Message-id: 1416958202-15913-1-git-send-email-gary.hook@nimboxx.com Signed-off-by: Stefan Hajnoczi (cherry picked from commit ebd9fbd7e102c533143c2c8372312b75c2b2678a) Signed-off-by: Michael Roth --- block-migration.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/block-migration.c b/block-migration.c index 08db01a..74d9eb1 100644 --- a/block-migration.c +++ b/block-migration.c @@ -653,6 +653,7 @@ static int block_save_iterate(QEMUFile *f, void *opaque) { int ret; int64_t last_ftell = qemu_ftell(f); + int64_t delta_ftell; DPRINTF("Enter save live iterate submitted %d transferred %d\n", block_mig_state.submitted, block_mig_state.transferred); @@ -702,7 +703,14 @@ static int block_save_iterate(QEMUFile *f, void *opaque) } qemu_put_be64(f, BLK_MIG_FLAG_EOS); - return qemu_ftell(f) - last_ftell; + delta_ftell = qemu_ftell(f) - last_ftell; + if (delta_ftell > 0) { + return 1; + } else if (delta_ftell < 0) { + return -1; + } else { + return 0; + } } /* Called with iothread lock taken. */ -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:47:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXbP-0007IV-SY; Tue, 24 Mar 2015 22: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 1YaXbO-0007Hy-Ic for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:14 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 4A/2D-19614-179E1155; Tue, 24 Mar 2015 22:47:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1427237232!15120006!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8256 invoked from network); 24 Mar 2015 22:47:13 -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; 24 Mar 2015 22:47:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbM-00078R-0W for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXbL-0004W5-V8 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:11 +0000 Date: Tue, 24 Mar 2015 22:47:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qcow2: Fix header extension size 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 63a3acd24af4067c5f8604ddde53c735bf1b95e1 Author: Kevin Wolf AuthorDate: Tue Nov 25 18:12:40 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:10:11 2015 -0600 qcow2: Fix header extension size check After reading the extension header, offset is incremented, but not checked against end_offset any more. This way an integer overflow could happen when checking whether the extension end is within the allowed range, effectively disabling the check. This patch adds the missing check and a test case for it. Cc: qemu-stable@nongnu.org Reported-by: Max Reitz Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Message-id: 1416935562-7760-2-git-send-email-kwolf@redhat.com Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf (cherry picked from commit 2ebafc854d109ff09b66fb4dd62c2c53fc29754a) Signed-off-by: Michael Roth --- block/qcow2.c | 2 +- tests/qemu-iotests/080 | 2 ++ tests/qemu-iotests/080.out | 2 ++ 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index c98d3b7..e4e690a 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -117,7 +117,7 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, #ifdef DEBUG_EXT printf("ext.magic = 0x%x\n", ext.magic); #endif - if (ext.len > end_offset - offset) { + if (offset > end_offset || ext.len > end_offset - offset) { error_setg(errp, "Header extension too large"); return -EINVAL; } diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080 index 9de337c..73795f1 100755 --- a/tests/qemu-iotests/080 +++ b/tests/qemu-iotests/080 @@ -78,6 +78,8 @@ poke_file "$TEST_IMG" "$offset_backing_file_offset" "\xff\xff\xff\xff\xff\xff\xf poke_file "$TEST_IMG" "$offset_ext_magic" "\x12\x34\x56\x78" poke_file "$TEST_IMG" "$offset_ext_size" "\x7f\xff\xff\xff" { $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir +poke_file "$TEST_IMG" "$offset_backing_file_offset" "\x00\x00\x00\x00\x00\x00\x00\x$(printf %x $offset_ext_size)" +{ $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir poke_file "$TEST_IMG" "$offset_backing_file_offset" "\x00\x00\x00\x00\x00\x00\x00\x00" { $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir diff --git a/tests/qemu-iotests/080.out b/tests/qemu-iotests/080.out index f7a943c..33d1f71 100644 --- a/tests/qemu-iotests/080.out +++ b/tests/qemu-iotests/080.out @@ -13,6 +13,8 @@ qemu-io: can't open device TEST_DIR/t.qcow2: Invalid backing file offset no file open, try 'help open' qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large no file open, try 'help open' +qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large +no file open, try 'help open' == Huge refcount table size == Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:47:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXbP-0007IV-SY; Tue, 24 Mar 2015 22: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 1YaXbO-0007Hy-Ic for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:14 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 4A/2D-19614-179E1155; Tue, 24 Mar 2015 22:47:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1427237232!15120006!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8256 invoked from network); 24 Mar 2015 22:47:13 -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; 24 Mar 2015 22:47:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbM-00078R-0W for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXbL-0004W5-V8 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:11 +0000 Date: Tue, 24 Mar 2015 22:47:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qcow2: Fix header extension size 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 63a3acd24af4067c5f8604ddde53c735bf1b95e1 Author: Kevin Wolf AuthorDate: Tue Nov 25 18:12:40 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:10:11 2015 -0600 qcow2: Fix header extension size check After reading the extension header, offset is incremented, but not checked against end_offset any more. This way an integer overflow could happen when checking whether the extension end is within the allowed range, effectively disabling the check. This patch adds the missing check and a test case for it. Cc: qemu-stable@nongnu.org Reported-by: Max Reitz Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Message-id: 1416935562-7760-2-git-send-email-kwolf@redhat.com Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf (cherry picked from commit 2ebafc854d109ff09b66fb4dd62c2c53fc29754a) Signed-off-by: Michael Roth --- block/qcow2.c | 2 +- tests/qemu-iotests/080 | 2 ++ tests/qemu-iotests/080.out | 2 ++ 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index c98d3b7..e4e690a 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -117,7 +117,7 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, #ifdef DEBUG_EXT printf("ext.magic = 0x%x\n", ext.magic); #endif - if (ext.len > end_offset - offset) { + if (offset > end_offset || ext.len > end_offset - offset) { error_setg(errp, "Header extension too large"); return -EINVAL; } diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080 index 9de337c..73795f1 100755 --- a/tests/qemu-iotests/080 +++ b/tests/qemu-iotests/080 @@ -78,6 +78,8 @@ poke_file "$TEST_IMG" "$offset_backing_file_offset" "\xff\xff\xff\xff\xff\xff\xf poke_file "$TEST_IMG" "$offset_ext_magic" "\x12\x34\x56\x78" poke_file "$TEST_IMG" "$offset_ext_size" "\x7f\xff\xff\xff" { $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir +poke_file "$TEST_IMG" "$offset_backing_file_offset" "\x00\x00\x00\x00\x00\x00\x00\x$(printf %x $offset_ext_size)" +{ $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir poke_file "$TEST_IMG" "$offset_backing_file_offset" "\x00\x00\x00\x00\x00\x00\x00\x00" { $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir diff --git a/tests/qemu-iotests/080.out b/tests/qemu-iotests/080.out index f7a943c..33d1f71 100644 --- a/tests/qemu-iotests/080.out +++ b/tests/qemu-iotests/080.out @@ -13,6 +13,8 @@ qemu-io: can't open device TEST_DIR/t.qcow2: Invalid backing file offset no file open, try 'help open' qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large no file open, try 'help open' +qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large +no file open, try 'help open' == Huge refcount table size == Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:47:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:47: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 1YaXba-0007LP-0l; Tue, 24 Mar 2015 22:47:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbZ-0007Kg-49 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:25 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id D4/F0-11368-C79E1155; Tue, 24 Mar 2015 22:47:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1427237242!15144490!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23446 invoked from network); 24 Mar 2015 22:47:23 -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; 24 Mar 2015 22:47:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbW-00078X-6u for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXbW-0004WR-5B for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:22 +0000 Date: Tue, 24 Mar 2015 22:47:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qcow2.py: Add required padding for header extensions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f8da0319dfc321abe98b6454e7970015ac4e23c Author: Kevin Wolf AuthorDate: Tue Nov 25 18:12:41 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:24:35 2015 -0600 qcow2.py: Add required padding for header extensions The qcow2 specification requires that the header extension data be padded to round up the extension size to the next multiple of 8 bytes. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Message-id: 1416935562-7760-3-git-send-email-kwolf@redhat.com Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf (cherry picked from commit 8884dd1bbc5ce42cd657ffcbef3a477443468974) Signed-off-by: Michael Roth --- tests/qemu-iotests/qcow2.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tests/qemu-iotests/qcow2.py b/tests/qemu-iotests/qcow2.py index 2058596..9cc4cf7 100755 --- a/tests/qemu-iotests/qcow2.py +++ b/tests/qemu-iotests/qcow2.py @@ -7,6 +7,10 @@ import string class QcowHeaderExtension: def __init__(self, magic, length, data): + if length % 8 != 0: + padding = 8 - (length % 8) + data += "\0" * padding + self.magic = magic self.length = length self.data = data -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:47:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:47: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 1YaXba-0007LP-0l; Tue, 24 Mar 2015 22:47:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbZ-0007Kg-49 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:25 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id D4/F0-11368-C79E1155; Tue, 24 Mar 2015 22:47:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1427237242!15144490!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23446 invoked from network); 24 Mar 2015 22:47:23 -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; 24 Mar 2015 22:47:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbW-00078X-6u for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXbW-0004WR-5B for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:22 +0000 Date: Tue, 24 Mar 2015 22:47:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qcow2.py: Add required padding for header extensions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f8da0319dfc321abe98b6454e7970015ac4e23c Author: Kevin Wolf AuthorDate: Tue Nov 25 18:12:41 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:24:35 2015 -0600 qcow2.py: Add required padding for header extensions The qcow2 specification requires that the header extension data be padded to round up the extension size to the next multiple of 8 bytes. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Message-id: 1416935562-7760-3-git-send-email-kwolf@redhat.com Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf (cherry picked from commit 8884dd1bbc5ce42cd657ffcbef3a477443468974) Signed-off-by: Michael Roth --- tests/qemu-iotests/qcow2.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tests/qemu-iotests/qcow2.py b/tests/qemu-iotests/qcow2.py index 2058596..9cc4cf7 100755 --- a/tests/qemu-iotests/qcow2.py +++ b/tests/qemu-iotests/qcow2.py @@ -7,6 +7,10 @@ import string class QcowHeaderExtension: def __init__(self, magic, length, data): + if length % 8 != 0: + padding = 8 - (length % 8) + data += "\0" * padding + self.magic = magic self.length = length self.data = data -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:47:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:47: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 1YaXbm-0007OO-6N; Tue, 24 Mar 2015 22:47:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbk-0007O6-OP for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:36 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 70/96-15508-889E1155; Tue, 24 Mar 2015 22:47:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1427237252!11339113!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31231 invoked from network); 24 Mar 2015 22:47:33 -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; 24 Mar 2015 22:47:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbg-00078f-Di for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXbg-0004Wr-Bk for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:32 +0000 Date: Tue, 24 Mar 2015 22:47:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block: Don't probe for unknown backing file format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ebd2bd2227b1f949a0ad4a4226262d0c3f955034 Author: Kevin Wolf AuthorDate: Tue Nov 25 18:12:42 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:27:06 2015 -0600 block: Don't probe for unknown backing file format If a qcow2 image specifies a backing file format that doesn't correspond to any format driver that qemu knows, we shouldn't fall back to probing, but simply error out. Not looking up the backing file driver in bdrv_open_backing_file(), but just filling in the "driver" option if it isn't there moves us closer to the goal of having everything in QDict options and gets us the error handling of bdrv_open(), which correctly refuses unknown drivers. Cc: qemu-stable@nongnu.org Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Message-id: 1416935562-7760-4-git-send-email-kwolf@redhat.com Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf (cherry picked from commit c5f6e493bb5339d244eae5d3f21c5b6d73996739) Conflicts: tests/qemu-iotests/group *resolved context conflict due to group 113 being present locally Signed-off-by: Michael Roth --- block.c | 7 ++--- tests/qemu-iotests/114 | 61 ++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/114.out | 13 +++++++++ tests/qemu-iotests/group | 1 + 4 files changed, 78 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 07f58fc..8717597 100644 --- a/block.c +++ b/block.c @@ -1175,7 +1175,6 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp) { char *backing_filename = g_malloc0(PATH_MAX); int ret = 0; - BlockDriver *back_drv = NULL; BlockDriverState *backing_hd; Error *local_err = NULL; @@ -1208,14 +1207,14 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp) backing_hd = bdrv_new(); - if (bs->backing_format[0] != '\0') { - back_drv = bdrv_find_format(bs->backing_format); + if (bs->backing_format[0] != '\0' && !qdict_haskey(options, "driver")) { + qdict_put(options, "driver", qstring_from_str(bs->backing_format)); } assert(bs->backing_hd == NULL); ret = bdrv_open(&backing_hd, *backing_filename ? backing_filename : NULL, NULL, options, - bdrv_backing_flags(bs->open_flags), back_drv, &local_err); + bdrv_backing_flags(bs->open_flags), NULL, &local_err); if (ret < 0) { bdrv_unref(backing_hd); backing_hd = NULL; diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114 new file mode 100755 index 0000000..d02e7ff --- /dev/null +++ b/tests/qemu-iotests/114 @@ -0,0 +1,61 @@ +#!/bin/bash +# +# Test invalid backing file format in qcow2 images +# +# Copyright (C) 2014 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +# creator +owner=kwolf@redhat.com + +seq="$(basename $0)" +echo "QA output created by $seq" + +here="$PWD" +tmp=/tmp/$$ +status=1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter + +_supported_fmt qcow2 +_supported_proto generic +_supported_os Linux + + +TEST_IMG="$TEST_IMG.base" _make_test_img 64M +_make_test_img -b "$TEST_IMG.base" 64M + +# Set an invalid backing file format +$PYTHON qcow2.py "$TEST_IMG" add-header-ext 0xE2792ACA "foo" +_img_info + +# Try opening the image. Should fail (and not probe) in the first case, but +# overriding the backing file format should be possible. +$QEMU_IO -c "open $TEST_IMG" -c "read 0 4k" 2>&1 | _filter_qemu_io | _filter_testdir +$QEMU_IO -c "open -o backing.driver=$IMGFMT $TEST_IMG" -c "read 0 4k" | _filter_qemu_io + +# success, all done +echo '*** done' +rm -f $seq.full +status=0 diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out new file mode 100644 index 0000000..6c6b210 --- /dev/null +++ b/tests/qemu-iotests/114.out @@ -0,0 +1,13 @@ +QA output created by 114 +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file='TEST_DIR/t.IMGFMT.base' +image: TEST_DIR/t.IMGFMT +file format: IMGFMT +virtual size: 64M (67108864 bytes) +cluster_size: 65536 +backing file: TEST_DIR/t.IMGFMT.base +backing file format: foo +qemu-io: can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown driver 'foo' +read 4096/4096 bytes at offset 0 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index fd2c64a..da59f57 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -113,3 +113,4 @@ 108 rw auto quick 111 rw auto quick 113 rw auto quick +114 rw auto quick -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:47:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:47: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 1YaXbm-0007OO-6N; Tue, 24 Mar 2015 22:47:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbk-0007O6-OP for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:36 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 70/96-15508-889E1155; Tue, 24 Mar 2015 22:47:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1427237252!11339113!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31231 invoked from network); 24 Mar 2015 22:47:33 -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; 24 Mar 2015 22:47:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbg-00078f-Di for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXbg-0004Wr-Bk for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:32 +0000 Date: Tue, 24 Mar 2015 22:47:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block: Don't probe for unknown backing file format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ebd2bd2227b1f949a0ad4a4226262d0c3f955034 Author: Kevin Wolf AuthorDate: Tue Nov 25 18:12:42 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:27:06 2015 -0600 block: Don't probe for unknown backing file format If a qcow2 image specifies a backing file format that doesn't correspond to any format driver that qemu knows, we shouldn't fall back to probing, but simply error out. Not looking up the backing file driver in bdrv_open_backing_file(), but just filling in the "driver" option if it isn't there moves us closer to the goal of having everything in QDict options and gets us the error handling of bdrv_open(), which correctly refuses unknown drivers. Cc: qemu-stable@nongnu.org Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Message-id: 1416935562-7760-4-git-send-email-kwolf@redhat.com Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf (cherry picked from commit c5f6e493bb5339d244eae5d3f21c5b6d73996739) Conflicts: tests/qemu-iotests/group *resolved context conflict due to group 113 being present locally Signed-off-by: Michael Roth --- block.c | 7 ++--- tests/qemu-iotests/114 | 61 ++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/114.out | 13 +++++++++ tests/qemu-iotests/group | 1 + 4 files changed, 78 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 07f58fc..8717597 100644 --- a/block.c +++ b/block.c @@ -1175,7 +1175,6 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp) { char *backing_filename = g_malloc0(PATH_MAX); int ret = 0; - BlockDriver *back_drv = NULL; BlockDriverState *backing_hd; Error *local_err = NULL; @@ -1208,14 +1207,14 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp) backing_hd = bdrv_new(); - if (bs->backing_format[0] != '\0') { - back_drv = bdrv_find_format(bs->backing_format); + if (bs->backing_format[0] != '\0' && !qdict_haskey(options, "driver")) { + qdict_put(options, "driver", qstring_from_str(bs->backing_format)); } assert(bs->backing_hd == NULL); ret = bdrv_open(&backing_hd, *backing_filename ? backing_filename : NULL, NULL, options, - bdrv_backing_flags(bs->open_flags), back_drv, &local_err); + bdrv_backing_flags(bs->open_flags), NULL, &local_err); if (ret < 0) { bdrv_unref(backing_hd); backing_hd = NULL; diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114 new file mode 100755 index 0000000..d02e7ff --- /dev/null +++ b/tests/qemu-iotests/114 @@ -0,0 +1,61 @@ +#!/bin/bash +# +# Test invalid backing file format in qcow2 images +# +# Copyright (C) 2014 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +# creator +owner=kwolf@redhat.com + +seq="$(basename $0)" +echo "QA output created by $seq" + +here="$PWD" +tmp=/tmp/$$ +status=1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter + +_supported_fmt qcow2 +_supported_proto generic +_supported_os Linux + + +TEST_IMG="$TEST_IMG.base" _make_test_img 64M +_make_test_img -b "$TEST_IMG.base" 64M + +# Set an invalid backing file format +$PYTHON qcow2.py "$TEST_IMG" add-header-ext 0xE2792ACA "foo" +_img_info + +# Try opening the image. Should fail (and not probe) in the first case, but +# overriding the backing file format should be possible. +$QEMU_IO -c "open $TEST_IMG" -c "read 0 4k" 2>&1 | _filter_qemu_io | _filter_testdir +$QEMU_IO -c "open -o backing.driver=$IMGFMT $TEST_IMG" -c "read 0 4k" | _filter_qemu_io + +# success, all done +echo '*** done' +rm -f $seq.full +status=0 diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out new file mode 100644 index 0000000..6c6b210 --- /dev/null +++ b/tests/qemu-iotests/114.out @@ -0,0 +1,13 @@ +QA output created by 114 +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file='TEST_DIR/t.IMGFMT.base' +image: TEST_DIR/t.IMGFMT +file format: IMGFMT +virtual size: 64M (67108864 bytes) +cluster_size: 65536 +backing file: TEST_DIR/t.IMGFMT.base +backing file format: foo +qemu-io: can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown driver 'foo' +read 4096/4096 bytes at offset 0 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index fd2c64a..da59f57 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -113,3 +113,4 @@ 108 rw auto quick 111 rw auto quick 113 rw auto quick +114 rw auto quick -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:47:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:47: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 1YaXbu-0007Qf-AK; Tue, 24 Mar 2015 22:47:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbt-0007QH-4w for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:45 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id A0/82-31314-099E1155; Tue, 24 Mar 2015 22:47:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1427237262!15144531!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24338 invoked from network); 24 Mar 2015 22:47: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; 24 Mar 2015 22:47:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbq-00078l-KE for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXbq-0004XJ-I1 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:42 +0000 Date: Tue, 24 Mar 2015 22:47:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] linuxboot: fix loading old kernels X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 51d703ff2e03285be7ba0433d814a688c923b1ea Author: Paolo Bonzini AuthorDate: Thu Dec 11 02:17:03 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:27:19 2015 -0600 linuxboot: fix loading old kernels Old kernels that used high memory only allowed the initrd to be in the first 896MB of memory. If you load the initrd above, they complain that "initrd extends beyond end of memory". In order to fix this, while not breaking machines with small amounts of memory fixed by cdebec5 (linuxboot: compute initrd loading address, 2014-10-06), we need to distinguish two cases. If pc.c placed the initrd at end of memory, use the new algorithm based on the e801 memory map. If instead pc.c placed the initrd at the maximum address specified by the bzImage, leave it there. The only interesting part is that the low-memory info block is now loaded very early, in real mode, and thus the 32-bit address has to be converted into a real mode segment. The initrd address is also patched in the info block before entering real mode, it is simpler that way. This fixes booting the RHEL4.8 32-bit installation image with 1GB of RAM. Cc: qemu-stable@nongnu.org Cc: mst@redhat.com Cc: jsnow@redhat.com Signed-off-by: Paolo Bonzini (cherry picked from commit 269e2358492b674c50160553d037702e916b9f1b) Signed-off-by: Michael Roth --- pc-bios/linuxboot.bin | Bin 1024 -> 1024 bytes pc-bios/optionrom/linuxboot.S | 37 +++++++++++++++++++++++++++---------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/pc-bios/linuxboot.bin b/pc-bios/linuxboot.bin index 130103f..923d179 100644 Binary files a/pc-bios/linuxboot.bin and b/pc-bios/linuxboot.bin differ diff --git a/pc-bios/optionrom/linuxboot.S b/pc-bios/optionrom/linuxboot.S index 5bc0af0..ba821ab 100644 --- a/pc-bios/optionrom/linuxboot.S +++ b/pc-bios/optionrom/linuxboot.S @@ -76,7 +76,31 @@ boot_kernel: copy_kernel: - /* Compute initrd address */ + /* Read info block in low memory (0x10000 or 0x90000) */ + read_fw FW_CFG_SETUP_ADDR + shr $4, %eax + mov %eax, %es + xor %edi, %edi + read_fw_blob_addr32_edi(FW_CFG_SETUP) + + cmpw $0x203, %es:0x206 // if protocol >= 0x203 + jae 1f // have initrd_max + movl $0x37ffffff, %es:0x22c // else assume 0x37ffffff +1: + + /* Check if using kernel-specified initrd address */ + read_fw FW_CFG_INITRD_ADDR + mov %eax, %edi // (load_kernel wants it in %edi) + read_fw FW_CFG_INITRD_SIZE // find end of initrd + add %edi, %eax + xor %es:0x22c, %eax // if it matches es:0x22c + and $-4096, %eax // (apart from padding for page) + jz load_kernel // then initrd is not at top + // of memory + + /* pc.c placed the initrd at end of memory. Compute a better + * initrd address based on e801 data. + */ mov $0xe801, %ax xor %cx, %cx xor %dx, %dx @@ -107,7 +131,9 @@ copy_kernel: read_fw FW_CFG_INITRD_SIZE subl %eax, %edi andl $-4096, %edi /* EDI = start of initrd */ + movl %edi, %es:0x218 /* put it in the header */ +load_kernel: /* We need to load the kernel into memory we can't access in 16 bit mode, so let's get into 32 bit mode, write the kernel and jump back again. */ @@ -139,19 +165,10 @@ copy_kernel: /* We're now running in 16-bit CS, but 32-bit ES! */ /* Load kernel and initrd */ - pushl %edi read_fw_blob_addr32_edi(FW_CFG_INITRD) read_fw_blob_addr32(FW_CFG_KERNEL) read_fw_blob_addr32(FW_CFG_CMDLINE) - read_fw FW_CFG_SETUP_ADDR - mov %eax, %edi - mov %eax, %ebx - read_fw_blob_addr32_edi(FW_CFG_SETUP) - - /* Update the header with the initrd address we chose above */ - popl %es:0x218(%ebx) - /* And now jump into Linux! */ mov $0, %eax mov %eax, %cr0 -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:47:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:47: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 1YaXbu-0007Qf-AK; Tue, 24 Mar 2015 22:47:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbt-0007QH-4w for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:45 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id A0/82-31314-099E1155; Tue, 24 Mar 2015 22:47:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1427237262!15144531!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24338 invoked from network); 24 Mar 2015 22:47: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; 24 Mar 2015 22:47:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXbq-00078l-KE for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXbq-0004XJ-I1 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:42 +0000 Date: Tue, 24 Mar 2015 22:47:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] linuxboot: fix loading old kernels X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 51d703ff2e03285be7ba0433d814a688c923b1ea Author: Paolo Bonzini AuthorDate: Thu Dec 11 02:17:03 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:27:19 2015 -0600 linuxboot: fix loading old kernels Old kernels that used high memory only allowed the initrd to be in the first 896MB of memory. If you load the initrd above, they complain that "initrd extends beyond end of memory". In order to fix this, while not breaking machines with small amounts of memory fixed by cdebec5 (linuxboot: compute initrd loading address, 2014-10-06), we need to distinguish two cases. If pc.c placed the initrd at end of memory, use the new algorithm based on the e801 memory map. If instead pc.c placed the initrd at the maximum address specified by the bzImage, leave it there. The only interesting part is that the low-memory info block is now loaded very early, in real mode, and thus the 32-bit address has to be converted into a real mode segment. The initrd address is also patched in the info block before entering real mode, it is simpler that way. This fixes booting the RHEL4.8 32-bit installation image with 1GB of RAM. Cc: qemu-stable@nongnu.org Cc: mst@redhat.com Cc: jsnow@redhat.com Signed-off-by: Paolo Bonzini (cherry picked from commit 269e2358492b674c50160553d037702e916b9f1b) Signed-off-by: Michael Roth --- pc-bios/linuxboot.bin | Bin 1024 -> 1024 bytes pc-bios/optionrom/linuxboot.S | 37 +++++++++++++++++++++++++++---------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/pc-bios/linuxboot.bin b/pc-bios/linuxboot.bin index 130103f..923d179 100644 Binary files a/pc-bios/linuxboot.bin and b/pc-bios/linuxboot.bin differ diff --git a/pc-bios/optionrom/linuxboot.S b/pc-bios/optionrom/linuxboot.S index 5bc0af0..ba821ab 100644 --- a/pc-bios/optionrom/linuxboot.S +++ b/pc-bios/optionrom/linuxboot.S @@ -76,7 +76,31 @@ boot_kernel: copy_kernel: - /* Compute initrd address */ + /* Read info block in low memory (0x10000 or 0x90000) */ + read_fw FW_CFG_SETUP_ADDR + shr $4, %eax + mov %eax, %es + xor %edi, %edi + read_fw_blob_addr32_edi(FW_CFG_SETUP) + + cmpw $0x203, %es:0x206 // if protocol >= 0x203 + jae 1f // have initrd_max + movl $0x37ffffff, %es:0x22c // else assume 0x37ffffff +1: + + /* Check if using kernel-specified initrd address */ + read_fw FW_CFG_INITRD_ADDR + mov %eax, %edi // (load_kernel wants it in %edi) + read_fw FW_CFG_INITRD_SIZE // find end of initrd + add %edi, %eax + xor %es:0x22c, %eax // if it matches es:0x22c + and $-4096, %eax // (apart from padding for page) + jz load_kernel // then initrd is not at top + // of memory + + /* pc.c placed the initrd at end of memory. Compute a better + * initrd address based on e801 data. + */ mov $0xe801, %ax xor %cx, %cx xor %dx, %dx @@ -107,7 +131,9 @@ copy_kernel: read_fw FW_CFG_INITRD_SIZE subl %eax, %edi andl $-4096, %edi /* EDI = start of initrd */ + movl %edi, %es:0x218 /* put it in the header */ +load_kernel: /* We need to load the kernel into memory we can't access in 16 bit mode, so let's get into 32 bit mode, write the kernel and jump back again. */ @@ -139,19 +165,10 @@ copy_kernel: /* We're now running in 16-bit CS, but 32-bit ES! */ /* Load kernel and initrd */ - pushl %edi read_fw_blob_addr32_edi(FW_CFG_INITRD) read_fw_blob_addr32(FW_CFG_KERNEL) read_fw_blob_addr32(FW_CFG_CMDLINE) - read_fw FW_CFG_SETUP_ADDR - mov %eax, %edi - mov %eax, %ebx - read_fw_blob_addr32_edi(FW_CFG_SETUP) - - /* Update the header with the initrd address we chose above */ - popl %es:0x218(%ebx) - /* And now jump into Linux! */ mov $0, %eax mov %eax, %cr0 -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:47:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXc4-0007Tt-K2; Tue, 24 Mar 2015 22:47:56 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXc3-0007Tb-9D for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:55 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 2E/7D-08386-A99E1155; Tue, 24 Mar 2015 22:47:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1427237272!15206228!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15199 invoked from network); 24 Mar 2015 22:47:54 -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; 24 Mar 2015 22:47:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXc0-00078r-PM for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXc0-0004Xi-OK for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:52 +0000 Date: Tue, 24 Mar 2015 22:47:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] audio: Don't free hw resources until after hw backend is stopped X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6569578197d93fcfeec4eb3e48c0659c18142dee Author: Peter Maydell AuthorDate: Tue Dec 16 16:58:05 2014 +0000 Commit: Michael Roth CommitDate: Sun Feb 22 12:27:26 2015 -0600 audio: Don't free hw resources until after hw backend is stopped When stopping an audio voice, call the audio backend's fini method before calling audio_pcm_hw_free_resources_ rather than afterwards. This allows backends which use helper threads (like pulseaudio) to terminate those threads before the conv_buf or mix_buf are freed and avoids race conditions where the helper may access a NULL pointer or freed memory. Cc: qemu-stable@nongnu.org Reviewed-by: Gerd Hoffmann Signed-off-by: Peter Maydell Message-id: 1418406239-9838-1-git-send-email-peter.maydell@linaro.org (cherry picked from commit b28fb27b5edf77f6fd0ac550a156fb20f2218db3) Signed-off-by: Michael Roth --- audio/audio_template.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/audio/audio_template.h b/audio/audio_template.h index 8173188..584e536 100644 --- a/audio/audio_template.h +++ b/audio/audio_template.h @@ -191,9 +191,9 @@ static void glue (audio_pcm_hw_gc_, TYPE) (HW **hwp) audio_detach_capture (hw); #endif QLIST_REMOVE (hw, entries); + glue (hw->pcm_ops->fini_, TYPE) (hw); glue (s->nb_hw_voices_, TYPE) += 1; glue (audio_pcm_hw_free_resources_ ,TYPE) (hw); - glue (hw->pcm_ops->fini_, TYPE) (hw); g_free (hw); *hwp = NULL; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:47:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXc4-0007Tt-K2; Tue, 24 Mar 2015 22:47:56 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXc3-0007Tb-9D for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:55 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 2E/7D-08386-A99E1155; Tue, 24 Mar 2015 22:47:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1427237272!15206228!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15199 invoked from network); 24 Mar 2015 22:47:54 -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; 24 Mar 2015 22:47:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXc0-00078r-PM for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXc0-0004Xi-OK for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:47:52 +0000 Date: Tue, 24 Mar 2015 22:47:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] audio: Don't free hw resources until after hw backend is stopped X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6569578197d93fcfeec4eb3e48c0659c18142dee Author: Peter Maydell AuthorDate: Tue Dec 16 16:58:05 2014 +0000 Commit: Michael Roth CommitDate: Sun Feb 22 12:27:26 2015 -0600 audio: Don't free hw resources until after hw backend is stopped When stopping an audio voice, call the audio backend's fini method before calling audio_pcm_hw_free_resources_ rather than afterwards. This allows backends which use helper threads (like pulseaudio) to terminate those threads before the conv_buf or mix_buf are freed and avoids race conditions where the helper may access a NULL pointer or freed memory. Cc: qemu-stable@nongnu.org Reviewed-by: Gerd Hoffmann Signed-off-by: Peter Maydell Message-id: 1418406239-9838-1-git-send-email-peter.maydell@linaro.org (cherry picked from commit b28fb27b5edf77f6fd0ac550a156fb20f2218db3) Signed-off-by: Michael Roth --- audio/audio_template.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/audio/audio_template.h b/audio/audio_template.h index 8173188..584e536 100644 --- a/audio/audio_template.h +++ b/audio/audio_template.h @@ -191,9 +191,9 @@ static void glue (audio_pcm_hw_gc_, TYPE) (HW **hwp) audio_detach_capture (hw); #endif QLIST_REMOVE (hw, entries); + glue (hw->pcm_ops->fini_, TYPE) (hw); glue (s->nb_hw_voices_, TYPE) += 1; glue (audio_pcm_hw_free_resources_ ,TYPE) (hw); - glue (hw->pcm_ops->fini_, TYPE) (hw); g_free (hw); *hwp = NULL; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:48:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:48:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcE-0007WE-Oj; Tue, 24 Mar 2015 22:48:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcD-0007Vp-CF for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:05 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 3A/F0-02712-4A9E1155; Tue, 24 Mar 2015 22:48:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1427237283!12846744!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30101 invoked from network); 24 Mar 2015 22:48:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2015 22:48:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcB-00079T-0g for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXcA-0004Yz-Tr for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:02 +0000 Date: Tue, 24 Mar 2015 22:48:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] target-xtensa: fix translation for opcodes crossing page boundary X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 27ad3df73ef88476a288e3aebd5fbcd501ff7e7f Author: Max Filippov AuthorDate: Sun Dec 14 07:50:55 2014 +0300 Commit: Michael Roth CommitDate: Sun Feb 22 12:27:36 2015 -0600 target-xtensa: fix translation for opcodes crossing page boundary If TB ends with an opcode that crosses page boundary and the following page is not executable then EPC1 for the code fetch exception wrongly points at the beginning of the TB. Always treat instruction that crosses page boundary as a separate TB. Cc: qemu-stable@nongnu.org Signed-off-by: Max Filippov (cherry picked from commit 01673a3401614b4199c9946ad47b97bedfc7a7c2) Signed-off-by: Michael Roth --- target-xtensa/translate.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c index badca19..a81573d 100644 --- a/target-xtensa/translate.c +++ b/target-xtensa/translate.c @@ -887,6 +887,11 @@ static TCGv_i32 gen_mac16_m(TCGv_i32 v, bool hi, bool is_unsigned) return m; } +static inline unsigned xtensa_op0_insn_len(unsigned op0) +{ + return op0 >= 8 ? 2 : 3; +} + static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc) { #define HAS_OPTION_BITS(opt) do { \ @@ -989,6 +994,7 @@ static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc) uint8_t b0 = cpu_ldub_code(env, dc->pc); uint8_t b1 = cpu_ldub_code(env, dc->pc + 1); uint8_t b2 = 0; + unsigned len = xtensa_op0_insn_len(OP0); static const uint32_t B4CONST[] = { 0xffffffff, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 16, 32, 64, 128, 256 @@ -998,13 +1004,19 @@ static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc) 32768, 65536, 2, 3, 4, 5, 6, 7, 8, 10, 12, 16, 32, 64, 128, 256 }; - if (OP0 >= 8) { - dc->next_pc = dc->pc + 2; + switch (len) { + case 2: HAS_OPTION(XTENSA_OPTION_CODE_DENSITY); - } else { - dc->next_pc = dc->pc + 3; + break; + + case 3: b2 = cpu_ldub_code(env, dc->pc + 2); + break; + + default: + RESERVED(); } + dc->next_pc = dc->pc + len; switch (OP0) { case 0: /*QRST*/ @@ -2949,6 +2961,12 @@ invalid_opcode: #undef HAS_OPTION } +static inline unsigned xtensa_insn_len(CPUXtensaState *env, DisasContext *dc) +{ + uint8_t b0 = cpu_ldub_code(env, dc->pc); + return xtensa_op0_insn_len(OP0); +} + static void check_breakpoint(CPUXtensaState *env, DisasContext *dc) { CPUState *cs = CPU(xtensa_env_get_cpu(env)); @@ -3081,6 +3099,7 @@ void gen_intermediate_code_internal(XtensaCPU *cpu, } while (dc.is_jmp == DISAS_NEXT && insn_count < max_insns && dc.pc < next_page_start && + dc.pc + xtensa_insn_len(env, &dc) <= next_page_start && tcg_ctx.gen_opc_ptr < gen_opc_end); reset_litbase(&dc); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:48:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:48:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcE-0007WE-Oj; Tue, 24 Mar 2015 22:48:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcD-0007Vp-CF for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:05 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 3A/F0-02712-4A9E1155; Tue, 24 Mar 2015 22:48:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1427237283!12846744!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30101 invoked from network); 24 Mar 2015 22:48:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2015 22:48:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcB-00079T-0g for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXcA-0004Yz-Tr for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:02 +0000 Date: Tue, 24 Mar 2015 22:48:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] target-xtensa: fix translation for opcodes crossing page boundary X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 27ad3df73ef88476a288e3aebd5fbcd501ff7e7f Author: Max Filippov AuthorDate: Sun Dec 14 07:50:55 2014 +0300 Commit: Michael Roth CommitDate: Sun Feb 22 12:27:36 2015 -0600 target-xtensa: fix translation for opcodes crossing page boundary If TB ends with an opcode that crosses page boundary and the following page is not executable then EPC1 for the code fetch exception wrongly points at the beginning of the TB. Always treat instruction that crosses page boundary as a separate TB. Cc: qemu-stable@nongnu.org Signed-off-by: Max Filippov (cherry picked from commit 01673a3401614b4199c9946ad47b97bedfc7a7c2) Signed-off-by: Michael Roth --- target-xtensa/translate.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c index badca19..a81573d 100644 --- a/target-xtensa/translate.c +++ b/target-xtensa/translate.c @@ -887,6 +887,11 @@ static TCGv_i32 gen_mac16_m(TCGv_i32 v, bool hi, bool is_unsigned) return m; } +static inline unsigned xtensa_op0_insn_len(unsigned op0) +{ + return op0 >= 8 ? 2 : 3; +} + static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc) { #define HAS_OPTION_BITS(opt) do { \ @@ -989,6 +994,7 @@ static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc) uint8_t b0 = cpu_ldub_code(env, dc->pc); uint8_t b1 = cpu_ldub_code(env, dc->pc + 1); uint8_t b2 = 0; + unsigned len = xtensa_op0_insn_len(OP0); static const uint32_t B4CONST[] = { 0xffffffff, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 16, 32, 64, 128, 256 @@ -998,13 +1004,19 @@ static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc) 32768, 65536, 2, 3, 4, 5, 6, 7, 8, 10, 12, 16, 32, 64, 128, 256 }; - if (OP0 >= 8) { - dc->next_pc = dc->pc + 2; + switch (len) { + case 2: HAS_OPTION(XTENSA_OPTION_CODE_DENSITY); - } else { - dc->next_pc = dc->pc + 3; + break; + + case 3: b2 = cpu_ldub_code(env, dc->pc + 2); + break; + + default: + RESERVED(); } + dc->next_pc = dc->pc + len; switch (OP0) { case 0: /*QRST*/ @@ -2949,6 +2961,12 @@ invalid_opcode: #undef HAS_OPTION } +static inline unsigned xtensa_insn_len(CPUXtensaState *env, DisasContext *dc) +{ + uint8_t b0 = cpu_ldub_code(env, dc->pc); + return xtensa_op0_insn_len(OP0); +} + static void check_breakpoint(CPUXtensaState *env, DisasContext *dc) { CPUState *cs = CPU(xtensa_env_get_cpu(env)); @@ -3081,6 +3099,7 @@ void gen_intermediate_code_internal(XtensaCPU *cpu, } while (dc.is_jmp == DISAS_NEXT && insn_count < max_insns && dc.pc < next_page_start && + dc.pc + xtensa_insn_len(env, &dc) <= next_page_start && tcg_ctx.gen_opc_ptr < gen_opc_end); reset_litbase(&dc); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:48:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:48: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 1YaXcP-0007YW-TZ; Tue, 24 Mar 2015 22:48:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcN-0007Y3-MW for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:15 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id D6/5A-32563-FA9E1155; Tue, 24 Mar 2015 22:48:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1427237293!12754065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21110 invoked from network); 24 Mar 2015 22:48:14 -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; 24 Mar 2015 22:48:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcL-00079Z-6L for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXcL-0004ZO-4d for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:13 +0000 Date: Tue, 24 Mar 2015 22:48:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] target-xtensa: test cross-page opcode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 718ab310169c65bd8aa5692981a0e65e6d0ca775 Author: Max Filippov AuthorDate: Sun Dec 14 08:23:52 2014 +0300 Commit: Michael Roth CommitDate: Sun Feb 22 12:27:43 2015 -0600 target-xtensa: test cross-page opcode Alter cross-page TB test to also test cross-page opcode. Signed-off-by: Max Filippov (cherry picked from commit 85d36377e4ff8b98119420099d445369bfd6b7bb) Signed-off-by: Michael Roth --- tests/tcg/xtensa/test_mmu.S | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/tcg/xtensa/test_mmu.S b/tests/tcg/xtensa/test_mmu.S index 58c5bca..a15316f 100644 --- a/tests/tcg/xtensa/test_mmu.S +++ b/tests/tcg/xtensa/test_mmu.S @@ -641,7 +641,7 @@ test cross_page_tb witlb a2, a3 wdtlb a2, a3 - movi a2, 0x00007ffd + movi a2, 0x00007ffc movi a3, 20f movi a4, 21f sub a4, a4, a3 @@ -651,7 +651,7 @@ test cross_page_tb addi a2, a2, 1 addi a3, a3, 1 1: - movi a2, 0x00007ffd + movi a2, 0x00007ffc movi a3, 0x00008000 /* DTLB: OK, ITLB: OK */ jx a2 @@ -668,10 +668,10 @@ test cross_page_tb movi a3, 1 assert eq, a2, a3 rsr a2, epc1 - movi a3, 0x8000 + movi a3, 0x7fff assert eq, a2, a3 rsr a2, excsave1 - movi a3, 0x00007ffd + movi a3, 0x00007ffc assert ne, a2, a3 reset_ps @@ -680,7 +680,7 @@ test cross_page_tb movi a2, 0x0400000c /* PPN */ movi a3, 0x00008000 /* VPN */ wdtlb a2, a3 - movi a2, 0x00007ffd + movi a2, 0x00007ffc movi a3, 0x00008000 /* DTLB: FAIL, ITLB: OK */ jx a2 @@ -689,10 +689,10 @@ test cross_page_tb movi a3, 28 assert eq, a2, a3 rsr a2, epc1 - movi a3, 0x7ffd + movi a3, 0x7ffc assert eq, a2, a3 rsr a2, excsave1 - movi a3, 0x00007ffd + movi a3, 0x00007ffc assert eq, a2, a3 reset_ps @@ -703,7 +703,7 @@ test cross_page_tb witlb a2, a3 movi a2, 0x04000003 /* PPN */ wdtlb a2, a3 - movi a2, 0x00007ffd + movi a2, 0x00007ffc movi a3, 0x00008000 /* DTLB: OK, ITLB: FAIL */ jx a2 @@ -712,10 +712,10 @@ test cross_page_tb movi a3, 20 assert eq, a2, a3 rsr a2, epc1 - movi a3, 0x8000 + movi a3, 0x7fff assert eq, a2, a3 rsr a2, excsave1 - movi a3, 0x00007ffd + movi a3, 0x00007ffc assert ne, a2, a3 reset_ps @@ -724,7 +724,7 @@ test cross_page_tb movi a2, 0x0400000c /* PPN */ movi a3, 0x00008000 /* VPN */ wdtlb a2, a3 - movi a2, 0x00007ffd + movi a2, 0x00007ffc movi a3, 0x00008000 /* DTLB: FAIL, ITLB: FAIL */ jx a2 @@ -733,10 +733,10 @@ test cross_page_tb movi a3, 28 assert eq, a2, a3 rsr a2, epc1 - movi a3, 0x7ffd + movi a3, 0x7ffc assert eq, a2, a3 rsr a2, excsave1 - movi a3, 0x00007ffd + movi a3, 0x00007ffc assert eq, a2, a3 test_end -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:48:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:48: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 1YaXcP-0007YW-TZ; Tue, 24 Mar 2015 22:48:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcN-0007Y3-MW for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:15 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id D6/5A-32563-FA9E1155; Tue, 24 Mar 2015 22:48:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1427237293!12754065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21110 invoked from network); 24 Mar 2015 22:48:14 -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; 24 Mar 2015 22:48:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcL-00079Z-6L for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXcL-0004ZO-4d for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:13 +0000 Date: Tue, 24 Mar 2015 22:48:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] target-xtensa: test cross-page opcode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 718ab310169c65bd8aa5692981a0e65e6d0ca775 Author: Max Filippov AuthorDate: Sun Dec 14 08:23:52 2014 +0300 Commit: Michael Roth CommitDate: Sun Feb 22 12:27:43 2015 -0600 target-xtensa: test cross-page opcode Alter cross-page TB test to also test cross-page opcode. Signed-off-by: Max Filippov (cherry picked from commit 85d36377e4ff8b98119420099d445369bfd6b7bb) Signed-off-by: Michael Roth --- tests/tcg/xtensa/test_mmu.S | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/tcg/xtensa/test_mmu.S b/tests/tcg/xtensa/test_mmu.S index 58c5bca..a15316f 100644 --- a/tests/tcg/xtensa/test_mmu.S +++ b/tests/tcg/xtensa/test_mmu.S @@ -641,7 +641,7 @@ test cross_page_tb witlb a2, a3 wdtlb a2, a3 - movi a2, 0x00007ffd + movi a2, 0x00007ffc movi a3, 20f movi a4, 21f sub a4, a4, a3 @@ -651,7 +651,7 @@ test cross_page_tb addi a2, a2, 1 addi a3, a3, 1 1: - movi a2, 0x00007ffd + movi a2, 0x00007ffc movi a3, 0x00008000 /* DTLB: OK, ITLB: OK */ jx a2 @@ -668,10 +668,10 @@ test cross_page_tb movi a3, 1 assert eq, a2, a3 rsr a2, epc1 - movi a3, 0x8000 + movi a3, 0x7fff assert eq, a2, a3 rsr a2, excsave1 - movi a3, 0x00007ffd + movi a3, 0x00007ffc assert ne, a2, a3 reset_ps @@ -680,7 +680,7 @@ test cross_page_tb movi a2, 0x0400000c /* PPN */ movi a3, 0x00008000 /* VPN */ wdtlb a2, a3 - movi a2, 0x00007ffd + movi a2, 0x00007ffc movi a3, 0x00008000 /* DTLB: FAIL, ITLB: OK */ jx a2 @@ -689,10 +689,10 @@ test cross_page_tb movi a3, 28 assert eq, a2, a3 rsr a2, epc1 - movi a3, 0x7ffd + movi a3, 0x7ffc assert eq, a2, a3 rsr a2, excsave1 - movi a3, 0x00007ffd + movi a3, 0x00007ffc assert eq, a2, a3 reset_ps @@ -703,7 +703,7 @@ test cross_page_tb witlb a2, a3 movi a2, 0x04000003 /* PPN */ wdtlb a2, a3 - movi a2, 0x00007ffd + movi a2, 0x00007ffc movi a3, 0x00008000 /* DTLB: OK, ITLB: FAIL */ jx a2 @@ -712,10 +712,10 @@ test cross_page_tb movi a3, 20 assert eq, a2, a3 rsr a2, epc1 - movi a3, 0x8000 + movi a3, 0x7fff assert eq, a2, a3 rsr a2, excsave1 - movi a3, 0x00007ffd + movi a3, 0x00007ffc assert ne, a2, a3 reset_ps @@ -724,7 +724,7 @@ test cross_page_tb movi a2, 0x0400000c /* PPN */ movi a3, 0x00008000 /* VPN */ wdtlb a2, a3 - movi a2, 0x00007ffd + movi a2, 0x00007ffc movi a3, 0x00008000 /* DTLB: FAIL, ITLB: FAIL */ jx a2 @@ -733,10 +733,10 @@ test cross_page_tb movi a3, 28 assert eq, a2, a3 rsr a2, epc1 - movi a3, 0x7ffd + movi a3, 0x7ffc assert eq, a2, a3 rsr a2, excsave1 - movi a3, 0x00007ffd + movi a3, 0x00007ffc assert eq, a2, a3 test_end -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:48:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:48: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 1YaXcZ-0007bH-32; Tue, 24 Mar 2015 22:48:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcX-0007at-LU for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:25 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id C5/A8-14870-9B9E1155; Tue, 24 Mar 2015 22:48:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1427237303!12854600!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13076 invoked from network); 24 Mar 2015 22:48:24 -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; 24 Mar 2015 22:48:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcV-00079f-DL for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXcV-0004Zm-C3 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:23 +0000 Date: Tue, 24 Mar 2015 22:48:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] migration/block: fix pending() return value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 83dbd88b5ce280e26a40a22aa473a248f9bb0f5e Author: Vladimir Sementsov-Ogievskiy AuthorDate: Tue Dec 30 13:04:16 2014 +0300 Commit: Michael Roth CommitDate: Sun Feb 22 12:27:50 2015 -0600 migration/block: fix pending() return value Because of wrong return value of .save_live_pending() in migration/block.c, migration finishes before the whole disk is transferred. Such situation occurs when the migration process is fast enough, for example when source and dest are on the same host. If in the bulk phase we return something < max_size, we will skip transferring the tail of the device. Currently we have "set pending to BLOCK_SIZE if it is zero" for bulk phase, but there no guarantee, that it will be < max_size. True approach is to return, for example, max_size+1 when we are in the bulk phase. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-id: 1419933856-4018-2-git-send-email-vsementsov@parallels.com Signed-off-by: Stefan Hajnoczi (cherry picked from commit 04636dc410b163c2243e66c3813dd4900a50a4ed) Signed-off-by: Michael Roth --- block-migration.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block-migration.c b/block-migration.c index 74d9eb1..2e92605 100644 --- a/block-migration.c +++ b/block-migration.c @@ -765,8 +765,8 @@ static uint64_t block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size) block_mig_state.read_done * BLOCK_SIZE; /* Report at least one block pending during bulk phase */ - if (pending == 0 && !block_mig_state.bulk_completed) { - pending = BLOCK_SIZE; + if (pending <= max_size && !block_mig_state.bulk_completed) { + pending = max_size + BLOCK_SIZE; } blk_mig_unlock(); qemu_mutex_unlock_iothread(); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:48:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:48: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 1YaXcZ-0007bH-32; Tue, 24 Mar 2015 22:48:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcX-0007at-LU for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:25 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id C5/A8-14870-9B9E1155; Tue, 24 Mar 2015 22:48:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1427237303!12854600!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13076 invoked from network); 24 Mar 2015 22:48:24 -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; 24 Mar 2015 22:48:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcV-00079f-DL for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXcV-0004Zm-C3 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:23 +0000 Date: Tue, 24 Mar 2015 22:48:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] migration/block: fix pending() return value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 83dbd88b5ce280e26a40a22aa473a248f9bb0f5e Author: Vladimir Sementsov-Ogievskiy AuthorDate: Tue Dec 30 13:04:16 2014 +0300 Commit: Michael Roth CommitDate: Sun Feb 22 12:27:50 2015 -0600 migration/block: fix pending() return value Because of wrong return value of .save_live_pending() in migration/block.c, migration finishes before the whole disk is transferred. Such situation occurs when the migration process is fast enough, for example when source and dest are on the same host. If in the bulk phase we return something < max_size, we will skip transferring the tail of the device. Currently we have "set pending to BLOCK_SIZE if it is zero" for bulk phase, but there no guarantee, that it will be < max_size. True approach is to return, for example, max_size+1 when we are in the bulk phase. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-id: 1419933856-4018-2-git-send-email-vsementsov@parallels.com Signed-off-by: Stefan Hajnoczi (cherry picked from commit 04636dc410b163c2243e66c3813dd4900a50a4ed) Signed-off-by: Michael Roth --- block-migration.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block-migration.c b/block-migration.c index 74d9eb1..2e92605 100644 --- a/block-migration.c +++ b/block-migration.c @@ -765,8 +765,8 @@ static uint64_t block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size) block_mig_state.read_done * BLOCK_SIZE; /* Report at least one block pending during bulk phase */ - if (pending == 0 && !block_mig_state.bulk_completed) { - pending = BLOCK_SIZE; + if (pending <= max_size && !block_mig_state.bulk_completed) { + pending = max_size + BLOCK_SIZE; } blk_mig_unlock(); qemu_mutex_unlock_iothread(); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:48:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:48: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 1YaXcj-0007dj-CZ; Tue, 24 Mar 2015 22:48:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXci-0007dR-GI for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:36 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 59/7A-32563-3C9E1155; Tue, 24 Mar 2015 22:48:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1427237313!12854730!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26219 invoked from network); 24 Mar 2015 22:48:34 -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; 24 Mar 2015 22:48:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcf-00079n-IQ for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXcf-0004aG-HD for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:33 +0000 Date: Tue, 24 Mar 2015 22:48:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] atomic: fix position of volatile qualifier X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f738adeb5edef023fde0c47c3dce47987d7f6982 Author: Paolo Bonzini AuthorDate: Tue Nov 4 14:35:28 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:27:56 2015 -0600 atomic: fix position of volatile qualifier What needs to be volatile is not the pointer, but the pointed-to value! Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini (cherry picked from commit 2cbcfb281afa041a41f6e4c4da0f5c9314084604) Signed-off-by: Michael Roth --- include/qemu/atomic.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/qemu/atomic.h b/include/qemu/atomic.h index 492bce1..93c2ae2 100644 --- a/include/qemu/atomic.h +++ b/include/qemu/atomic.h @@ -122,11 +122,11 @@ #endif #ifndef atomic_read -#define atomic_read(ptr) (*(__typeof__(*ptr) *volatile) (ptr)) +#define atomic_read(ptr) (*(__typeof__(*ptr) volatile*) (ptr)) #endif #ifndef atomic_set -#define atomic_set(ptr, i) ((*(__typeof__(*ptr) *volatile) (ptr)) = (i)) +#define atomic_set(ptr, i) ((*(__typeof__(*ptr) volatile*) (ptr)) = (i)) #endif /* These have the same semantics as Java volatile variables. -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:48:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:48: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 1YaXcj-0007dj-CZ; Tue, 24 Mar 2015 22:48:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXci-0007dR-GI for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:36 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 59/7A-32563-3C9E1155; Tue, 24 Mar 2015 22:48:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1427237313!12854730!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26219 invoked from network); 24 Mar 2015 22:48:34 -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; 24 Mar 2015 22:48:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcf-00079n-IQ for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXcf-0004aG-HD for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:33 +0000 Date: Tue, 24 Mar 2015 22:48:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] atomic: fix position of volatile qualifier X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f738adeb5edef023fde0c47c3dce47987d7f6982 Author: Paolo Bonzini AuthorDate: Tue Nov 4 14:35:28 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 12:27:56 2015 -0600 atomic: fix position of volatile qualifier What needs to be volatile is not the pointer, but the pointed-to value! Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini (cherry picked from commit 2cbcfb281afa041a41f6e4c4da0f5c9314084604) Signed-off-by: Michael Roth --- include/qemu/atomic.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/qemu/atomic.h b/include/qemu/atomic.h index 492bce1..93c2ae2 100644 --- a/include/qemu/atomic.h +++ b/include/qemu/atomic.h @@ -122,11 +122,11 @@ #endif #ifndef atomic_read -#define atomic_read(ptr) (*(__typeof__(*ptr) *volatile) (ptr)) +#define atomic_read(ptr) (*(__typeof__(*ptr) volatile*) (ptr)) #endif #ifndef atomic_set -#define atomic_set(ptr, i) ((*(__typeof__(*ptr) *volatile) (ptr)) = (i)) +#define atomic_set(ptr, i) ((*(__typeof__(*ptr) volatile*) (ptr)) = (i)) #endif /* These have the same semantics as Java volatile variables. -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:48:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXct-0007gO-IY; Tue, 24 Mar 2015 22: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 1YaXcs-0007g3-Bg for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:46 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id FD/37-25011-DC9E1155; Tue, 24 Mar 2015 22:48:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1427237323!6049769!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1495 invoked from network); 24 Mar 2015 22:48:44 -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; 24 Mar 2015 22:48:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcp-00079t-O3 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXcp-0004ag-M7 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:43 +0000 Date: Tue, 24 Mar 2015 22:48:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] PPC: Fix crash on spapr_tce_table_finalize() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb3360dbdd85ce2eb97805e4ce70932ab333e8d1 Author: David Gibson AuthorDate: Mon Dec 8 13:48:02 2014 +1100 Commit: Michael Roth CommitDate: Sun Feb 22 12:28:01 2015 -0600 PPC: Fix crash on spapr_tce_table_finalize() spapr_tce_table_finalize() can SEGV if the object was not previously realized. In particular this can be triggered by running qemu-system-ppc -device spapr-tce-table,? The basic problem is that we have mismatched initialization versus finalization: spapr_tce_table_finalize() is attempting to undo things that are done in spapr_tce_table_realize(), not an instance_init function. Therefore, replace spapr_tce_table_finalize() with spapr_tce_table_unrealize(). Signed-off-by: David Gibson Cc: qemu-stable@nongnu.org Signed-off-by: Alexander Graf (cherry picked from commit 5f9490de566c5b092a6cfedc3c7a37a9c9dee917) Signed-off-by: Michael Roth --- hw/ppc/spapr_iommu.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index 6c91d8e..da47474 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -173,9 +173,9 @@ sPAPRTCETable *spapr_tce_new_table(DeviceState *owner, uint32_t liobn, return tcet; } -static void spapr_tce_table_finalize(Object *obj) +static void spapr_tce_table_unrealize(DeviceState *dev, Error **errp) { - sPAPRTCETable *tcet = SPAPR_TCE_TABLE(obj); + sPAPRTCETable *tcet = SPAPR_TCE_TABLE(dev); QLIST_REMOVE(tcet, list); @@ -420,6 +420,7 @@ static void spapr_tce_table_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); dc->init = spapr_tce_table_realize; dc->reset = spapr_tce_reset; + dc->unrealize = spapr_tce_table_unrealize; QLIST_INIT(&spapr_tce_tables); @@ -435,7 +436,6 @@ static TypeInfo spapr_tce_table_info = { .parent = TYPE_DEVICE, .instance_size = sizeof(sPAPRTCETable), .class_init = spapr_tce_table_class_init, - .instance_finalize = spapr_tce_table_finalize, }; static void register_types(void) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:48:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXct-0007gO-IY; Tue, 24 Mar 2015 22: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 1YaXcs-0007g3-Bg for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:46 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id FD/37-25011-DC9E1155; Tue, 24 Mar 2015 22:48:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1427237323!6049769!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1495 invoked from network); 24 Mar 2015 22:48:44 -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; 24 Mar 2015 22:48:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcp-00079t-O3 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXcp-0004ag-M7 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:43 +0000 Date: Tue, 24 Mar 2015 22:48:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] PPC: Fix crash on spapr_tce_table_finalize() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb3360dbdd85ce2eb97805e4ce70932ab333e8d1 Author: David Gibson AuthorDate: Mon Dec 8 13:48:02 2014 +1100 Commit: Michael Roth CommitDate: Sun Feb 22 12:28:01 2015 -0600 PPC: Fix crash on spapr_tce_table_finalize() spapr_tce_table_finalize() can SEGV if the object was not previously realized. In particular this can be triggered by running qemu-system-ppc -device spapr-tce-table,? The basic problem is that we have mismatched initialization versus finalization: spapr_tce_table_finalize() is attempting to undo things that are done in spapr_tce_table_realize(), not an instance_init function. Therefore, replace spapr_tce_table_finalize() with spapr_tce_table_unrealize(). Signed-off-by: David Gibson Cc: qemu-stable@nongnu.org Signed-off-by: Alexander Graf (cherry picked from commit 5f9490de566c5b092a6cfedc3c7a37a9c9dee917) Signed-off-by: Michael Roth --- hw/ppc/spapr_iommu.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index 6c91d8e..da47474 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -173,9 +173,9 @@ sPAPRTCETable *spapr_tce_new_table(DeviceState *owner, uint32_t liobn, return tcet; } -static void spapr_tce_table_finalize(Object *obj) +static void spapr_tce_table_unrealize(DeviceState *dev, Error **errp) { - sPAPRTCETable *tcet = SPAPR_TCE_TABLE(obj); + sPAPRTCETable *tcet = SPAPR_TCE_TABLE(dev); QLIST_REMOVE(tcet, list); @@ -420,6 +420,7 @@ static void spapr_tce_table_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); dc->init = spapr_tce_table_realize; dc->reset = spapr_tce_reset; + dc->unrealize = spapr_tce_table_unrealize; QLIST_INIT(&spapr_tce_tables); @@ -435,7 +436,6 @@ static TypeInfo spapr_tce_table_info = { .parent = TYPE_DEVICE, .instance_size = sizeof(sPAPRTCETable), .class_init = spapr_tce_table_class_init, - .instance_finalize = spapr_tce_table_finalize, }; static void register_types(void) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:48:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:48:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXd3-0007iN-LS; Tue, 24 Mar 2015 22:48:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXd2-0007i7-Ie for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:56 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id D0/EA-01024-7D9E1155; Tue, 24 Mar 2015 22:48:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1427237334!12787391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11222 invoked from network); 24 Mar 2015 22:48: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; 24 Mar 2015 22:48:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcz-0007A6-Uj for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXcz-0004bA-SJ for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:53 +0000 Date: Tue, 24 Mar 2015 22:48:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] vl.c: fix regression when reading machine type from config file X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1ce0c3cb7c99e71feb001e392489aa333e87f3c Author: Marcel Apfelbaum AuthorDate: Wed Jan 7 14:11:38 2015 +0200 Commit: Michael Roth CommitDate: Sun Feb 22 12:28:09 2015 -0600 vl.c: fix regression when reading machine type from config file After 'Machine as QOM' series the machine type input triggers the creation of the machine class. If the machine type is set in the configuration file, the machine class is not updated accordingly and remains the default. Fixed that by querying the machine options after the configuration file is loaded. Cc: qemu-stable@nongnu.org Reported-by: William Dauchy Signed-off-by: Marcel Apfelbaum Signed-off-by: Paolo Bonzini (cherry picked from commit 364c3e6b8dd7912e01d19122d791b8c8f6df4f6c) Signed-off-by: Michael Roth --- vl.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/vl.c b/vl.c index eb89d62..91411c1 100644 --- a/vl.c +++ b/vl.c @@ -2886,9 +2886,6 @@ int main(int argc, char **argv, char **envp) exit(1); } switch(popt->index) { - case QEMU_OPTION_M: - machine_class = machine_parse(optarg); - break; case QEMU_OPTION_no_kvm_irqchip: { olist = qemu_find_opts("machine"); qemu_opts_parse(olist, "kernel_irqchip=off", 0); @@ -3506,16 +3503,13 @@ int main(int argc, char **argv, char **envp) olist = qemu_find_opts("machine"); qemu_opts_parse(olist, "accel=kvm", 0); break; + case QEMU_OPTION_M: case QEMU_OPTION_machine: olist = qemu_find_opts("machine"); opts = qemu_opts_parse(olist, optarg, 1); if (!opts) { exit(1); } - optarg = qemu_opt_get(opts, "type"); - if (optarg) { - machine_class = machine_parse(optarg); - } break; case QEMU_OPTION_no_kvm: olist = qemu_find_opts("machine"); @@ -3807,6 +3801,13 @@ int main(int argc, char **argv, char **envp) } } } + + opts = qemu_get_machine_opts(); + optarg = qemu_opt_get(opts, "type"); + if (optarg) { + machine_class = machine_parse(optarg); + } + loc_set_none(); os_daemonize(); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:48:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:48:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXd3-0007iN-LS; Tue, 24 Mar 2015 22:48:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXd2-0007i7-Ie for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:56 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id D0/EA-01024-7D9E1155; Tue, 24 Mar 2015 22:48:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1427237334!12787391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11222 invoked from network); 24 Mar 2015 22:48: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; 24 Mar 2015 22:48:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXcz-0007A6-Uj for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXcz-0004bA-SJ for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:48:53 +0000 Date: Tue, 24 Mar 2015 22:48:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] vl.c: fix regression when reading machine type from config file X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1ce0c3cb7c99e71feb001e392489aa333e87f3c Author: Marcel Apfelbaum AuthorDate: Wed Jan 7 14:11:38 2015 +0200 Commit: Michael Roth CommitDate: Sun Feb 22 12:28:09 2015 -0600 vl.c: fix regression when reading machine type from config file After 'Machine as QOM' series the machine type input triggers the creation of the machine class. If the machine type is set in the configuration file, the machine class is not updated accordingly and remains the default. Fixed that by querying the machine options after the configuration file is loaded. Cc: qemu-stable@nongnu.org Reported-by: William Dauchy Signed-off-by: Marcel Apfelbaum Signed-off-by: Paolo Bonzini (cherry picked from commit 364c3e6b8dd7912e01d19122d791b8c8f6df4f6c) Signed-off-by: Michael Roth --- vl.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/vl.c b/vl.c index eb89d62..91411c1 100644 --- a/vl.c +++ b/vl.c @@ -2886,9 +2886,6 @@ int main(int argc, char **argv, char **envp) exit(1); } switch(popt->index) { - case QEMU_OPTION_M: - machine_class = machine_parse(optarg); - break; case QEMU_OPTION_no_kvm_irqchip: { olist = qemu_find_opts("machine"); qemu_opts_parse(olist, "kernel_irqchip=off", 0); @@ -3506,16 +3503,13 @@ int main(int argc, char **argv, char **envp) olist = qemu_find_opts("machine"); qemu_opts_parse(olist, "accel=kvm", 0); break; + case QEMU_OPTION_M: case QEMU_OPTION_machine: olist = qemu_find_opts("machine"); opts = qemu_opts_parse(olist, optarg, 1); if (!opts) { exit(1); } - optarg = qemu_opt_get(opts, "type"); - if (optarg) { - machine_class = machine_parse(optarg); - } break; case QEMU_OPTION_no_kvm: olist = qemu_find_opts("machine"); @@ -3807,6 +3801,13 @@ int main(int argc, char **argv, char **envp) } } } + + opts = qemu_get_machine_opts(); + optarg = qemu_opt_get(opts, "type"); + if (optarg) { + machine_class = machine_parse(optarg); + } + loc_set_none(); os_daemonize(); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:49:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:49: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 1YaXdG-0007ku-QD; Tue, 24 Mar 2015 22:49:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXdF-0007kh-Ps for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:09 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 13/28-11605-5E9E1155; Tue, 24 Mar 2015 22:49:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1427237345!7989463!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21050 invoked from network); 24 Mar 2015 22:49:06 -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; 24 Mar 2015 22:49:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXdA-0007Ac-5E for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXdA-0004cU-2M for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:04 +0000 Date: Tue, 24 Mar 2015 22:49:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] serial: reset thri_pending on IER writes with THRI=0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e54bcad901f4891dd5c3bf72e199175a23944214 Author: Paolo Bonzini AuthorDate: Fri Dec 12 10:17:08 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:03:34 2015 -0600 serial: reset thri_pending on IER writes with THRI=0 This is responsible for failure of migration from 2.2 to 2.1, because thr_ipending is always one in practice. serial.c is setting thr_ipending unconditionally. However, thr_ipending is not used at all if THRI=0, and it will be overwritten again the next time THRE or THRI changes. For that reason, we can set thr_ipending to zero every time THRI is reset. There is disagreement on whether LSR.THRE should be resampled when IER.THRI goes from 1 to 1. This patch does not touch the code, leaving that for QEMU 2.3+. This has no semantic change and is enough to fix migration in the common case where the interrupt is not pending or is reported in IIR. It does not change the migration format, so 2.2.0 -> 2.1 will remain broken but we can fix 2.2.1 -> 2.1 without breaking 2.2.1 <-> 2.2.0. The case that remains broken (the one in which the subsection is strictly necessary) is when THRE=1, the THRI interrupt has *not* been acknowledged yet, and a higher-priority interrupt comes. In this case, you need the subsection to tell the source that the lower-priority THRI interrupt is pending. The subsection's breakage of migration, in this case, prevents continuing the VM on the destination with an invalid state. Cc: qemu-stable@nongnu.org Reported-by: Igor Mammedov Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Paolo Bonzini (cherry picked from commit 4e02b0fcf5c97579d0d3261c80c65abcf92870fe) Signed-off-by: Michael Roth --- hw/char/serial.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index ebcacdc..8c42d03 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -350,10 +350,24 @@ static void serial_ioport_write(void *opaque, hwaddr addr, uint64_t val, s->poll_msl = 0; } } - if (s->lsr & UART_LSR_THRE) { + + /* Turning on the THRE interrupt on IER can trigger the interrupt + * if LSR.THRE=1, even if it had been masked before by reading IIR. + * This is not in the datasheet, but Windows relies on it. It is + * unclear if THRE has to be resampled every time THRI becomes + * 1, or only on the rising edge. Bochs does the latter, and Windows + * always toggles IER to all zeroes and back to all ones. But for + * now leave it as it has always been in QEMU. + * + * If IER.THRI is zero, thr_ipending is not used. Set it to zero + * so that the thr_ipending subsection is not migrated. + */ + if ((s->ier & UART_IER_THRI) && (s->lsr & UART_LSR_THRE)) { s->thr_ipending = 1; - serial_update_irq(s); + } else { + s->thr_ipending = 0; } + serial_update_irq(s); } break; case 2: -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:49:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:49: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 1YaXdG-0007ku-QD; Tue, 24 Mar 2015 22:49:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXdF-0007kh-Ps for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:09 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 13/28-11605-5E9E1155; Tue, 24 Mar 2015 22:49:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1427237345!7989463!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21050 invoked from network); 24 Mar 2015 22:49:06 -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; 24 Mar 2015 22:49:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXdA-0007Ac-5E for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXdA-0004cU-2M for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:04 +0000 Date: Tue, 24 Mar 2015 22:49:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] serial: reset thri_pending on IER writes with THRI=0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e54bcad901f4891dd5c3bf72e199175a23944214 Author: Paolo Bonzini AuthorDate: Fri Dec 12 10:17:08 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:03:34 2015 -0600 serial: reset thri_pending on IER writes with THRI=0 This is responsible for failure of migration from 2.2 to 2.1, because thr_ipending is always one in practice. serial.c is setting thr_ipending unconditionally. However, thr_ipending is not used at all if THRI=0, and it will be overwritten again the next time THRE or THRI changes. For that reason, we can set thr_ipending to zero every time THRI is reset. There is disagreement on whether LSR.THRE should be resampled when IER.THRI goes from 1 to 1. This patch does not touch the code, leaving that for QEMU 2.3+. This has no semantic change and is enough to fix migration in the common case where the interrupt is not pending or is reported in IIR. It does not change the migration format, so 2.2.0 -> 2.1 will remain broken but we can fix 2.2.1 -> 2.1 without breaking 2.2.1 <-> 2.2.0. The case that remains broken (the one in which the subsection is strictly necessary) is when THRE=1, the THRI interrupt has *not* been acknowledged yet, and a higher-priority interrupt comes. In this case, you need the subsection to tell the source that the lower-priority THRI interrupt is pending. The subsection's breakage of migration, in this case, prevents continuing the VM on the destination with an invalid state. Cc: qemu-stable@nongnu.org Reported-by: Igor Mammedov Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Paolo Bonzini (cherry picked from commit 4e02b0fcf5c97579d0d3261c80c65abcf92870fe) Signed-off-by: Michael Roth --- hw/char/serial.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index ebcacdc..8c42d03 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -350,10 +350,24 @@ static void serial_ioport_write(void *opaque, hwaddr addr, uint64_t val, s->poll_msl = 0; } } - if (s->lsr & UART_LSR_THRE) { + + /* Turning on the THRE interrupt on IER can trigger the interrupt + * if LSR.THRE=1, even if it had been masked before by reading IIR. + * This is not in the datasheet, but Windows relies on it. It is + * unclear if THRE has to be resampled every time THRI becomes + * 1, or only on the rising edge. Bochs does the latter, and Windows + * always toggles IER to all zeroes and back to all ones. But for + * now leave it as it has always been in QEMU. + * + * If IER.THRI is zero, thr_ipending is not used. Set it to zero + * so that the thr_ipending subsection is not migrated. + */ + if ((s->ier & UART_IER_THRI) && (s->lsr & UART_LSR_THRE)) { s->thr_ipending = 1; - serial_update_irq(s); + } else { + s->thr_ipending = 0; } + serial_update_irq(s); } break; case 2: -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:49:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:49: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 1YaXdP-0007mt-Sq; Tue, 24 Mar 2015 22:49:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXdO-0007m9-1n for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:18 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 4A/FA-01024-DE9E1155; Tue, 24 Mar 2015 22:49:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1427237355!15144722!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28337 invoked from network); 24 Mar 2015 22:49:16 -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; 24 Mar 2015 22:49:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXdL-0007Ak-I7 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXdL-0004iJ-Ef for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:15 +0000 Date: Tue, 24 Mar 2015 22:49:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] serial: refine serial_thr_ipending_needed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fdb2ed44f1bf3568f12858c5752dc5d3add57945 Author: Paolo Bonzini AuthorDate: Mon Dec 22 08:51:57 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:06:01 2015 -0600 serial: refine serial_thr_ipending_needed If the THR interrupt is disabled, there is no need to migrate thr_ipending because LSR.THRE will be sampled again when the interrupt is enabled. (This is the behavior that is not documented in the datasheet, but relied on by Windows!) Note that in this case IIR will never be 0x2 so, if thr_ipending were to be one, QEMU would produce the subsection. Reported-by: Igor Mammedov Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini (cherry picked from commit bfa7362889d05d6951493d1c298289b39cf9bf86) Signed-off-by: Michael Roth --- hw/char/serial.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 8c42d03..51d939e 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -637,8 +637,17 @@ static int serial_post_load(void *opaque, int version_id) static bool serial_thr_ipending_needed(void *opaque) { SerialState *s = opaque; - bool expected_value = ((s->iir & UART_IIR_ID) == UART_IIR_THRI); - return s->thr_ipending != expected_value; + + if (s->ier & UART_IER_THRI) { + bool expected_value = ((s->iir & UART_IIR_ID) == UART_IIR_THRI); + return s->thr_ipending != expected_value; + } else { + /* LSR.THRE will be sampled again when the interrupt is + * enabled. thr_ipending is not used in this case, do + * not migrate it. + */ + return false; + } } const VMStateDescription vmstate_serial_thr_ipending = { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:49:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:49: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 1YaXdP-0007mt-Sq; Tue, 24 Mar 2015 22:49:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXdO-0007m9-1n for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:18 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 4A/FA-01024-DE9E1155; Tue, 24 Mar 2015 22:49:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1427237355!15144722!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28337 invoked from network); 24 Mar 2015 22:49:16 -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; 24 Mar 2015 22:49:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXdL-0007Ak-I7 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXdL-0004iJ-Ef for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:15 +0000 Date: Tue, 24 Mar 2015 22:49:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] serial: refine serial_thr_ipending_needed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fdb2ed44f1bf3568f12858c5752dc5d3add57945 Author: Paolo Bonzini AuthorDate: Mon Dec 22 08:51:57 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:06:01 2015 -0600 serial: refine serial_thr_ipending_needed If the THR interrupt is disabled, there is no need to migrate thr_ipending because LSR.THRE will be sampled again when the interrupt is enabled. (This is the behavior that is not documented in the datasheet, but relied on by Windows!) Note that in this case IIR will never be 0x2 so, if thr_ipending were to be one, QEMU would produce the subsection. Reported-by: Igor Mammedov Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini (cherry picked from commit bfa7362889d05d6951493d1c298289b39cf9bf86) Signed-off-by: Michael Roth --- hw/char/serial.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 8c42d03..51d939e 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -637,8 +637,17 @@ static int serial_post_load(void *opaque, int version_id) static bool serial_thr_ipending_needed(void *opaque) { SerialState *s = opaque; - bool expected_value = ((s->iir & UART_IIR_ID) == UART_IIR_THRI); - return s->thr_ipending != expected_value; + + if (s->ier & UART_IER_THRI) { + bool expected_value = ((s->iir & UART_IIR_ID) == UART_IIR_THRI); + return s->thr_ipending != expected_value; + } else { + /* LSR.THRE will be sampled again when the interrupt is + * enabled. thr_ipending is not used in this case, do + * not migrate it. + */ + return false; + } } const VMStateDescription vmstate_serial_thr_ipending = { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:49:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:49: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 1YaXdZ-0007qH-VX; Tue, 24 Mar 2015 22: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 1YaXdY-0007ps-Ah for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:28 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 46/49-30396-7F9E1155; Tue, 24 Mar 2015 22:49:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1427237365!11333336!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31414 invoked from network); 24 Mar 2015 22:49:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2015 22:49:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXdV-0007Aq-O4 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXdV-0004if-Lx for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:25 +0000 Date: Tue, 24 Mar 2015 22:49:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pckbd: set bits 2-3-6-7 of the output port by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 49725cdf045e3bb7b6f5ae5d6c1331fdcc034d64 Author: Paolo Bonzini AuthorDate: Mon Dec 22 08:55:19 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:06:17 2015 -0600 pckbd: set bits 2-3-6-7 of the output port by default OSes typically write 0xdd/0xdf to turn the A20 line off and on. This has bits 2-3-6-7 on, so that the output port subsection is migrated. Change the reset value and migration default to include those four bits, thus avoiding that the subsection is migrated. This strictly speaking changes guest ABI, but the long time during which we have not migrated the value means that the guests really do not care much; so the change is for all machine types. Reported-by: Igor Mammedov Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini (cherry picked from commit d13c0404092eb46e548754a47a808da1bb8d4fd0) Signed-off-by: Michael Roth --- hw/input/pckbd.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 2b0cd3d..9b9a7d7 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -101,6 +101,12 @@ #define KBD_OUT_OBF 0x10 /* Keyboard output buffer full */ #define KBD_OUT_MOUSE_OBF 0x20 /* Mouse output buffer full */ +/* OSes typically write 0xdd/0xdf to turn the A20 line off and on. + * We make the default value of the outport include these four bits, + * so that the subsection is rarely necessary. + */ +#define KBD_OUT_ONES 0xcc + /* Mouse Commands */ #define AUX_SET_SCALE11 0xE6 /* Set 1:1 scaling */ #define AUX_SET_SCALE21 0xE7 /* Set 2:1 scaling */ @@ -367,13 +373,13 @@ static void kbd_reset(void *opaque) s->mode = KBD_MODE_KBD_INT | KBD_MODE_MOUSE_INT; s->status = KBD_STAT_CMD | KBD_STAT_UNLOCKED; - s->outport = KBD_OUT_RESET | KBD_OUT_A20; + s->outport = KBD_OUT_RESET | KBD_OUT_A20 | KBD_OUT_ONES; s->outport_present = false; } static uint8_t kbd_outport_default(KBDState *s) { - return KBD_OUT_RESET | KBD_OUT_A20 + return KBD_OUT_RESET | KBD_OUT_A20 | KBD_OUT_ONES | (s->status & KBD_STAT_OBF ? KBD_OUT_OBF : 0) | (s->status & KBD_STAT_MOUSE_OBF ? KBD_OUT_MOUSE_OBF : 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 Tue Mar 24 22:49:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:49: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 1YaXdZ-0007qH-VX; Tue, 24 Mar 2015 22: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 1YaXdY-0007ps-Ah for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:28 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 46/49-30396-7F9E1155; Tue, 24 Mar 2015 22:49:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1427237365!11333336!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31414 invoked from network); 24 Mar 2015 22:49:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2015 22:49:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXdV-0007Aq-O4 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXdV-0004if-Lx for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:25 +0000 Date: Tue, 24 Mar 2015 22:49:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pckbd: set bits 2-3-6-7 of the output port by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 49725cdf045e3bb7b6f5ae5d6c1331fdcc034d64 Author: Paolo Bonzini AuthorDate: Mon Dec 22 08:55:19 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:06:17 2015 -0600 pckbd: set bits 2-3-6-7 of the output port by default OSes typically write 0xdd/0xdf to turn the A20 line off and on. This has bits 2-3-6-7 on, so that the output port subsection is migrated. Change the reset value and migration default to include those four bits, thus avoiding that the subsection is migrated. This strictly speaking changes guest ABI, but the long time during which we have not migrated the value means that the guests really do not care much; so the change is for all machine types. Reported-by: Igor Mammedov Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini (cherry picked from commit d13c0404092eb46e548754a47a808da1bb8d4fd0) Signed-off-by: Michael Roth --- hw/input/pckbd.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 2b0cd3d..9b9a7d7 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -101,6 +101,12 @@ #define KBD_OUT_OBF 0x10 /* Keyboard output buffer full */ #define KBD_OUT_MOUSE_OBF 0x20 /* Mouse output buffer full */ +/* OSes typically write 0xdd/0xdf to turn the A20 line off and on. + * We make the default value of the outport include these four bits, + * so that the subsection is rarely necessary. + */ +#define KBD_OUT_ONES 0xcc + /* Mouse Commands */ #define AUX_SET_SCALE11 0xE6 /* Set 1:1 scaling */ #define AUX_SET_SCALE21 0xE7 /* Set 2:1 scaling */ @@ -367,13 +373,13 @@ static void kbd_reset(void *opaque) s->mode = KBD_MODE_KBD_INT | KBD_MODE_MOUSE_INT; s->status = KBD_STAT_CMD | KBD_STAT_UNLOCKED; - s->outport = KBD_OUT_RESET | KBD_OUT_A20; + s->outport = KBD_OUT_RESET | KBD_OUT_A20 | KBD_OUT_ONES; s->outport_present = false; } static uint8_t kbd_outport_default(KBDState *s) { - return KBD_OUT_RESET | KBD_OUT_A20 + return KBD_OUT_RESET | KBD_OUT_A20 | KBD_OUT_ONES | (s->status & KBD_STAT_OBF ? KBD_OUT_OBF : 0) | (s->status & KBD_STAT_MOUSE_OBF ? KBD_OUT_MOUSE_OBF : 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 Tue Mar 24 22:49:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXdk-0007tE-1o; Tue, 24 Mar 2015 22:49:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXdi-0007sw-Dd for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:38 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 1E/E1-11368-10AE1155; Tue, 24 Mar 2015 22:49:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1427237376!11470116!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25019 invoked from network); 24 Mar 2015 22:49:37 -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; 24 Mar 2015 22:49:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXdf-0007Ay-Sg for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXdf-0004jV-Rj for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:35 +0000 Date: Tue, 24 Mar 2015 22:49:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] linux-user: Fix broken m68k signal handling on 64 bit hosts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09e2753be0e7841ae0045a87ee974e47ba10befd Author: Peter Maydell AuthorDate: Mon Dec 22 17:47:00 2014 +0000 Commit: Michael Roth CommitDate: Sun Feb 22 18:09:36 2015 -0600 linux-user: Fix broken m68k signal handling on 64 bit hosts The m68k signal frame setup code which writes the signal return trampoline code to the stack was assuming that a 'long' was 32 bits; on 64 bit systems this meant we would end up writing the 32 bit (2 insn) trampoline sequence to retaddr+4,retaddr+6 instead of the intended retaddr+0,retaddr+2, resulting in a guest crash when it tried to execute the invalid zero-bytes at retaddr+0. Fix by using uint32_t instead; also use uint16_t rather than short for consistency. This fixes bug LP:1404690. Reported-by: Michel Boaventura Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio (cherry picked from commit 1669add752d9f29283f8ebf6a863d7b1e2d0f146) Signed-off-by: Michael Roth --- linux-user/signal.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index e11b208..a324fd1 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -5091,7 +5091,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, /* moveq #,d0; trap #0 */ __put_user(0x70004e40 + (TARGET_NR_sigreturn << 16), - (long *)(frame->retcode)); + (uint32_t *)(frame->retcode)); /* Set up to return from userspace */ @@ -5225,8 +5225,8 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, /* moveq #,d0; notb d0; trap #0 */ __put_user(0x70004600 + ((TARGET_NR_rt_sigreturn ^ 0xff) << 16), - (long *)(frame->retcode + 0)); - __put_user(0x4e40, (short *)(frame->retcode + 4)); + (uint32_t *)(frame->retcode + 0)); + __put_user(0x4e40, (uint16_t *)(frame->retcode + 4)); if (err) goto give_sigsegv; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:49:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXdk-0007tE-1o; Tue, 24 Mar 2015 22:49:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXdi-0007sw-Dd for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:38 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 1E/E1-11368-10AE1155; Tue, 24 Mar 2015 22:49:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1427237376!11470116!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25019 invoked from network); 24 Mar 2015 22:49:37 -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; 24 Mar 2015 22:49:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXdf-0007Ay-Sg for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXdf-0004jV-Rj for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:35 +0000 Date: Tue, 24 Mar 2015 22:49:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] linux-user: Fix broken m68k signal handling on 64 bit hosts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09e2753be0e7841ae0045a87ee974e47ba10befd Author: Peter Maydell AuthorDate: Mon Dec 22 17:47:00 2014 +0000 Commit: Michael Roth CommitDate: Sun Feb 22 18:09:36 2015 -0600 linux-user: Fix broken m68k signal handling on 64 bit hosts The m68k signal frame setup code which writes the signal return trampoline code to the stack was assuming that a 'long' was 32 bits; on 64 bit systems this meant we would end up writing the 32 bit (2 insn) trampoline sequence to retaddr+4,retaddr+6 instead of the intended retaddr+0,retaddr+2, resulting in a guest crash when it tried to execute the invalid zero-bytes at retaddr+0. Fix by using uint32_t instead; also use uint16_t rather than short for consistency. This fixes bug LP:1404690. Reported-by: Michel Boaventura Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio (cherry picked from commit 1669add752d9f29283f8ebf6a863d7b1e2d0f146) Signed-off-by: Michael Roth --- linux-user/signal.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index e11b208..a324fd1 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -5091,7 +5091,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, /* moveq #,d0; trap #0 */ __put_user(0x70004e40 + (TARGET_NR_sigreturn << 16), - (long *)(frame->retcode)); + (uint32_t *)(frame->retcode)); /* Set up to return from userspace */ @@ -5225,8 +5225,8 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, /* moveq #,d0; notb d0; trap #0 */ __put_user(0x70004600 + ((TARGET_NR_rt_sigreturn ^ 0xff) << 16), - (long *)(frame->retcode + 0)); - __put_user(0x4e40, (short *)(frame->retcode + 4)); + (uint32_t *)(frame->retcode + 0)); + __put_user(0x4e40, (uint16_t *)(frame->retcode + 4)); if (err) goto give_sigsegv; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:49:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXdu-0007uv-4U; Tue, 24 Mar 2015 22:49:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXds-0007ud-Gg for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:48 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id F2/C7-25011-B0AE1155; Tue, 24 Mar 2015 22:49:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1427237386!11331788!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29795 invoked from network); 24 Mar 2015 22:49:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2015 22:49:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXdq-0007B8-3Y for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXdq-0004pI-1d for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:46 +0000 Date: Tue, 24 Mar 2015 22:49:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] scsi: fix cancellation when I/O was completed but DMA was not. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b0a231a9a9ab7cca0ad24b8c2eb2249e17727fdb Author: Paolo Bonzini AuthorDate: Mon Jan 12 11:47:30 2015 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:12:51 2015 -0600 scsi: fix cancellation when I/O was completed but DMA was not. Commit d577646 (scsi: Introduce scsi_req_cancel_complete, 2014-09-25) was supposed to have no semantic change, but it missed a case. When r->aiocb has already been NULLed, but DMA was not complete and the SCSI layer was waiting for scsi_req_continue, after the patch the SCSI layer will not call the .cancel callback of SCSIBusInfo. Fixes: d5776465ee9a55815792efa34d79de240f4ffd99 Cc: qemu-stable@nongnu.org Reported-by: Dr. David Alan Gilbert Tested-by: Dr. David Alan Gilbert Reviewed-by: Fam Zheng Signed-off-by: Paolo Bonzini (cherry picked from commit 488eef2f1d16c97cf7f9ebf644ecafa1ea1e9acc) Signed-off-by: Michael Roth --- hw/scsi/scsi-bus.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 24f7b74..9b740a3 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1770,6 +1770,8 @@ void scsi_req_cancel(SCSIRequest *req) req->io_canceled = true; if (req->aiocb) { blk_aio_cancel(req->aiocb); + } else { + scsi_req_cancel_complete(req); } } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:49:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXdu-0007uv-4U; Tue, 24 Mar 2015 22:49:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXds-0007ud-Gg for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:48 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id F2/C7-25011-B0AE1155; Tue, 24 Mar 2015 22:49:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1427237386!11331788!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29795 invoked from network); 24 Mar 2015 22:49:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2015 22:49:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXdq-0007B8-3Y for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXdq-0004pI-1d for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:46 +0000 Date: Tue, 24 Mar 2015 22:49:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] scsi: fix cancellation when I/O was completed but DMA was not. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b0a231a9a9ab7cca0ad24b8c2eb2249e17727fdb Author: Paolo Bonzini AuthorDate: Mon Jan 12 11:47:30 2015 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:12:51 2015 -0600 scsi: fix cancellation when I/O was completed but DMA was not. Commit d577646 (scsi: Introduce scsi_req_cancel_complete, 2014-09-25) was supposed to have no semantic change, but it missed a case. When r->aiocb has already been NULLed, but DMA was not complete and the SCSI layer was waiting for scsi_req_continue, after the patch the SCSI layer will not call the .cancel callback of SCSIBusInfo. Fixes: d5776465ee9a55815792efa34d79de240f4ffd99 Cc: qemu-stable@nongnu.org Reported-by: Dr. David Alan Gilbert Tested-by: Dr. David Alan Gilbert Reviewed-by: Fam Zheng Signed-off-by: Paolo Bonzini (cherry picked from commit 488eef2f1d16c97cf7f9ebf644ecafa1ea1e9acc) Signed-off-by: Michael Roth --- hw/scsi/scsi-bus.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 24f7b74..9b740a3 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1770,6 +1770,8 @@ void scsi_req_cancel(SCSIRequest *req) req->io_canceled = true; if (req->aiocb) { blk_aio_cancel(req->aiocb); + } else { + scsi_req_cancel_complete(req); } } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:50:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:50:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXe5-0007wi-NR; Tue, 24 Mar 2015 22:50:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXe3-0007wQ-9P for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:59 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 63/0E-23598-61AE1155; Tue, 24 Mar 2015 22:49:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1427237396!15075968!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2487 invoked from network); 24 Mar 2015 22:49:57 -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; 24 Mar 2015 22:49:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXe0-0007BH-JG for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXe0-0004pe-7k for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:56 +0000 Date: Tue, 24 Mar 2015 22:49:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] target-i386: fix movntsd on big-endian hosts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d1fdb16cd92fee24c9d6e7181ae29ac2585c0d1 Author: Paolo Bonzini AuthorDate: Wed Jan 7 17:36:27 2015 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:15:01 2015 -0600 target-i386: fix movntsd on big-endian hosts This was accessing an XMM register's low half without going through XMM_Q. Cc: qemu-stable@nongnu.org Reviewed-by: Eduardo Habkost Signed-off-by: Paolo Bonzini (cherry picked from commit 07958082fdf39284935d38a5b8aec1fe7d020637) Signed-off-by: Michael Roth --- target-i386/translate.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 782f7d2..269b885 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -3069,7 +3069,8 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, goto illegal_op; gen_lea_modrm(env, s, modrm); if (b1 & 1) { - gen_stq_env_A0(s, offsetof(CPUX86State, xmm_regs[reg])); + gen_stq_env_A0(s, offsetof(CPUX86State, + xmm_regs[reg].XMM_Q(0))); } else { tcg_gen_ld32u_tl(cpu_T[0], cpu_env, offsetof(CPUX86State, xmm_regs[reg].XMM_L(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 Tue Mar 24 22:50:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:50:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXe5-0007wi-NR; Tue, 24 Mar 2015 22:50:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXe3-0007wQ-9P for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:59 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 63/0E-23598-61AE1155; Tue, 24 Mar 2015 22:49:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1427237396!15075968!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2487 invoked from network); 24 Mar 2015 22:49:57 -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; 24 Mar 2015 22:49:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXe0-0007BH-JG for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXe0-0004pe-7k for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:49:56 +0000 Date: Tue, 24 Mar 2015 22:49:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] target-i386: fix movntsd on big-endian hosts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d1fdb16cd92fee24c9d6e7181ae29ac2585c0d1 Author: Paolo Bonzini AuthorDate: Wed Jan 7 17:36:27 2015 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:15:01 2015 -0600 target-i386: fix movntsd on big-endian hosts This was accessing an XMM register's low half without going through XMM_Q. Cc: qemu-stable@nongnu.org Reviewed-by: Eduardo Habkost Signed-off-by: Paolo Bonzini (cherry picked from commit 07958082fdf39284935d38a5b8aec1fe7d020637) Signed-off-by: Michael Roth --- target-i386/translate.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 782f7d2..269b885 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -3069,7 +3069,8 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, goto illegal_op; gen_lea_modrm(env, s, modrm); if (b1 & 1) { - gen_stq_env_A0(s, offsetof(CPUX86State, xmm_regs[reg])); + gen_stq_env_A0(s, offsetof(CPUX86State, + xmm_regs[reg].XMM_Q(0))); } else { tcg_gen_ld32u_tl(cpu_T[0], cpu_env, offsetof(CPUX86State, xmm_regs[reg].XMM_L(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 Tue Mar 24 22:50:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:50: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 1YaXeE-0007yB-Q8; Tue, 24 Mar 2015 22: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 1YaXeD-0007xv-Iv for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:09 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id AC/B1-02712-02AE1155; Tue, 24 Mar 2015 22:50:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1427237407!7434443!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18849 invoked from network); 24 Mar 2015 22:50:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2015 22:50:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXeA-0007Br-Qt for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXeA-0004qw-OA for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:06 +0000 Date: Tue, 24 Mar 2015 22:50:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] vt82c686: avoid out-of-bounds read X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d093159b4a48e24350cb7092b3b62ec4402f447 Author: Paolo Bonzini AuthorDate: Wed Dec 10 10:17:36 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:16:04 2015 -0600 vt82c686: avoid out-of-bounds read superio_ioport_readb can read the 256th element of the array. Coverity reports an out-of-bounds write in superio_ioport_writeb, but it does not show the corresponding out-of-bounds read because it cannot prove that it can happen. Fix the root cause of the problem (zhanghailang's patch instead fixes the logic in superio_ioport_writeb). Signed-off-by: Paolo Bonzini Reviewed-by: zhanghailiang Signed-off-by: Michael Tokarev Cc: qemu-stable@nongnu.org (cherry picked from commit 9feb8adeaa850d15b930c30f22c1ed2f2f695172) Signed-off-by: Michael Roth --- hw/isa/vt82c686.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index e0c235c..a43e26d 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -36,7 +36,7 @@ typedef struct SuperIOConfig { - uint8_t config[0xff]; + uint8_t config[0x100]; uint8_t index; uint8_t data; } SuperIOConfig; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:50:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:50: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 1YaXeE-0007yB-Q8; Tue, 24 Mar 2015 22: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 1YaXeD-0007xv-Iv for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:09 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id AC/B1-02712-02AE1155; Tue, 24 Mar 2015 22:50:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1427237407!7434443!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18849 invoked from network); 24 Mar 2015 22:50:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2015 22:50:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXeA-0007Br-Qt for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXeA-0004qw-OA for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:06 +0000 Date: Tue, 24 Mar 2015 22:50:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] vt82c686: avoid out-of-bounds read X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d093159b4a48e24350cb7092b3b62ec4402f447 Author: Paolo Bonzini AuthorDate: Wed Dec 10 10:17:36 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:16:04 2015 -0600 vt82c686: avoid out-of-bounds read superio_ioport_readb can read the 256th element of the array. Coverity reports an out-of-bounds write in superio_ioport_writeb, but it does not show the corresponding out-of-bounds read because it cannot prove that it can happen. Fix the root cause of the problem (zhanghailang's patch instead fixes the logic in superio_ioport_writeb). Signed-off-by: Paolo Bonzini Reviewed-by: zhanghailiang Signed-off-by: Michael Tokarev Cc: qemu-stable@nongnu.org (cherry picked from commit 9feb8adeaa850d15b930c30f22c1ed2f2f695172) Signed-off-by: Michael Roth --- hw/isa/vt82c686.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index e0c235c..a43e26d 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -36,7 +36,7 @@ typedef struct SuperIOConfig { - uint8_t config[0xff]; + uint8_t config[0x100]; uint8_t index; uint8_t data; } SuperIOConfig; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:50:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXeO-0007zh-Se; Tue, 24 Mar 2015 22:50:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXeN-0007zS-Iq for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:19 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 59/9B-18377-A2AE1155; Tue, 24 Mar 2015 22:50:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1427237417!12838117!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24462 invoked from network); 24 Mar 2015 22:50:18 -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; 24 Mar 2015 22:50:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXeL-0007Bz-6Q for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXeK-0004rT-W7 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:17 +0000 Date: Tue, 24 Mar 2015 22:50:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] virtio: fix feature bit checks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 451b9e2d4c65ad20cbd4247adc82cd69c8ebce2c Author: Cornelia Huck AuthorDate: Fri Dec 12 10:01:46 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:34:26 2015 -0600 virtio: fix feature bit checks Several places check against the feature bit number instead of against the feature bit. Fix them. Cc: qemu-stable@nongnu.org Reported-by: Thomas Huth Signed-off-by: Cornelia Huck Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin (cherry picked from commit 91d5c57a2e98845c02cda026f3f6a88cb5e14225) Signed-off-by: Michael Roth --- hw/scsi/virtio-scsi.c | 2 +- hw/virtio/dataplane/vring.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index ef48550..a44c410 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -144,7 +144,7 @@ static int virtio_scsi_parse_req(VirtIOSCSIReq *req, * * TODO: always disable this workaround for virtio 1.0 devices. */ - if ((vdev->guest_features & VIRTIO_F_ANY_LAYOUT) == 0) { + if ((vdev->guest_features & (1 << VIRTIO_F_ANY_LAYOUT)) == 0) { req_size = req->elem.out_sg[0].iov_len; resp_size = req->elem.in_sg[0].iov_len; } diff --git a/hw/virtio/dataplane/vring.c b/hw/virtio/dataplane/vring.c index 61f6d83..78c6f45 100644 --- a/hw/virtio/dataplane/vring.c +++ b/hw/virtio/dataplane/vring.c @@ -133,12 +133,12 @@ bool vring_should_notify(VirtIODevice *vdev, Vring *vring) * interrupts. */ smp_mb(); - if ((vdev->guest_features & VIRTIO_F_NOTIFY_ON_EMPTY) && + if ((vdev->guest_features & (1 << VIRTIO_F_NOTIFY_ON_EMPTY)) && unlikely(vring->vr.avail->idx == vring->last_avail_idx)) { return true; } - if (!(vdev->guest_features & VIRTIO_RING_F_EVENT_IDX)) { + if (!(vdev->guest_features & (1 << VIRTIO_RING_F_EVENT_IDX))) { return !(vring->vr.avail->flags & VRING_AVAIL_F_NO_INTERRUPT); } old = vring->signalled_used; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:50:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXeO-0007zh-Se; Tue, 24 Mar 2015 22:50:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXeN-0007zS-Iq for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:19 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 59/9B-18377-A2AE1155; Tue, 24 Mar 2015 22:50:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1427237417!12838117!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24462 invoked from network); 24 Mar 2015 22:50:18 -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; 24 Mar 2015 22:50:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXeL-0007Bz-6Q for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXeK-0004rT-W7 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:17 +0000 Date: Tue, 24 Mar 2015 22:50:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] virtio: fix feature bit checks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 451b9e2d4c65ad20cbd4247adc82cd69c8ebce2c Author: Cornelia Huck AuthorDate: Fri Dec 12 10:01:46 2014 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:34:26 2015 -0600 virtio: fix feature bit checks Several places check against the feature bit number instead of against the feature bit. Fix them. Cc: qemu-stable@nongnu.org Reported-by: Thomas Huth Signed-off-by: Cornelia Huck Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin (cherry picked from commit 91d5c57a2e98845c02cda026f3f6a88cb5e14225) Signed-off-by: Michael Roth --- hw/scsi/virtio-scsi.c | 2 +- hw/virtio/dataplane/vring.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index ef48550..a44c410 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -144,7 +144,7 @@ static int virtio_scsi_parse_req(VirtIOSCSIReq *req, * * TODO: always disable this workaround for virtio 1.0 devices. */ - if ((vdev->guest_features & VIRTIO_F_ANY_LAYOUT) == 0) { + if ((vdev->guest_features & (1 << VIRTIO_F_ANY_LAYOUT)) == 0) { req_size = req->elem.out_sg[0].iov_len; resp_size = req->elem.in_sg[0].iov_len; } diff --git a/hw/virtio/dataplane/vring.c b/hw/virtio/dataplane/vring.c index 61f6d83..78c6f45 100644 --- a/hw/virtio/dataplane/vring.c +++ b/hw/virtio/dataplane/vring.c @@ -133,12 +133,12 @@ bool vring_should_notify(VirtIODevice *vdev, Vring *vring) * interrupts. */ smp_mb(); - if ((vdev->guest_features & VIRTIO_F_NOTIFY_ON_EMPTY) && + if ((vdev->guest_features & (1 << VIRTIO_F_NOTIFY_ON_EMPTY)) && unlikely(vring->vr.avail->idx == vring->last_avail_idx)) { return true; } - if (!(vdev->guest_features & VIRTIO_RING_F_EVENT_IDX)) { + if (!(vdev->guest_features & (1 << VIRTIO_RING_F_EVENT_IDX))) { return !(vring->vr.avail->flags & VRING_AVAIL_F_NO_INTERRUPT); } old = vring->signalled_used; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:50:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:50: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 1YaXea-00084H-11; Tue, 24 Mar 2015 22:50:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXeY-00083n-9Y for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:30 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 94/89-14870-53AE1155; Tue, 24 Mar 2015 22:50:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1427237427!12824965!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13539 invoked from network); 24 Mar 2015 22:50:28 -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; 24 Mar 2015 22:50:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXeV-0007C5-Ci for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXeV-0004s5-BM for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:27 +0000 Date: Tue, 24 Mar 2015 22:50:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] sb16: fix interrupt acknowledgement X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e60fb7af55b3321431ffa6f3523f11111ae66714 Author: Paolo Bonzini AuthorDate: Tue Jan 20 17:23:48 2015 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:36:08 2015 -0600 sb16: fix interrupt acknowledgement SoundBlaster 16 emulation is very broken and consumes a lot of CPU, but a small fix was suggested offlist and it is enough to fix some games. I got Epic Pinball to work with the "SoundBlaster Clone" option. The processing of the interrupt register is wrong due to two missing "not"s. This causes the interrupt flag to remain set even after the Acknowledge ports have been read (0x0e and 0x0f). The line was introduced by commit 85571bc (audio merge (malc), 2004-11-07), but the code might have been broken before because I did not look closely at the huge patches from 10 years ago. Reported-by: Joshua Bair Cc: Gerd Hoffmann Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini Signed-off-by: Gerd Hoffmann (cherry picked from commit 9939375c282a0f97afa69dc6799d3c77aaf7d544) Signed-off-by: Michael Roth --- hw/audio/sb16.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index bda26d0..444eb9e 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -999,7 +999,7 @@ static IO_READ_PROTO (dsp_read) retval = (!s->out_data_len || s->highspeed) ? 0 : 0x80; if (s->mixer_regs[0x82] & 1) { ack = 1; - s->mixer_regs[0x82] &= 1; + s->mixer_regs[0x82] &= ~1; qemu_irq_lower (s->pic); } break; @@ -1008,7 +1008,7 @@ static IO_READ_PROTO (dsp_read) retval = 0xff; if (s->mixer_regs[0x82] & 2) { ack = 1; - s->mixer_regs[0x82] &= 2; + s->mixer_regs[0x82] &= ~2; qemu_irq_lower (s->pic); } break; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:50:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:50: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 1YaXea-00084H-11; Tue, 24 Mar 2015 22:50:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXeY-00083n-9Y for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:30 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 94/89-14870-53AE1155; Tue, 24 Mar 2015 22:50:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1427237427!12824965!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13539 invoked from network); 24 Mar 2015 22:50:28 -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; 24 Mar 2015 22:50:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXeV-0007C5-Ci for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXeV-0004s5-BM for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:27 +0000 Date: Tue, 24 Mar 2015 22:50:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] sb16: fix interrupt acknowledgement X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e60fb7af55b3321431ffa6f3523f11111ae66714 Author: Paolo Bonzini AuthorDate: Tue Jan 20 17:23:48 2015 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:36:08 2015 -0600 sb16: fix interrupt acknowledgement SoundBlaster 16 emulation is very broken and consumes a lot of CPU, but a small fix was suggested offlist and it is enough to fix some games. I got Epic Pinball to work with the "SoundBlaster Clone" option. The processing of the interrupt register is wrong due to two missing "not"s. This causes the interrupt flag to remain set even after the Acknowledge ports have been read (0x0e and 0x0f). The line was introduced by commit 85571bc (audio merge (malc), 2004-11-07), but the code might have been broken before because I did not look closely at the huge patches from 10 years ago. Reported-by: Joshua Bair Cc: Gerd Hoffmann Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini Signed-off-by: Gerd Hoffmann (cherry picked from commit 9939375c282a0f97afa69dc6799d3c77aaf7d544) Signed-off-by: Michael Roth --- hw/audio/sb16.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index bda26d0..444eb9e 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -999,7 +999,7 @@ static IO_READ_PROTO (dsp_read) retval = (!s->out_data_len || s->highspeed) ? 0 : 0x80; if (s->mixer_regs[0x82] & 1) { ack = 1; - s->mixer_regs[0x82] &= 1; + s->mixer_regs[0x82] &= ~1; qemu_irq_lower (s->pic); } break; @@ -1008,7 +1008,7 @@ static IO_READ_PROTO (dsp_read) retval = 0xff; if (s->mixer_regs[0x82] & 2) { ack = 1; - s->mixer_regs[0x82] &= 2; + s->mixer_regs[0x82] &= ~2; qemu_irq_lower (s->pic); } break; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:50:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:50: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 1YaXel-00087g-3b; Tue, 24 Mar 2015 22:50:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXej-000864-Mz for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:41 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id BC/4F-32368-F3AE1155; Tue, 24 Mar 2015 22:50:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1427237437!15224274!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10029 invoked from network); 24 Mar 2015 22:50: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; 24 Mar 2015 22:50:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXef-0007CD-Im for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXef-0004sV-Gq for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:37 +0000 Date: Tue, 24 Mar 2015 22:50:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] hw/input/hid.c Fix capslock hid code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4ac8b01fa8de00bb649d0b87c1dc542e50dcf530 Author: Dinar Valeev AuthorDate: Wed Jan 21 23:48:41 2015 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:36:50 2015 -0600 hw/input/hid.c Fix capslock hid code When ever USB keyboard is used, e.g. '-usbdevice keyboard' pressing caps lock key send 0x32 hid code, which is treated as backslash. Instead it should be 0x39 code. This affects sending uppercase keys, as they typed whith caps lock active. While on x86 this can be workarounded by using ps/2 protocol. On Power it is crusial as we don't have anything else than USB. This is fixes guest automation tasts over vnc. Signed-off-by: Dinar Valeev Signed-off-by: Gerd Hoffmann (cherry picked from commit 0ee4de5840ccc1072459ec68062bfb63c888a94d) Signed-off-by: Michael Roth --- hw/input/hid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/input/hid.c b/hw/input/hid.c index 148c003..58212a7 100644 --- a/hw/input/hid.c +++ b/hw/input/hid.c @@ -41,7 +41,7 @@ static const uint8_t hid_usage_keys[0x100] = { 0x07, 0x09, 0x0a, 0x0b, 0x0d, 0x0e, 0x0f, 0x33, 0x34, 0x35, 0xe1, 0x31, 0x1d, 0x1b, 0x06, 0x19, 0x05, 0x11, 0x10, 0x36, 0x37, 0x38, 0xe5, 0x55, - 0xe2, 0x2c, 0x32, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, + 0xe2, 0x2c, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43, 0x53, 0x47, 0x5f, 0x60, 0x61, 0x56, 0x5c, 0x5d, 0x5e, 0x57, 0x59, 0x5a, 0x5b, 0x62, 0x63, 0x00, 0x00, 0x00, 0x44, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:50:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:50: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 1YaXel-00087g-3b; Tue, 24 Mar 2015 22:50:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXej-000864-Mz for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:41 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id BC/4F-32368-F3AE1155; Tue, 24 Mar 2015 22:50:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1427237437!15224274!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10029 invoked from network); 24 Mar 2015 22:50: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; 24 Mar 2015 22:50:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXef-0007CD-Im for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXef-0004sV-Gq for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:37 +0000 Date: Tue, 24 Mar 2015 22:50:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] hw/input/hid.c Fix capslock hid code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4ac8b01fa8de00bb649d0b87c1dc542e50dcf530 Author: Dinar Valeev AuthorDate: Wed Jan 21 23:48:41 2015 +0100 Commit: Michael Roth CommitDate: Sun Feb 22 18:36:50 2015 -0600 hw/input/hid.c Fix capslock hid code When ever USB keyboard is used, e.g. '-usbdevice keyboard' pressing caps lock key send 0x32 hid code, which is treated as backslash. Instead it should be 0x39 code. This affects sending uppercase keys, as they typed whith caps lock active. While on x86 this can be workarounded by using ps/2 protocol. On Power it is crusial as we don't have anything else than USB. This is fixes guest automation tasts over vnc. Signed-off-by: Dinar Valeev Signed-off-by: Gerd Hoffmann (cherry picked from commit 0ee4de5840ccc1072459ec68062bfb63c888a94d) Signed-off-by: Michael Roth --- hw/input/hid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/input/hid.c b/hw/input/hid.c index 148c003..58212a7 100644 --- a/hw/input/hid.c +++ b/hw/input/hid.c @@ -41,7 +41,7 @@ static const uint8_t hid_usage_keys[0x100] = { 0x07, 0x09, 0x0a, 0x0b, 0x0d, 0x0e, 0x0f, 0x33, 0x34, 0x35, 0xe1, 0x31, 0x1d, 0x1b, 0x06, 0x19, 0x05, 0x11, 0x10, 0x36, 0x37, 0x38, 0xe5, 0x55, - 0xe2, 0x2c, 0x32, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, + 0xe2, 0x2c, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43, 0x53, 0x47, 0x5f, 0x60, 0x61, 0x56, 0x5c, 0x5d, 0x5e, 0x57, 0x59, 0x5a, 0x5b, 0x62, 0x63, 0x00, 0x00, 0x00, 0x44, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:50:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXeu-0008AH-6F; Tue, 24 Mar 2015 22:50:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXes-00089q-Cd for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:50 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id D9/C8-30447-94AE1155; Tue, 24 Mar 2015 22:50:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1427237447!9517183!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29540 invoked from network); 24 Mar 2015 22:50:48 -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; 24 Mar 2015 22:50:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXep-0007CJ-Og for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXep-0004t3-Mr for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:47 +0000 Date: Tue, 24 Mar 2015 22:50:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] target-arm/translate-a64: Fix wrong mmu_idx usage for LDT/STT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3750d2588e8d8d204820fef4ce95d7c271bafd3f Author: Peter Maydell AuthorDate: Thu Feb 5 13:37:23 2015 +0000 Commit: Michael Roth CommitDate: Sun Feb 22 18:38:35 2015 -0600 target-arm/translate-a64: Fix wrong mmu_idx usage for LDT/STT The LDT/STT (load/store unprivileged) instruction decode was using the wrong MMU index value. This meant that instead of these insns being "always access as if user-mode regardless of current privilege" they were "always access as if kernel-mode regardless of current privilege". This went unnoticed because AArch64 Linux doesn't use these instructions. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Reviewed-by: Greg Bellows Reviewed-by: Edgar E. Iglesias --- I'm not counting this as a security issue because I'm assuming nobody treats TCG guests as a security boundary (certainly I would not recommend doing so...) (cherry picked from commit 949013ce111eb64f8bc81cf9a9f1cefd6a1678c3) Signed-off-by: Michael Roth --- target-arm/translate-a64.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 80d2c07..97206aa 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -2107,7 +2107,7 @@ static void disas_ldst_reg_imm9(DisasContext *s, uint32_t insn) } } else { TCGv_i64 tcg_rt = cpu_reg(s, rt); - int memidx = is_unpriv ? 1 : get_mem_index(s); + int memidx = is_unpriv ? MMU_USER_IDX : get_mem_index(s); if (is_store) { do_gpr_st_memidx(s, tcg_rt, tcg_addr, size, memidx); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:50:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXeu-0008AH-6F; Tue, 24 Mar 2015 22:50:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXes-00089q-Cd for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:50 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id D9/C8-30447-94AE1155; Tue, 24 Mar 2015 22:50:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1427237447!9517183!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29540 invoked from network); 24 Mar 2015 22:50:48 -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; 24 Mar 2015 22:50:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXep-0007CJ-Og for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXep-0004t3-Mr for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:47 +0000 Date: Tue, 24 Mar 2015 22:50:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] target-arm/translate-a64: Fix wrong mmu_idx usage for LDT/STT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3750d2588e8d8d204820fef4ce95d7c271bafd3f Author: Peter Maydell AuthorDate: Thu Feb 5 13:37:23 2015 +0000 Commit: Michael Roth CommitDate: Sun Feb 22 18:38:35 2015 -0600 target-arm/translate-a64: Fix wrong mmu_idx usage for LDT/STT The LDT/STT (load/store unprivileged) instruction decode was using the wrong MMU index value. This meant that instead of these insns being "always access as if user-mode regardless of current privilege" they were "always access as if kernel-mode regardless of current privilege". This went unnoticed because AArch64 Linux doesn't use these instructions. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Reviewed-by: Greg Bellows Reviewed-by: Edgar E. Iglesias --- I'm not counting this as a security issue because I'm assuming nobody treats TCG guests as a security boundary (certainly I would not recommend doing so...) (cherry picked from commit 949013ce111eb64f8bc81cf9a9f1cefd6a1678c3) Signed-off-by: Michael Roth --- target-arm/translate-a64.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 80d2c07..97206aa 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -2107,7 +2107,7 @@ static void disas_ldst_reg_imm9(DisasContext *s, uint32_t insn) } } else { TCGv_i64 tcg_rt = cpu_reg(s, rt); - int memidx = is_unpriv ? 1 : get_mem_index(s); + int memidx = is_unpriv ? MMU_USER_IDX : get_mem_index(s); if (is_store) { do_gpr_st_memidx(s, tcg_rt, tcg_addr, size, memidx); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:51:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXf4-0008Ci-8t; Tue, 24 Mar 2015 22: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 1YaXf2-0008CV-JA for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:00 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 9C/CE-19614-35AE1155; Tue, 24 Mar 2015 22:50:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1427237458!15224331!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12009 invoked from network); 24 Mar 2015 22:50:59 -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; 24 Mar 2015 22:50:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXez-0007CS-UI for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXez-0004tU-SK for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:57 +0000 Date: Tue, 24 Mar 2015 22:50:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] vfio-pci: Fix missing unparent of dynamically allocated MemoryRegion X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4d49de6b6f9b45446dd31990a177b13953f2e842 Author: Alex Williamson AuthorDate: Wed Feb 4 11:45:32 2015 -0700 Commit: Michael Roth CommitDate: Mon Feb 23 18:04:34 2015 -0600 vfio-pci: Fix missing unparent of dynamically allocated MemoryRegion Commit d8d95814609e added explicit object_unparent() calls for dynamically allocated MemoryRegions. The VFIOMSIXInfo structure also contains such a MemoryRegion, covering the mmap'd region of a PCI BAR above the MSI-X table. This structure is freed as part of the class exit function and therefore also needs an explicit object_unparent(). Failing to do this results in random segfaults due to fields within the structure, often the class pointer, being reclaimed and corrupted by the time object_finalize_child_property() is called for the object. Signed-off-by: Alex Williamson Reviewed-by: Paolo Bonzini Cc: qemu-stable@nongnu.org # 2.2 (cherry picked from commit 3a4dbe6aa934370a92372528c1255ee1504965ee) Signed-off-by: Michael Roth --- hw/misc/vfio.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index fd318a1..7bff62c 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -4049,6 +4049,7 @@ static void vfio_put_device(VFIODevice *vdev) DPRINTF("vfio_put_device: close vdev->fd\n"); close(vdev->fd); if (vdev->msix) { + object_unparent(OBJECT(&vdev->msix->mmap_mem)); g_free(vdev->msix); vdev->msix = NULL; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:51:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXf4-0008Ci-8t; Tue, 24 Mar 2015 22: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 1YaXf2-0008CV-JA for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:00 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 9C/CE-19614-35AE1155; Tue, 24 Mar 2015 22:50:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1427237458!15224331!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12009 invoked from network); 24 Mar 2015 22:50:59 -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; 24 Mar 2015 22:50:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXez-0007CS-UI for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXez-0004tU-SK for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:50:57 +0000 Date: Tue, 24 Mar 2015 22:50:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] vfio-pci: Fix missing unparent of dynamically allocated MemoryRegion X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4d49de6b6f9b45446dd31990a177b13953f2e842 Author: Alex Williamson AuthorDate: Wed Feb 4 11:45:32 2015 -0700 Commit: Michael Roth CommitDate: Mon Feb 23 18:04:34 2015 -0600 vfio-pci: Fix missing unparent of dynamically allocated MemoryRegion Commit d8d95814609e added explicit object_unparent() calls for dynamically allocated MemoryRegions. The VFIOMSIXInfo structure also contains such a MemoryRegion, covering the mmap'd region of a PCI BAR above the MSI-X table. This structure is freed as part of the class exit function and therefore also needs an explicit object_unparent(). Failing to do this results in random segfaults due to fields within the structure, often the class pointer, being reclaimed and corrupted by the time object_finalize_child_property() is called for the object. Signed-off-by: Alex Williamson Reviewed-by: Paolo Bonzini Cc: qemu-stable@nongnu.org # 2.2 (cherry picked from commit 3a4dbe6aa934370a92372528c1255ee1504965ee) Signed-off-by: Michael Roth --- hw/misc/vfio.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index fd318a1..7bff62c 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -4049,6 +4049,7 @@ static void vfio_put_device(VFIODevice *vdev) DPRINTF("vfio_put_device: close vdev->fd\n"); close(vdev->fd); if (vdev->msix) { + object_unparent(OBJECT(&vdev->msix->mmap_mem)); g_free(vdev->msix); vdev->msix = NULL; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:51:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXfE-0008FC-BX; Tue, 24 Mar 2015 22:51:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfC-0008Ew-VM for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:11 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 9C/B2-23283-D5AE1155; Tue, 24 Mar 2015 22:51:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1427237468!12828067!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24798 invoked from network); 24 Mar 2015 22:51:09 -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; 24 Mar 2015 22:51:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfA-0007D1-6P for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXfA-0004vA-1h for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:08 +0000 Date: Tue, 24 Mar 2015 22:51:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qemu-thread: fix qemu_event without futexes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a9eb2b60538e2cb48cc71824d2c6239a8aa85cb8 Author: Paolo Bonzini AuthorDate: Mon Feb 2 16:36:51 2015 +0100 Commit: Michael Roth CommitDate: Mon Feb 23 18:04:34 2015 -0600 qemu-thread: fix qemu_event without futexes This had a possible deadlock that was visible with rcutorture. qemu_event_set qemu_event_wait ---------------------------------------------------------------- cmpxchg reads FREE, writes BUSY futex_wait: pthread_mutex_lock futex_wait: value == BUSY xchg reads BUSY, writes SET futex_wake: pthread_cond_broadcast futex_wait: pthread_cond_wait The fix is simply to avoid condvar tricks and do the obvious locking around pthread_cond_broadcast: qemu_event_set qemu_event_wait ---------------------------------------------------------------- cmpxchg reads FREE, writes BUSY futex_wait: pthread_mutex_lock futex_wait: value == BUSY xchg reads BUSY, writes SET futex_wake: pthread_mutex_lock (blocks) futex_wait: pthread_cond_wait (mutex unlocked) futex_wake: pthread_cond_broadcast futex_wake: pthread_mutex_unlock futex_wait: pthread_mutex_unlock Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini (cherry picked from commit 158ef8cbb7e0fe8bb430310924b8bebe5f186e6e) Signed-off-by: Michael Roth --- util/qemu-thread-posix.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c index d05a649..bb14ad4 100644 --- a/util/qemu-thread-posix.c +++ b/util/qemu-thread-posix.c @@ -306,11 +306,13 @@ static inline void futex_wait(QemuEvent *ev, unsigned val) #else static inline void futex_wake(QemuEvent *ev, int n) { + pthread_mutex_lock(&ev->lock); if (n == 1) { pthread_cond_signal(&ev->cond); } else { pthread_cond_broadcast(&ev->cond); } + pthread_mutex_unlock(&ev->lock); } static inline void futex_wait(QemuEvent *ev, unsigned val) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:51:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXfE-0008FC-BX; Tue, 24 Mar 2015 22:51:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfC-0008Ew-VM for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:11 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 9C/B2-23283-D5AE1155; Tue, 24 Mar 2015 22:51:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1427237468!12828067!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24798 invoked from network); 24 Mar 2015 22:51:09 -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; 24 Mar 2015 22:51:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfA-0007D1-6P for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXfA-0004vA-1h for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:08 +0000 Date: Tue, 24 Mar 2015 22:51:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qemu-thread: fix qemu_event without futexes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a9eb2b60538e2cb48cc71824d2c6239a8aa85cb8 Author: Paolo Bonzini AuthorDate: Mon Feb 2 16:36:51 2015 +0100 Commit: Michael Roth CommitDate: Mon Feb 23 18:04:34 2015 -0600 qemu-thread: fix qemu_event without futexes This had a possible deadlock that was visible with rcutorture. qemu_event_set qemu_event_wait ---------------------------------------------------------------- cmpxchg reads FREE, writes BUSY futex_wait: pthread_mutex_lock futex_wait: value == BUSY xchg reads BUSY, writes SET futex_wake: pthread_cond_broadcast futex_wait: pthread_cond_wait The fix is simply to avoid condvar tricks and do the obvious locking around pthread_cond_broadcast: qemu_event_set qemu_event_wait ---------------------------------------------------------------- cmpxchg reads FREE, writes BUSY futex_wait: pthread_mutex_lock futex_wait: value == BUSY xchg reads BUSY, writes SET futex_wake: pthread_mutex_lock (blocks) futex_wait: pthread_cond_wait (mutex unlocked) futex_wake: pthread_cond_broadcast futex_wake: pthread_mutex_unlock futex_wait: pthread_mutex_unlock Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini (cherry picked from commit 158ef8cbb7e0fe8bb430310924b8bebe5f186e6e) Signed-off-by: Michael Roth --- util/qemu-thread-posix.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c index d05a649..bb14ad4 100644 --- a/util/qemu-thread-posix.c +++ b/util/qemu-thread-posix.c @@ -306,11 +306,13 @@ static inline void futex_wait(QemuEvent *ev, unsigned val) #else static inline void futex_wake(QemuEvent *ev, int n) { + pthread_mutex_lock(&ev->lock); if (n == 1) { pthread_cond_signal(&ev->cond); } else { pthread_cond_broadcast(&ev->cond); } + pthread_mutex_unlock(&ev->lock); } static inline void futex_wait(QemuEvent *ev, unsigned val) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:51:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:51: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 1YaXfP-0008Gk-EF; Tue, 24 Mar 2015 22:51:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfN-0008GW-Ue for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:22 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 23/AE-23598-96AE1155; Tue, 24 Mar 2015 22:51:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1427237478!12787680!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19000 invoked from network); 24 Mar 2015 22:51:19 -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; 24 Mar 2015 22:51:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfK-0007D7-Ia for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXfK-0004ve-BT for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:18 +0000 Date: Tue, 24 Mar 2015 22:51:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] libcacard: stop linking against every single 3rd party 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 6833856e868d752fe7d70302c7fc550272ff2679 Author: Daniel P. Berrange AuthorDate: Tue Feb 3 11:31:30 2015 +0000 Commit: Michael Roth CommitDate: Mon Feb 23 18:04:34 2015 -0600 libcacard: stop linking against every single 3rd party library Building QEMU results in a libcacard.so that links against practically the entire world linux-vdso.so.1 => (0x00007fff71e99000) libssl3.so => /usr/lib64/libssl3.so (0x00007f49f94b6000) libsmime3.so => /usr/lib64/libsmime3.so (0x00007f49f928e000) libnss3.so => /usr/lib64/libnss3.so (0x00007f49f8f67000) libnssutil3.so => /usr/lib64/libnssutil3.so (0x00007f49f8d3b000) libplds4.so => /usr/lib64/libplds4.so (0x00007f49f8b36000) libplc4.so => /usr/lib64/libplc4.so (0x00007f49f8931000) libnspr4.so => /usr/lib64/libnspr4.so (0x00007f49f86f2000) libdl.so.2 => /usr/lib64/libdl.so.2 (0x00007f49f84ed000) libm.so.6 => /usr/lib64/libm.so.6 (0x00007f49f81e5000) libgthread-2.0.so.0 => /usr/lib64/libgthread-2.0.so.0 (0x00007f49f7fe3000) librt.so.1 => /usr/lib64/librt.so.1 (0x00007f49f7dda000) libz.so.1 => /usr/lib64/libz.so.1 (0x00007f49f7bc4000) libcap-ng.so.0 => /usr/lib64/libcap-ng.so.0 (0x00007f49f79be000) libuuid.so.1 => /usr/lib64/libuuid.so.1 (0x00007f49f77b8000) libgnutls.so.28 => /usr/lib64/libgnutls.so.28 (0x00007f49f749a000) libSDL-1.2.so.0 => /usr/lib64/libSDL-1.2.so.0 (0x00007f49f71fd000) libpthread.so.0 => /usr/lib64/libpthread.so.0 (0x00007f49f6fe0000) libvte.so.9 => /usr/lib64/libvte.so.9 (0x00007f49f6d3f000) libXext.so.6 => /usr/lib64/libXext.so.6 (0x00007f49f6b2d000) libgtk-x11-2.0.so.0 => /usr/lib64/libgtk-x11-2.0.so.0 (0x00007f49f64a0000) libgdk-x11-2.0.so.0 => /usr/lib64/libgdk-x11-2.0.so.0 (0x00007f49f61de000) libpangocairo-1.0.so.0 => /usr/lib64/libpangocairo-1.0.so.0 (0x00007f49f5fd1000) libatk-1.0.so.0 => /usr/lib64/libatk-1.0.so.0 (0x00007f49f5daa000) libcairo.so.2 => /usr/lib64/libcairo.so.2 (0x00007f49f5a9d000) libgdk_pixbuf-2.0.so.0 => /usr/lib64/libgdk_pixbuf-2.0.so.0 (0x00007f49f5878000) libgio-2.0.so.0 => /usr/lib64/libgio-2.0.so.0 (0x00007f49f5500000) libpangoft2-1.0.so.0 => /usr/lib64/libpangoft2-1.0.so.0 (0x00007f49f52eb000) libpango-1.0.so.0 => /usr/lib64/libpango-1.0.so.0 (0x00007f49f50a0000) libgobject-2.0.so.0 => /usr/lib64/libgobject-2.0.so.0 (0x00007f49f4e4e000) libglib-2.0.so.0 => /usr/lib64/libglib-2.0.so.0 (0x00007f49f4b15000) libfontconfig.so.1 => /usr/lib64/libfontconfig.so.1 (0x00007f49f48d6000) libfreetype.so.6 => /usr/lib64/libfreetype.so.6 (0x00007f49f462b000) libX11.so.6 => /usr/lib64/libX11.so.6 (0x00007f49f42e8000) libxenstore.so.3.0 => /usr/lib64/libxenstore.so.3.0 (0x00007f49f40de000) libxenctrl.so.4.4 => /usr/lib64/libxenctrl.so.4.4 (0x00007f49f3eb6000) libxenguest.so.4.4 => /usr/lib64/libxenguest.so.4.4 (0x00007f49f3c8b000) libseccomp.so.2 => /usr/lib64/libseccomp.so.2 (0x00007f49f3a74000) librdmacm.so.1 => /usr/lib64/librdmacm.so.1 (0x00007f49f385d000) libibverbs.so.1 => /usr/lib64/libibverbs.so.1 (0x00007f49f364a000) libutil.so.1 => /usr/lib64/libutil.so.1 (0x00007f49f3447000) libc.so.6 => /usr/lib64/libc.so.6 (0x00007f49f3089000) /lib64/ld-linux-x86-64.so.2 (0x00007f49f9902000) libp11-kit.so.0 => /usr/lib64/libp11-kit.so.0 (0x00007f49f2e23000) libtspi.so.1 => /usr/lib64/libtspi.so.1 (0x00007f49f2bb2000) libtasn1.so.6 => /usr/lib64/libtasn1.so.6 (0x00007f49f299f000) libnettle.so.4 => /usr/lib64/libnettle.so.4 (0x00007f49f276d000) libhogweed.so.2 => /usr/lib64/libhogweed.so.2 (0x00007f49f2545000) libgmp.so.10 => /usr/lib64/libgmp.so.10 (0x00007f49f22cd000) libncurses.so.5 => /usr/lib64/libncurses.so.5 (0x00007f49f20a5000) libtinfo.so.5 => /usr/lib64/libtinfo.so.5 (0x00007f49f1e7a000) libgmodule-2.0.so.0 => /usr/lib64/libgmodule-2.0.so.0 (0x00007f49f1c76000) libXfixes.so.3 => /usr/lib64/libXfixes.so.3 (0x00007f49f1a6f000) libXrender.so.1 => /usr/lib64/libXrender.so.1 (0x00007f49f1865000) libXinerama.so.1 => /usr/lib64/libXinerama.so.1 (0x00007f49f1662000) libXi.so.6 => /usr/lib64/libXi.so.6 (0x00007f49f1452000) libXrandr.so.2 => /usr/lib64/libXrandr.so.2 (0x00007f49f1247000) libXcursor.so.1 => /usr/lib64/libXcursor.so.1 (0x00007f49f103c000) libXcomposite.so.1 => /usr/lib64/libXcomposite.so.1 (0x00007f49f0e39000) libXdamage.so.1 => /usr/lib64/libXdamage.so.1 (0x00007f49f0c35000) libharfbuzz.so.0 => /usr/lib64/libharfbuzz.so.0 (0x00007f49f09dd000) libpixman-1.so.0 => /usr/lib64/libpixman-1.so.0 (0x00007f49f072f000) libEGL.so.1 => /usr/lib64/libEGL.so.1 (0x00007f49f0505000) libpng16.so.16 => /usr/lib64/libpng16.so.16 (0x00007f49f02d2000) libxcb-shm.so.0 => /usr/lib64/libxcb-shm.so.0 (0x00007f49f00cd000) libxcb-render.so.0 => /usr/lib64/libxcb-render.so.0 (0x00007f49efec3000) libxcb.so.1 => /usr/lib64/libxcb.so.1 (0x00007f49efca1000) libGL.so.1 => /usr/lib64/libGL.so.1 (0x00007f49efa06000) libffi.so.6 => /usr/lib64/libffi.so.6 (0x00007f49ef7fe000) libselinux.so.1 => /usr/lib64/libselinux.so.1 (0x00007f49ef5d8000) libresolv.so.2 => /usr/lib64/libresolv.so.2 (0x00007f49ef3be000) libexpat.so.1 => /usr/lib64/libexpat.so.1 (0x00007f49ef193000) libbz2.so.1 => /usr/lib64/libbz2.so.1 (0x00007f49eef83000) libgcc_s.so.1 => /usr/lib64/libgcc_s.so.1 (0x00007f49eed6c000) liblzma.so.5 => /usr/lib64/liblzma.so.5 (0x00007f49eeb46000) libnl-route-3.so.200 => /usr/lib64/libnl-route-3.so.200 (0x00007f49ee8e2000) libnl-3.so.200 => /usr/lib64/libnl-3.so.200 (0x00007f49ee6c4000) libcrypto.so.10 => /usr/lib64/libcrypto.so.10 (0x00007f49ee2d6000) libssl.so.10 => /usr/lib64/libssl.so.10 (0x00007f49ee067000) libgraphite2.so.3 => /usr/lib64/libgraphite2.so.3 (0x00007f49ede48000) libX11-xcb.so.1 => /usr/lib64/libX11-xcb.so.1 (0x00007f49edc46000) libxcb-dri2.so.0 => /usr/lib64/libxcb-dri2.so.0 (0x00007f49eda41000) libxcb-xfixes.so.0 => /usr/lib64/libxcb-xfixes.so.0 (0x00007f49ed838000) libxcb-shape.so.0 => /usr/lib64/libxcb-shape.so.0 (0x00007f49ed634000) libgbm.so.1 => /usr/lib64/libgbm.so.1 (0x00007f49ed426000) libwayland-client.so.0 => /usr/lib64/libwayland-client.so.0 (0x00007f49ed217000) libwayland-server.so.0 => /usr/lib64/libwayland-server.so.0 (0x00007f49ed005000) libglapi.so.0 => /usr/lib64/libglapi.so.0 (0x00007f49ecddb000) libdrm.so.2 => /usr/lib64/libdrm.so.2 (0x00007f49ecbce000) libXau.so.6 => /usr/lib64/libXau.so.6 (0x00007f49ec9ca000) libxcb-glx.so.0 => /usr/lib64/libxcb-glx.so.0 (0x00007f49ec7b0000) libxcb-dri3.so.0 => /usr/lib64/libxcb-dri3.so.0 (0x00007f49ec5ad000) libxcb-present.so.0 => /usr/lib64/libxcb-present.so.0 (0x00007f49ec3aa000) libxcb-randr.so.0 => /usr/lib64/libxcb-randr.so.0 (0x00007f49ec19b000) libxcb-sync.so.1 => /usr/lib64/libxcb-sync.so.1 (0x00007f49ebf94000) libxshmfence.so.1 => /usr/lib64/libxshmfence.so.1 (0x00007f49ebd91000) libXxf86vm.so.1 => /usr/lib64/libXxf86vm.so.1 (0x00007f49ebb8a000) libpcre.so.1 => /usr/lib64/libpcre.so.1 (0x00007f49eb91d000) libgssapi_krb5.so.2 => /usr/lib64/libgssapi_krb5.so.2 (0x00007f49eb6cf000) libkrb5.so.3 => /usr/lib64/libkrb5.so.3 (0x00007f49eb3ec000) libcom_err.so.2 => /usr/lib64/libcom_err.so.2 (0x00007f49eb1e8000) libk5crypto.so.3 => /usr/lib64/libk5crypto.so.3 (0x00007f49eafb4000) libkrb5support.so.0 => /usr/lib64/libkrb5support.so.0 (0x00007f49eada5000) libkeyutils.so.1 => /usr/lib64/libkeyutils.so.1 (0x00007f49eaba0000) All libcacard actually needs are the NSS libs. Linking against the entire world is a regression caused by commit 9d171bd9375e4d08feff9adda15163e0811f5f42 Author: Michael Tokarev Date: Thu May 8 16:48:27 2014 +0400 libcacard: remove libcacard-specific CFLAGS and LIBS from global vars Which removed the setting of the LIBS variable in libcacard/Makefile. Adding it back as an empty assignment brings the linked libs back to a more reasonable set linux-vdso.so.1 => (0x00007fff575c1000) libssl3.so => /usr/lib64/libssl3.so (0x00007f7f753b1000) libsmime3.so => /usr/lib64/libsmime3.so (0x00007f7f75189000) libnss3.so => /usr/lib64/libnss3.so (0x00007f7f74e62000) libnssutil3.so => /usr/lib64/libnssutil3.so (0x00007f7f74c36000) libplds4.so => /usr/lib64/libplds4.so (0x00007f7f74a31000) libplc4.so => /usr/lib64/libplc4.so (0x00007f7f7482c000) libnspr4.so => /usr/lib64/libnspr4.so (0x00007f7f745ed000) libpthread.so.0 => /usr/lib64/libpthread.so.0 (0x00007f7f743d0000) libdl.so.2 => /usr/lib64/libdl.so.2 (0x00007f7f741cc000) libgthread-2.0.so.0 => /usr/lib64/libgthread-2.0.so.0 (0x00007f7f73fca000) libglib-2.0.so.0 => /usr/lib64/libglib-2.0.so.0 (0x00007f7f73c90000) libc.so.6 => /usr/lib64/libc.so.6 (0x00007f7f738d3000) libz.so.1 => /usr/lib64/libz.so.1 (0x00007f7f736bd000) librt.so.1 => /usr/lib64/librt.so.1 (0x00007f7f734b4000) /lib64/ld-linux-x86-64.so.2 (0x00007f7f757fd000) Signed-off-by: Daniel P. Berrange Cc: Reviewed-by: Paolo Bonzini Signed-off-by: Michael Tokarev (cherry picked from commit b41112c46b93f781669c0eb89e51d3a87af6bb49) Signed-off-by: Michael Roth --- libcacard/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libcacard/Makefile b/libcacard/Makefile index 0e7903f..b5eddff 100644 --- a/libcacard/Makefile +++ b/libcacard/Makefile @@ -19,6 +19,8 @@ vscclient$(EXESUF): libcacard/vscclient.o libcacard.la libcacard.la: LDFLAGS += -rpath $(libdir) -no-undefined \ -export-symbols $(SRC_PATH)/libcacard/libcacard.syms +# Prevent libcacard.so linking against the entire world of 3rd party libs +libcacard.la: LIBS = libcacard.la: $(libcacard-lobj-y) $(call LINK,$^) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:51:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:51: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 1YaXfP-0008Gk-EF; Tue, 24 Mar 2015 22:51:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfN-0008GW-Ue for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:22 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 23/AE-23598-96AE1155; Tue, 24 Mar 2015 22:51:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1427237478!12787680!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19000 invoked from network); 24 Mar 2015 22:51:19 -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; 24 Mar 2015 22:51:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfK-0007D7-Ia for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXfK-0004ve-BT for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:18 +0000 Date: Tue, 24 Mar 2015 22:51:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] libcacard: stop linking against every single 3rd party 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 6833856e868d752fe7d70302c7fc550272ff2679 Author: Daniel P. Berrange AuthorDate: Tue Feb 3 11:31:30 2015 +0000 Commit: Michael Roth CommitDate: Mon Feb 23 18:04:34 2015 -0600 libcacard: stop linking against every single 3rd party library Building QEMU results in a libcacard.so that links against practically the entire world linux-vdso.so.1 => (0x00007fff71e99000) libssl3.so => /usr/lib64/libssl3.so (0x00007f49f94b6000) libsmime3.so => /usr/lib64/libsmime3.so (0x00007f49f928e000) libnss3.so => /usr/lib64/libnss3.so (0x00007f49f8f67000) libnssutil3.so => /usr/lib64/libnssutil3.so (0x00007f49f8d3b000) libplds4.so => /usr/lib64/libplds4.so (0x00007f49f8b36000) libplc4.so => /usr/lib64/libplc4.so (0x00007f49f8931000) libnspr4.so => /usr/lib64/libnspr4.so (0x00007f49f86f2000) libdl.so.2 => /usr/lib64/libdl.so.2 (0x00007f49f84ed000) libm.so.6 => /usr/lib64/libm.so.6 (0x00007f49f81e5000) libgthread-2.0.so.0 => /usr/lib64/libgthread-2.0.so.0 (0x00007f49f7fe3000) librt.so.1 => /usr/lib64/librt.so.1 (0x00007f49f7dda000) libz.so.1 => /usr/lib64/libz.so.1 (0x00007f49f7bc4000) libcap-ng.so.0 => /usr/lib64/libcap-ng.so.0 (0x00007f49f79be000) libuuid.so.1 => /usr/lib64/libuuid.so.1 (0x00007f49f77b8000) libgnutls.so.28 => /usr/lib64/libgnutls.so.28 (0x00007f49f749a000) libSDL-1.2.so.0 => /usr/lib64/libSDL-1.2.so.0 (0x00007f49f71fd000) libpthread.so.0 => /usr/lib64/libpthread.so.0 (0x00007f49f6fe0000) libvte.so.9 => /usr/lib64/libvte.so.9 (0x00007f49f6d3f000) libXext.so.6 => /usr/lib64/libXext.so.6 (0x00007f49f6b2d000) libgtk-x11-2.0.so.0 => /usr/lib64/libgtk-x11-2.0.so.0 (0x00007f49f64a0000) libgdk-x11-2.0.so.0 => /usr/lib64/libgdk-x11-2.0.so.0 (0x00007f49f61de000) libpangocairo-1.0.so.0 => /usr/lib64/libpangocairo-1.0.so.0 (0x00007f49f5fd1000) libatk-1.0.so.0 => /usr/lib64/libatk-1.0.so.0 (0x00007f49f5daa000) libcairo.so.2 => /usr/lib64/libcairo.so.2 (0x00007f49f5a9d000) libgdk_pixbuf-2.0.so.0 => /usr/lib64/libgdk_pixbuf-2.0.so.0 (0x00007f49f5878000) libgio-2.0.so.0 => /usr/lib64/libgio-2.0.so.0 (0x00007f49f5500000) libpangoft2-1.0.so.0 => /usr/lib64/libpangoft2-1.0.so.0 (0x00007f49f52eb000) libpango-1.0.so.0 => /usr/lib64/libpango-1.0.so.0 (0x00007f49f50a0000) libgobject-2.0.so.0 => /usr/lib64/libgobject-2.0.so.0 (0x00007f49f4e4e000) libglib-2.0.so.0 => /usr/lib64/libglib-2.0.so.0 (0x00007f49f4b15000) libfontconfig.so.1 => /usr/lib64/libfontconfig.so.1 (0x00007f49f48d6000) libfreetype.so.6 => /usr/lib64/libfreetype.so.6 (0x00007f49f462b000) libX11.so.6 => /usr/lib64/libX11.so.6 (0x00007f49f42e8000) libxenstore.so.3.0 => /usr/lib64/libxenstore.so.3.0 (0x00007f49f40de000) libxenctrl.so.4.4 => /usr/lib64/libxenctrl.so.4.4 (0x00007f49f3eb6000) libxenguest.so.4.4 => /usr/lib64/libxenguest.so.4.4 (0x00007f49f3c8b000) libseccomp.so.2 => /usr/lib64/libseccomp.so.2 (0x00007f49f3a74000) librdmacm.so.1 => /usr/lib64/librdmacm.so.1 (0x00007f49f385d000) libibverbs.so.1 => /usr/lib64/libibverbs.so.1 (0x00007f49f364a000) libutil.so.1 => /usr/lib64/libutil.so.1 (0x00007f49f3447000) libc.so.6 => /usr/lib64/libc.so.6 (0x00007f49f3089000) /lib64/ld-linux-x86-64.so.2 (0x00007f49f9902000) libp11-kit.so.0 => /usr/lib64/libp11-kit.so.0 (0x00007f49f2e23000) libtspi.so.1 => /usr/lib64/libtspi.so.1 (0x00007f49f2bb2000) libtasn1.so.6 => /usr/lib64/libtasn1.so.6 (0x00007f49f299f000) libnettle.so.4 => /usr/lib64/libnettle.so.4 (0x00007f49f276d000) libhogweed.so.2 => /usr/lib64/libhogweed.so.2 (0x00007f49f2545000) libgmp.so.10 => /usr/lib64/libgmp.so.10 (0x00007f49f22cd000) libncurses.so.5 => /usr/lib64/libncurses.so.5 (0x00007f49f20a5000) libtinfo.so.5 => /usr/lib64/libtinfo.so.5 (0x00007f49f1e7a000) libgmodule-2.0.so.0 => /usr/lib64/libgmodule-2.0.so.0 (0x00007f49f1c76000) libXfixes.so.3 => /usr/lib64/libXfixes.so.3 (0x00007f49f1a6f000) libXrender.so.1 => /usr/lib64/libXrender.so.1 (0x00007f49f1865000) libXinerama.so.1 => /usr/lib64/libXinerama.so.1 (0x00007f49f1662000) libXi.so.6 => /usr/lib64/libXi.so.6 (0x00007f49f1452000) libXrandr.so.2 => /usr/lib64/libXrandr.so.2 (0x00007f49f1247000) libXcursor.so.1 => /usr/lib64/libXcursor.so.1 (0x00007f49f103c000) libXcomposite.so.1 => /usr/lib64/libXcomposite.so.1 (0x00007f49f0e39000) libXdamage.so.1 => /usr/lib64/libXdamage.so.1 (0x00007f49f0c35000) libharfbuzz.so.0 => /usr/lib64/libharfbuzz.so.0 (0x00007f49f09dd000) libpixman-1.so.0 => /usr/lib64/libpixman-1.so.0 (0x00007f49f072f000) libEGL.so.1 => /usr/lib64/libEGL.so.1 (0x00007f49f0505000) libpng16.so.16 => /usr/lib64/libpng16.so.16 (0x00007f49f02d2000) libxcb-shm.so.0 => /usr/lib64/libxcb-shm.so.0 (0x00007f49f00cd000) libxcb-render.so.0 => /usr/lib64/libxcb-render.so.0 (0x00007f49efec3000) libxcb.so.1 => /usr/lib64/libxcb.so.1 (0x00007f49efca1000) libGL.so.1 => /usr/lib64/libGL.so.1 (0x00007f49efa06000) libffi.so.6 => /usr/lib64/libffi.so.6 (0x00007f49ef7fe000) libselinux.so.1 => /usr/lib64/libselinux.so.1 (0x00007f49ef5d8000) libresolv.so.2 => /usr/lib64/libresolv.so.2 (0x00007f49ef3be000) libexpat.so.1 => /usr/lib64/libexpat.so.1 (0x00007f49ef193000) libbz2.so.1 => /usr/lib64/libbz2.so.1 (0x00007f49eef83000) libgcc_s.so.1 => /usr/lib64/libgcc_s.so.1 (0x00007f49eed6c000) liblzma.so.5 => /usr/lib64/liblzma.so.5 (0x00007f49eeb46000) libnl-route-3.so.200 => /usr/lib64/libnl-route-3.so.200 (0x00007f49ee8e2000) libnl-3.so.200 => /usr/lib64/libnl-3.so.200 (0x00007f49ee6c4000) libcrypto.so.10 => /usr/lib64/libcrypto.so.10 (0x00007f49ee2d6000) libssl.so.10 => /usr/lib64/libssl.so.10 (0x00007f49ee067000) libgraphite2.so.3 => /usr/lib64/libgraphite2.so.3 (0x00007f49ede48000) libX11-xcb.so.1 => /usr/lib64/libX11-xcb.so.1 (0x00007f49edc46000) libxcb-dri2.so.0 => /usr/lib64/libxcb-dri2.so.0 (0x00007f49eda41000) libxcb-xfixes.so.0 => /usr/lib64/libxcb-xfixes.so.0 (0x00007f49ed838000) libxcb-shape.so.0 => /usr/lib64/libxcb-shape.so.0 (0x00007f49ed634000) libgbm.so.1 => /usr/lib64/libgbm.so.1 (0x00007f49ed426000) libwayland-client.so.0 => /usr/lib64/libwayland-client.so.0 (0x00007f49ed217000) libwayland-server.so.0 => /usr/lib64/libwayland-server.so.0 (0x00007f49ed005000) libglapi.so.0 => /usr/lib64/libglapi.so.0 (0x00007f49ecddb000) libdrm.so.2 => /usr/lib64/libdrm.so.2 (0x00007f49ecbce000) libXau.so.6 => /usr/lib64/libXau.so.6 (0x00007f49ec9ca000) libxcb-glx.so.0 => /usr/lib64/libxcb-glx.so.0 (0x00007f49ec7b0000) libxcb-dri3.so.0 => /usr/lib64/libxcb-dri3.so.0 (0x00007f49ec5ad000) libxcb-present.so.0 => /usr/lib64/libxcb-present.so.0 (0x00007f49ec3aa000) libxcb-randr.so.0 => /usr/lib64/libxcb-randr.so.0 (0x00007f49ec19b000) libxcb-sync.so.1 => /usr/lib64/libxcb-sync.so.1 (0x00007f49ebf94000) libxshmfence.so.1 => /usr/lib64/libxshmfence.so.1 (0x00007f49ebd91000) libXxf86vm.so.1 => /usr/lib64/libXxf86vm.so.1 (0x00007f49ebb8a000) libpcre.so.1 => /usr/lib64/libpcre.so.1 (0x00007f49eb91d000) libgssapi_krb5.so.2 => /usr/lib64/libgssapi_krb5.so.2 (0x00007f49eb6cf000) libkrb5.so.3 => /usr/lib64/libkrb5.so.3 (0x00007f49eb3ec000) libcom_err.so.2 => /usr/lib64/libcom_err.so.2 (0x00007f49eb1e8000) libk5crypto.so.3 => /usr/lib64/libk5crypto.so.3 (0x00007f49eafb4000) libkrb5support.so.0 => /usr/lib64/libkrb5support.so.0 (0x00007f49eada5000) libkeyutils.so.1 => /usr/lib64/libkeyutils.so.1 (0x00007f49eaba0000) All libcacard actually needs are the NSS libs. Linking against the entire world is a regression caused by commit 9d171bd9375e4d08feff9adda15163e0811f5f42 Author: Michael Tokarev Date: Thu May 8 16:48:27 2014 +0400 libcacard: remove libcacard-specific CFLAGS and LIBS from global vars Which removed the setting of the LIBS variable in libcacard/Makefile. Adding it back as an empty assignment brings the linked libs back to a more reasonable set linux-vdso.so.1 => (0x00007fff575c1000) libssl3.so => /usr/lib64/libssl3.so (0x00007f7f753b1000) libsmime3.so => /usr/lib64/libsmime3.so (0x00007f7f75189000) libnss3.so => /usr/lib64/libnss3.so (0x00007f7f74e62000) libnssutil3.so => /usr/lib64/libnssutil3.so (0x00007f7f74c36000) libplds4.so => /usr/lib64/libplds4.so (0x00007f7f74a31000) libplc4.so => /usr/lib64/libplc4.so (0x00007f7f7482c000) libnspr4.so => /usr/lib64/libnspr4.so (0x00007f7f745ed000) libpthread.so.0 => /usr/lib64/libpthread.so.0 (0x00007f7f743d0000) libdl.so.2 => /usr/lib64/libdl.so.2 (0x00007f7f741cc000) libgthread-2.0.so.0 => /usr/lib64/libgthread-2.0.so.0 (0x00007f7f73fca000) libglib-2.0.so.0 => /usr/lib64/libglib-2.0.so.0 (0x00007f7f73c90000) libc.so.6 => /usr/lib64/libc.so.6 (0x00007f7f738d3000) libz.so.1 => /usr/lib64/libz.so.1 (0x00007f7f736bd000) librt.so.1 => /usr/lib64/librt.so.1 (0x00007f7f734b4000) /lib64/ld-linux-x86-64.so.2 (0x00007f7f757fd000) Signed-off-by: Daniel P. Berrange Cc: Reviewed-by: Paolo Bonzini Signed-off-by: Michael Tokarev (cherry picked from commit b41112c46b93f781669c0eb89e51d3a87af6bb49) Signed-off-by: Michael Roth --- libcacard/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libcacard/Makefile b/libcacard/Makefile index 0e7903f..b5eddff 100644 --- a/libcacard/Makefile +++ b/libcacard/Makefile @@ -19,6 +19,8 @@ vscclient$(EXESUF): libcacard/vscclient.o libcacard.la libcacard.la: LDFLAGS += -rpath $(libdir) -no-undefined \ -export-symbols $(SRC_PATH)/libcacard/libcacard.syms +# Prevent libcacard.so linking against the entire world of 3rd party libs +libcacard.la: LIBS = libcacard.la: $(libcacard-lobj-y) $(call LINK,$^) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:51:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:51: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 1YaXfY-0008IN-Jq; Tue, 24 Mar 2015 22:51:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfX-0008IC-Hm for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:31 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 93/AF-32368-27AE1155; Tue, 24 Mar 2015 22:51:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1427237488!15260301!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5138 invoked from network); 24 Mar 2015 22: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; 24 Mar 2015 22:51:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfU-0007DF-OB for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXfU-0004w8-Mi for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:28 +0000 Date: Tue, 24 Mar 2015 22:51:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] fix mc146818rtc wrong subsection name to avoid vmstate_subsection_load() fail X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2a020d29dff124003728d517c1896ed6f14a53d6 Author: Zhang Haoyu AuthorDate: Thu Feb 5 19:33:11 2015 +0800 Commit: Michael Roth CommitDate: Mon Feb 23 18:04:34 2015 -0600 fix mc146818rtc wrong subsection name to avoid vmstate_subsection_load() fail fix mc146818rtc wrong subsection name to avoid vmstate_subsection_load() fail during incoming migration or loadvm. Signed-off-by: Zhang Haoyu Reviewed-by: Paolo Bonzini Signed-off-by: Juan Quintela (cherry picked from commit bb426311901776b95b021cece831b69dce4ef5ee) Signed-off-by: Michael Roth --- hw/timer/mc146818rtc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index f18d128..9373e18 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -734,7 +734,7 @@ static int rtc_post_load(void *opaque, int version_id) } static const VMStateDescription vmstate_rtc_irq_reinject_on_ack_count = { - .name = "irq_reinject_on_ack_count", + .name = "mc146818rtc/irq_reinject_on_ack_count", .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:51:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:51: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 1YaXfY-0008IN-Jq; Tue, 24 Mar 2015 22:51:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfX-0008IC-Hm for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:31 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 93/AF-32368-27AE1155; Tue, 24 Mar 2015 22:51:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1427237488!15260301!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5138 invoked from network); 24 Mar 2015 22: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; 24 Mar 2015 22:51:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfU-0007DF-OB for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXfU-0004w8-Mi for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:28 +0000 Date: Tue, 24 Mar 2015 22:51:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] fix mc146818rtc wrong subsection name to avoid vmstate_subsection_load() fail X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2a020d29dff124003728d517c1896ed6f14a53d6 Author: Zhang Haoyu AuthorDate: Thu Feb 5 19:33:11 2015 +0800 Commit: Michael Roth CommitDate: Mon Feb 23 18:04:34 2015 -0600 fix mc146818rtc wrong subsection name to avoid vmstate_subsection_load() fail fix mc146818rtc wrong subsection name to avoid vmstate_subsection_load() fail during incoming migration or loadvm. Signed-off-by: Zhang Haoyu Reviewed-by: Paolo Bonzini Signed-off-by: Juan Quintela (cherry picked from commit bb426311901776b95b021cece831b69dce4ef5ee) Signed-off-by: Michael Roth --- hw/timer/mc146818rtc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index f18d128..9373e18 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -734,7 +734,7 @@ static int rtc_post_load(void *opaque, int version_id) } static const VMStateDescription vmstate_rtc_irq_reinject_on_ack_count = { - .name = "irq_reinject_on_ack_count", + .name = "mc146818rtc/irq_reinject_on_ack_count", .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:51:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:51: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 1YaXfi-0008Jn-Mb; Tue, 24 Mar 2015 22:51:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfh-0008Jb-LN for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:41 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id C8/52-18861-C7AE1155; Tue, 24 Mar 2015 22:51:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1427237499!11331961!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3784 invoked from network); 24 Mar 2015 22:51:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2015 22:51:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfe-0007DL-TV for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXfe-0004wg-SV for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:38 +0000 Date: Tue, 24 Mar 2015 22:51:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block/iscsi: fix uninitialized variable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d389a2138a3b31895cf40300d052eda71ef0722 Author: Peter Wu AuthorDate: Tue Dec 23 16:30:41 2014 +0100 Commit: Michael Roth CommitDate: Tue Feb 24 15:02:12 2015 -0600 block/iscsi: fix uninitialized variable 'ret' was never initialized in the success path. Signed-off-by: Peter Wu Signed-off-by: Paolo Bonzini (cherry picked from commit debfb917a4f9c0784772c86f110f2bcd22e5a14f) Signed-off-by: Michael Roth --- block/iscsi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index ed375fc..12ddbfb 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1286,7 +1286,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, QemuOpts *opts; Error *local_err = NULL; const char *filename; - int i, ret; + int i, ret = 0; if ((BDRV_SECTOR_SIZE % 512) != 0) { error_setg(errp, "iSCSI: Invalid BDRV_SECTOR_SIZE. " -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:51:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:51: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 1YaXfi-0008Jn-Mb; Tue, 24 Mar 2015 22:51:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfh-0008Jb-LN for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:41 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id C8/52-18861-C7AE1155; Tue, 24 Mar 2015 22:51:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1427237499!11331961!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3784 invoked from network); 24 Mar 2015 22:51:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2015 22:51:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfe-0007DL-TV for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXfe-0004wg-SV for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:38 +0000 Date: Tue, 24 Mar 2015 22:51:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block/iscsi: fix uninitialized variable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d389a2138a3b31895cf40300d052eda71ef0722 Author: Peter Wu AuthorDate: Tue Dec 23 16:30:41 2014 +0100 Commit: Michael Roth CommitDate: Tue Feb 24 15:02:12 2015 -0600 block/iscsi: fix uninitialized variable 'ret' was never initialized in the success path. Signed-off-by: Peter Wu Signed-off-by: Paolo Bonzini (cherry picked from commit debfb917a4f9c0784772c86f110f2bcd22e5a14f) Signed-off-by: Michael Roth --- block/iscsi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index ed375fc..12ddbfb 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1286,7 +1286,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, QemuOpts *opts; Error *local_err = NULL; const char *filename; - int i, ret; + int i, ret = 0; if ((BDRV_SECTOR_SIZE % 512) != 0) { error_setg(errp, "iSCSI: Invalid BDRV_SECTOR_SIZE. " -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:51:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:51: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 1YaXfs-0008LI-PE; Tue, 24 Mar 2015 22:51:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfr-0008L5-G1 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:51 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 99/88-15508-68AE1155; Tue, 24 Mar 2015 22:51:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1427237509!11331975!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.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4058 invoked from network); 24 Mar 2015 22:51:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2015 22:51:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfp-0007DR-2o for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXfp-0004x2-13 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:49 +0000 Date: Tue, 24 Mar 2015 22:51:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qtest: Fix deadloop by running main loop AIO context's timers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 987aba53db2e9e62e3f0ae0c22aa0381a735e282 Author: Fam Zheng AuthorDate: Mon Jan 19 17:51:43 2015 +0800 Commit: Michael Roth CommitDate: Tue Feb 24 15:05:39 2015 -0600 qtest: Fix deadloop by running main loop AIO context's timers qemu_clock_run_timers() only takes care of main_loop_tlg, we shouldn't forget aio timer list groups. Currently, the qemu_clock_deadline_ns_all (a few lines above) counts all the timergroups of this clock type, including aio tlg, but we don't fire them, so they are never cleared, which makes a dead loop. For example, this function hangs when trying to drive throttled block request queue with qtest clock_step. Signed-off-by: Fam Zheng Acked-by: Paolo Bonzini Message-id: 1421661103-29153-1-git-send-email-famz@redhat.com Signed-off-by: Stefan Hajnoczi (cherry picked from commit efef88b3d9ad4325172ed288032807fa88d683cc) Signed-off-by: Michael Roth --- cpus.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/cpus.c b/cpus.c index 0c33458..ff555e2 100644 --- a/cpus.c +++ b/cpus.c @@ -372,15 +372,19 @@ static void icount_warp_rt(void *opaque) void qtest_clock_warp(int64_t dest) { int64_t clock = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + AioContext *aio_context; assert(qtest_enabled()); + aio_context = qemu_get_aio_context(); while (clock < dest) { int64_t deadline = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL); int64_t warp = qemu_soonest_timeout(dest - clock, deadline); + seqlock_write_lock(&timers_state.vm_clock_seqlock); timers_state.qemu_icount_bias += warp; seqlock_write_unlock(&timers_state.vm_clock_seqlock); qemu_clock_run_timers(QEMU_CLOCK_VIRTUAL); + timerlist_run_timers(aio_context->tlg.tl[QEMU_CLOCK_VIRTUAL]); clock = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); } qemu_clock_notify(QEMU_CLOCK_VIRTUAL); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:51:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:51: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 1YaXfs-0008LI-PE; Tue, 24 Mar 2015 22:51:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfr-0008L5-G1 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:51 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 99/88-15508-68AE1155; Tue, 24 Mar 2015 22:51:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1427237509!11331975!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.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4058 invoked from network); 24 Mar 2015 22:51:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2015 22:51:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfp-0007DR-2o for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXfp-0004x2-13 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:49 +0000 Date: Tue, 24 Mar 2015 22:51:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qtest: Fix deadloop by running main loop AIO context's timers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 987aba53db2e9e62e3f0ae0c22aa0381a735e282 Author: Fam Zheng AuthorDate: Mon Jan 19 17:51:43 2015 +0800 Commit: Michael Roth CommitDate: Tue Feb 24 15:05:39 2015 -0600 qtest: Fix deadloop by running main loop AIO context's timers qemu_clock_run_timers() only takes care of main_loop_tlg, we shouldn't forget aio timer list groups. Currently, the qemu_clock_deadline_ns_all (a few lines above) counts all the timergroups of this clock type, including aio tlg, but we don't fire them, so they are never cleared, which makes a dead loop. For example, this function hangs when trying to drive throttled block request queue with qtest clock_step. Signed-off-by: Fam Zheng Acked-by: Paolo Bonzini Message-id: 1421661103-29153-1-git-send-email-famz@redhat.com Signed-off-by: Stefan Hajnoczi (cherry picked from commit efef88b3d9ad4325172ed288032807fa88d683cc) Signed-off-by: Michael Roth --- cpus.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/cpus.c b/cpus.c index 0c33458..ff555e2 100644 --- a/cpus.c +++ b/cpus.c @@ -372,15 +372,19 @@ static void icount_warp_rt(void *opaque) void qtest_clock_warp(int64_t dest) { int64_t clock = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + AioContext *aio_context; assert(qtest_enabled()); + aio_context = qemu_get_aio_context(); while (clock < dest) { int64_t deadline = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL); int64_t warp = qemu_soonest_timeout(dest - clock, deadline); + seqlock_write_lock(&timers_state.vm_clock_seqlock); timers_state.qemu_icount_bias += warp; seqlock_write_unlock(&timers_state.vm_clock_seqlock); qemu_clock_run_timers(QEMU_CLOCK_VIRTUAL); + timerlist_run_timers(aio_context->tlg.tl[QEMU_CLOCK_VIRTUAL]); clock = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); } qemu_clock_notify(QEMU_CLOCK_VIRTUAL); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:52:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:52: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 1YaXg3-0008Mi-Rw; Tue, 24 Mar 2015 22:52:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXg2-0008MV-9O for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:02 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 80/2C-13528-19AE1155; Tue, 24 Mar 2015 22:52:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1427237519!11331987!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4807 invoked from network); 24 Mar 2015 22:52:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2015 22:52:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfz-0007Da-8i for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXfz-0004xQ-6u for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:59 +0000 Date: Tue, 24 Mar 2015 22:51:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] exec: change default exception_index value for migration to -1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a97f9a7ec720d6f141cf4ee825f5c54c48747457 Author: Paolo Bonzini AuthorDate: Fri Dec 19 12:53:14 2014 +0100 Commit: Michael Roth CommitDate: Tue Feb 24 15:17:35 2015 -0600 exec: change default exception_index value for migration to -1 In QEMU 2.2 the exception_index value was added to the migration stream through a subsection. The default was set to 0, which is wrong and should have been -1. However, 2.2 does not have commit e511b4d (cpu-exec: reset exception_index correctly, 2014-11-26), hence in 2.2 the exception_index is never used and is set to -1 on the next call to cpu_exec. So we can change the migration stream to make the default -1. The effects are: - 2.2.1 -> 2.2.0: cpu->exception_index set incorrectly to 0 if it were -1 on the source; then reset to -1 in cpu_exec. This is TCG only; KVM does not use exception_index. - 2.2.0 -> 2.2.1: cpu->exception_index set incorrectly to -1 if it were 0 on the source; but it would be reset to -1 in cpu_exec anyway. This is TCG only; KVM does not use exception_index. - 2.2.1 -> 2.1: two bugs fixed: 1) can migrate backwards if cpu->exception_index is set to -1; 2) should not migrate backwards (but 2.2.0 allows it) if cpu->exception_index is set to 0 - 2.2.0 -> 2.3.0: 2.2.0 will send the subsection unnecessarily if exception_index is -1, but that is not a problem. 2.3.0 will set cpu->exception_index to -1 if it is 0 on the source, but this would be anyway a problem for 2.2.0 -> 2.2.x migration (due to lack of commit e511b4d in 2.2.x) so we can ignore it - 2.2.1 -> 2.3.0: everything works. In addition, play it safe and never send the subsection unless TCG is in use. KVM does not use exception_index (PPC KVM stores values in it for use in the subsequent call to ppc_cpu_do_interrupt, but does not need it as soon as kvm_handle_debug returns). Xen and qtest do not run any code for the CPU at all. Reported-by: Igor Mammedov Tested-by: Laurent Desnogues Tested-by: Eduardo Habkost Signed-off-by: Paolo Bonzini Message-id: 1418989994-17244-3-git-send-email-pbonzini@redhat.com Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini Signed-off-by: Peter Maydell (cherry picked from commit adee64249ee37e822d578e65a765750e7f2081f6) Signed-off-by: Michael Roth --- exec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index 71ac104..46fe70e 100644 --- a/exec.c +++ b/exec.c @@ -434,7 +434,7 @@ static int cpu_common_pre_load(void *opaque) { CPUState *cpu = opaque; - cpu->exception_index = 0; + cpu->exception_index = -1; return 0; } @@ -443,7 +443,7 @@ static bool cpu_common_exception_index_needed(void *opaque) { CPUState *cpu = opaque; - return cpu->exception_index != 0; + return tcg_enabled() && cpu->exception_index != -1; } static const VMStateDescription vmstate_cpu_common_exception_index = { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:52:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:52: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 1YaXg3-0008Mi-Rw; Tue, 24 Mar 2015 22:52:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXg2-0008MV-9O for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:02 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 80/2C-13528-19AE1155; Tue, 24 Mar 2015 22:52:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1427237519!11331987!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4807 invoked from network); 24 Mar 2015 22:52:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Mar 2015 22:52:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXfz-0007Da-8i for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXfz-0004xQ-6u for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:51:59 +0000 Date: Tue, 24 Mar 2015 22:51:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] exec: change default exception_index value for migration to -1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a97f9a7ec720d6f141cf4ee825f5c54c48747457 Author: Paolo Bonzini AuthorDate: Fri Dec 19 12:53:14 2014 +0100 Commit: Michael Roth CommitDate: Tue Feb 24 15:17:35 2015 -0600 exec: change default exception_index value for migration to -1 In QEMU 2.2 the exception_index value was added to the migration stream through a subsection. The default was set to 0, which is wrong and should have been -1. However, 2.2 does not have commit e511b4d (cpu-exec: reset exception_index correctly, 2014-11-26), hence in 2.2 the exception_index is never used and is set to -1 on the next call to cpu_exec. So we can change the migration stream to make the default -1. The effects are: - 2.2.1 -> 2.2.0: cpu->exception_index set incorrectly to 0 if it were -1 on the source; then reset to -1 in cpu_exec. This is TCG only; KVM does not use exception_index. - 2.2.0 -> 2.2.1: cpu->exception_index set incorrectly to -1 if it were 0 on the source; but it would be reset to -1 in cpu_exec anyway. This is TCG only; KVM does not use exception_index. - 2.2.1 -> 2.1: two bugs fixed: 1) can migrate backwards if cpu->exception_index is set to -1; 2) should not migrate backwards (but 2.2.0 allows it) if cpu->exception_index is set to 0 - 2.2.0 -> 2.3.0: 2.2.0 will send the subsection unnecessarily if exception_index is -1, but that is not a problem. 2.3.0 will set cpu->exception_index to -1 if it is 0 on the source, but this would be anyway a problem for 2.2.0 -> 2.2.x migration (due to lack of commit e511b4d in 2.2.x) so we can ignore it - 2.2.1 -> 2.3.0: everything works. In addition, play it safe and never send the subsection unless TCG is in use. KVM does not use exception_index (PPC KVM stores values in it for use in the subsequent call to ppc_cpu_do_interrupt, but does not need it as soon as kvm_handle_debug returns). Xen and qtest do not run any code for the CPU at all. Reported-by: Igor Mammedov Tested-by: Laurent Desnogues Tested-by: Eduardo Habkost Signed-off-by: Paolo Bonzini Message-id: 1418989994-17244-3-git-send-email-pbonzini@redhat.com Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini Signed-off-by: Peter Maydell (cherry picked from commit adee64249ee37e822d578e65a765750e7f2081f6) Signed-off-by: Michael Roth --- exec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index 71ac104..46fe70e 100644 --- a/exec.c +++ b/exec.c @@ -434,7 +434,7 @@ static int cpu_common_pre_load(void *opaque) { CPUState *cpu = opaque; - cpu->exception_index = 0; + cpu->exception_index = -1; return 0; } @@ -443,7 +443,7 @@ static bool cpu_common_exception_index_needed(void *opaque) { CPUState *cpu = opaque; - return cpu->exception_index != 0; + return tcg_enabled() && cpu->exception_index != -1; } static const VMStateDescription vmstate_cpu_common_exception_index = { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:52:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:52: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 1YaXgD-0008OA-Uj; Tue, 24 Mar 2015 22:52:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXgC-0008Nx-NI for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:12 +0000 Content-Length: 13723 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 16/1C-01024-B9AE1155; Tue, 24 Mar 2015 22:52:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1427237529!12787770!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20925 invoked from network); 24 Mar 2015 22:52:10 -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; 24 Mar 2015 22:52:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXg9-0007E9-F8 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXg9-0004yW-Dc for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:09 +0000 Date: Tue, 24 Mar 2015 22:52:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] update ipxe from 69313ed to 35c5379 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6329475679704373532==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6329475679704373532== Content-Length: 13505 Content-Transfer-Encoding: quoted-printable commit 3d1cd5997d24c83b5b1b534fc1650b715b5168cf Author: Gerd Hoffmann AuthorDate: Wed Dec 17 13:56:50 2014 +0100 Commit: Michael Roth CommitDate: Sun Mar 1 18:06:31 2015 -0600 update ipxe from 69313ed to 35c5379 Anton D. Kachalov (1): [intel] Add 8086:1557 card (Intel 82599 10G ethernet mezz) Christian Hesse (1): [build] Merge util/geniso and util/genliso Curtis Larsen (3): [efi] Use EFI_CONSOLE_CONTROL_PROTOCOL to set text mode if available [efi] Report errors from attempting to disconnect existing drivers [efi] Try various possible SNP receive filters Dale Hamel (1): [smbios] Expose board serial number as ${board-serial} Florian Schmaus (1): [build] Set GITVERSION only if there is a git repository Hannes Reinecke (3): [ethernet] Provide eth_random_addr() to generate random Ethernet addresses [igbvf] Assign random MAC address if none is set [igbvf] Allow changing of MAC address Jan Kiszka (1): [intel] Add I217-LM PCI ID Marin Hannache (4): [nfs] Fix an invalid free() when loading a symlink [nfs] Fix an invalid free() when loading a regular (non-symlink) file [nfs] Rewrite NFS URI handling [readline] Add CTRL-W shortcut to remove a word Michael Brown (144): [profile] Allow interrupts to be excluded from profiling results [intel] Exclude time spent in hypervisor from profiling [build] Fix version.o dependency upon git index [tcp] Defer sending ACKs until all received packets have been processed [lkrnprefix] Function as a bzImage kernel [build] Avoid errors when build directory is mounted via NFS [undi] Apply quota only to number of complete received packets [lkrnprefix] Make real-mode setup code relocatable [intel] Increase receive ring fill level [syslog] Strip invalid characters from hostname [test] Add self-tests for strdup() [libc] Prevent strndup() from reading beyond the end of the string [efi] Allow for optional protocols [efi] Make EFI_DEVICE_PATH_TO_TEXT_PROTOCOL optional [efi] Make EFI_HII_DATABASE_PROTOCOL optional [efi] Do not try to fetch loaded image device path protocol [ipv6] Fix definition of IN6_IS_ADDR_LINKLOCAL() [dhcpv6] Do not set sin6_scope_id on the unspecified client socket address [ipv6] Do not set sin6_scope_id on source address [ipv6] Include network device when transcribing multicast addresses [ipv6] Avoid potentially copying from a NULL pointer in ipv6_tx() [librm] Allow for the PIC interrupt vector offset to be changed [ifmgmt] Do not sleep CPU while configuring network devices [scsi] Improve sense code parsing [iscsi] Read IPv4 settings only from the relevant network device [iscsi] Include IP address origin in iBFT [debug] Allow debug message colours to be customised via DBGCOL=3D... [build] Expose build timestamp, build name, and product names [efi] Allow device paths to be easily included in debug messages [efi] Provide a meaningful EFI SNP device name [efi] Restructure EFI driver model [build] Fix erroneous object name in version object [build] Add yet another potential location for isolinux.bin [efi] Allow network devices to be created on top of arbitrary SNP devices [autoboot] Allow autoboot device to be identified by link-layer address [efi] Identify autoboot device by MAC address when chainloading [efi] Attempt to start only drivers claiming support for a device [efi] Rewrite SNP NIC driver [efi] Include SNP NIC driver within the all-drivers target [crypto] Add support for iPAddress subject alternative names [crypto] Fix debug message [netdevice] Reset network device index when last device is unregistered [efi] Update EDK2 headers [efi] Install our own disk I/O protocol and claim exclusive use of it [efi] Allow for interception of boot services calls by loaded image [efi] Print well-known GUIDs by name in debug messages [efi] Include EFI_CONSOLE_CONTROL_PROTOCOL header [ioapi] Fail ioremap() when attempting to map a zero bus address [intel] Check for ioremap() failures [realtek] Check for ioremap() failures [vmxnet3] Check for ioremap() failures [skel] Check for ioremap() failures [myson] Check for ioremap() failures [natsemi] Check for ioremap() failures [i386] Add functions to read and write model-specific registers [x86_64] Add functions to read and write model-specific registers [efi] Show more diagnostic information when building with DEBUG=3Defi_wrap [ioapi] Centralise notion of PAGE_SIZE [lotest] Discard packets arriving on the incorrect network device [xen] Import selected public headers [xen] Add basic support for PV-HVM domains [xen] Add support for Xen netfront virtual NICs [efi] Default to releasing network devices for use via SNP [efi] Unload started images only on failure [efi] Fill in loaded image's DeviceHandle if firmware fails to do so [efi] Fix incorrect debug message level when device has no device path [efi] Report exact failure when unable to open the device path [netdevice] Avoid registering duplicate network devices [efi] Ignore failures when attempting to install SNP HII protocol [efi] Expand the range of well-known EFI GUIDs in debug messages [efi] Provide efi_handle_name() for debugging [efi] Add ability to dump all openers of a given protocol on a handle [efi] Use efi_handle_name() instead of efi_handle_devpath_text() [efi] Use efi_handle_name() instead of efi_devpath_text() where applicable [efi] Allow compiler to perform type checks on EFI_HANDLE [efi] Avoid unnecessarily passing pointers to EFI_HANDLEs [efi] Dump existing openers when we are unable to open a protocol [efi] Dump handle information around connect/disconnect attempts [efi] Improve debugging of the debugging facilities [efi] Add excessive sanity checks into efi_debug functions [efi] Also try original ComponentName protocol for retrieving driver names [efi] Print raw device path when we have no DevicePathToTextProtocol [efi] Add ability to dump SNP device mode information [efi] Reset multicast filter list when setting SNP receive filters [efi] Provide centralised definitions of commonly-used GUIDs [efi] Open device path protocol only at point of use [efi] Move abstract device path and handle functions to efi_utils.c [efi] Generalise snpnet_pci_info() to efi_locate_device() [bios] Support displaying and hiding cursor [efi] Support displaying and hiding cursor [readline] Ensure cursor is visible when prompting for input [xen] Accept alternative Xen platform PCI device ID 5853:0002 [xen] Use version 1 grant tables by default [xen] Cope with unexpected initial backend states [smc9000] Avoid using CONFIG as a preprocessor macro [build] Allow for named configurations at build time [intel] Display PBS value when applying ICH errata workaround [intel] Display before and after values for both PBS and PBA [intel] Apply PBS/PBA errata workaround only to ICH8 PCI device IDs [efi] Add definitions of GUIDs observed during Windows boot [efi] Dump details of any calls to our dummy block and disk I/O protocols [romprefix] Do not preserve unused register %di [build] Remove obsolete references to .zrom build targets [build] Allow ISA ROMs to be built [build] Avoid deleting config header files if build is interrupted [prefix] Halt system without burning CPU if we cannot access the payload [prefix] Report both %esi and %ecx when opening payload fails [util] Use PCI length field to obtain length of individual images [mromprefix] Use PCI length field to obtain length of individual images [mromprefix] Allow for .mrom images larger than 128kB [efi] Show details of intercepted LoadImage() calls [efi] Make our virtual file system case insensitive [efi] Wrap any images loaded by our wrapped image [efi] Use the SNP protocol instance to match the SNP chainloading device [efi] Avoid returning uninitialised data from PCI configuration space reads [efi] Make EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL optional [efi] Allow for non-PCI snpnet devices [build] Clean up all binary directories on "make [very]clean" [efi] Add efifatbin utility [efi] Provide dummy device path in efi_image_probe() [dhcp] Check for matching chaddr in received DHCP packets [dhcp] Remove obsolete dhcp_chaddr() function [build] Use -malign-double to build 32-bit UEFI binaries [efi] Centralise definitions of more protocol GUIDs [efi] Add definitions of GUIDs observed when chainloading from Intel driver [efi] Free transmit ring entry before calling netdev_tx_complete() [efi] Generalise snpnet_dev_info() to efi_device_info() [efi] Update to current EDK2 headers [efi] Add NII / UNDI driver [efi] Check for presence of UNDI in NII protocol [efi] Include NII driver within "snp" and "snponly" build targets [ping] Report timed-out pings via the callback function [ping] Allow termination after a specified number of packets [ping] Allow "ping" command output to be inhibited [intel] Use autoloaded MAC address instead of EEPROM MAC address [crypto] Fix parsing of OCSP responder ID key hash [vmxnet3] Add profiling code to exclude time spent in the hypervisor [netdevice] Fix erroneous use of free(iobuf) instead of free_iob(iobuf) [libc] Add ASSERTED macro to test if any assertion has triggered [list] Add sanity checks after list-adding functions [malloc] Tidy up debug output [malloc] Sanity check parameters to alloc_memblock() and free_memblock() [malloc] Check integrity of free list [malloc] Report caller address as soon as memory corruption is detected Peter Lemenkov (1): [build] Check if git index actually exists Robin Smidsr=C3=B8d (2): [build] Add named configuration for VirtualBox [build] Avoid using embedded script in VirtualBox named configuration Sven Ulland (1): [lacp] Set "aggregatable" flag in response LACPDU Signed-off-by: Gerd Hoffmann (cherry picked from commit c246cee4eedb17ae3932d699e009a8b63240235f) Signed-off-by: Michael Roth --- pc-bios/efi-e1000.rom | Bin 194560 -> 197120 bytes pc-bios/efi-eepro100.rom | Bin 196096 -> 197632 bytes pc-bios/efi-ne2k_pci.rom | Bin 194560 -> 195584 bytes pc-bios/efi-pcnet.rom | Bin 194560 -> 195584 bytes pc-bios/efi-rtl8139.rom | Bin 198144 -> 200192 bytes pc-bios/efi-virtio.rom | Bin 192000 -> 194048 bytes roms/ipxe | 2 +- 7 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pc-bios/efi-e1000.rom b/pc-bios/efi-e1000.rom index 776e217..4e29d9d 100644 Binary files a/pc-bios/efi-e1000.rom and b/pc-bios/efi-e1000.rom differ diff --git a/pc-bios/efi-eepro100.rom b/pc-bios/efi-eepro100.rom index 677a8c3..2a92d6f 100644 Binary files a/pc-bios/efi-eepro100.rom and b/pc-bios/efi-eepro100.rom differ diff --git a/pc-bios/efi-ne2k_pci.rom b/pc-bios/efi-ne2k_pci.rom index 9dd6d91..6366017 100644 Binary files a/pc-bios/efi-ne2k_pci.rom and b/pc-bios/efi-ne2k_pci.rom differ diff --git a/pc-bios/efi-pcnet.rom b/pc-bios/efi-pcnet.rom index cae3a85..a61f586 100644 Binary files a/pc-bios/efi-pcnet.rom and b/pc-bios/efi-pcnet.rom differ diff --git a/pc-bios/efi-rtl8139.rom b/pc-bios/efi-rtl8139.rom index 477f9b9..c9c77ea 100644 Binary files a/pc-bios/efi-rtl8139.rom and b/pc-bios/efi-rtl8139.rom differ diff --git a/pc-bios/efi-virtio.rom b/pc-bios/efi-virtio.rom index 935c927..eec2790 100644 Binary files a/pc-bios/efi-virtio.rom and b/pc-bios/efi-virtio.rom differ diff --git a/roms/ipxe b/roms/ipxe index 69313ed..35c5379 160000 --- a/roms/ipxe +++ b/roms/ipxe @@ -1 +1 @@ -Subproject commit 69313edad85f8958acc8a47272b3c3da494835ec +Subproject commit 35c5379760aa1fea5e38f7a78b090f92bb7813ee -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============6329475679704373532== 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 --===============6329475679704373532==-- From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:52:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:52: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 1YaXgD-0008OA-Uj; Tue, 24 Mar 2015 22:52:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXgC-0008Nx-NI for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:12 +0000 Content-Length: 13723 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 16/1C-01024-B9AE1155; Tue, 24 Mar 2015 22:52:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1427237529!12787770!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20925 invoked from network); 24 Mar 2015 22:52:10 -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; 24 Mar 2015 22:52:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXg9-0007E9-F8 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXg9-0004yW-Dc for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:09 +0000 Date: Tue, 24 Mar 2015 22:52:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] update ipxe from 69313ed to 35c5379 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6329475679704373532==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6329475679704373532== Content-Length: 13505 Content-Transfer-Encoding: quoted-printable commit 3d1cd5997d24c83b5b1b534fc1650b715b5168cf Author: Gerd Hoffmann AuthorDate: Wed Dec 17 13:56:50 2014 +0100 Commit: Michael Roth CommitDate: Sun Mar 1 18:06:31 2015 -0600 update ipxe from 69313ed to 35c5379 Anton D. Kachalov (1): [intel] Add 8086:1557 card (Intel 82599 10G ethernet mezz) Christian Hesse (1): [build] Merge util/geniso and util/genliso Curtis Larsen (3): [efi] Use EFI_CONSOLE_CONTROL_PROTOCOL to set text mode if available [efi] Report errors from attempting to disconnect existing drivers [efi] Try various possible SNP receive filters Dale Hamel (1): [smbios] Expose board serial number as ${board-serial} Florian Schmaus (1): [build] Set GITVERSION only if there is a git repository Hannes Reinecke (3): [ethernet] Provide eth_random_addr() to generate random Ethernet addresses [igbvf] Assign random MAC address if none is set [igbvf] Allow changing of MAC address Jan Kiszka (1): [intel] Add I217-LM PCI ID Marin Hannache (4): [nfs] Fix an invalid free() when loading a symlink [nfs] Fix an invalid free() when loading a regular (non-symlink) file [nfs] Rewrite NFS URI handling [readline] Add CTRL-W shortcut to remove a word Michael Brown (144): [profile] Allow interrupts to be excluded from profiling results [intel] Exclude time spent in hypervisor from profiling [build] Fix version.o dependency upon git index [tcp] Defer sending ACKs until all received packets have been processed [lkrnprefix] Function as a bzImage kernel [build] Avoid errors when build directory is mounted via NFS [undi] Apply quota only to number of complete received packets [lkrnprefix] Make real-mode setup code relocatable [intel] Increase receive ring fill level [syslog] Strip invalid characters from hostname [test] Add self-tests for strdup() [libc] Prevent strndup() from reading beyond the end of the string [efi] Allow for optional protocols [efi] Make EFI_DEVICE_PATH_TO_TEXT_PROTOCOL optional [efi] Make EFI_HII_DATABASE_PROTOCOL optional [efi] Do not try to fetch loaded image device path protocol [ipv6] Fix definition of IN6_IS_ADDR_LINKLOCAL() [dhcpv6] Do not set sin6_scope_id on the unspecified client socket address [ipv6] Do not set sin6_scope_id on source address [ipv6] Include network device when transcribing multicast addresses [ipv6] Avoid potentially copying from a NULL pointer in ipv6_tx() [librm] Allow for the PIC interrupt vector offset to be changed [ifmgmt] Do not sleep CPU while configuring network devices [scsi] Improve sense code parsing [iscsi] Read IPv4 settings only from the relevant network device [iscsi] Include IP address origin in iBFT [debug] Allow debug message colours to be customised via DBGCOL=3D... [build] Expose build timestamp, build name, and product names [efi] Allow device paths to be easily included in debug messages [efi] Provide a meaningful EFI SNP device name [efi] Restructure EFI driver model [build] Fix erroneous object name in version object [build] Add yet another potential location for isolinux.bin [efi] Allow network devices to be created on top of arbitrary SNP devices [autoboot] Allow autoboot device to be identified by link-layer address [efi] Identify autoboot device by MAC address when chainloading [efi] Attempt to start only drivers claiming support for a device [efi] Rewrite SNP NIC driver [efi] Include SNP NIC driver within the all-drivers target [crypto] Add support for iPAddress subject alternative names [crypto] Fix debug message [netdevice] Reset network device index when last device is unregistered [efi] Update EDK2 headers [efi] Install our own disk I/O protocol and claim exclusive use of it [efi] Allow for interception of boot services calls by loaded image [efi] Print well-known GUIDs by name in debug messages [efi] Include EFI_CONSOLE_CONTROL_PROTOCOL header [ioapi] Fail ioremap() when attempting to map a zero bus address [intel] Check for ioremap() failures [realtek] Check for ioremap() failures [vmxnet3] Check for ioremap() failures [skel] Check for ioremap() failures [myson] Check for ioremap() failures [natsemi] Check for ioremap() failures [i386] Add functions to read and write model-specific registers [x86_64] Add functions to read and write model-specific registers [efi] Show more diagnostic information when building with DEBUG=3Defi_wrap [ioapi] Centralise notion of PAGE_SIZE [lotest] Discard packets arriving on the incorrect network device [xen] Import selected public headers [xen] Add basic support for PV-HVM domains [xen] Add support for Xen netfront virtual NICs [efi] Default to releasing network devices for use via SNP [efi] Unload started images only on failure [efi] Fill in loaded image's DeviceHandle if firmware fails to do so [efi] Fix incorrect debug message level when device has no device path [efi] Report exact failure when unable to open the device path [netdevice] Avoid registering duplicate network devices [efi] Ignore failures when attempting to install SNP HII protocol [efi] Expand the range of well-known EFI GUIDs in debug messages [efi] Provide efi_handle_name() for debugging [efi] Add ability to dump all openers of a given protocol on a handle [efi] Use efi_handle_name() instead of efi_handle_devpath_text() [efi] Use efi_handle_name() instead of efi_devpath_text() where applicable [efi] Allow compiler to perform type checks on EFI_HANDLE [efi] Avoid unnecessarily passing pointers to EFI_HANDLEs [efi] Dump existing openers when we are unable to open a protocol [efi] Dump handle information around connect/disconnect attempts [efi] Improve debugging of the debugging facilities [efi] Add excessive sanity checks into efi_debug functions [efi] Also try original ComponentName protocol for retrieving driver names [efi] Print raw device path when we have no DevicePathToTextProtocol [efi] Add ability to dump SNP device mode information [efi] Reset multicast filter list when setting SNP receive filters [efi] Provide centralised definitions of commonly-used GUIDs [efi] Open device path protocol only at point of use [efi] Move abstract device path and handle functions to efi_utils.c [efi] Generalise snpnet_pci_info() to efi_locate_device() [bios] Support displaying and hiding cursor [efi] Support displaying and hiding cursor [readline] Ensure cursor is visible when prompting for input [xen] Accept alternative Xen platform PCI device ID 5853:0002 [xen] Use version 1 grant tables by default [xen] Cope with unexpected initial backend states [smc9000] Avoid using CONFIG as a preprocessor macro [build] Allow for named configurations at build time [intel] Display PBS value when applying ICH errata workaround [intel] Display before and after values for both PBS and PBA [intel] Apply PBS/PBA errata workaround only to ICH8 PCI device IDs [efi] Add definitions of GUIDs observed during Windows boot [efi] Dump details of any calls to our dummy block and disk I/O protocols [romprefix] Do not preserve unused register %di [build] Remove obsolete references to .zrom build targets [build] Allow ISA ROMs to be built [build] Avoid deleting config header files if build is interrupted [prefix] Halt system without burning CPU if we cannot access the payload [prefix] Report both %esi and %ecx when opening payload fails [util] Use PCI length field to obtain length of individual images [mromprefix] Use PCI length field to obtain length of individual images [mromprefix] Allow for .mrom images larger than 128kB [efi] Show details of intercepted LoadImage() calls [efi] Make our virtual file system case insensitive [efi] Wrap any images loaded by our wrapped image [efi] Use the SNP protocol instance to match the SNP chainloading device [efi] Avoid returning uninitialised data from PCI configuration space reads [efi] Make EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL optional [efi] Allow for non-PCI snpnet devices [build] Clean up all binary directories on "make [very]clean" [efi] Add efifatbin utility [efi] Provide dummy device path in efi_image_probe() [dhcp] Check for matching chaddr in received DHCP packets [dhcp] Remove obsolete dhcp_chaddr() function [build] Use -malign-double to build 32-bit UEFI binaries [efi] Centralise definitions of more protocol GUIDs [efi] Add definitions of GUIDs observed when chainloading from Intel driver [efi] Free transmit ring entry before calling netdev_tx_complete() [efi] Generalise snpnet_dev_info() to efi_device_info() [efi] Update to current EDK2 headers [efi] Add NII / UNDI driver [efi] Check for presence of UNDI in NII protocol [efi] Include NII driver within "snp" and "snponly" build targets [ping] Report timed-out pings via the callback function [ping] Allow termination after a specified number of packets [ping] Allow "ping" command output to be inhibited [intel] Use autoloaded MAC address instead of EEPROM MAC address [crypto] Fix parsing of OCSP responder ID key hash [vmxnet3] Add profiling code to exclude time spent in the hypervisor [netdevice] Fix erroneous use of free(iobuf) instead of free_iob(iobuf) [libc] Add ASSERTED macro to test if any assertion has triggered [list] Add sanity checks after list-adding functions [malloc] Tidy up debug output [malloc] Sanity check parameters to alloc_memblock() and free_memblock() [malloc] Check integrity of free list [malloc] Report caller address as soon as memory corruption is detected Peter Lemenkov (1): [build] Check if git index actually exists Robin Smidsr=C3=B8d (2): [build] Add named configuration for VirtualBox [build] Avoid using embedded script in VirtualBox named configuration Sven Ulland (1): [lacp] Set "aggregatable" flag in response LACPDU Signed-off-by: Gerd Hoffmann (cherry picked from commit c246cee4eedb17ae3932d699e009a8b63240235f) Signed-off-by: Michael Roth --- pc-bios/efi-e1000.rom | Bin 194560 -> 197120 bytes pc-bios/efi-eepro100.rom | Bin 196096 -> 197632 bytes pc-bios/efi-ne2k_pci.rom | Bin 194560 -> 195584 bytes pc-bios/efi-pcnet.rom | Bin 194560 -> 195584 bytes pc-bios/efi-rtl8139.rom | Bin 198144 -> 200192 bytes pc-bios/efi-virtio.rom | Bin 192000 -> 194048 bytes roms/ipxe | 2 +- 7 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pc-bios/efi-e1000.rom b/pc-bios/efi-e1000.rom index 776e217..4e29d9d 100644 Binary files a/pc-bios/efi-e1000.rom and b/pc-bios/efi-e1000.rom differ diff --git a/pc-bios/efi-eepro100.rom b/pc-bios/efi-eepro100.rom index 677a8c3..2a92d6f 100644 Binary files a/pc-bios/efi-eepro100.rom and b/pc-bios/efi-eepro100.rom differ diff --git a/pc-bios/efi-ne2k_pci.rom b/pc-bios/efi-ne2k_pci.rom index 9dd6d91..6366017 100644 Binary files a/pc-bios/efi-ne2k_pci.rom and b/pc-bios/efi-ne2k_pci.rom differ diff --git a/pc-bios/efi-pcnet.rom b/pc-bios/efi-pcnet.rom index cae3a85..a61f586 100644 Binary files a/pc-bios/efi-pcnet.rom and b/pc-bios/efi-pcnet.rom differ diff --git a/pc-bios/efi-rtl8139.rom b/pc-bios/efi-rtl8139.rom index 477f9b9..c9c77ea 100644 Binary files a/pc-bios/efi-rtl8139.rom and b/pc-bios/efi-rtl8139.rom differ diff --git a/pc-bios/efi-virtio.rom b/pc-bios/efi-virtio.rom index 935c927..eec2790 100644 Binary files a/pc-bios/efi-virtio.rom and b/pc-bios/efi-virtio.rom differ diff --git a/roms/ipxe b/roms/ipxe index 69313ed..35c5379 160000 --- a/roms/ipxe +++ b/roms/ipxe @@ -1 +1 @@ -Subproject commit 69313edad85f8958acc8a47272b3c3da494835ec +Subproject commit 35c5379760aa1fea5e38f7a78b090f92bb7813ee -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============6329475679704373532== 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 --===============6329475679704373532==-- From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:52:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXgN-0008QV-3T; Tue, 24 Mar 2015 22: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 1YaXgM-0008QK-64 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:22 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 6D/1E-01116-5AAE1155; Tue, 24 Mar 2015 22:52:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1427237539!5936034!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17302 invoked from network); 24 Mar 2015 22:52:20 -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; 24 Mar 2015 22:52:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXgJ-0007EF-My for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXgJ-0004yt-JJ for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:19 +0000 Date: Tue, 24 Mar 2015 22:52:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] target-mips: fix broken snapshotting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 00fd8904f6383fca1c25e24d45a00960b0417749 Author: Leon Alrae AuthorDate: Mon Jan 26 16:49:42 2015 +0000 Commit: Michael Roth CommitDate: Sun Mar 1 18:09:42 2015 -0600 target-mips: fix broken snapshotting Recently added CP0.BadInstr and CP0.BadInstrP registers ended up in cpu_load() under different offset than in cpu_save(). These and all registers between were incorrectly restored. Signed-off-by: Leon Alrae (cherry picked from commit b40a1530f294b5fa4479dc3ca9bf46c269d08d87) Signed-off-by: Michael Roth --- target-mips/machine.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/target-mips/machine.c b/target-mips/machine.c index 0ba7d73..6c76dfb 100644 --- a/target-mips/machine.c +++ b/target-mips/machine.c @@ -285,6 +285,10 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) qemu_get_sbe32s(f, &env->CP0_SRSConf4); qemu_get_sbe32s(f, &env->CP0_HWREna); qemu_get_betls(f, &env->CP0_BadVAddr); + if (version_id >= 5) { + qemu_get_be32s(f, &env->CP0_BadInstr); + qemu_get_be32s(f, &env->CP0_BadInstrP); + } qemu_get_sbe32s(f, &env->CP0_Count); qemu_get_betls(f, &env->CP0_EntryHi); qemu_get_sbe32s(f, &env->CP0_Compare); @@ -319,8 +323,6 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) qemu_get_betls(f, &env->CP0_ErrorEPC); qemu_get_sbe32s(f, &env->CP0_DESAVE); if (version_id >= 5) { - qemu_get_be32s(f, &env->CP0_BadInstr); - qemu_get_be32s(f, &env->CP0_BadInstrP); for (i = 0; i < MIPS_KSCRATCH_NUM; i++) { qemu_get_betls(f, &env->CP0_KScratch[i]); } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:52:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXgN-0008QV-3T; Tue, 24 Mar 2015 22: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 1YaXgM-0008QK-64 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:22 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 6D/1E-01116-5AAE1155; Tue, 24 Mar 2015 22:52:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1427237539!5936034!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17302 invoked from network); 24 Mar 2015 22:52:20 -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; 24 Mar 2015 22:52:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXgJ-0007EF-My for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXgJ-0004yt-JJ for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:19 +0000 Date: Tue, 24 Mar 2015 22:52:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] target-mips: fix broken snapshotting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 00fd8904f6383fca1c25e24d45a00960b0417749 Author: Leon Alrae AuthorDate: Mon Jan 26 16:49:42 2015 +0000 Commit: Michael Roth CommitDate: Sun Mar 1 18:09:42 2015 -0600 target-mips: fix broken snapshotting Recently added CP0.BadInstr and CP0.BadInstrP registers ended up in cpu_load() under different offset than in cpu_save(). These and all registers between were incorrectly restored. Signed-off-by: Leon Alrae (cherry picked from commit b40a1530f294b5fa4479dc3ca9bf46c269d08d87) Signed-off-by: Michael Roth --- target-mips/machine.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/target-mips/machine.c b/target-mips/machine.c index 0ba7d73..6c76dfb 100644 --- a/target-mips/machine.c +++ b/target-mips/machine.c @@ -285,6 +285,10 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) qemu_get_sbe32s(f, &env->CP0_SRSConf4); qemu_get_sbe32s(f, &env->CP0_HWREna); qemu_get_betls(f, &env->CP0_BadVAddr); + if (version_id >= 5) { + qemu_get_be32s(f, &env->CP0_BadInstr); + qemu_get_be32s(f, &env->CP0_BadInstrP); + } qemu_get_sbe32s(f, &env->CP0_Count); qemu_get_betls(f, &env->CP0_EntryHi); qemu_get_sbe32s(f, &env->CP0_Compare); @@ -319,8 +323,6 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) qemu_get_betls(f, &env->CP0_ErrorEPC); qemu_get_sbe32s(f, &env->CP0_DESAVE); if (version_id >= 5) { - qemu_get_be32s(f, &env->CP0_BadInstr); - qemu_get_be32s(f, &env->CP0_BadInstrP); for (i = 0; i < MIPS_KSCRATCH_NUM; i++) { qemu_get_betls(f, &env->CP0_KScratch[i]); } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:52:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:52: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 1YaXgY-0008Sa-69; Tue, 24 Mar 2015 22:52:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXgW-0008SA-Ku for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:32 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 0C/44-31982-FAAE1155; Tue, 24 Mar 2015 22:52:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1427237550!11385929!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31018 invoked from network); 24 Mar 2015 22:52:30 -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; 24 Mar 2015 22:52:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXgT-0007EN-SK for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXgT-0004zH-Qf for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:29 +0000 Date: Tue, 24 Mar 2015 22:52:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] kvm/apic: fix 2.2->2.1 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 3e04f97cbc904fc8196774758c76343b3ee9ef6a Author: Paolo Bonzini AuthorDate: Wed Dec 10 16:56:46 2014 +0100 Commit: Michael Roth CommitDate: Sun Mar 1 18:13:00 2015 -0600 kvm/apic: fix 2.2->2.1 migration The wait_for_sipi field is set back to 1 after an INIT, so it was not effective to reset it in kvm_apic_realize. Introduce a reset callback and reset wait_for_sipi there. Reported-by: Igor Mammedov Cc: qemu-stable@nongnu.org Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Paolo Bonzini (cherry picked from commit 575a6f4082c45778b93032ef1e7fbea4467b3a2a) Signed-off-by: Michael Roth --- hw/i386/kvm/apic.c | 10 +++++++--- hw/intc/apic_common.c | 5 +++++ include/hw/i386/apic_internal.h | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c index 271e97f..5b47056 100644 --- a/hw/i386/kvm/apic.c +++ b/hw/i386/kvm/apic.c @@ -171,12 +171,15 @@ static const MemoryRegionOps kvm_apic_io_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static void kvm_apic_realize(DeviceState *dev, Error **errp) +static void kvm_apic_reset(APICCommonState *s) { - APICCommonState *s = APIC_COMMON(dev); - /* Not used by KVM, which uses the CPU mp_state instead. */ s->wait_for_sipi = 0; +} + +static void kvm_apic_realize(DeviceState *dev, Error **errp) +{ + APICCommonState *s = APIC_COMMON(dev); memory_region_init_io(&s->io_memory, NULL, &kvm_apic_io_ops, s, "kvm-apic-msi", APIC_SPACE_SIZE); @@ -191,6 +194,7 @@ static void kvm_apic_class_init(ObjectClass *klass, void *data) APICCommonClass *k = APIC_COMMON_CLASS(klass); k->realize = kvm_apic_realize; + k->reset = kvm_apic_reset; k->set_base = kvm_apic_set_base; k->set_tpr = kvm_apic_set_tpr; k->get_tpr = kvm_apic_get_tpr; diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 4e62f25..d9bb188 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -178,6 +178,7 @@ bool apic_next_timer(APICCommonState *s, int64_t current_time) void apic_init_reset(DeviceState *dev) { APICCommonState *s = APIC_COMMON(dev); + APICCommonClass *info = APIC_COMMON_GET_CLASS(s); int i; if (!s) { @@ -206,6 +207,10 @@ void apic_init_reset(DeviceState *dev) timer_del(s->timer); } s->timer_expiry = -1; + + if (info->reset) { + info->reset(s); + } } void apic_designate_bsp(DeviceState *dev) diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h index 83e2a42..dc7a89d 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -89,6 +89,7 @@ typedef struct APICCommonClass void (*external_nmi)(APICCommonState *s); void (*pre_save)(APICCommonState *s); void (*post_load)(APICCommonState *s); + void (*reset)(APICCommonState *s); } APICCommonClass; struct APICCommonState { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:52:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:52: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 1YaXgY-0008Sa-69; Tue, 24 Mar 2015 22:52:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXgW-0008SA-Ku for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:32 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 0C/44-31982-FAAE1155; Tue, 24 Mar 2015 22:52:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1427237550!11385929!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31018 invoked from network); 24 Mar 2015 22:52:30 -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; 24 Mar 2015 22:52:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXgT-0007EN-SK for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXgT-0004zH-Qf for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:29 +0000 Date: Tue, 24 Mar 2015 22:52:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] kvm/apic: fix 2.2->2.1 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 3e04f97cbc904fc8196774758c76343b3ee9ef6a Author: Paolo Bonzini AuthorDate: Wed Dec 10 16:56:46 2014 +0100 Commit: Michael Roth CommitDate: Sun Mar 1 18:13:00 2015 -0600 kvm/apic: fix 2.2->2.1 migration The wait_for_sipi field is set back to 1 after an INIT, so it was not effective to reset it in kvm_apic_realize. Introduce a reset callback and reset wait_for_sipi there. Reported-by: Igor Mammedov Cc: qemu-stable@nongnu.org Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Paolo Bonzini (cherry picked from commit 575a6f4082c45778b93032ef1e7fbea4467b3a2a) Signed-off-by: Michael Roth --- hw/i386/kvm/apic.c | 10 +++++++--- hw/intc/apic_common.c | 5 +++++ include/hw/i386/apic_internal.h | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c index 271e97f..5b47056 100644 --- a/hw/i386/kvm/apic.c +++ b/hw/i386/kvm/apic.c @@ -171,12 +171,15 @@ static const MemoryRegionOps kvm_apic_io_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static void kvm_apic_realize(DeviceState *dev, Error **errp) +static void kvm_apic_reset(APICCommonState *s) { - APICCommonState *s = APIC_COMMON(dev); - /* Not used by KVM, which uses the CPU mp_state instead. */ s->wait_for_sipi = 0; +} + +static void kvm_apic_realize(DeviceState *dev, Error **errp) +{ + APICCommonState *s = APIC_COMMON(dev); memory_region_init_io(&s->io_memory, NULL, &kvm_apic_io_ops, s, "kvm-apic-msi", APIC_SPACE_SIZE); @@ -191,6 +194,7 @@ static void kvm_apic_class_init(ObjectClass *klass, void *data) APICCommonClass *k = APIC_COMMON_CLASS(klass); k->realize = kvm_apic_realize; + k->reset = kvm_apic_reset; k->set_base = kvm_apic_set_base; k->set_tpr = kvm_apic_set_tpr; k->get_tpr = kvm_apic_get_tpr; diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 4e62f25..d9bb188 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -178,6 +178,7 @@ bool apic_next_timer(APICCommonState *s, int64_t current_time) void apic_init_reset(DeviceState *dev) { APICCommonState *s = APIC_COMMON(dev); + APICCommonClass *info = APIC_COMMON_GET_CLASS(s); int i; if (!s) { @@ -206,6 +207,10 @@ void apic_init_reset(DeviceState *dev) timer_del(s->timer); } s->timer_expiry = -1; + + if (info->reset) { + info->reset(s); + } } void apic_designate_bsp(DeviceState *dev) diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h index 83e2a42..dc7a89d 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -89,6 +89,7 @@ typedef struct APICCommonClass void (*external_nmi)(APICCommonState *s); void (*pre_save)(APICCommonState *s); void (*post_load)(APICCommonState *s); + void (*reset)(APICCommonState *s); } APICCommonClass; struct APICCommonState { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:52:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:52: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 1YaXgh-0008VV-8j; Tue, 24 Mar 2015 22:52:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXgg-0008VJ-Av for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:42 +0000 Content-Length: 2592 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id F2/E9-07584-9BAE1155; Tue, 24 Mar 2015 22:52:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1427237560!11339058!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31404 invoked from network); 24 Mar 2015 22:52:40 -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; 24 Mar 2015 22:52:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXge-0007ET-0T for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXgd-0004zj-VR for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:39 +0000 Date: Tue, 24 Mar 2015 22:52:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qdev: Avoid type assertion in qdev_build_hotpluggable_device_list() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============2617421246171653270==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2617421246171653270== Content-Length: 2195 Content-Transfer-Encoding: quoted-printable commit 4ec1b9b159b79cf391753ef19aeff2236a6c099c Author: Jun Li AuthorDate: Wed Nov 5 15:03:03 2014 +0800 Commit: Michael Roth CommitDate: Sun Mar 8 22:58:13 2015 -0500 qdev: Avoid type assertion in qdev_build_hotpluggable_device_list() Currently when *obj is not a TYPE_DEVICE, QEMU will abort. This patch fixes it. When *obj is not a TYPE_DEVICE, just do not add it to hotpluggable device list. This patch also fixes the following issue: 1. boot QEMU using cli: $ /opt/qemu-git-arm/bin/qemu-system-x86_64 -monitor stdio -enable-kvm \ -device virtio-scsi-pci,id=3Dscsi0 2. device_del scsi0 via hmp using tab key(first input device_del, then press "Tab" key). (qemu) device_del After step 2, QEMU will abort. (qemu) device_del hw/core/qdev.c:930:qdev_build_hotpluggable_device_list: Object 0x5555563a2460 is not an instance of type device Signed-off-by: Jun Li Reviewed-by: Paolo Bonzini Cc: qemu-stable@nongnu.org Signed-off-by: Andreas F=C3=A4rber (cherry picked from commit 09d560177101d2ef1e333754a25cfa49b70583b3) Signed-off-by: Michael Roth --- hw/core/qdev.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 35fd00d..ef06aa4 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -938,7 +938,12 @@ void qdev_alias_all_properties(DeviceState *target, Object *source) static int qdev_add_hotpluggable_device(Object *obj, void *opaque) { GSList **list =3D opaque; - DeviceState *dev =3D DEVICE(obj); + DeviceState *dev =3D (DeviceState *)object_dynamic_cast(OBJECT(obj), + TYPE_DEVICE); + + if (dev =3D=3D NULL) { + return 0; + } if (dev->realized && object_property_get_bool(obj, "hotpluggable", NULL)) { *list =3D g_slist_append(*list, dev); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============2617421246171653270== 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 --===============2617421246171653270==-- From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:52:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:52: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 1YaXgh-0008VV-8j; Tue, 24 Mar 2015 22:52:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXgg-0008VJ-Av for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:42 +0000 Content-Length: 2592 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id F2/E9-07584-9BAE1155; Tue, 24 Mar 2015 22:52:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1427237560!11339058!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31404 invoked from network); 24 Mar 2015 22:52:40 -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; 24 Mar 2015 22:52:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXge-0007ET-0T for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXgd-0004zj-VR for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:39 +0000 Date: Tue, 24 Mar 2015 22:52:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qdev: Avoid type assertion in qdev_build_hotpluggable_device_list() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============2617421246171653270==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2617421246171653270== Content-Length: 2195 Content-Transfer-Encoding: quoted-printable commit 4ec1b9b159b79cf391753ef19aeff2236a6c099c Author: Jun Li AuthorDate: Wed Nov 5 15:03:03 2014 +0800 Commit: Michael Roth CommitDate: Sun Mar 8 22:58:13 2015 -0500 qdev: Avoid type assertion in qdev_build_hotpluggable_device_list() Currently when *obj is not a TYPE_DEVICE, QEMU will abort. This patch fixes it. When *obj is not a TYPE_DEVICE, just do not add it to hotpluggable device list. This patch also fixes the following issue: 1. boot QEMU using cli: $ /opt/qemu-git-arm/bin/qemu-system-x86_64 -monitor stdio -enable-kvm \ -device virtio-scsi-pci,id=3Dscsi0 2. device_del scsi0 via hmp using tab key(first input device_del, then press "Tab" key). (qemu) device_del After step 2, QEMU will abort. (qemu) device_del hw/core/qdev.c:930:qdev_build_hotpluggable_device_list: Object 0x5555563a2460 is not an instance of type device Signed-off-by: Jun Li Reviewed-by: Paolo Bonzini Cc: qemu-stable@nongnu.org Signed-off-by: Andreas F=C3=A4rber (cherry picked from commit 09d560177101d2ef1e333754a25cfa49b70583b3) Signed-off-by: Michael Roth --- hw/core/qdev.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 35fd00d..ef06aa4 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -938,7 +938,12 @@ void qdev_alias_all_properties(DeviceState *target, Object *source) static int qdev_add_hotpluggable_device(Object *obj, void *opaque) { GSList **list =3D opaque; - DeviceState *dev =3D DEVICE(obj); + DeviceState *dev =3D (DeviceState *)object_dynamic_cast(OBJECT(obj), + TYPE_DEVICE); + + if (dev =3D=3D NULL) { + return 0; + } if (dev->realized && object_property_get_bool(obj, "hotpluggable", NULL)) { *list =3D g_slist_append(*list, dev); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============2617421246171653270== 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 --===============2617421246171653270==-- From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:52:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:52: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 1YaXgs-00005c-Bi; Tue, 24 Mar 2015 22:52:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXgq-000057-Lw for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:52 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 6B/57-32332-3CAE1155; Tue, 24 Mar 2015 22:52:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1427237570!11361759!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31287 invoked from network); 24 Mar 2015 22:52:51 -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; 24 Mar 2015 22:52:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXgo-0007EZ-6P for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXgo-000509-4b for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:50 +0000 Date: Tue, 24 Mar 2015 22:52:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] linux-user: Check for cpu_init() errors X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a958b9be8697dd2316669a83e85c68ccd85bfc49 Author: Eduardo Habkost AuthorDate: Tue Feb 3 16:48:51 2015 -0200 Commit: Michael Roth CommitDate: Sun Mar 8 22:58:13 2015 -0500 linux-user: Check for cpu_init() errors This was the only caller of cpu_init() that was not checking for NULL yet. Reviewed-by: Paolo Bonzini Signed-off-by: Eduardo Habkost (cherry picked from commit 696da41b1b741f6056e52c572e05abd790637be1) Conflicts: linux-user/main.c *removed context dependency on ec53b45 Signed-off-by: Michael Roth --- linux-user/main.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 5c14c1e..f2cf2b6 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3435,12 +3435,19 @@ CPUArchState *cpu_copy(CPUArchState *env) { CPUState *cpu = ENV_GET_CPU(env); CPUArchState *new_env = cpu_init(cpu_model); - CPUState *new_cpu = ENV_GET_CPU(new_env); + CPUState *new_cpu; #if defined(TARGET_HAS_ICE) CPUBreakpoint *bp; CPUWatchpoint *wp; #endif + if (!new_env) { + fprintf(stderr, "cpu_copy: Failed to create new CPU\n"); + exit(1); + } + + new_cpu = ENV_GET_CPU(new_env); + /* Reset non arch specific state */ cpu_reset(new_cpu); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:52:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:52: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 1YaXgs-00005c-Bi; Tue, 24 Mar 2015 22:52:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXgq-000057-Lw for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:52 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 6B/57-32332-3CAE1155; Tue, 24 Mar 2015 22:52:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1427237570!11361759!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31287 invoked from network); 24 Mar 2015 22:52:51 -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; 24 Mar 2015 22:52:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXgo-0007EZ-6P for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXgo-000509-4b for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:52:50 +0000 Date: Tue, 24 Mar 2015 22:52:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] linux-user: Check for cpu_init() errors X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a958b9be8697dd2316669a83e85c68ccd85bfc49 Author: Eduardo Habkost AuthorDate: Tue Feb 3 16:48:51 2015 -0200 Commit: Michael Roth CommitDate: Sun Mar 8 22:58:13 2015 -0500 linux-user: Check for cpu_init() errors This was the only caller of cpu_init() that was not checking for NULL yet. Reviewed-by: Paolo Bonzini Signed-off-by: Eduardo Habkost (cherry picked from commit 696da41b1b741f6056e52c572e05abd790637be1) Conflicts: linux-user/main.c *removed context dependency on ec53b45 Signed-off-by: Michael Roth --- linux-user/main.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 5c14c1e..f2cf2b6 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3435,12 +3435,19 @@ CPUArchState *cpu_copy(CPUArchState *env) { CPUState *cpu = ENV_GET_CPU(env); CPUArchState *new_env = cpu_init(cpu_model); - CPUState *new_cpu = ENV_GET_CPU(new_env); + CPUState *new_cpu; #if defined(TARGET_HAS_ICE) CPUBreakpoint *bp; CPUWatchpoint *wp; #endif + if (!new_env) { + fprintf(stderr, "cpu_copy: Failed to create new CPU\n"); + exit(1); + } + + new_cpu = ENV_GET_CPU(new_env); + /* Reset non arch specific state */ cpu_reset(new_cpu); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:53:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXh3-00007j-EL; Tue, 24 Mar 2015 22:53:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXh1-000071-Sy for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:04 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 90/3B-31677-ECAE1155; Tue, 24 Mar 2015 22:53:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1427237580!12787892!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23884 invoked from network); 24 Mar 2015 22:53:01 -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; 24 Mar 2015 22:53:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXgy-0007Ei-Cw for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXgy-00050W-AQ for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:00 +0000 Date: Tue, 24 Mar 2015 22:53:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen-hvm: increase maxmem before calling xc_domain_populate_physmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c699aa9f98646bc5c58d042960ac7a7edf2d0e9 Author: Stefano Stabellini AuthorDate: Wed Dec 3 08:15:19 2014 -0500 Commit: Michael Roth CommitDate: Sun Mar 8 22:58:13 2015 -0500 xen-hvm: increase maxmem before calling xc_domain_populate_physmap Increase maxmem before calling xc_domain_populate_physmap_exact to avoid the risk of running out of guest memory. This way we can also avoid complex memory calculations in libxl at domain construction time. This patch fixes an abort() when assigning more than 4 NICs to a VM. Signed-off-by: Stefano Stabellini Signed-off-by: Don Slutz (cherry picked from commit c1d322e6048796296555dd36fdd102d7fa2f50bf) Signed-off-by: Michael Roth --- xen-hvm.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/xen-hvm.c b/xen-hvm.c index 7548794..e2e575b 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -90,6 +90,12 @@ static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu) #endif #define BUFFER_IO_MAX_DELAY 100 +/* Leave some slack so that hvmloader does not complain about lack of + * memory at boot time ("Could not allocate order=0 extent"). + * Once hvmloader is modified to cope with that situation without + * printing warning messages, QEMU_SPARE_PAGES can be removed. + */ +#define QEMU_SPARE_PAGES 16 typedef struct XenPhysmap { hwaddr start_addr; @@ -244,6 +250,8 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr) unsigned long nr_pfn; xen_pfn_t *pfn_list; int i; + xc_domaininfo_t info; + unsigned long free_pages; if (runstate_check(RUN_STATE_INMIGRATE)) { /* RAM already populated in Xen */ @@ -266,6 +274,22 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr) pfn_list[i] = (ram_addr >> TARGET_PAGE_BITS) + i; } + if ((xc_domain_getinfolist(xen_xc, xen_domid, 1, &info) != 1) || + (info.domain != xen_domid)) { + hw_error("xc_domain_getinfolist failed"); + } + free_pages = info.max_pages - info.tot_pages; + if (free_pages > QEMU_SPARE_PAGES) { + free_pages -= QEMU_SPARE_PAGES; + } else { + free_pages = 0; + } + if ((free_pages < nr_pfn) && + (xc_domain_setmaxmem(xen_xc, xen_domid, + ((info.max_pages + nr_pfn - free_pages) + << (XC_PAGE_SHIFT - 10))) < 0)) { + hw_error("xc_domain_setmaxmem failed"); + } if (xc_domain_populate_physmap_exact(xen_xc, xen_domid, nr_pfn, 0, 0, pfn_list)) { hw_error("xen: failed to populate ram at " RAM_ADDR_FMT, ram_addr); } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:53:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXh3-00007j-EL; Tue, 24 Mar 2015 22:53:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXh1-000071-Sy for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:04 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 90/3B-31677-ECAE1155; Tue, 24 Mar 2015 22:53:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1427237580!12787892!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.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23884 invoked from network); 24 Mar 2015 22:53:01 -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; 24 Mar 2015 22:53:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXgy-0007Ei-Cw for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXgy-00050W-AQ for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:00 +0000 Date: Tue, 24 Mar 2015 22:53:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen-hvm: increase maxmem before calling xc_domain_populate_physmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c699aa9f98646bc5c58d042960ac7a7edf2d0e9 Author: Stefano Stabellini AuthorDate: Wed Dec 3 08:15:19 2014 -0500 Commit: Michael Roth CommitDate: Sun Mar 8 22:58:13 2015 -0500 xen-hvm: increase maxmem before calling xc_domain_populate_physmap Increase maxmem before calling xc_domain_populate_physmap_exact to avoid the risk of running out of guest memory. This way we can also avoid complex memory calculations in libxl at domain construction time. This patch fixes an abort() when assigning more than 4 NICs to a VM. Signed-off-by: Stefano Stabellini Signed-off-by: Don Slutz (cherry picked from commit c1d322e6048796296555dd36fdd102d7fa2f50bf) Signed-off-by: Michael Roth --- xen-hvm.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/xen-hvm.c b/xen-hvm.c index 7548794..e2e575b 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -90,6 +90,12 @@ static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu) #endif #define BUFFER_IO_MAX_DELAY 100 +/* Leave some slack so that hvmloader does not complain about lack of + * memory at boot time ("Could not allocate order=0 extent"). + * Once hvmloader is modified to cope with that situation without + * printing warning messages, QEMU_SPARE_PAGES can be removed. + */ +#define QEMU_SPARE_PAGES 16 typedef struct XenPhysmap { hwaddr start_addr; @@ -244,6 +250,8 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr) unsigned long nr_pfn; xen_pfn_t *pfn_list; int i; + xc_domaininfo_t info; + unsigned long free_pages; if (runstate_check(RUN_STATE_INMIGRATE)) { /* RAM already populated in Xen */ @@ -266,6 +274,22 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr) pfn_list[i] = (ram_addr >> TARGET_PAGE_BITS) + i; } + if ((xc_domain_getinfolist(xen_xc, xen_domid, 1, &info) != 1) || + (info.domain != xen_domid)) { + hw_error("xc_domain_getinfolist failed"); + } + free_pages = info.max_pages - info.tot_pages; + if (free_pages > QEMU_SPARE_PAGES) { + free_pages -= QEMU_SPARE_PAGES; + } else { + free_pages = 0; + } + if ((free_pages < nr_pfn) && + (xc_domain_setmaxmem(xen_xc, xen_domid, + ((info.max_pages + nr_pfn - free_pages) + << (XC_PAGE_SHIFT - 10))) < 0)) { + hw_error("xc_domain_setmaxmem failed"); + } if (xc_domain_populate_physmap_exact(xen_xc, xen_domid, nr_pfn, 0, 0, pfn_list)) { hw_error("xen: failed to populate ram at " RAM_ADDR_FMT, ram_addr); } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:53:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:53: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 1YaXhC-0000Al-Gz; Tue, 24 Mar 2015 22:53:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhA-0000A6-R3 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:12 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 74/16-28741-8DAE1155; Tue, 24 Mar 2015 22:53:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1427237590!6050108!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22130 invoked from network); 24 Mar 2015 22:53:11 -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; 24 Mar 2015 22:53:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXh8-0007FH-Hq for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXh8-00051t-GZ for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:10 +0000 Date: Tue, 24 Mar 2015 22:53:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pc: acpi: fix WindowsXP BSOD when memory hotplug 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 dab0efc33fc839d76ca39353c3538052eabdb796 Author: Igor Mammedov AuthorDate: Fri Dec 19 11:46:57 2014 +0000 Commit: Michael Roth CommitDate: Sun Mar 8 22:58:14 2015 -0500 pc: acpi: fix WindowsXP BSOD when memory hotplug is enabled ACPI parser in XP considers PNP0A06 devices of CPU and memory hotplug as duplicates. Adding unique _UID to CPU hotplug device fixes BSOD. Cc: qemu-stable@nongnu.org Signed-off-by: Igor Mammedov Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin (cherry picked from commit 6d4e4cb9985e24557abcf3932a0e7f8f6ab3c1d2) Signed-off-by: Michael Roth --- hw/i386/acpi-dsdt-cpu-hotplug.dsl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/i386/acpi-dsdt-cpu-hotplug.dsl b/hw/i386/acpi-dsdt-cpu-hotplug.dsl index 34aab5a..268d870 100644 --- a/hw/i386/acpi-dsdt-cpu-hotplug.dsl +++ b/hw/i386/acpi-dsdt-cpu-hotplug.dsl @@ -94,6 +94,7 @@ Scope(\_SB) { Device(CPU_HOTPLUG_RESOURCE_DEVICE) { Name(_HID, EisaId("PNP0A06")) + Name(_UID, "CPU hotplug resources") Name(_CRS, ResourceTemplate() { IO(Decode16, CPU_STATUS_BASE, CPU_STATUS_BASE, 0, CPU_STATUS_LEN) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:53:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:53: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 1YaXhC-0000Al-Gz; Tue, 24 Mar 2015 22:53:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhA-0000A6-R3 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:12 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 74/16-28741-8DAE1155; Tue, 24 Mar 2015 22:53:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1427237590!6050108!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22130 invoked from network); 24 Mar 2015 22:53:11 -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; 24 Mar 2015 22:53:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXh8-0007FH-Hq for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXh8-00051t-GZ for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:10 +0000 Date: Tue, 24 Mar 2015 22:53:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pc: acpi: fix WindowsXP BSOD when memory hotplug 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 dab0efc33fc839d76ca39353c3538052eabdb796 Author: Igor Mammedov AuthorDate: Fri Dec 19 11:46:57 2014 +0000 Commit: Michael Roth CommitDate: Sun Mar 8 22:58:14 2015 -0500 pc: acpi: fix WindowsXP BSOD when memory hotplug is enabled ACPI parser in XP considers PNP0A06 devices of CPU and memory hotplug as duplicates. Adding unique _UID to CPU hotplug device fixes BSOD. Cc: qemu-stable@nongnu.org Signed-off-by: Igor Mammedov Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin (cherry picked from commit 6d4e4cb9985e24557abcf3932a0e7f8f6ab3c1d2) Signed-off-by: Michael Roth --- hw/i386/acpi-dsdt-cpu-hotplug.dsl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/i386/acpi-dsdt-cpu-hotplug.dsl b/hw/i386/acpi-dsdt-cpu-hotplug.dsl index 34aab5a..268d870 100644 --- a/hw/i386/acpi-dsdt-cpu-hotplug.dsl +++ b/hw/i386/acpi-dsdt-cpu-hotplug.dsl @@ -94,6 +94,7 @@ Scope(\_SB) { Device(CPU_HOTPLUG_RESOURCE_DEVICE) { Name(_HID, EisaId("PNP0A06")) + Name(_UID, "CPU hotplug resources") Name(_CRS, ResourceTemplate() { IO(Decode16, CPU_STATUS_BASE, CPU_STATUS_BASE, 0, CPU_STATUS_LEN) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:53:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:53: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 1YaXhM-0000GF-Jp; Tue, 24 Mar 2015 22:53:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhK-0000Fm-Vu for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:23 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id D8/7B-13427-2EAE1155; Tue, 24 Mar 2015 22:53:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1427237600!7989736!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 504 invoked from network); 24 Mar 2015 22:53:21 -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; 24 Mar 2015 22:53:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhI-0007FN-OI for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXhI-00052G-MS for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:20 +0000 Date: Tue, 24 Mar 2015 22:53:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] acpi-test: update expected DSDT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 16765a55c182e9610e9754465efb1845852aa994 Author: Michael Roth AuthorDate: Fri Mar 6 21:14:17 2015 -0600 Commit: Michael Roth CommitDate: Sun Mar 8 22:58:14 2015 -0500 acpi-test: update expected DSDT Previous patch pc: acpi: fix WindowsXP BSOD when memory hotplug is enabled changed DSDT, update expected test files. Signed-off-by: Michael Roth --- tests/acpi-test-data/pc/DSDT | Bin 3592 -> 3621 bytes tests/acpi-test-data/q35/DSDT | Bin 8182 -> 8211 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/acpi-test-data/pc/DSDT b/tests/acpi-test-data/pc/DSDT index ee9cc67..010d746 100644 Binary files a/tests/acpi-test-data/pc/DSDT and b/tests/acpi-test-data/pc/DSDT differ diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT index ef0c75f..8ac32ef 100644 Binary files a/tests/acpi-test-data/q35/DSDT and b/tests/acpi-test-data/q35/DSDT differ -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:53:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:53: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 1YaXhM-0000GF-Jp; Tue, 24 Mar 2015 22:53:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhK-0000Fm-Vu for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:23 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id D8/7B-13427-2EAE1155; Tue, 24 Mar 2015 22:53:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1427237600!7989736!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 504 invoked from network); 24 Mar 2015 22:53:21 -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; 24 Mar 2015 22:53:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhI-0007FN-OI for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXhI-00052G-MS for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:20 +0000 Date: Tue, 24 Mar 2015 22:53:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] acpi-test: update expected DSDT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 16765a55c182e9610e9754465efb1845852aa994 Author: Michael Roth AuthorDate: Fri Mar 6 21:14:17 2015 -0600 Commit: Michael Roth CommitDate: Sun Mar 8 22:58:14 2015 -0500 acpi-test: update expected DSDT Previous patch pc: acpi: fix WindowsXP BSOD when memory hotplug is enabled changed DSDT, update expected test files. Signed-off-by: Michael Roth --- tests/acpi-test-data/pc/DSDT | Bin 3592 -> 3621 bytes tests/acpi-test-data/q35/DSDT | Bin 8182 -> 8211 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/acpi-test-data/pc/DSDT b/tests/acpi-test-data/pc/DSDT index ee9cc67..010d746 100644 Binary files a/tests/acpi-test-data/pc/DSDT and b/tests/acpi-test-data/pc/DSDT differ diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT index ef0c75f..8ac32ef 100644 Binary files a/tests/acpi-test-data/q35/DSDT and b/tests/acpi-test-data/q35/DSDT differ -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:53:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:53: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 1YaXhX-0000KB-Md; Tue, 24 Mar 2015 22:53:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhV-0000Ji-NP for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:33 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 1B/A3-11368-DEAE1155; Tue, 24 Mar 2015 22:53:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1427237611!15102698!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26882 invoked from network); 24 Mar 2015 22:53:32 -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; 24 Mar 2015 22:53:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhT-0007FV-4f for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXhT-00052g-13 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:31 +0000 Date: Tue, 24 Mar 2015 22:53:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] acpi: update generated hex files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c4ca8af86deca543a1e19aac4cbaec052a3ea455 Author: Michael Roth AuthorDate: Fri Mar 6 21:15:32 2015 -0600 Commit: Michael Roth CommitDate: Sun Mar 8 22:58:14 2015 -0500 acpi: update generated hex files Previous patch pc: acpi: fix WindowsXP BSOD when memory hotplug is enabled changed DSDT, update hex files for non-iasl builds. Signed-off-by: Michael Roth --- hw/i386/acpi-dsdt.hex.generated | 43 ++++++++++++++++++++++++++++----- hw/i386/q35-acpi-dsdt.hex.generated | 45 ++++++++++++++++++++++++++++------ 2 files changed, 73 insertions(+), 15 deletions(-) diff --git a/hw/i386/acpi-dsdt.hex.generated b/hw/i386/acpi-dsdt.hex.generated index 875570e..92c749c 100644 --- a/hw/i386/acpi-dsdt.hex.generated +++ b/hw/i386/acpi-dsdt.hex.generated @@ -3,12 +3,12 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x53, 0x44, 0x54, -0x8, +0x25, 0xe, 0x0, 0x0, 0x1, -0xfc, +0x6e, 0x42, 0x58, 0x50, @@ -31,8 +31,8 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x4e, 0x54, 0x4c, -0x28, -0x8, +0x14, +0x2, 0x14, 0x20, 0x10, @@ -2318,8 +2318,8 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x53, 0x1, 0x10, -0x42, -0x11, +0x4f, +0x12, 0x5f, 0x53, 0x42, @@ -2551,7 +2551,8 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x60, 0x5b, 0x82, -0x29, +0x46, +0x4, 0x50, 0x52, 0x45, @@ -2568,6 +2569,34 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x6, 0x8, 0x5f, +0x55, +0x49, +0x44, +0xd, +0x43, +0x50, +0x55, +0x20, +0x68, +0x6f, +0x74, +0x70, +0x6c, +0x75, +0x67, +0x20, +0x72, +0x65, +0x73, +0x6f, +0x75, +0x72, +0x63, +0x65, +0x73, +0x0, +0x8, +0x5f, 0x43, 0x52, 0x53, diff --git a/hw/i386/q35-acpi-dsdt.hex.generated b/hw/i386/q35-acpi-dsdt.hex.generated index 4807bdf..84513b7 100644 --- a/hw/i386/q35-acpi-dsdt.hex.generated +++ b/hw/i386/q35-acpi-dsdt.hex.generated @@ -3,12 +3,12 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0x53, 0x44, 0x54, -0xf6, -0x1f, +0x13, +0x20, 0x0, 0x0, 0x1, -0x91, +0x2, 0x42, 0x58, 0x50, @@ -31,8 +31,8 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0x4e, 0x54, 0x4c, -0x28, -0x8, +0x14, +0x2, 0x14, 0x20, 0x10, @@ -6959,8 +6959,8 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0x53, 0x1, 0x10, -0x42, -0x11, +0x4f, +0x12, 0x5f, 0x53, 0x42, @@ -7192,7 +7192,8 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0x60, 0x5b, 0x82, -0x29, +0x46, +0x4, 0x50, 0x52, 0x45, @@ -7209,6 +7210,34 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0x6, 0x8, 0x5f, +0x55, +0x49, +0x44, +0xd, +0x43, +0x50, +0x55, +0x20, +0x68, +0x6f, +0x74, +0x70, +0x6c, +0x75, +0x67, +0x20, +0x72, +0x65, +0x73, +0x6f, +0x75, +0x72, +0x63, +0x65, +0x73, +0x0, +0x8, +0x5f, 0x43, 0x52, 0x53, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:53:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:53: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 1YaXhX-0000KB-Md; Tue, 24 Mar 2015 22:53:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhV-0000Ji-NP for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:33 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 1B/A3-11368-DEAE1155; Tue, 24 Mar 2015 22:53:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1427237611!15102698!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26882 invoked from network); 24 Mar 2015 22:53:32 -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; 24 Mar 2015 22:53:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhT-0007FV-4f for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXhT-00052g-13 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:31 +0000 Date: Tue, 24 Mar 2015 22:53:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] acpi: update generated hex files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c4ca8af86deca543a1e19aac4cbaec052a3ea455 Author: Michael Roth AuthorDate: Fri Mar 6 21:15:32 2015 -0600 Commit: Michael Roth CommitDate: Sun Mar 8 22:58:14 2015 -0500 acpi: update generated hex files Previous patch pc: acpi: fix WindowsXP BSOD when memory hotplug is enabled changed DSDT, update hex files for non-iasl builds. Signed-off-by: Michael Roth --- hw/i386/acpi-dsdt.hex.generated | 43 ++++++++++++++++++++++++++++----- hw/i386/q35-acpi-dsdt.hex.generated | 45 ++++++++++++++++++++++++++++------ 2 files changed, 73 insertions(+), 15 deletions(-) diff --git a/hw/i386/acpi-dsdt.hex.generated b/hw/i386/acpi-dsdt.hex.generated index 875570e..92c749c 100644 --- a/hw/i386/acpi-dsdt.hex.generated +++ b/hw/i386/acpi-dsdt.hex.generated @@ -3,12 +3,12 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x53, 0x44, 0x54, -0x8, +0x25, 0xe, 0x0, 0x0, 0x1, -0xfc, +0x6e, 0x42, 0x58, 0x50, @@ -31,8 +31,8 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x4e, 0x54, 0x4c, -0x28, -0x8, +0x14, +0x2, 0x14, 0x20, 0x10, @@ -2318,8 +2318,8 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x53, 0x1, 0x10, -0x42, -0x11, +0x4f, +0x12, 0x5f, 0x53, 0x42, @@ -2551,7 +2551,8 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x60, 0x5b, 0x82, -0x29, +0x46, +0x4, 0x50, 0x52, 0x45, @@ -2568,6 +2569,34 @@ static unsigned char AcpiDsdtAmlCode[] = { 0x6, 0x8, 0x5f, +0x55, +0x49, +0x44, +0xd, +0x43, +0x50, +0x55, +0x20, +0x68, +0x6f, +0x74, +0x70, +0x6c, +0x75, +0x67, +0x20, +0x72, +0x65, +0x73, +0x6f, +0x75, +0x72, +0x63, +0x65, +0x73, +0x0, +0x8, +0x5f, 0x43, 0x52, 0x53, diff --git a/hw/i386/q35-acpi-dsdt.hex.generated b/hw/i386/q35-acpi-dsdt.hex.generated index 4807bdf..84513b7 100644 --- a/hw/i386/q35-acpi-dsdt.hex.generated +++ b/hw/i386/q35-acpi-dsdt.hex.generated @@ -3,12 +3,12 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0x53, 0x44, 0x54, -0xf6, -0x1f, +0x13, +0x20, 0x0, 0x0, 0x1, -0x91, +0x2, 0x42, 0x58, 0x50, @@ -31,8 +31,8 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0x4e, 0x54, 0x4c, -0x28, -0x8, +0x14, +0x2, 0x14, 0x20, 0x10, @@ -6959,8 +6959,8 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0x53, 0x1, 0x10, -0x42, -0x11, +0x4f, +0x12, 0x5f, 0x53, 0x42, @@ -7192,7 +7192,8 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0x60, 0x5b, 0x82, -0x29, +0x46, +0x4, 0x50, 0x52, 0x45, @@ -7209,6 +7210,34 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 0x6, 0x8, 0x5f, +0x55, +0x49, +0x44, +0xd, +0x43, +0x50, +0x55, +0x20, +0x68, +0x6f, +0x74, +0x70, +0x6c, +0x75, +0x67, +0x20, +0x72, +0x65, +0x73, +0x6f, +0x75, +0x72, +0x63, +0x65, +0x73, +0x0, +0x8, +0x5f, 0x43, 0x52, 0x53, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:53:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:53: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 1YaXhg-0000Nc-SJ; Tue, 24 Mar 2015 22:53:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhf-0000ND-Gm for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:43 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 74/FC-13528-6FAE1155; Tue, 24 Mar 2015 22:53:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1427237621!11361815!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32457 invoked from network); 24 Mar 2015 22:53:42 -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; 24 Mar 2015 22:53:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhd-0007Fq-9y for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXhd-00053C-95 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:41 +0000 Date: Tue, 24 Mar 2015 22:53:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] coroutine: Fix use after free with qemu_coroutine_yield() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 07db6859abffa79db6290a5f9f4dfdf93148189f Author: Kevin Wolf AuthorDate: Tue Feb 10 11:17:53 2015 +0100 Commit: Michael Roth CommitDate: Sun Mar 8 22:58:14 2015 -0500 coroutine: Fix use after free with qemu_coroutine_yield() Instead of using the same function for entering and exiting coroutines, and hoping that it doesn't add any functionality that hurts with the parameters used for exiting, we can just directly call into the real task switch in qemu_coroutine_switch(). This fixes a use-after-free scenario where reentering a coroutine that has yielded still accesses the old parent coroutine (which may have meanwhile terminated) in the part of coroutine_swap() that follows qemu_coroutine_switch(). Cc: qemu-stable@nongnu.org Signed-off-by: Kevin Wolf Reviewed-by: Paolo Bonzini (cherry picked from commit 80687b4dd6f43b3fef61fef8fbcb358457350562) Signed-off-by: Michael Roth --- qemu-coroutine.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/qemu-coroutine.c b/qemu-coroutine.c index bd574aa..0101855 100644 --- a/qemu-coroutine.c +++ b/qemu-coroutine.c @@ -135,7 +135,7 @@ void coroutine_fn qemu_coroutine_yield(void) } self->caller = NULL; - coroutine_swap(self, to); + qemu_coroutine_switch(self, to, COROUTINE_YIELD); } void qemu_coroutine_adjust_pool_size(int n) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:53:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:53: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 1YaXhg-0000Nc-SJ; Tue, 24 Mar 2015 22:53:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhf-0000ND-Gm for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:43 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 74/FC-13528-6FAE1155; Tue, 24 Mar 2015 22:53:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1427237621!11361815!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32457 invoked from network); 24 Mar 2015 22:53:42 -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; 24 Mar 2015 22:53:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhd-0007Fq-9y for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXhd-00053C-95 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:41 +0000 Date: Tue, 24 Mar 2015 22:53:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] coroutine: Fix use after free with qemu_coroutine_yield() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 07db6859abffa79db6290a5f9f4dfdf93148189f Author: Kevin Wolf AuthorDate: Tue Feb 10 11:17:53 2015 +0100 Commit: Michael Roth CommitDate: Sun Mar 8 22:58:14 2015 -0500 coroutine: Fix use after free with qemu_coroutine_yield() Instead of using the same function for entering and exiting coroutines, and hoping that it doesn't add any functionality that hurts with the parameters used for exiting, we can just directly call into the real task switch in qemu_coroutine_switch(). This fixes a use-after-free scenario where reentering a coroutine that has yielded still accesses the old parent coroutine (which may have meanwhile terminated) in the part of coroutine_swap() that follows qemu_coroutine_switch(). Cc: qemu-stable@nongnu.org Signed-off-by: Kevin Wolf Reviewed-by: Paolo Bonzini (cherry picked from commit 80687b4dd6f43b3fef61fef8fbcb358457350562) Signed-off-by: Michael Roth --- qemu-coroutine.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/qemu-coroutine.c b/qemu-coroutine.c index bd574aa..0101855 100644 --- a/qemu-coroutine.c +++ b/qemu-coroutine.c @@ -135,7 +135,7 @@ void coroutine_fn qemu_coroutine_yield(void) } self->caller = NULL; - coroutine_swap(self, to); + qemu_coroutine_switch(self, to, COROUTINE_YIELD); } void qemu_coroutine_adjust_pool_size(int n) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:53:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXhr-0000Qt-VI; Tue, 24 Mar 2015 22:53:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhq-0000QF-Ix for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:54 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id DA/B0-32368-10BE1155; Tue, 24 Mar 2015 22:53:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1427237631!15234107!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24951 invoked from network); 24 Mar 2015 22:53:52 -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; 24 Mar 2015 22:53:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhn-0007Fw-F3 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXhn-00053b-Dj for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:51 +0000 Date: Tue, 24 Mar 2015 22:53:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] vpc: Fix size in fixed image creation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c70221df1f89953e85a3f1f96ceefbd6888bb55f Author: Kevin Wolf AuthorDate: Wed Feb 11 17:19:57 2015 +0100 Commit: Michael Roth CommitDate: Sun Mar 8 22:58:14 2015 -0500 vpc: Fix size in fixed image creation If total_sectors is rounded to match the geometry, total_size needs to be changed as well. Otherwise we end up with an image whose geometry describes a disk larger than the image file, which doesn't end well. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz (cherry picked from commit c7dd631d482912fd615a9ef18a0e0691e7a84836) Signed-off-by: Michael Roth --- block/vpc.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/block/vpc.c b/block/vpc.c index 38c4f02..40baa64 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -801,6 +801,7 @@ static int vpc_create(const char *filename, QemuOpts *opts, Error **errp) } total_sectors = (int64_t) cyls * heads * secs_per_cyl; + total_size = total_sectors * BDRV_SECTOR_SIZE; /* Prepare the Hard Disk Footer */ memset(buf, 0, 1024); @@ -822,13 +823,8 @@ static int vpc_create(const char *filename, QemuOpts *opts, Error **errp) /* Version of Virtual PC 2007 */ footer->major = cpu_to_be16(0x0005); footer->minor = cpu_to_be16(0x0003); - if (disk_type == VHD_DYNAMIC) { - footer->orig_size = cpu_to_be64(total_sectors * 512); - footer->size = cpu_to_be64(total_sectors * 512); - } else { - footer->orig_size = cpu_to_be64(total_size); - footer->size = cpu_to_be64(total_size); - } + footer->orig_size = cpu_to_be64(total_size); + footer->size = cpu_to_be64(total_size); footer->cyls = cpu_to_be16(cyls); footer->heads = heads; footer->secs_per_cyl = secs_per_cyl; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:53:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22: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 1YaXhr-0000Qt-VI; Tue, 24 Mar 2015 22:53:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhq-0000QF-Ix for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:54 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id DA/B0-32368-10BE1155; Tue, 24 Mar 2015 22:53:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1427237631!15234107!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24951 invoked from network); 24 Mar 2015 22:53:52 -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; 24 Mar 2015 22:53:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhn-0007Fw-F3 for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXhn-00053b-Dj for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:53:51 +0000 Date: Tue, 24 Mar 2015 22:53:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] vpc: Fix size in fixed image creation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c70221df1f89953e85a3f1f96ceefbd6888bb55f Author: Kevin Wolf AuthorDate: Wed Feb 11 17:19:57 2015 +0100 Commit: Michael Roth CommitDate: Sun Mar 8 22:58:14 2015 -0500 vpc: Fix size in fixed image creation If total_sectors is rounded to match the geometry, total_size needs to be changed as well. Otherwise we end up with an image whose geometry describes a disk larger than the image file, which doesn't end well. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz (cherry picked from commit c7dd631d482912fd615a9ef18a0e0691e7a84836) Signed-off-by: Michael Roth --- block/vpc.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/block/vpc.c b/block/vpc.c index 38c4f02..40baa64 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -801,6 +801,7 @@ static int vpc_create(const char *filename, QemuOpts *opts, Error **errp) } total_sectors = (int64_t) cyls * heads * secs_per_cyl; + total_size = total_sectors * BDRV_SECTOR_SIZE; /* Prepare the Hard Disk Footer */ memset(buf, 0, 1024); @@ -822,13 +823,8 @@ static int vpc_create(const char *filename, QemuOpts *opts, Error **errp) /* Version of Virtual PC 2007 */ footer->major = cpu_to_be16(0x0005); footer->minor = cpu_to_be16(0x0003); - if (disk_type == VHD_DYNAMIC) { - footer->orig_size = cpu_to_be64(total_sectors * 512); - footer->size = cpu_to_be64(total_sectors * 512); - } else { - footer->orig_size = cpu_to_be64(total_size); - footer->size = cpu_to_be64(total_size); - } + footer->orig_size = cpu_to_be64(total_size); + footer->size = cpu_to_be64(total_size); footer->cyls = cpu_to_be16(cyls); footer->heads = heads; footer->secs_per_cyl = secs_per_cyl; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:54:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:54:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXi3-0000SK-1m; Tue, 24 Mar 2015 22:54:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXi2-0000SE-HN for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:54:06 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id D2/D9-25011-D0BE1155; Tue, 24 Mar 2015 22:54:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1427237644!11339585!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18467 invoked from network); 24 Mar 2015 22:54:05 -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; 24 Mar 2015 22:54:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhx-0007GY-Jh for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:54:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXhx-000540-Hy for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:54:01 +0000 Date: Tue, 24 Mar 2015 22:54:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Update version for v2.2.1 release X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2001e197cf68a4f262a5a06e0ffe6dce3c2e2a7b Author: Michael Roth AuthorDate: Tue Mar 10 12:29:35 2015 -0500 Commit: Michael Roth CommitDate: Tue Mar 10 12:29:35 2015 -0500 Update version for v2.2.1 release Signed-off-by: Michael Roth --- VERSION | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/VERSION b/VERSION index ccbccc3..c043eea 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.0 +2.2.1 -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:54:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:54:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXi3-0000SK-1m; Tue, 24 Mar 2015 22:54:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXi2-0000SE-HN for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:54:06 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id D2/D9-25011-D0BE1155; Tue, 24 Mar 2015 22:54:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1427237644!11339585!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18467 invoked from network); 24 Mar 2015 22:54:05 -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; 24 Mar 2015 22:54:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXhx-0007GY-Jh for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:54:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXhx-000540-Hy for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:54:01 +0000 Date: Tue, 24 Mar 2015 22:54:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Update version for v2.2.1 release X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2001e197cf68a4f262a5a06e0ffe6dce3c2e2a7b Author: Michael Roth AuthorDate: Tue Mar 10 12:29:35 2015 -0500 Commit: Michael Roth CommitDate: Tue Mar 10 12:29:35 2015 -0500 Update version for v2.2.1 release Signed-off-by: Michael Roth --- VERSION | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/VERSION b/VERSION index ccbccc3..c043eea 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.0 +2.2.1 -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:54:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:54: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 1YaXiE-0000Tm-4O; Tue, 24 Mar 2015 22:54:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXiD-0000Te-0s for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:54:17 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id E6/E9-25011-81BE1155; Tue, 24 Mar 2015 22:54:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1427237654!11321084!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14557 invoked from network); 24 Mar 2015 22:54:15 -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; 24 Mar 2015 22:54:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXiA-0007Ge-Ld for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:54:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXiA-000553-Jb for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:54:14 +0000 Date: Tue, 24 Mar 2015 22:54:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Merge remote-tracking branch 'origin/stable-2.2' into xen-staging/master X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 42ffdf360dd9df66b0a4a7ada059c02a3cf3a8de Merge: be11dc1e9172f91e798a8f831b30c14b479e08e8 2001e197cf68a4f262a5a06e0ffe6dce3c2e2a7b Author: Stefano Stabellini AuthorDate: Wed Mar 11 11:16:38 2015 +0000 Commit: Stefano Stabellini CommitDate: Wed Mar 11 11:16:38 2015 +0000 Merge remote-tracking branch 'origin/stable-2.2' into xen-staging/master VERSION | 2 +- audio/audio_template.h | 2 +- block-migration.c | 14 +++- block.c | 36 ++++++----- block/iscsi.c | 2 +- block/nfs.c | 15 +++++ block/qcow2-cluster.c | 2 +- block/qcow2.c | 33 +++++++--- block/raw-posix.c | 3 +- block/raw-win32.c | 2 +- block/raw_bsd.c | 2 +- block/vpc.c | 10 +-- block/vvfat.c | 6 ++ cpus.c | 4 + exec.c | 4 +- hw/audio/sb16.c | 4 +- hw/char/serial.c | 31 ++++++++- hw/core/qdev.c | 7 ++- hw/i386/acpi-dsdt-cpu-hotplug.dsl | 1 + hw/i386/acpi-dsdt.hex.generated | 43 +++++++++++-- hw/i386/kvm/apic.c | 10 ++- hw/i386/q35-acpi-dsdt.hex.generated | 45 +++++++++++--- hw/input/hid.c | 2 +- hw/input/pckbd.c | 10 +++- hw/intc/apic_common.c | 5 ++ hw/isa/vt82c686.c | 2 +- hw/misc/vfio.c | 1 + hw/ppc/spapr_iommu.c | 6 +- hw/scsi/scsi-bus.c | 2 + hw/scsi/virtio-scsi.c | 2 +- hw/timer/mc146818rtc.c | 2 +- hw/virtio/dataplane/vring.c | 4 +- include/block/block_int.h | 8 +++ include/hw/i386/apic_internal.h | 1 + include/qemu/atomic.h | 4 +- libcacard/Makefile | 2 + linux-user/main.c | 9 +++- linux-user/signal.c | 6 +- pc-bios/efi-e1000.rom | Bin 194560 -> 197120 bytes pc-bios/efi-eepro100.rom | Bin 196096 -> 197632 bytes pc-bios/efi-ne2k_pci.rom | Bin 194560 -> 195584 bytes pc-bios/efi-pcnet.rom | Bin 194560 -> 195584 bytes pc-bios/efi-rtl8139.rom | Bin 198144 -> 200192 bytes pc-bios/efi-virtio.rom | Bin 192000 -> 194048 bytes pc-bios/linuxboot.bin | Bin 1024 -> 1024 bytes pc-bios/optionrom/linuxboot.S | 37 ++++++++--- qemu-coroutine.c | 2 +- qemu-img.c | 21 ++++++ roms/ipxe | 2 +- target-arm/translate-a64.c | 2 +- target-i386/translate.c | 3 +- target-mips/machine.c | 6 +- target-xtensa/translate.c | 27 +++++++- tests/acpi-test-data/pc/DSDT | Bin 3592 -> 3621 bytes tests/acpi-test-data/q35/DSDT | Bin 8182 -> 8211 bytes tests/qemu-iotests/026.out | 120 +++++++++++++++++++++++++++++++++++ tests/qemu-iotests/071.out | 8 +++ tests/qemu-iotests/080 | 2 + tests/qemu-iotests/080.out | 2 + tests/qemu-iotests/089.out | 2 + tests/qemu-iotests/113 | 76 ++++++++++++++++++++++ tests/qemu-iotests/113.out | 15 +++++ tests/qemu-iotests/114 | 61 ++++++++++++++++++ tests/qemu-iotests/114.out | 13 ++++ tests/qemu-iotests/common.rc | 4 +- tests/qemu-iotests/group | 2 + tests/qemu-iotests/qcow2.py | 4 + tests/tcg/xtensa/test_mmu.S | 26 ++++---- util/qemu-thread-posix.c | 2 + vl.c | 15 +++-- 70 files changed, 667 insertions(+), 129 deletions(-) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 24 22:54:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Mar 2015 22:54: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 1YaXiE-0000Tm-4O; Tue, 24 Mar 2015 22:54:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXiD-0000Te-0s for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:54:17 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id E6/E9-25011-81BE1155; Tue, 24 Mar 2015 22:54:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1427237654!11321084!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14557 invoked from network); 24 Mar 2015 22:54:15 -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; 24 Mar 2015 22:54:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YaXiA-0007Ge-Ld for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:54:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YaXiA-000553-Jb for xen-changelog@lists.xensource.com; Tue, 24 Mar 2015 22:54:14 +0000 Date: Tue, 24 Mar 2015 22:54:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Merge remote-tracking branch 'origin/stable-2.2' into xen-staging/master X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 42ffdf360dd9df66b0a4a7ada059c02a3cf3a8de Merge: be11dc1e9172f91e798a8f831b30c14b479e08e8 2001e197cf68a4f262a5a06e0ffe6dce3c2e2a7b Author: Stefano Stabellini AuthorDate: Wed Mar 11 11:16:38 2015 +0000 Commit: Stefano Stabellini CommitDate: Wed Mar 11 11:16:38 2015 +0000 Merge remote-tracking branch 'origin/stable-2.2' into xen-staging/master VERSION | 2 +- audio/audio_template.h | 2 +- block-migration.c | 14 +++- block.c | 36 ++++++----- block/iscsi.c | 2 +- block/nfs.c | 15 +++++ block/qcow2-cluster.c | 2 +- block/qcow2.c | 33 +++++++--- block/raw-posix.c | 3 +- block/raw-win32.c | 2 +- block/raw_bsd.c | 2 +- block/vpc.c | 10 +-- block/vvfat.c | 6 ++ cpus.c | 4 + exec.c | 4 +- hw/audio/sb16.c | 4 +- hw/char/serial.c | 31 ++++++++- hw/core/qdev.c | 7 ++- hw/i386/acpi-dsdt-cpu-hotplug.dsl | 1 + hw/i386/acpi-dsdt.hex.generated | 43 +++++++++++-- hw/i386/kvm/apic.c | 10 ++- hw/i386/q35-acpi-dsdt.hex.generated | 45 +++++++++++--- hw/input/hid.c | 2 +- hw/input/pckbd.c | 10 +++- hw/intc/apic_common.c | 5 ++ hw/isa/vt82c686.c | 2 +- hw/misc/vfio.c | 1 + hw/ppc/spapr_iommu.c | 6 +- hw/scsi/scsi-bus.c | 2 + hw/scsi/virtio-scsi.c | 2 +- hw/timer/mc146818rtc.c | 2 +- hw/virtio/dataplane/vring.c | 4 +- include/block/block_int.h | 8 +++ include/hw/i386/apic_internal.h | 1 + include/qemu/atomic.h | 4 +- libcacard/Makefile | 2 + linux-user/main.c | 9 +++- linux-user/signal.c | 6 +- pc-bios/efi-e1000.rom | Bin 194560 -> 197120 bytes pc-bios/efi-eepro100.rom | Bin 196096 -> 197632 bytes pc-bios/efi-ne2k_pci.rom | Bin 194560 -> 195584 bytes pc-bios/efi-pcnet.rom | Bin 194560 -> 195584 bytes pc-bios/efi-rtl8139.rom | Bin 198144 -> 200192 bytes pc-bios/efi-virtio.rom | Bin 192000 -> 194048 bytes pc-bios/linuxboot.bin | Bin 1024 -> 1024 bytes pc-bios/optionrom/linuxboot.S | 37 ++++++++--- qemu-coroutine.c | 2 +- qemu-img.c | 21 ++++++ roms/ipxe | 2 +- target-arm/translate-a64.c | 2 +- target-i386/translate.c | 3 +- target-mips/machine.c | 6 +- target-xtensa/translate.c | 27 +++++++- tests/acpi-test-data/pc/DSDT | Bin 3592 -> 3621 bytes tests/acpi-test-data/q35/DSDT | Bin 8182 -> 8211 bytes tests/qemu-iotests/026.out | 120 +++++++++++++++++++++++++++++++++++ tests/qemu-iotests/071.out | 8 +++ tests/qemu-iotests/080 | 2 + tests/qemu-iotests/080.out | 2 + tests/qemu-iotests/089.out | 2 + tests/qemu-iotests/113 | 76 ++++++++++++++++++++++ tests/qemu-iotests/113.out | 15 +++++ tests/qemu-iotests/114 | 61 ++++++++++++++++++ tests/qemu-iotests/114.out | 13 ++++ tests/qemu-iotests/common.rc | 4 +- tests/qemu-iotests/group | 2 + tests/qemu-iotests/qcow2.py | 4 + tests/tcg/xtensa/test_mmu.S | 26 ++++---- util/qemu-thread-posix.c | 2 + vl.c | 15 +++-- 70 files changed, 667 insertions(+), 129 deletions(-) -- 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 Thu Mar 26 12:11:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Mar 2015 12: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 1Yb6cw-0006Cc-Bg; Thu, 26 Mar 2015 12:11:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yb6cu-0006B8-VZ for xen-changelog@lists.xensource.com; Thu, 26 Mar 2015 12:11:09 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 79/B0-13265-C57F3155; Thu, 26 Mar 2015 12:11:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1427371866!11315635!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.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4230 invoked from network); 26 Mar 2015 12:11:07 -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; 26 Mar 2015 12:11:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yb6cp-0005fV-5Y for xen-changelog@lists.xensource.com; Thu, 26 Mar 2015 12:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yb6co-000330-VA for xen-changelog@lists.xensource.com; Thu, 26 Mar 2015 12:11:03 +0000 Date: Thu, 26 Mar 2015 12:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] update Xen version to 4.3.4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c58b16ef1572176cf2f6a424b527b5ed4bb73f17 Author: Jan Beulich AuthorDate: Thu Mar 19 16:08:36 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 19 16:08:36 2015 +0100 update Xen version to 4.3.4 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index b318a23..94c4601 100644 --- a/Config.mk +++ b/Config.mk @@ -212,7 +212,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.3-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.4-rc1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.4 SEABIOS_UPSTREAM_TAG ?= 3a28511b46f0c2af5fae1b6ed2b0c19d7913cee3 # Wed Jun 26 16:30:45 2013 +0100 # xen: Don't perform SMP setup. @@ -224,7 +224,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.3.4-rc2 +QEMU_TAG ?= xen-4.3.4 # Mon Feb 2 16:49:59 2015 +0000 # cirrus: fix an uninitialized variable diff --git a/xen/Makefile b/xen/Makefile index d1b1a59..48da669 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 3 -export XEN_EXTRAVERSION ?= .4-rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Mar 26 12:11:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Mar 2015 12: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 1Yb6cw-0006Cc-Bg; Thu, 26 Mar 2015 12:11:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yb6cu-0006B8-VZ for xen-changelog@lists.xensource.com; Thu, 26 Mar 2015 12:11:09 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 79/B0-13265-C57F3155; Thu, 26 Mar 2015 12:11:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1427371866!11315635!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.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4230 invoked from network); 26 Mar 2015 12:11:07 -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; 26 Mar 2015 12:11:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yb6cp-0005fV-5Y for xen-changelog@lists.xensource.com; Thu, 26 Mar 2015 12:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yb6co-000330-VA for xen-changelog@lists.xensource.com; Thu, 26 Mar 2015 12:11:03 +0000 Date: Thu, 26 Mar 2015 12:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] update Xen version to 4.3.4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c58b16ef1572176cf2f6a424b527b5ed4bb73f17 Author: Jan Beulich AuthorDate: Thu Mar 19 16:08:36 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 19 16:08:36 2015 +0100 update Xen version to 4.3.4 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index b318a23..94c4601 100644 --- a/Config.mk +++ b/Config.mk @@ -212,7 +212,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.3-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.4-rc1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.4 SEABIOS_UPSTREAM_TAG ?= 3a28511b46f0c2af5fae1b6ed2b0c19d7913cee3 # Wed Jun 26 16:30:45 2013 +0100 # xen: Don't perform SMP setup. @@ -224,7 +224,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.3.4-rc2 +QEMU_TAG ?= xen-4.3.4 # Mon Feb 2 16:49:59 2015 +0000 # cirrus: fix an uninitialized variable diff --git a/xen/Makefile b/xen/Makefile index d1b1a59..48da669 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 3 -export XEN_EXTRAVERSION ?= .4-rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 31 01:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 01: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 1YclDt-0003Sb-4l; Tue, 31 Mar 2015 01:44:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclDr-0003ST-I3 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:07 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id E6/28-13265-6EBF9155; Tue, 31 Mar 2015 01:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1427766245!8029659!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28863 invoked from network); 31 Mar 2015 01:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 31 Mar 2015 01:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclDn-0007bZ-N3 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YclDn-00075K-C3 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:03 +0000 Date: Tue, 31 Mar 2015 01:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] update Xen version to 4.4.3-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c0577aecaa4655be674d36ed3ec37dd2fd91b0ad Author: Jan Beulich AuthorDate: Thu Mar 26 08:29:30 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:29:30 2015 +0100 update Xen version to 4.4.3-pre --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index c5c40df..be8e1a2 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= .2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 31 01:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 01: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 1YclDt-0003Sb-4l; Tue, 31 Mar 2015 01:44:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclDr-0003ST-I3 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:07 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id E6/28-13265-6EBF9155; Tue, 31 Mar 2015 01:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1427766245!8029659!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28863 invoked from network); 31 Mar 2015 01:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 31 Mar 2015 01:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclDn-0007bZ-N3 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YclDn-00075K-C3 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:03 +0000 Date: Tue, 31 Mar 2015 01:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] update Xen version to 4.4.3-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c0577aecaa4655be674d36ed3ec37dd2fd91b0ad Author: Jan Beulich AuthorDate: Thu Mar 26 08:29:30 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:29:30 2015 +0100 update Xen version to 4.4.3-pre --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index c5c40df..be8e1a2 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= .2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 31 01:44:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 01: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 1YclE3-0003TM-7G; Tue, 31 Mar 2015 01:44:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclE1-0003TD-VJ for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:18 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 67/99-30165-1FBF9155; Tue, 31 Mar 2015 01:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1427766255!12461300!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13591 invoked from network); 31 Mar 2015 01:44:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 31 Mar 2015 01:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclDz-0007bk-9Q for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YclDz-00075r-2v for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:15 +0000 Date: Tue, 31 Mar 2015 01:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] honor MEMF_no_refcount in alloc_heap_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 4a49a29776520ebe7685978e0c8982b1491bc202 Author: Jan Beulich AuthorDate: Thu Mar 26 08:37:08 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:37:08 2015 +0100 honor MEMF_no_refcount in alloc_heap_pages() Non-anonymous allocations with this flag set should - for the purpose of the availability check - be treated just like anonymous ones, as they wouldn't lead to a reduction of ->outstanding_pages. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 17294e69c4cd299da7ba3ca8077e24be76bd61b1 master date: 2015-02-26 13:58:54 +0100 --- xen/common/page_alloc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 5cbdeb7..e951a0a 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -600,7 +600,8 @@ static struct page_info *alloc_heap_pages( */ if ( (outstanding_claims + request > total_avail_pages + tmem_freeable_pages()) && - (d == NULL || d->outstanding_pages < request) ) + ((memflags & MEMF_no_refcount) || + !d || d->outstanding_pages < request) ) goto not_found; /* -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 31 01:44:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 01: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 1YclE3-0003TM-7G; Tue, 31 Mar 2015 01:44:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclE1-0003TD-VJ for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:18 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 67/99-30165-1FBF9155; Tue, 31 Mar 2015 01:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1427766255!12461300!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13591 invoked from network); 31 Mar 2015 01:44:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 31 Mar 2015 01:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclDz-0007bk-9Q for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YclDz-00075r-2v for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:15 +0000 Date: Tue, 31 Mar 2015 01:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] honor MEMF_no_refcount in alloc_heap_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 4a49a29776520ebe7685978e0c8982b1491bc202 Author: Jan Beulich AuthorDate: Thu Mar 26 08:37:08 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:37:08 2015 +0100 honor MEMF_no_refcount in alloc_heap_pages() Non-anonymous allocations with this flag set should - for the purpose of the availability check - be treated just like anonymous ones, as they wouldn't lead to a reduction of ->outstanding_pages. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 17294e69c4cd299da7ba3ca8077e24be76bd61b1 master date: 2015-02-26 13:58:54 +0100 --- xen/common/page_alloc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 5cbdeb7..e951a0a 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -600,7 +600,8 @@ static struct page_info *alloc_heap_pages( */ if ( (outstanding_claims + request > total_avail_pages + tmem_freeable_pages()) && - (d == NULL || d->outstanding_pages < request) ) + ((memflags & MEMF_no_refcount) || + !d || d->outstanding_pages < request) ) goto not_found; /* -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 31 01:44:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 01:44:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEE-0003Ui-9z; Tue, 31 Mar 2015 01:44:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEC-0003UT-8Y for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:28 +0000 Content-Length: 3561 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 0B/A7-19484-BFBF9155; Tue, 31 Mar 2015 01:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1427766265!9855211!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19645 invoked from network); 31 Mar 2015 01:44:26 -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; 31 Mar 2015 01:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclE9-0007bt-Ds for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YclE9-00076D-CC for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:25 +0000 Date: Tue, 31 Mar 2015 01:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] VT-d: print_vtd_entries() should cope with superpages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6111806577973568842==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6111806577973568842== Content-Length: 3181 Content-Transfer-Encoding: quoted-printable commit b39e48d67a3baf2b3ce823df09bbfc044d7d5678 Author: Jan Beulich AuthorDate: Thu Mar 26 08:37:56 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:37:56 2015 +0100 VT-d: print_vtd_entries() should cope with superpages Even if VT-d code alone (i.e. when not sharing tables with EPT) still doesn't support superpages, this function - invoked upon DMA remapping faults - needs to cope with such. While at it also replace a few more plain numbers with suitable named constants. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Acked-by: Kevin Tian master commit: 92cf6c2456dc428694ed95b6b1dec5bb84319790 master date: 2015-03-09 14:00:19 +0100 --- xen/drivers/passthrough/vtd/iommu.h | 12 ++++++++---- xen/drivers/passthrough/vtd/utils.c | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index a90f81a..8215654 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -268,18 +268,22 @@ struct dma_pte { }; #define DMA_PTE_READ (1) #define DMA_PTE_WRITE (2) +#define DMA_PTE_PROT (DMA_PTE_READ | DMA_PTE_WRITE) +#define DMA_PTE_SP (1 << 7) #define DMA_PTE_SNP (1 << 11) #define dma_clear_pte(p) do {(p).val =3D 0;} while(0) #define dma_set_pte_readable(p) do {(p).val |=3D DMA_PTE_READ;} while(0) #define dma_set_pte_writable(p) do {(p).val |=3D DMA_PTE_WRITE;} while(0) -#define dma_set_pte_superpage(p) do {(p).val |=3D (1 << 7);} while(0) +#define dma_set_pte_superpage(p) do {(p).val |=3D DMA_PTE_SP;} while(0) #define dma_set_pte_snp(p) do {(p).val |=3D DMA_PTE_SNP;} while(0) -#define dma_set_pte_prot(p, prot) \ - do {(p).val =3D ((p).val & ~3) | ((prot) & 3); } while (0) +#define dma_set_pte_prot(p, prot) do { \ + (p).val =3D ((p).val & ~DMA_PTE_PROT) | ((prot) & DMA_PTE_PROT); \ + } while (0) #define dma_pte_addr(p) ((p).val & PADDR_MASK & PAGE_MASK_4K) #define dma_set_pte_addr(p, addr) do {\ (p).val |=3D ((addr) & PAGE_MASK_4K); } while (0) -#define dma_pte_present(p) (((p).val & 3) !=3D 0) +#define dma_pte_present(p) (((p).val & DMA_PTE_PROT) !=3D 0) +#define dma_pte_superpage(p) (((p).val & DMA_PTE_SP) !=3D 0) /* interrupt remap entry */ struct iremap_entry { diff --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/vtd/utils.c index db4c326..bd14c02 100644 --- a/xen/drivers/passthrough/vtd/utils.c +++ b/xen/drivers/passthrough/vtd/utils.c @@ -179,6 +179,8 @@ void print_vtd_entries(struct iommu *iommu, int bus, int devfn, u64 gmfn) printk(" l%d[%x] not present\n", level, l_index); break; } + if ( dma_pte_superpage(pte) ) + break; val =3D dma_pte_addr(pte); } while ( --level ); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 --===============6111806577973568842== 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 --===============6111806577973568842==-- From xen-changelog-bounces@lists.xen.org Tue Mar 31 01:44:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 01:44:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEE-0003Ui-9z; Tue, 31 Mar 2015 01:44:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEC-0003UT-8Y for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:28 +0000 Content-Length: 3561 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 0B/A7-19484-BFBF9155; Tue, 31 Mar 2015 01:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1427766265!9855211!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19645 invoked from network); 31 Mar 2015 01:44:26 -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; 31 Mar 2015 01:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclE9-0007bt-Ds for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YclE9-00076D-CC for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:25 +0000 Date: Tue, 31 Mar 2015 01:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] VT-d: print_vtd_entries() should cope with superpages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6111806577973568842==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6111806577973568842== Content-Length: 3181 Content-Transfer-Encoding: quoted-printable commit b39e48d67a3baf2b3ce823df09bbfc044d7d5678 Author: Jan Beulich AuthorDate: Thu Mar 26 08:37:56 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:37:56 2015 +0100 VT-d: print_vtd_entries() should cope with superpages Even if VT-d code alone (i.e. when not sharing tables with EPT) still doesn't support superpages, this function - invoked upon DMA remapping faults - needs to cope with such. While at it also replace a few more plain numbers with suitable named constants. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Acked-by: Kevin Tian master commit: 92cf6c2456dc428694ed95b6b1dec5bb84319790 master date: 2015-03-09 14:00:19 +0100 --- xen/drivers/passthrough/vtd/iommu.h | 12 ++++++++---- xen/drivers/passthrough/vtd/utils.c | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index a90f81a..8215654 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -268,18 +268,22 @@ struct dma_pte { }; #define DMA_PTE_READ (1) #define DMA_PTE_WRITE (2) +#define DMA_PTE_PROT (DMA_PTE_READ | DMA_PTE_WRITE) +#define DMA_PTE_SP (1 << 7) #define DMA_PTE_SNP (1 << 11) #define dma_clear_pte(p) do {(p).val =3D 0;} while(0) #define dma_set_pte_readable(p) do {(p).val |=3D DMA_PTE_READ;} while(0) #define dma_set_pte_writable(p) do {(p).val |=3D DMA_PTE_WRITE;} while(0) -#define dma_set_pte_superpage(p) do {(p).val |=3D (1 << 7);} while(0) +#define dma_set_pte_superpage(p) do {(p).val |=3D DMA_PTE_SP;} while(0) #define dma_set_pte_snp(p) do {(p).val |=3D DMA_PTE_SNP;} while(0) -#define dma_set_pte_prot(p, prot) \ - do {(p).val =3D ((p).val & ~3) | ((prot) & 3); } while (0) +#define dma_set_pte_prot(p, prot) do { \ + (p).val =3D ((p).val & ~DMA_PTE_PROT) | ((prot) & DMA_PTE_PROT); \ + } while (0) #define dma_pte_addr(p) ((p).val & PADDR_MASK & PAGE_MASK_4K) #define dma_set_pte_addr(p, addr) do {\ (p).val |=3D ((addr) & PAGE_MASK_4K); } while (0) -#define dma_pte_present(p) (((p).val & 3) !=3D 0) +#define dma_pte_present(p) (((p).val & DMA_PTE_PROT) !=3D 0) +#define dma_pte_superpage(p) (((p).val & DMA_PTE_SP) !=3D 0) /* interrupt remap entry */ struct iremap_entry { diff --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/vtd/utils.c index db4c326..bd14c02 100644 --- a/xen/drivers/passthrough/vtd/utils.c +++ b/xen/drivers/passthrough/vtd/utils.c @@ -179,6 +179,8 @@ void print_vtd_entries(struct iommu *iommu, int bus, int devfn, u64 gmfn) printk(" l%d[%x] not present\n", level, l_index); break; } + if ( dma_pte_superpage(pte) ) + break; val =3D dma_pte_addr(pte); } while ( --level ); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 --===============6111806577973568842== 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 --===============6111806577973568842==-- From xen-changelog-bounces@lists.xen.org Tue Mar 31 01:44:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 01:44: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 1YclEN-0003WF-Cb; Tue, 31 Mar 2015 01:44:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEM-0003Vz-5Y for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:38 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 14/C4-23827-50CF9155; Tue, 31 Mar 2015 01:44:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1427766275!14410561!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32732 invoked from network); 31 Mar 2015 01:44:36 -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; 31 Mar 2015 01:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEJ-0007c1-JC for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YclEJ-00077G-Hj for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:35 +0000 Date: Tue, 31 Mar 2015 01:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] EFI: fix getting EFI variable list on some systems X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 21a97a7de7f0b2f633169235444c0ebcbb6cbf9b Author: Ross Lagerwall AuthorDate: Thu Mar 26 08:38:35 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:38:35 2015 +0100 EFI: fix getting EFI variable list on some systems Copy the entire output buffer to the guest because some firmwares update size on successful calls (contrary to the spec) and the buffer may contain data beyond the output size that the firmware requires on a subsequent GetNextVariableName() call (e.g. a NULL character). Note that this shouldn't change the amount of data copied because on success, a compliant firmware does not change size and so the entire buffer is copied anyway. If size is changed, Xen does not copy the buffer. Without this change, the following (simplified) sequence would occur: GetNextVariableName: in \0, size 1024 || out AdminPw\0, size 7 GetNextVariableName: in AdminPw\0, size 1024 || out UserPw\0, size 6 GetNextVariableName: in UserPww\0, size 1024 || NOT FOUND This was seen on an Intel S1200RP_SE with firmware S1200RP.86B.02.02.0005.102320140911, version 4.6, date 2014-10-23. Signed-off-by: Ross Lagerwall Reviewed-by: Andrew Cooper master commit: 1f4eb9d27d0ebd62a0b6cdff8213726f5ae8f25c master date: 2015-03-10 13:52:01 +0100 --- xen/arch/x86/efi/runtime.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/efi/runtime.c b/xen/arch/x86/efi/runtime.c index ff6a49c..7fd7431 100644 --- a/xen/arch/x86/efi/runtime.c +++ b/xen/arch/x86/efi/runtime.c @@ -508,9 +508,13 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) cast_guid(&op->u.get_next_variable_name.vendor_guid)); efi_rs_leave(cr3); + /* + * Copy the variable name if necessary. The caller provided size + * is used because some firmwares update size when they shouldn't. + * */ if ( !EFI_ERROR(status) && - copy_to_guest(op->u.get_next_variable_name.name, - name.raw, size) ) + __copy_to_guest(op->u.get_next_variable_name.name, + name.raw, op->u.get_next_variable_name.size) ) rc = -EFAULT; op->u.get_next_variable_name.size = size; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 31 01:44:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 01:44: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 1YclEN-0003WF-Cb; Tue, 31 Mar 2015 01:44:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEM-0003Vz-5Y for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:38 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 14/C4-23827-50CF9155; Tue, 31 Mar 2015 01:44:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1427766275!14410561!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32732 invoked from network); 31 Mar 2015 01:44:36 -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; 31 Mar 2015 01:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEJ-0007c1-JC for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YclEJ-00077G-Hj for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:35 +0000 Date: Tue, 31 Mar 2015 01:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] EFI: fix getting EFI variable list on some systems X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 21a97a7de7f0b2f633169235444c0ebcbb6cbf9b Author: Ross Lagerwall AuthorDate: Thu Mar 26 08:38:35 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:38:35 2015 +0100 EFI: fix getting EFI variable list on some systems Copy the entire output buffer to the guest because some firmwares update size on successful calls (contrary to the spec) and the buffer may contain data beyond the output size that the firmware requires on a subsequent GetNextVariableName() call (e.g. a NULL character). Note that this shouldn't change the amount of data copied because on success, a compliant firmware does not change size and so the entire buffer is copied anyway. If size is changed, Xen does not copy the buffer. Without this change, the following (simplified) sequence would occur: GetNextVariableName: in \0, size 1024 || out AdminPw\0, size 7 GetNextVariableName: in AdminPw\0, size 1024 || out UserPw\0, size 6 GetNextVariableName: in UserPww\0, size 1024 || NOT FOUND This was seen on an Intel S1200RP_SE with firmware S1200RP.86B.02.02.0005.102320140911, version 4.6, date 2014-10-23. Signed-off-by: Ross Lagerwall Reviewed-by: Andrew Cooper master commit: 1f4eb9d27d0ebd62a0b6cdff8213726f5ae8f25c master date: 2015-03-10 13:52:01 +0100 --- xen/arch/x86/efi/runtime.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/efi/runtime.c b/xen/arch/x86/efi/runtime.c index ff6a49c..7fd7431 100644 --- a/xen/arch/x86/efi/runtime.c +++ b/xen/arch/x86/efi/runtime.c @@ -508,9 +508,13 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) cast_guid(&op->u.get_next_variable_name.vendor_guid)); efi_rs_leave(cr3); + /* + * Copy the variable name if necessary. The caller provided size + * is used because some firmwares update size when they shouldn't. + * */ if ( !EFI_ERROR(status) && - copy_to_guest(op->u.get_next_variable_name.name, - name.raw, size) ) + __copy_to_guest(op->u.get_next_variable_name.name, + name.raw, op->u.get_next_variable_name.size) ) rc = -EFAULT; op->u.get_next_variable_name.size = size; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 31 01:44:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 01:44:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEX-0003Xr-FF; Tue, 31 Mar 2015 01:44:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEW-0003Xg-St for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:49 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 7E/D7-19484-01CF9155; Tue, 31 Mar 2015 01:44:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1427766286!12777449!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.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15834 invoked from network); 31 Mar 2015 01:44:47 -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; 31 Mar 2015 01:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclET-0007c7-T2 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YclET-00077c-N7 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:45 +0000 Date: Tue, 31 Mar 2015 01:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/EFI: allow reboot= overrides when running under EFI X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 42b446ed8d540057cd39f3bff945127939fa1cb6 Author: Konrad Rzeszutek Wilk AuthorDate: Thu Mar 26 08:40:12 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:40:12 2015 +0100 x86/EFI: allow reboot= overrides when running under EFI By default we will always use EFI reboot mechanism when running under EFI platforms. However some EFI platforms are buggy and need to use the ACPI mechanism to reboot (such as Lenovo ThinkCentre M57). As such respect the 'reboot=' override and DMI overrides for EFI platforms. Signed-off-by: Konrad Rzeszutek Wilk - BOOT_INVALID is just zero - also consider acpi_disabled in BOOT_INVALID resolution - duplicate BOOT_INVALID resolution in machine_restart() - don't fall back from BOOT_ACPI to BOOT_EFI (if it was overridden, it surely was for a reason) - adjust doc change formatting Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper x86/EFI: fix reboot after c643fb110a acpi_disabled needs to be moved out of .init.data. Reported-by: Ross Lagerwall From: Konrad Rzeszutek Wilk Signed-off-by: Jan Beulich Tested-by: Ross Lagerwall master commit: c643fb110a51693e82a36ca9178d54f0b9744024 master date: 2015-03-13 11:25:52 +0100 master commit: 8ff330ec11e471919621bce97c069b83b0319d15 master date: 2015-03-23 18:01:51 +0100 --- docs/misc/xen-command-line.markdown | 7 ++++++- xen/arch/x86/setup.c | 2 +- xen/arch/x86/shutdown.c | 34 +++++++++++++++++++++++++++++----- xen/include/xen/lib.h | 2 ++ 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 7cfa303..304588e 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -789,7 +789,7 @@ This option can be specified more than once (up to 8 times at present). > `= ` ### reboot -> `= t[riple] | k[bd] | n[o] [, [w]arm | [c]old]` +> `= t[riple] | k[bd] | a[cpi] | p[ci] | e[fi] | n[o] [, [w]arm | [c]old]` Default: `0` @@ -805,6 +805,11 @@ Specify the host reboot method. `acpi` instructs Xen to reboot the host using RESET_REG in the ACPI FADT. +`pci` instructs Xen to reboot the host using PCI reset register (port CF9). + +'efi' instructs Xen to reboot using the EFI reboot call (in EFI mode by + default it will use that method first). + ### sched > `= credit | credit2 | sedf | arinc653` diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index b49256d..a6c3fed 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -103,7 +103,7 @@ struct cpuinfo_x86 __read_mostly boot_cpu_data = { 0, 0, 0, 0, -1 }; unsigned long __read_mostly mmu_cr4_features = X86_CR4_PSE | X86_CR4_PGE | X86_CR4_PAE; -bool_t __initdata acpi_disabled; +bool_t __read_mostly acpi_disabled; bool_t __initdata acpi_force; static char __initdata acpi_param[10] = ""; static void __init parse_acpi_param(char *s) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 6eba271..a2f3428 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -28,25 +28,29 @@ #include enum reboot_type { + BOOT_INVALID, BOOT_TRIPLE = 't', BOOT_KBD = 'k', BOOT_ACPI = 'a', BOOT_CF9 = 'p', + BOOT_EFI = 'e', }; static long no_idt[2]; static int reboot_mode; /* - * reboot=b[ios] | t[riple] | k[bd] | n[o] [, [w]arm | [c]old] + * reboot=t[riple] | k[bd] | a[cpi] | p[ci] | n[o] | [e]fi [, [w]arm | [c]old] * warm Don't set the cold reboot flag * cold Set the cold reboot flag + * no Suppress automatic reboot after panics or crashes * triple Force a triple fault (init) * kbd Use the keyboard controller. cold reset (default) * acpi Use the RESET_REG in the FADT * pci Use the so-called "PCI reset register", CF9 + * efi Use the EFI reboot (if running under EFI) */ -static enum reboot_type reboot_type = BOOT_ACPI; +static enum reboot_type reboot_type = BOOT_INVALID; static void __init set_reboot_type(char *str) { for ( ; ; ) @@ -63,6 +67,7 @@ static void __init set_reboot_type(char *str) reboot_mode = 0x0; break; case 'a': + case 'e': case 'k': case 't': case 'p': @@ -101,6 +106,14 @@ void machine_halt(void) __machine_halt(NULL); } +static void default_reboot_type(void) +{ + if ( reboot_type == BOOT_INVALID ) + reboot_type = efi_enabled ? BOOT_EFI + : acpi_disabled ? BOOT_KBD + : BOOT_ACPI; +} + static int __init override_reboot(struct dmi_system_id *d) { enum reboot_type type = (long)d->driver_data; @@ -447,6 +460,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { static int __init reboot_init(void) { + default_reboot_type(); dmi_check_system(reboot_dmi_table); return 0; } @@ -460,7 +474,7 @@ static void __machine_restart(void *pdelay) void machine_restart(unsigned int delay_millisecs) { unsigned int i, attempt; - enum reboot_type orig_reboot_type = reboot_type; + enum reboot_type orig_reboot_type; watchdog_disable(); console_start_sync(); @@ -495,15 +509,20 @@ void machine_restart(unsigned int delay_millisecs) tboot_shutdown(TB_SHUTDOWN_REBOOT); } - efi_reset_system(reboot_mode != 0); + /* Just in case reboot_init() didn't run yet. */ + default_reboot_type(); + orig_reboot_type = reboot_type; /* Rebooting needs to touch the page at absolute address 0. */ - *((unsigned short *)__va(0x472)) = reboot_mode; + if ( reboot_type != BOOT_EFI ) + *((unsigned short *)__va(0x472)) = reboot_mode; for ( attempt = 0; ; attempt++ ) { switch ( reboot_type ) { + case BOOT_INVALID: + ASSERT_UNREACHABLE(); case BOOT_KBD: /* Pulse the keyboard reset line. */ for ( i = 0; i < 100; i++ ) @@ -523,6 +542,11 @@ void machine_restart(unsigned int delay_millisecs) reboot_type = (((attempt == 1) && (orig_reboot_type == BOOT_ACPI)) ? BOOT_ACPI : BOOT_TRIPLE); break; + case BOOT_EFI: + reboot_type = acpi_disabled ? BOOT_KBD : BOOT_ACPI; + efi_reset_system(reboot_mode != 0); + *((unsigned short *)__va(0x472)) = reboot_mode; + break; case BOOT_TRIPLE: asm volatile ( "lidt %0 ; int3" : "=m" (no_idt) ); reboot_type = BOOT_KBD; diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 5b258fd..8f5d104 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -41,9 +41,11 @@ do { \ #ifndef NDEBUG #define ASSERT(p) \ do { if ( unlikely(!(p)) ) assert_failed(#p); } while (0) +#define ASSERT_UNREACHABLE() assert_failed("unreachable") #define debug_build() 1 #else #define ASSERT(p) do { if ( 0 && (p) ); } while (0) +#define ASSERT_UNREACHABLE() do { } while (0) #define debug_build() 0 #endif -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 31 01:44:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 01:44:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEX-0003Xr-FF; Tue, 31 Mar 2015 01:44:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEW-0003Xg-St for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:49 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 7E/D7-19484-01CF9155; Tue, 31 Mar 2015 01:44:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1427766286!12777449!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.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15834 invoked from network); 31 Mar 2015 01:44:47 -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; 31 Mar 2015 01:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclET-0007c7-T2 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YclET-00077c-N7 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:45 +0000 Date: Tue, 31 Mar 2015 01:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/EFI: allow reboot= overrides when running under EFI X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 42b446ed8d540057cd39f3bff945127939fa1cb6 Author: Konrad Rzeszutek Wilk AuthorDate: Thu Mar 26 08:40:12 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:40:12 2015 +0100 x86/EFI: allow reboot= overrides when running under EFI By default we will always use EFI reboot mechanism when running under EFI platforms. However some EFI platforms are buggy and need to use the ACPI mechanism to reboot (such as Lenovo ThinkCentre M57). As such respect the 'reboot=' override and DMI overrides for EFI platforms. Signed-off-by: Konrad Rzeszutek Wilk - BOOT_INVALID is just zero - also consider acpi_disabled in BOOT_INVALID resolution - duplicate BOOT_INVALID resolution in machine_restart() - don't fall back from BOOT_ACPI to BOOT_EFI (if it was overridden, it surely was for a reason) - adjust doc change formatting Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper x86/EFI: fix reboot after c643fb110a acpi_disabled needs to be moved out of .init.data. Reported-by: Ross Lagerwall From: Konrad Rzeszutek Wilk Signed-off-by: Jan Beulich Tested-by: Ross Lagerwall master commit: c643fb110a51693e82a36ca9178d54f0b9744024 master date: 2015-03-13 11:25:52 +0100 master commit: 8ff330ec11e471919621bce97c069b83b0319d15 master date: 2015-03-23 18:01:51 +0100 --- docs/misc/xen-command-line.markdown | 7 ++++++- xen/arch/x86/setup.c | 2 +- xen/arch/x86/shutdown.c | 34 +++++++++++++++++++++++++++++----- xen/include/xen/lib.h | 2 ++ 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 7cfa303..304588e 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -789,7 +789,7 @@ This option can be specified more than once (up to 8 times at present). > `= ` ### reboot -> `= t[riple] | k[bd] | n[o] [, [w]arm | [c]old]` +> `= t[riple] | k[bd] | a[cpi] | p[ci] | e[fi] | n[o] [, [w]arm | [c]old]` Default: `0` @@ -805,6 +805,11 @@ Specify the host reboot method. `acpi` instructs Xen to reboot the host using RESET_REG in the ACPI FADT. +`pci` instructs Xen to reboot the host using PCI reset register (port CF9). + +'efi' instructs Xen to reboot using the EFI reboot call (in EFI mode by + default it will use that method first). + ### sched > `= credit | credit2 | sedf | arinc653` diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index b49256d..a6c3fed 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -103,7 +103,7 @@ struct cpuinfo_x86 __read_mostly boot_cpu_data = { 0, 0, 0, 0, -1 }; unsigned long __read_mostly mmu_cr4_features = X86_CR4_PSE | X86_CR4_PGE | X86_CR4_PAE; -bool_t __initdata acpi_disabled; +bool_t __read_mostly acpi_disabled; bool_t __initdata acpi_force; static char __initdata acpi_param[10] = ""; static void __init parse_acpi_param(char *s) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 6eba271..a2f3428 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -28,25 +28,29 @@ #include enum reboot_type { + BOOT_INVALID, BOOT_TRIPLE = 't', BOOT_KBD = 'k', BOOT_ACPI = 'a', BOOT_CF9 = 'p', + BOOT_EFI = 'e', }; static long no_idt[2]; static int reboot_mode; /* - * reboot=b[ios] | t[riple] | k[bd] | n[o] [, [w]arm | [c]old] + * reboot=t[riple] | k[bd] | a[cpi] | p[ci] | n[o] | [e]fi [, [w]arm | [c]old] * warm Don't set the cold reboot flag * cold Set the cold reboot flag + * no Suppress automatic reboot after panics or crashes * triple Force a triple fault (init) * kbd Use the keyboard controller. cold reset (default) * acpi Use the RESET_REG in the FADT * pci Use the so-called "PCI reset register", CF9 + * efi Use the EFI reboot (if running under EFI) */ -static enum reboot_type reboot_type = BOOT_ACPI; +static enum reboot_type reboot_type = BOOT_INVALID; static void __init set_reboot_type(char *str) { for ( ; ; ) @@ -63,6 +67,7 @@ static void __init set_reboot_type(char *str) reboot_mode = 0x0; break; case 'a': + case 'e': case 'k': case 't': case 'p': @@ -101,6 +106,14 @@ void machine_halt(void) __machine_halt(NULL); } +static void default_reboot_type(void) +{ + if ( reboot_type == BOOT_INVALID ) + reboot_type = efi_enabled ? BOOT_EFI + : acpi_disabled ? BOOT_KBD + : BOOT_ACPI; +} + static int __init override_reboot(struct dmi_system_id *d) { enum reboot_type type = (long)d->driver_data; @@ -447,6 +460,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { static int __init reboot_init(void) { + default_reboot_type(); dmi_check_system(reboot_dmi_table); return 0; } @@ -460,7 +474,7 @@ static void __machine_restart(void *pdelay) void machine_restart(unsigned int delay_millisecs) { unsigned int i, attempt; - enum reboot_type orig_reboot_type = reboot_type; + enum reboot_type orig_reboot_type; watchdog_disable(); console_start_sync(); @@ -495,15 +509,20 @@ void machine_restart(unsigned int delay_millisecs) tboot_shutdown(TB_SHUTDOWN_REBOOT); } - efi_reset_system(reboot_mode != 0); + /* Just in case reboot_init() didn't run yet. */ + default_reboot_type(); + orig_reboot_type = reboot_type; /* Rebooting needs to touch the page at absolute address 0. */ - *((unsigned short *)__va(0x472)) = reboot_mode; + if ( reboot_type != BOOT_EFI ) + *((unsigned short *)__va(0x472)) = reboot_mode; for ( attempt = 0; ; attempt++ ) { switch ( reboot_type ) { + case BOOT_INVALID: + ASSERT_UNREACHABLE(); case BOOT_KBD: /* Pulse the keyboard reset line. */ for ( i = 0; i < 100; i++ ) @@ -523,6 +542,11 @@ void machine_restart(unsigned int delay_millisecs) reboot_type = (((attempt == 1) && (orig_reboot_type == BOOT_ACPI)) ? BOOT_ACPI : BOOT_TRIPLE); break; + case BOOT_EFI: + reboot_type = acpi_disabled ? BOOT_KBD : BOOT_ACPI; + efi_reset_system(reboot_mode != 0); + *((unsigned short *)__va(0x472)) = reboot_mode; + break; case BOOT_TRIPLE: asm volatile ( "lidt %0 ; int3" : "=m" (no_idt) ); reboot_type = BOOT_KBD; diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 5b258fd..8f5d104 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -41,9 +41,11 @@ do { \ #ifndef NDEBUG #define ASSERT(p) \ do { if ( unlikely(!(p)) ) assert_failed(#p); } while (0) +#define ASSERT_UNREACHABLE() assert_failed("unreachable") #define debug_build() 1 #else #define ASSERT(p) do { if ( 0 && (p) ); } while (0) +#define ASSERT_UNREACHABLE() do { } while (0) #define debug_build() 0 #endif -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 31 01:45:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 01:45: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 1YclEl-0003Zd-Hy; Tue, 31 Mar 2015 01:45:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEj-0003ZR-Lk for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:45:02 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 87/67-07318-C1CF9155; Tue, 31 Mar 2015 01:45:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1427766296!12441993!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15777 invoked from network); 31 Mar 2015 01:44:57 -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; 31 Mar 2015 01:44:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEe-0007cG-15 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YclEe-00077y-08 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:56 +0000 Date: Tue, 31 Mar 2015 01:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Revert "cpupools: update domU's node-affinity on the cpupool_unassign_cpu() path" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77da6c2de65de3b00e5181cd26a3869744555ea4 Author: Jan Beulich AuthorDate: Thu Mar 26 08:41:03 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:41:03 2015 +0100 Revert "cpupools: update domU's node-affinity on the cpupool_unassign_cpu() path" This reverts commit 93be8285a79c6cbbf66c8681fec1d1bfb71d84cc. At the point this patch calls domain_update_node_affinity(), the vcpu hard affinities have not yet been updated; so calling it at this point can in some circumstances trigger an ASSERT(). domain_update_node_affinity() is already called in cpu_disable_scheduler(), so adding it to cpupool_unassign_cpu() is redundant. Simply reverting the patch is sufficient. Acked-by: George Dunlap --- xen/common/cpupool.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 53a1394..2c283b9 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -379,12 +379,6 @@ int cpupool_unassign_cpu(struct cpupool *c, unsigned int cpu) atomic_inc(&c->refcnt); cpupool_cpu_moving = c; cpumask_clear_cpu(cpu, c->cpu_valid); - - rcu_read_lock(&domlist_read_lock); - for_each_domain_in_cpupool(d, c) - domain_update_node_affinity(d); - rcu_read_unlock(&domlist_read_lock); - spin_unlock(&cpupool_lock); work_cpu = smp_processor_id(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 31 01:45:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 01:45: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 1YclEl-0003Zd-Hy; Tue, 31 Mar 2015 01:45:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEj-0003ZR-Lk for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:45:02 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 87/67-07318-C1CF9155; Tue, 31 Mar 2015 01:45:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1427766296!12441993!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15777 invoked from network); 31 Mar 2015 01:44:57 -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; 31 Mar 2015 01:44:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEe-0007cG-15 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YclEe-00077y-08 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:44:56 +0000 Date: Tue, 31 Mar 2015 01:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Revert "cpupools: update domU's node-affinity on the cpupool_unassign_cpu() path" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77da6c2de65de3b00e5181cd26a3869744555ea4 Author: Jan Beulich AuthorDate: Thu Mar 26 08:41:03 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:41:03 2015 +0100 Revert "cpupools: update domU's node-affinity on the cpupool_unassign_cpu() path" This reverts commit 93be8285a79c6cbbf66c8681fec1d1bfb71d84cc. At the point this patch calls domain_update_node_affinity(), the vcpu hard affinities have not yet been updated; so calling it at this point can in some circumstances trigger an ASSERT(). domain_update_node_affinity() is already called in cpu_disable_scheduler(), so adding it to cpupool_unassign_cpu() is redundant. Simply reverting the patch is sufficient. Acked-by: George Dunlap --- xen/common/cpupool.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 53a1394..2c283b9 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -379,12 +379,6 @@ int cpupool_unassign_cpu(struct cpupool *c, unsigned int cpu) atomic_inc(&c->refcnt); cpupool_cpu_moving = c; cpumask_clear_cpu(cpu, c->cpu_valid); - - rcu_read_lock(&domlist_read_lock); - for_each_domain_in_cpupool(d, c) - domain_update_node_affinity(d); - rcu_read_unlock(&domlist_read_lock); - spin_unlock(&cpupool_lock); work_cpu = smp_processor_id(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Mar 31 01:45:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 01:45:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEr-0003ak-KQ; Tue, 31 Mar 2015 01:45:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEq-0003aa-QL for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:45:08 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 09/A7-12069-42CF9155; Tue, 31 Mar 2015 01:45:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1427766306!10029502!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19989 invoked from network); 31 Mar 2015 01:45:07 -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; 31 Mar 2015 01:45:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEo-0007dE-B5 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:45:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YclEo-00078c-44 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:45:06 +0000 Date: Tue, 31 Mar 2015 01:45:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: don't apply reboot quirks if reboot set by user X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fc6fe18f1511d4b393057c60a2e6b05ccd963e90 Author: Ross Lagerwall AuthorDate: Thu Mar 26 08:41:44 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:41:44 2015 +0100 x86: don't apply reboot quirks if reboot set by user If reboot= is specified on the command-line, don't apply reboot quirks to allow the command-line option to take precedence. This is a port of Linux commit 5955633e91bf ("x86/reboot: Skip DMI checks if reboot set by user"). Signed-off-by: Ross Lagerwall Leverage (and make apply on top of) c643fb110a ("x86/EFI: allow reboot= overrides when running under EFI"). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 9832f5e8e3575f8affceb2751f7422704bf7b446 master date: 2015-03-13 12:41:51 +0100 --- xen/arch/x86/shutdown.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index a2f3428..68fabc7 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -460,6 +460,13 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { static int __init reboot_init(void) { + /* + * Only do the DMI check if reboot_type hasn't been overridden + * on the command line + */ + if ( reboot_type != BOOT_INVALID ) + return 0; + default_reboot_type(); dmi_check_system(reboot_dmi_table); return 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 Tue Mar 31 01:45:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 01:45:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEr-0003ak-KQ; Tue, 31 Mar 2015 01:45:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEq-0003aa-QL for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:45:08 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 09/A7-12069-42CF9155; Tue, 31 Mar 2015 01:45:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1427766306!10029502!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19989 invoked from network); 31 Mar 2015 01:45:07 -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; 31 Mar 2015 01:45:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YclEo-0007dE-B5 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:45:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YclEo-00078c-44 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 01:45:06 +0000 Date: Tue, 31 Mar 2015 01:45:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: don't apply reboot quirks if reboot set by user X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fc6fe18f1511d4b393057c60a2e6b05ccd963e90 Author: Ross Lagerwall AuthorDate: Thu Mar 26 08:41:44 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:41:44 2015 +0100 x86: don't apply reboot quirks if reboot set by user If reboot= is specified on the command-line, don't apply reboot quirks to allow the command-line option to take precedence. This is a port of Linux commit 5955633e91bf ("x86/reboot: Skip DMI checks if reboot set by user"). Signed-off-by: Ross Lagerwall Leverage (and make apply on top of) c643fb110a ("x86/EFI: allow reboot= overrides when running under EFI"). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 9832f5e8e3575f8affceb2751f7422704bf7b446 master date: 2015-03-13 12:41:51 +0100 --- xen/arch/x86/shutdown.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index a2f3428..68fabc7 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -460,6 +460,13 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { static int __init reboot_init(void) { + /* + * Only do the DMI check if reboot_type hasn't been overridden + * on the command line + */ + if ( reboot_type != BOOT_INVALID ) + return 0; + default_reboot_type(); dmi_check_system(reboot_dmi_table); return 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 Tue Mar 31 08:44:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 08:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcrmO-0003UV-1Y; Tue, 31 Mar 2015 08:44:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcrmM-0003UN-Ib for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:10 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id AB/88-26324-95E5A155; Tue, 31 Mar 2015 08:44:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1427791445!12518435!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4135 invoked from network); 31 Mar 2015 08:44:06 -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; 31 Mar 2015 08:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcrmF-0004XU-JI for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YcrmF-0005cO-Bp for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:03 +0000 Date: Tue, 31 Mar 2015 08:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] honor MEMF_no_refcount in alloc_heap_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 483c6cd2945fd05ec54ef9c3b0c9c8b8020959ba Author: Jan Beulich AuthorDate: Thu Mar 26 08:18:29 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:18:29 2015 +0100 honor MEMF_no_refcount in alloc_heap_pages() Non-anonymous allocations with this flag set should - for the purpose of the availability check - be treated just like anonymous ones, as they wouldn't lead to a reduction of ->outstanding_pages. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 17294e69c4cd299da7ba3ca8077e24be76bd61b1 master date: 2015-02-26 13:58:54 +0100 --- xen/common/page_alloc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 7b4092d..24a759c 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -617,7 +617,8 @@ static struct page_info *alloc_heap_pages( */ if ( (outstanding_claims + request > total_avail_pages + tmem_freeable_pages()) && - (d == NULL || d->outstanding_pages < request) ) + ((memflags & MEMF_no_refcount) || + !d || d->outstanding_pages < request) ) goto not_found; /* -- 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 Mar 31 08:44:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 08:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcrmO-0003UV-1Y; Tue, 31 Mar 2015 08:44:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcrmM-0003UN-Ib for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:10 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id AB/88-26324-95E5A155; Tue, 31 Mar 2015 08:44:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1427791445!12518435!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4135 invoked from network); 31 Mar 2015 08:44:06 -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; 31 Mar 2015 08:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcrmF-0004XU-JI for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YcrmF-0005cO-Bp for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:03 +0000 Date: Tue, 31 Mar 2015 08:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] honor MEMF_no_refcount in alloc_heap_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 483c6cd2945fd05ec54ef9c3b0c9c8b8020959ba Author: Jan Beulich AuthorDate: Thu Mar 26 08:18:29 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:18:29 2015 +0100 honor MEMF_no_refcount in alloc_heap_pages() Non-anonymous allocations with this flag set should - for the purpose of the availability check - be treated just like anonymous ones, as they wouldn't lead to a reduction of ->outstanding_pages. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 17294e69c4cd299da7ba3ca8077e24be76bd61b1 master date: 2015-02-26 13:58:54 +0100 --- xen/common/page_alloc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 7b4092d..24a759c 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -617,7 +617,8 @@ static struct page_info *alloc_heap_pages( */ if ( (outstanding_claims + request > total_avail_pages + tmem_freeable_pages()) && - (d == NULL || d->outstanding_pages < request) ) + ((memflags & MEMF_no_refcount) || + !d || d->outstanding_pages < request) ) goto not_found; /* -- 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 Mar 31 08:44:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 08:44:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcrmW-0003VY-47; Tue, 31 Mar 2015 08:44:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcrmU-0003VH-Ag for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:18 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id F6/9F-25453-16E5A155; Tue, 31 Mar 2015 08:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1427791456!7402889!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23403 invoked from network); 31 Mar 2015 08:44:17 -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; 31 Mar 2015 08:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcrmR-0004Xc-S3 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YcrmR-0005cy-N8 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:15 +0000 Date: Tue, 31 Mar 2015 08:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] complete conversion set_bit() -> __cpumask_set_cpu() by 4aaca0e9cd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5bbd39daee372e3b12eec50169b54870cfec9e03 Author: Jan Beulich AuthorDate: Thu Mar 26 08:20:11 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:20:11 2015 +0100 complete conversion set_bit() -> __cpumask_set_cpu() by 4aaca0e9cd While converting to __cpumask_set_cpu() was correct, the first argument passed should have been corrected to be "cpu" instead of "nr" at once. The wrong construct results in problems on systems with relatively few CPUs. Reported-by: Sander Eikelenboom Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell master commit: 5dbdf33c57e3c95125b92f86d847ed8432e28f1c master date: 2015-02-27 16:09:27 +0100 --- xen/common/softirq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/softirq.c b/xen/common/softirq.c index 22e417a..33d5d86 100644 --- a/xen/common/softirq.c +++ b/xen/common/softirq.c @@ -106,7 +106,7 @@ void cpu_raise_softirq(unsigned int cpu, unsigned int nr) if ( !per_cpu(batching, this_cpu) || in_irq() ) smp_send_event_check_cpu(cpu); else - set_bit(nr, &per_cpu(batch_mask, this_cpu)); + cpumask_set_cpu(cpu, &per_cpu(batch_mask, this_cpu)); } void cpu_raise_softirq_batch_begin(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 Tue Mar 31 08:44:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 08:44:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcrmW-0003VY-47; Tue, 31 Mar 2015 08:44:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcrmU-0003VH-Ag for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:18 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id F6/9F-25453-16E5A155; Tue, 31 Mar 2015 08:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1427791456!7402889!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23403 invoked from network); 31 Mar 2015 08:44:17 -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; 31 Mar 2015 08:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcrmR-0004Xc-S3 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YcrmR-0005cy-N8 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:15 +0000 Date: Tue, 31 Mar 2015 08:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] complete conversion set_bit() -> __cpumask_set_cpu() by 4aaca0e9cd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5bbd39daee372e3b12eec50169b54870cfec9e03 Author: Jan Beulich AuthorDate: Thu Mar 26 08:20:11 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:20:11 2015 +0100 complete conversion set_bit() -> __cpumask_set_cpu() by 4aaca0e9cd While converting to __cpumask_set_cpu() was correct, the first argument passed should have been corrected to be "cpu" instead of "nr" at once. The wrong construct results in problems on systems with relatively few CPUs. Reported-by: Sander Eikelenboom Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell master commit: 5dbdf33c57e3c95125b92f86d847ed8432e28f1c master date: 2015-02-27 16:09:27 +0100 --- xen/common/softirq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/softirq.c b/xen/common/softirq.c index 22e417a..33d5d86 100644 --- a/xen/common/softirq.c +++ b/xen/common/softirq.c @@ -106,7 +106,7 @@ void cpu_raise_softirq(unsigned int cpu, unsigned int nr) if ( !per_cpu(batching, this_cpu) || in_irq() ) smp_send_event_check_cpu(cpu); else - set_bit(nr, &per_cpu(batch_mask, this_cpu)); + cpumask_set_cpu(cpu, &per_cpu(batch_mask, this_cpu)); } void cpu_raise_softirq_batch_begin(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 Tue Mar 31 08:44:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 08:44:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrmg-0003XF-6g; Tue, 31 Mar 2015 08:44:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrme-0003Wx-VO for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:29 +0000 Content-Length: 3561 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id CC/B5-14673-C6E5A155; Tue, 31 Mar 2015 08:44:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1427791466!8121958!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13690 invoked from network); 31 Mar 2015 08:44:27 -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; 31 Mar 2015 08:44:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrmc-0004Xm-0J for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Ycrmb-0005dO-Ug for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:25 +0000 Date: Tue, 31 Mar 2015 08:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] VT-d: print_vtd_entries() should cope with superpages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7933679600830215492==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7933679600830215492== Content-Length: 3181 Content-Transfer-Encoding: quoted-printable commit b7386502a228cc4f18fd119182baa211f9c71892 Author: Jan Beulich AuthorDate: Thu Mar 26 08:21:03 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:21:03 2015 +0100 VT-d: print_vtd_entries() should cope with superpages Even if VT-d code alone (i.e. when not sharing tables with EPT) still doesn't support superpages, this function - invoked upon DMA remapping faults - needs to cope with such. While at it also replace a few more plain numbers with suitable named constants. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Acked-by: Kevin Tian master commit: 92cf6c2456dc428694ed95b6b1dec5bb84319790 master date: 2015-03-09 14:00:19 +0100 --- xen/drivers/passthrough/vtd/iommu.h | 12 ++++++++---- xen/drivers/passthrough/vtd/utils.c | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index c3e5181..d6e6520 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -268,18 +268,22 @@ struct dma_pte { }; #define DMA_PTE_READ (1) #define DMA_PTE_WRITE (2) +#define DMA_PTE_PROT (DMA_PTE_READ | DMA_PTE_WRITE) +#define DMA_PTE_SP (1 << 7) #define DMA_PTE_SNP (1 << 11) #define dma_clear_pte(p) do {(p).val =3D 0;} while(0) #define dma_set_pte_readable(p) do {(p).val |=3D DMA_PTE_READ;} while(0) #define dma_set_pte_writable(p) do {(p).val |=3D DMA_PTE_WRITE;} while(0) -#define dma_set_pte_superpage(p) do {(p).val |=3D (1 << 7);} while(0) +#define dma_set_pte_superpage(p) do {(p).val |=3D DMA_PTE_SP;} while(0) #define dma_set_pte_snp(p) do {(p).val |=3D DMA_PTE_SNP;} while(0) -#define dma_set_pte_prot(p, prot) \ - do {(p).val =3D ((p).val & ~3) | ((prot) & 3); } while (0) +#define dma_set_pte_prot(p, prot) do { \ + (p).val =3D ((p).val & ~DMA_PTE_PROT) | ((prot) & DMA_PTE_PROT); \ + } while (0) #define dma_pte_addr(p) ((p).val & PADDR_MASK & PAGE_MASK_4K) #define dma_set_pte_addr(p, addr) do {\ (p).val |=3D ((addr) & PAGE_MASK_4K); } while (0) -#define dma_pte_present(p) (((p).val & 3) !=3D 0) +#define dma_pte_present(p) (((p).val & DMA_PTE_PROT) !=3D 0) +#define dma_pte_superpage(p) (((p).val & DMA_PTE_SP) !=3D 0) /* interrupt remap entry */ struct iremap_entry { diff --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/vtd/utils.c index db4c326..bd14c02 100644 --- a/xen/drivers/passthrough/vtd/utils.c +++ b/xen/drivers/passthrough/vtd/utils.c @@ -179,6 +179,8 @@ void print_vtd_entries(struct iommu *iommu, int bus, int devfn, u64 gmfn) printk(" l%d[%x] not present\n", level, l_index); break; } + if ( dma_pte_superpage(pte) ) + break; val =3D dma_pte_addr(pte); } while ( --level ); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 --===============7933679600830215492== 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 --===============7933679600830215492==-- From xen-changelog-bounces@lists.xen.org Tue Mar 31 08:44:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 08:44:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrmg-0003XF-6g; Tue, 31 Mar 2015 08:44:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrme-0003Wx-VO for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:29 +0000 Content-Length: 3561 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id CC/B5-14673-C6E5A155; Tue, 31 Mar 2015 08:44:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1427791466!8121958!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13690 invoked from network); 31 Mar 2015 08:44:27 -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; 31 Mar 2015 08:44:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrmc-0004Xm-0J for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Ycrmb-0005dO-Ug for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:25 +0000 Date: Tue, 31 Mar 2015 08:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] VT-d: print_vtd_entries() should cope with superpages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7933679600830215492==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7933679600830215492== Content-Length: 3181 Content-Transfer-Encoding: quoted-printable commit b7386502a228cc4f18fd119182baa211f9c71892 Author: Jan Beulich AuthorDate: Thu Mar 26 08:21:03 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:21:03 2015 +0100 VT-d: print_vtd_entries() should cope with superpages Even if VT-d code alone (i.e. when not sharing tables with EPT) still doesn't support superpages, this function - invoked upon DMA remapping faults - needs to cope with such. While at it also replace a few more plain numbers with suitable named constants. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Acked-by: Kevin Tian master commit: 92cf6c2456dc428694ed95b6b1dec5bb84319790 master date: 2015-03-09 14:00:19 +0100 --- xen/drivers/passthrough/vtd/iommu.h | 12 ++++++++---- xen/drivers/passthrough/vtd/utils.c | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index c3e5181..d6e6520 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -268,18 +268,22 @@ struct dma_pte { }; #define DMA_PTE_READ (1) #define DMA_PTE_WRITE (2) +#define DMA_PTE_PROT (DMA_PTE_READ | DMA_PTE_WRITE) +#define DMA_PTE_SP (1 << 7) #define DMA_PTE_SNP (1 << 11) #define dma_clear_pte(p) do {(p).val =3D 0;} while(0) #define dma_set_pte_readable(p) do {(p).val |=3D DMA_PTE_READ;} while(0) #define dma_set_pte_writable(p) do {(p).val |=3D DMA_PTE_WRITE;} while(0) -#define dma_set_pte_superpage(p) do {(p).val |=3D (1 << 7);} while(0) +#define dma_set_pte_superpage(p) do {(p).val |=3D DMA_PTE_SP;} while(0) #define dma_set_pte_snp(p) do {(p).val |=3D DMA_PTE_SNP;} while(0) -#define dma_set_pte_prot(p, prot) \ - do {(p).val =3D ((p).val & ~3) | ((prot) & 3); } while (0) +#define dma_set_pte_prot(p, prot) do { \ + (p).val =3D ((p).val & ~DMA_PTE_PROT) | ((prot) & DMA_PTE_PROT); \ + } while (0) #define dma_pte_addr(p) ((p).val & PADDR_MASK & PAGE_MASK_4K) #define dma_set_pte_addr(p, addr) do {\ (p).val |=3D ((addr) & PAGE_MASK_4K); } while (0) -#define dma_pte_present(p) (((p).val & 3) !=3D 0) +#define dma_pte_present(p) (((p).val & DMA_PTE_PROT) !=3D 0) +#define dma_pte_superpage(p) (((p).val & DMA_PTE_SP) !=3D 0) /* interrupt remap entry */ struct iremap_entry { diff --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/vtd/utils.c index db4c326..bd14c02 100644 --- a/xen/drivers/passthrough/vtd/utils.c +++ b/xen/drivers/passthrough/vtd/utils.c @@ -179,6 +179,8 @@ void print_vtd_entries(struct iommu *iommu, int bus, int devfn, u64 gmfn) printk(" l%d[%x] not present\n", level, l_index); break; } + if ( dma_pte_superpage(pte) ) + break; val =3D dma_pte_addr(pte); } while ( --level ); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 --===============7933679600830215492== 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 --===============7933679600830215492==-- From xen-changelog-bounces@lists.xen.org Tue Mar 31 08:44:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 08: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 1Ycrmq-0003Z1-9O; Tue, 31 Mar 2015 08:44:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrmo-0003Yi-KO for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:38 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id BC/F2-20070-57E5A155; Tue, 31 Mar 2015 08:44:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1427791476!5222751!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29304 invoked from network); 31 Mar 2015 08:44:37 -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; 31 Mar 2015 08:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrmm-0004Xu-54 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Ycrmm-0005eS-42 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:36 +0000 Date: Tue, 31 Mar 2015 08:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] EFI: fix getting EFI variable list on some systems X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 68e434b45547b1f8aca730d9c20169a4a6b82ac1 Author: Ross Lagerwall AuthorDate: Thu Mar 26 08:21:40 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:21:40 2015 +0100 EFI: fix getting EFI variable list on some systems Copy the entire output buffer to the guest because some firmwares update size on successful calls (contrary to the spec) and the buffer may contain data beyond the output size that the firmware requires on a subsequent GetNextVariableName() call (e.g. a NULL character). Note that this shouldn't change the amount of data copied because on success, a compliant firmware does not change size and so the entire buffer is copied anyway. If size is changed, Xen does not copy the buffer. Without this change, the following (simplified) sequence would occur: GetNextVariableName: in \0, size 1024 || out AdminPw\0, size 7 GetNextVariableName: in AdminPw\0, size 1024 || out UserPw\0, size 6 GetNextVariableName: in UserPww\0, size 1024 || NOT FOUND This was seen on an Intel S1200RP_SE with firmware S1200RP.86B.02.02.0005.102320140911, version 4.6, date 2014-10-23. Signed-off-by: Ross Lagerwall Reviewed-by: Andrew Cooper master commit: 1f4eb9d27d0ebd62a0b6cdff8213726f5ae8f25c master date: 2015-03-10 13:52:01 +0100 --- xen/common/efi/runtime.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index c840e08..f5df51e 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -515,9 +515,13 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) cast_guid(&op->u.get_next_variable_name.vendor_guid)); efi_rs_leave(cr3); + /* + * Copy the variable name if necessary. The caller provided size + * is used because some firmwares update size when they shouldn't. + * */ if ( !EFI_ERROR(status) && - copy_to_guest(op->u.get_next_variable_name.name, - name.raw, size) ) + __copy_to_guest(op->u.get_next_variable_name.name, + name.raw, op->u.get_next_variable_name.size) ) rc = -EFAULT; op->u.get_next_variable_name.size = size; } -- 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 Mar 31 08:44:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 08: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 1Ycrmq-0003Z1-9O; Tue, 31 Mar 2015 08:44:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrmo-0003Yi-KO for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:38 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id BC/F2-20070-57E5A155; Tue, 31 Mar 2015 08:44:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1427791476!5222751!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29304 invoked from network); 31 Mar 2015 08:44:37 -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; 31 Mar 2015 08:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrmm-0004Xu-54 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Ycrmm-0005eS-42 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:36 +0000 Date: Tue, 31 Mar 2015 08:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] EFI: fix getting EFI variable list on some systems X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 68e434b45547b1f8aca730d9c20169a4a6b82ac1 Author: Ross Lagerwall AuthorDate: Thu Mar 26 08:21:40 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:21:40 2015 +0100 EFI: fix getting EFI variable list on some systems Copy the entire output buffer to the guest because some firmwares update size on successful calls (contrary to the spec) and the buffer may contain data beyond the output size that the firmware requires on a subsequent GetNextVariableName() call (e.g. a NULL character). Note that this shouldn't change the amount of data copied because on success, a compliant firmware does not change size and so the entire buffer is copied anyway. If size is changed, Xen does not copy the buffer. Without this change, the following (simplified) sequence would occur: GetNextVariableName: in \0, size 1024 || out AdminPw\0, size 7 GetNextVariableName: in AdminPw\0, size 1024 || out UserPw\0, size 6 GetNextVariableName: in UserPww\0, size 1024 || NOT FOUND This was seen on an Intel S1200RP_SE with firmware S1200RP.86B.02.02.0005.102320140911, version 4.6, date 2014-10-23. Signed-off-by: Ross Lagerwall Reviewed-by: Andrew Cooper master commit: 1f4eb9d27d0ebd62a0b6cdff8213726f5ae8f25c master date: 2015-03-10 13:52:01 +0100 --- xen/common/efi/runtime.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index c840e08..f5df51e 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -515,9 +515,13 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) cast_guid(&op->u.get_next_variable_name.vendor_guid)); efi_rs_leave(cr3); + /* + * Copy the variable name if necessary. The caller provided size + * is used because some firmwares update size when they shouldn't. + * */ if ( !EFI_ERROR(status) && - copy_to_guest(op->u.get_next_variable_name.name, - name.raw, size) ) + __copy_to_guest(op->u.get_next_variable_name.name, + name.raw, op->u.get_next_variable_name.size) ) rc = -EFAULT; op->u.get_next_variable_name.size = size; } -- 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 Mar 31 08:44:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 08:44: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 1Ycrn1-0003ay-CX; Tue, 31 Mar 2015 08:44:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrmz-0003aW-2X for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:49 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 1B/8B-22533-08E5A155; Tue, 31 Mar 2015 08:44:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1427791486!14490809!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.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12233 invoked from network); 31 Mar 2015 08:44:47 -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; 31 Mar 2015 08:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrmw-0004Y0-A9 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Ycrmw-0005eo-8U for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:46 +0000 Date: Tue, 31 Mar 2015 08:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/EFI: allow reboot= overrides when running under EFI X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 89bdb85c5cf5d71683a4eddd6143ee15cc298655 Author: Konrad Rzeszutek Wilk AuthorDate: Thu Mar 26 08:25:12 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:25:12 2015 +0100 x86/EFI: allow reboot= overrides when running under EFI By default we will always use EFI reboot mechanism when running under EFI platforms. However some EFI platforms are buggy and need to use the ACPI mechanism to reboot (such as Lenovo ThinkCentre M57). As such respect the 'reboot=' override and DMI overrides for EFI platforms. Signed-off-by: Konrad Rzeszutek Wilk - BOOT_INVALID is just zero - also consider acpi_disabled in BOOT_INVALID resolution - duplicate BOOT_INVALID resolution in machine_restart() - don't fall back from BOOT_ACPI to BOOT_EFI (if it was overridden, it surely was for a reason) - adjust doc change formatting Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper x86/EFI: fix reboot after c643fb110a acpi_disabled needs to be moved out of .init.data. Reported-by: Ross Lagerwall From: Konrad Rzeszutek Wilk Signed-off-by: Jan Beulich Tested-by: Ross Lagerwall master commit: c643fb110a51693e82a36ca9178d54f0b9744024 master date: 2015-03-13 11:25:52 +0100 master commit: 8ff330ec11e471919621bce97c069b83b0319d15 master date: 2015-03-23 18:01:51 +0100 --- docs/misc/xen-command-line.markdown | 5 ++++- xen/arch/x86/setup.c | 2 +- xen/arch/x86/shutdown.c | 33 ++++++++++++++++++++++++++++----- xen/include/xen/lib.h | 2 ++ 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 0042e0f..3c2b066 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1091,7 +1091,7 @@ The following resources are available: * `rmid_max` indicates the max value for rmid. ### reboot -> `= t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old]` +> `= t[riple] | k[bd] | a[cpi] | p[ci] | e[fi] | n[o] [, [w]arm | [c]old]` > Default: `0` @@ -1111,6 +1111,9 @@ Specify the host reboot method. `pci` instructs Xen to reboot the host using PCI reset register (port CF9). +'efi' instructs Xen to reboot using the EFI reboot call (in EFI mode by + default it will use that method first). + ### sched > `= credit | credit2 | sedf | arinc653` diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index c27c49c..fefa0b7 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -106,7 +106,7 @@ struct cpuinfo_x86 __read_mostly boot_cpu_data = { 0, 0, 0, 0, -1 }; unsigned long __read_mostly mmu_cr4_features = XEN_MINIMAL_CR4; -bool_t __initdata acpi_disabled; +bool_t __read_mostly acpi_disabled; bool_t __initdata acpi_force; static char __initdata acpi_param[10] = ""; static void __init parse_acpi_param(char *s) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 21f6cf5..d2bb24b 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -28,16 +28,18 @@ #include enum reboot_type { + BOOT_INVALID, BOOT_TRIPLE = 't', BOOT_KBD = 'k', BOOT_ACPI = 'a', BOOT_CF9 = 'p', + BOOT_EFI = 'e', }; static int reboot_mode; /* - * reboot=t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old] + * reboot=t[riple] | k[bd] | a[cpi] | p[ci] | n[o] | [e]fi [, [w]arm | [c]old] * warm Don't set the cold reboot flag * cold Set the cold reboot flag * no Suppress automatic reboot after panics or crashes @@ -45,8 +47,9 @@ static int reboot_mode; * kbd Use the keyboard controller. cold reset (default) * acpi Use the RESET_REG in the FADT * pci Use the so-called "PCI reset register", CF9 + * efi Use the EFI reboot (if running under EFI) */ -static enum reboot_type reboot_type = BOOT_ACPI; +static enum reboot_type reboot_type = BOOT_INVALID; static void __init set_reboot_type(char *str) { for ( ; ; ) @@ -63,6 +66,7 @@ static void __init set_reboot_type(char *str) reboot_mode = 0x0; break; case 'a': + case 'e': case 'k': case 't': case 'p': @@ -106,6 +110,14 @@ void machine_halt(void) __machine_halt(NULL); } +static void default_reboot_type(void) +{ + if ( reboot_type == BOOT_INVALID ) + reboot_type = efi_enabled ? BOOT_EFI + : acpi_disabled ? BOOT_KBD + : BOOT_ACPI; +} + static int __init override_reboot(struct dmi_system_id *d) { enum reboot_type type = (long)d->driver_data; @@ -452,6 +464,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { static int __init reboot_init(void) { + default_reboot_type(); dmi_check_system(reboot_dmi_table); return 0; } @@ -465,7 +478,7 @@ static void noreturn __machine_restart(void *pdelay) void machine_restart(unsigned int delay_millisecs) { unsigned int i, attempt; - enum reboot_type orig_reboot_type = reboot_type; + enum reboot_type orig_reboot_type; const struct desc_ptr no_idt = { 0 }; watchdog_disable(); @@ -504,15 +517,20 @@ void machine_restart(unsigned int delay_millisecs) tboot_shutdown(TB_SHUTDOWN_REBOOT); } - efi_reset_system(reboot_mode != 0); + /* Just in case reboot_init() didn't run yet. */ + default_reboot_type(); + orig_reboot_type = reboot_type; /* Rebooting needs to touch the page at absolute address 0. */ - *((unsigned short *)__va(0x472)) = reboot_mode; + if ( reboot_type != BOOT_EFI ) + *((unsigned short *)__va(0x472)) = reboot_mode; for ( attempt = 0; ; attempt++ ) { switch ( reboot_type ) { + case BOOT_INVALID: + ASSERT_UNREACHABLE(); case BOOT_KBD: /* Pulse the keyboard reset line. */ for ( i = 0; i < 100; i++ ) @@ -532,6 +550,11 @@ void machine_restart(unsigned int delay_millisecs) reboot_type = (((attempt == 1) && (orig_reboot_type == BOOT_ACPI)) ? BOOT_ACPI : BOOT_TRIPLE); break; + case BOOT_EFI: + reboot_type = acpi_disabled ? BOOT_KBD : BOOT_ACPI; + efi_reset_system(reboot_mode != 0); + *((unsigned short *)__va(0x472)) = reboot_mode; + break; case BOOT_TRIPLE: asm volatile ("lidt %0; int3" : : "m" (no_idt)); reboot_type = BOOT_KBD; diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index f11b49e..0bb05e5 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -41,9 +41,11 @@ do { \ #ifndef NDEBUG #define ASSERT(p) \ do { if ( unlikely(!(p)) ) assert_failed(#p); } while (0) +#define ASSERT_UNREACHABLE() assert_failed("unreachable") #define debug_build() 1 #else #define ASSERT(p) do { if ( 0 && (p) ); } while (0) +#define ASSERT_UNREACHABLE() do { } while (0) #define debug_build() 0 #endif -- 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 Mar 31 08:44:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 08:44: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 1Ycrn1-0003ay-CX; Tue, 31 Mar 2015 08:44:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrmz-0003aW-2X for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:49 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 1B/8B-22533-08E5A155; Tue, 31 Mar 2015 08:44:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1427791486!14490809!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.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12233 invoked from network); 31 Mar 2015 08:44:47 -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; 31 Mar 2015 08:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrmw-0004Y0-A9 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Ycrmw-0005eo-8U for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:46 +0000 Date: Tue, 31 Mar 2015 08:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/EFI: allow reboot= overrides when running under EFI X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 89bdb85c5cf5d71683a4eddd6143ee15cc298655 Author: Konrad Rzeszutek Wilk AuthorDate: Thu Mar 26 08:25:12 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:25:12 2015 +0100 x86/EFI: allow reboot= overrides when running under EFI By default we will always use EFI reboot mechanism when running under EFI platforms. However some EFI platforms are buggy and need to use the ACPI mechanism to reboot (such as Lenovo ThinkCentre M57). As such respect the 'reboot=' override and DMI overrides for EFI platforms. Signed-off-by: Konrad Rzeszutek Wilk - BOOT_INVALID is just zero - also consider acpi_disabled in BOOT_INVALID resolution - duplicate BOOT_INVALID resolution in machine_restart() - don't fall back from BOOT_ACPI to BOOT_EFI (if it was overridden, it surely was for a reason) - adjust doc change formatting Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper x86/EFI: fix reboot after c643fb110a acpi_disabled needs to be moved out of .init.data. Reported-by: Ross Lagerwall From: Konrad Rzeszutek Wilk Signed-off-by: Jan Beulich Tested-by: Ross Lagerwall master commit: c643fb110a51693e82a36ca9178d54f0b9744024 master date: 2015-03-13 11:25:52 +0100 master commit: 8ff330ec11e471919621bce97c069b83b0319d15 master date: 2015-03-23 18:01:51 +0100 --- docs/misc/xen-command-line.markdown | 5 ++++- xen/arch/x86/setup.c | 2 +- xen/arch/x86/shutdown.c | 33 ++++++++++++++++++++++++++++----- xen/include/xen/lib.h | 2 ++ 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 0042e0f..3c2b066 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1091,7 +1091,7 @@ The following resources are available: * `rmid_max` indicates the max value for rmid. ### reboot -> `= t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old]` +> `= t[riple] | k[bd] | a[cpi] | p[ci] | e[fi] | n[o] [, [w]arm | [c]old]` > Default: `0` @@ -1111,6 +1111,9 @@ Specify the host reboot method. `pci` instructs Xen to reboot the host using PCI reset register (port CF9). +'efi' instructs Xen to reboot using the EFI reboot call (in EFI mode by + default it will use that method first). + ### sched > `= credit | credit2 | sedf | arinc653` diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index c27c49c..fefa0b7 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -106,7 +106,7 @@ struct cpuinfo_x86 __read_mostly boot_cpu_data = { 0, 0, 0, 0, -1 }; unsigned long __read_mostly mmu_cr4_features = XEN_MINIMAL_CR4; -bool_t __initdata acpi_disabled; +bool_t __read_mostly acpi_disabled; bool_t __initdata acpi_force; static char __initdata acpi_param[10] = ""; static void __init parse_acpi_param(char *s) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 21f6cf5..d2bb24b 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -28,16 +28,18 @@ #include enum reboot_type { + BOOT_INVALID, BOOT_TRIPLE = 't', BOOT_KBD = 'k', BOOT_ACPI = 'a', BOOT_CF9 = 'p', + BOOT_EFI = 'e', }; static int reboot_mode; /* - * reboot=t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old] + * reboot=t[riple] | k[bd] | a[cpi] | p[ci] | n[o] | [e]fi [, [w]arm | [c]old] * warm Don't set the cold reboot flag * cold Set the cold reboot flag * no Suppress automatic reboot after panics or crashes @@ -45,8 +47,9 @@ static int reboot_mode; * kbd Use the keyboard controller. cold reset (default) * acpi Use the RESET_REG in the FADT * pci Use the so-called "PCI reset register", CF9 + * efi Use the EFI reboot (if running under EFI) */ -static enum reboot_type reboot_type = BOOT_ACPI; +static enum reboot_type reboot_type = BOOT_INVALID; static void __init set_reboot_type(char *str) { for ( ; ; ) @@ -63,6 +66,7 @@ static void __init set_reboot_type(char *str) reboot_mode = 0x0; break; case 'a': + case 'e': case 'k': case 't': case 'p': @@ -106,6 +110,14 @@ void machine_halt(void) __machine_halt(NULL); } +static void default_reboot_type(void) +{ + if ( reboot_type == BOOT_INVALID ) + reboot_type = efi_enabled ? BOOT_EFI + : acpi_disabled ? BOOT_KBD + : BOOT_ACPI; +} + static int __init override_reboot(struct dmi_system_id *d) { enum reboot_type type = (long)d->driver_data; @@ -452,6 +464,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { static int __init reboot_init(void) { + default_reboot_type(); dmi_check_system(reboot_dmi_table); return 0; } @@ -465,7 +478,7 @@ static void noreturn __machine_restart(void *pdelay) void machine_restart(unsigned int delay_millisecs) { unsigned int i, attempt; - enum reboot_type orig_reboot_type = reboot_type; + enum reboot_type orig_reboot_type; const struct desc_ptr no_idt = { 0 }; watchdog_disable(); @@ -504,15 +517,20 @@ void machine_restart(unsigned int delay_millisecs) tboot_shutdown(TB_SHUTDOWN_REBOOT); } - efi_reset_system(reboot_mode != 0); + /* Just in case reboot_init() didn't run yet. */ + default_reboot_type(); + orig_reboot_type = reboot_type; /* Rebooting needs to touch the page at absolute address 0. */ - *((unsigned short *)__va(0x472)) = reboot_mode; + if ( reboot_type != BOOT_EFI ) + *((unsigned short *)__va(0x472)) = reboot_mode; for ( attempt = 0; ; attempt++ ) { switch ( reboot_type ) { + case BOOT_INVALID: + ASSERT_UNREACHABLE(); case BOOT_KBD: /* Pulse the keyboard reset line. */ for ( i = 0; i < 100; i++ ) @@ -532,6 +550,11 @@ void machine_restart(unsigned int delay_millisecs) reboot_type = (((attempt == 1) && (orig_reboot_type == BOOT_ACPI)) ? BOOT_ACPI : BOOT_TRIPLE); break; + case BOOT_EFI: + reboot_type = acpi_disabled ? BOOT_KBD : BOOT_ACPI; + efi_reset_system(reboot_mode != 0); + *((unsigned short *)__va(0x472)) = reboot_mode; + break; case BOOT_TRIPLE: asm volatile ("lidt %0; int3" : : "m" (no_idt)); reboot_type = BOOT_KBD; diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index f11b49e..0bb05e5 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -41,9 +41,11 @@ do { \ #ifndef NDEBUG #define ASSERT(p) \ do { if ( unlikely(!(p)) ) assert_failed(#p); } while (0) +#define ASSERT_UNREACHABLE() assert_failed("unreachable") #define debug_build() 1 #else #define ASSERT(p) do { if ( 0 && (p) ); } while (0) +#define ASSERT_UNREACHABLE() do { } while (0) #define debug_build() 0 #endif -- 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 Mar 31 08:45:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 08:45: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 1YcrnA-0003ca-Fu; Tue, 31 Mar 2015 08:45:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrn9-0003cM-6m for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:59 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 3E/E8-23555-A8E5A155; Tue, 31 Mar 2015 08:44:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1427791496!12588638!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4894 invoked from network); 31 Mar 2015 08:44:57 -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; 31 Mar 2015 08:44:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrn6-0004Y9-FQ for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Ycrn6-0005fA-DX for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:56 +0000 Date: Tue, 31 Mar 2015 08:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Revert "cpupools: update domU's node-affinity on the cpupool_unassign_cpu() path" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 969df12d257998ada49eb209ff0224b3b89a253b Author: Jan Beulich AuthorDate: Thu Mar 26 08:26:28 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:26:28 2015 +0100 Revert "cpupools: update domU's node-affinity on the cpupool_unassign_cpu() path" This reverts commit 93be8285a79c6cbbf66c8681fec1d1bfb71d84cc. At the point this patch calls domain_update_node_affinity(), the vcpu hard affinities have not yet been updated; so calling it at this point can in some circumstances trigger an ASSERT(). domain_update_node_affinity() is already called in cpu_disable_scheduler(), so adding it to cpupool_unassign_cpu() is redundant. Simply reverting the patch is sufficient. Acked-by: George Dunlap --- xen/common/cpupool.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index a758a8b..cd6aab9 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -379,12 +379,6 @@ static int cpupool_unassign_cpu(struct cpupool *c, unsigned int cpu) atomic_inc(&c->refcnt); cpupool_cpu_moving = c; cpumask_clear_cpu(cpu, c->cpu_valid); - - rcu_read_lock(&domlist_read_lock); - for_each_domain_in_cpupool(d, c) - domain_update_node_affinity(d); - rcu_read_unlock(&domlist_read_lock); - spin_unlock(&cpupool_lock); work_cpu = smp_processor_id(); -- 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 Mar 31 08:45:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 08:45: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 1YcrnA-0003ca-Fu; Tue, 31 Mar 2015 08:45:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrn9-0003cM-6m for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:59 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 3E/E8-23555-A8E5A155; Tue, 31 Mar 2015 08:44:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1427791496!12588638!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4894 invoked from network); 31 Mar 2015 08:44:57 -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; 31 Mar 2015 08:44:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Ycrn6-0004Y9-FQ for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Ycrn6-0005fA-DX for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:44:56 +0000 Date: Tue, 31 Mar 2015 08:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Revert "cpupools: update domU's node-affinity on the cpupool_unassign_cpu() path" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 969df12d257998ada49eb209ff0224b3b89a253b Author: Jan Beulich AuthorDate: Thu Mar 26 08:26:28 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:26:28 2015 +0100 Revert "cpupools: update domU's node-affinity on the cpupool_unassign_cpu() path" This reverts commit 93be8285a79c6cbbf66c8681fec1d1bfb71d84cc. At the point this patch calls domain_update_node_affinity(), the vcpu hard affinities have not yet been updated; so calling it at this point can in some circumstances trigger an ASSERT(). domain_update_node_affinity() is already called in cpu_disable_scheduler(), so adding it to cpupool_unassign_cpu() is redundant. Simply reverting the patch is sufficient. Acked-by: George Dunlap --- xen/common/cpupool.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index a758a8b..cd6aab9 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -379,12 +379,6 @@ static int cpupool_unassign_cpu(struct cpupool *c, unsigned int cpu) atomic_inc(&c->refcnt); cpupool_cpu_moving = c; cpumask_clear_cpu(cpu, c->cpu_valid); - - rcu_read_lock(&domlist_read_lock); - for_each_domain_in_cpupool(d, c) - domain_update_node_affinity(d); - rcu_read_unlock(&domlist_read_lock); - spin_unlock(&cpupool_lock); work_cpu = smp_processor_id(); -- 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 Mar 31 08:45:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 08: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 1YcrnM-0003fW-3j; Tue, 31 Mar 2015 08:45:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcrnK-0003f1-Ht for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:45:10 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 39/BB-09816-59E5A155; Tue, 31 Mar 2015 08:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1427791508!9067289!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30384 invoked from network); 31 Mar 2015 08:45:09 -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; 31 Mar 2015 08:45:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcrnH-0004ZD-Uw for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:45:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YcrnG-0005gQ-IV for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:45:07 +0000 Date: Tue, 31 Mar 2015 08:45:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86: don't apply reboot quirks if reboot set by user X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7fe1c1b28581686aca42361d4fee740c643dde1b Author: Ross Lagerwall AuthorDate: Thu Mar 26 08:27:13 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:27:13 2015 +0100 x86: don't apply reboot quirks if reboot set by user If reboot= is specified on the command-line, don't apply reboot quirks to allow the command-line option to take precedence. This is a port of Linux commit 5955633e91bf ("x86/reboot: Skip DMI checks if reboot set by user"). Signed-off-by: Ross Lagerwall Leverage (and make apply on top of) c643fb110a ("x86/EFI: allow reboot= overrides when running under EFI"). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 9832f5e8e3575f8affceb2751f7422704bf7b446 master date: 2015-03-13 12:41:51 +0100 --- xen/arch/x86/shutdown.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index d2bb24b..9ec8f97 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -464,6 +464,13 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { static int __init reboot_init(void) { + /* + * Only do the DMI check if reboot_type hasn't been overridden + * on the command line + */ + if ( reboot_type != BOOT_INVALID ) + return 0; + default_reboot_type(); dmi_check_system(reboot_dmi_table); return 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 Tue Mar 31 08:45:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 08: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 1YcrnM-0003fW-3j; Tue, 31 Mar 2015 08:45:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcrnK-0003f1-Ht for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:45:10 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 39/BB-09816-59E5A155; Tue, 31 Mar 2015 08:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1427791508!9067289!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30384 invoked from network); 31 Mar 2015 08:45:09 -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; 31 Mar 2015 08:45:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcrnH-0004ZD-Uw for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:45:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YcrnG-0005gQ-IV for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 08:45:07 +0000 Date: Tue, 31 Mar 2015 08:45:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86: don't apply reboot quirks if reboot set by user X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7fe1c1b28581686aca42361d4fee740c643dde1b Author: Ross Lagerwall AuthorDate: Thu Mar 26 08:27:13 2015 +0100 Commit: Jan Beulich CommitDate: Thu Mar 26 08:27:13 2015 +0100 x86: don't apply reboot quirks if reboot set by user If reboot= is specified on the command-line, don't apply reboot quirks to allow the command-line option to take precedence. This is a port of Linux commit 5955633e91bf ("x86/reboot: Skip DMI checks if reboot set by user"). Signed-off-by: Ross Lagerwall Leverage (and make apply on top of) c643fb110a ("x86/EFI: allow reboot= overrides when running under EFI"). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 9832f5e8e3575f8affceb2751f7422704bf7b446 master date: 2015-03-13 12:41:51 +0100 --- xen/arch/x86/shutdown.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index d2bb24b..9ec8f97 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -464,6 +464,13 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { static int __init reboot_init(void) { + /* + * Only do the DMI check if reboot_type hasn't been overridden + * on the command line + */ + if ( reboot_type != BOOT_INVALID ) + return 0; + default_reboot_type(); dmi_check_system(reboot_dmi_table); return 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 Tue Mar 31 15:33:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 15:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyA6-0000a8-SW; Tue, 31 Mar 2015 15:33:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyA4-0000ZU-UH for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:05 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 77/EB-09361-03EBA155; Tue, 31 Mar 2015 15:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1427815982!12615657!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31960 invoked from network); 31 Mar 2015 15:33:03 -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; 31 Mar 2015 15:33:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyA2-0000u6-6E for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YcyA2-00065r-2T for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:02 +0000 Date: Tue, 31 Mar 2015 15:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] xen: limit guest control of PCI command register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ab42b4408cb4fc4f869d73218e3d2034e6f5e8ac Author: Jan Beulich AuthorDate: Tue Mar 31 16:27:45 2015 +0100 Commit: Ian Jackson CommitDate: Tue Mar 31 16:27:45 2015 +0100 xen: limit guest control of PCI command register Otherwise the guest can abuse that control to cause e.g. PCIe Unsupported Request responses (by disabling memory and/or I/O decoding and subsequently causing [CPU side] accesses to the respective address ranges), which (depending on system configuration) may be fatal to the host. This is CVE-2015-2756 / XSA-126. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini Acked-by: Ian Campbell --- hw/pass-through.c | 54 ++++++++++++++++++---------------------------------- 1 files changed, 19 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 4821182..eb2704b 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -172,9 +172,6 @@ static int pt_word_reg_read(struct pt_dev *ptdev, static int pt_long_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); @@ -286,9 +283,9 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xF880, - .emu_mask = 0x0740, + .emu_mask = 0x0743, .init = pt_common_reg_init, - .u.w.read = pt_cmd_reg_read, + .u.w.read = pt_word_reg_read, .u.w.write = pt_cmd_reg_write, .u.w.restore = pt_cmd_reg_restore, }, @@ -1905,7 +1902,7 @@ static int pt_dev_is_virtfn(struct pci_dev *dev) return rc; } -static int pt_register_regions(struct pt_dev *assigned_device) +static int pt_register_regions(struct pt_dev *assigned_device, uint16_t *cmd) { int i = 0; uint32_t bar_data = 0; @@ -1925,17 +1922,26 @@ static int pt_register_regions(struct pt_dev *assigned_device) /* Register current region */ if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_IO ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_IO, pt_ioport_map); + *cmd |= PCI_COMMAND_IO; + } else if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_MEM_PREFETCH ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM_PREFETCH, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } else + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } PT_LOG("IO region registered (size=0x%08x base_addr=0x%08x)\n", (uint32_t)(pci_dev->size[i]), @@ -3263,27 +3269,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, return 0; } -/* read Command register */ -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = 0; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; - - /* emulate word register */ - valid_emu_mask = emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - /* read BAR */ static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3418,19 +3403,13 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, uint16_t writable_mask = 0; uint16_t throughable_mask = 0; uint16_t wr_value = *value; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; /* modify emulate register */ writable_mask = ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; if (*value & PCI_COMMAND_DISABLE_INTx) { @@ -4211,6 +4190,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, struct pt_dev *assigned_device = NULL; struct pci_dev *pci_dev; uint8_t e_device, e_intx; + uint16_t cmd = 0; char *key, *val; int msi_translate, power_mgmt; @@ -4300,7 +4280,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->dev.config[i] = pci_read_byte(pci_dev, i); /* Handle real device's MMIO/PIO BARs */ - pt_register_regions(assigned_device); + pt_register_regions(assigned_device, &cmd); /* Setup VGA bios for passthroughed gfx */ if ( setup_vga_pt(assigned_device) < 0 ) @@ -4378,6 +4358,10 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, } out: + if (cmd) + pci_write_word(pci_dev, PCI_COMMAND, + *(uint16_t *)(&assigned_device->dev.config[PCI_COMMAND]) | cmd); + PT_LOG("Real physical device %02x:%02x.%x registered successfuly!\n" "IRQ type = %s\n", r_bus, r_dev, r_func, assigned_device->msi_trans_en? "MSI-INTx":"INTx"); -- 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 Tue Mar 31 15:33:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 15:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyA6-0000a8-SW; Tue, 31 Mar 2015 15:33:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyA4-0000ZU-UH for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:05 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 77/EB-09361-03EBA155; Tue, 31 Mar 2015 15:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1427815982!12615657!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31960 invoked from network); 31 Mar 2015 15:33:03 -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; 31 Mar 2015 15:33:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyA2-0000u6-6E for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YcyA2-00065r-2T for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:02 +0000 Date: Tue, 31 Mar 2015 15:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] xen: limit guest control of PCI command register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ab42b4408cb4fc4f869d73218e3d2034e6f5e8ac Author: Jan Beulich AuthorDate: Tue Mar 31 16:27:45 2015 +0100 Commit: Ian Jackson CommitDate: Tue Mar 31 16:27:45 2015 +0100 xen: limit guest control of PCI command register Otherwise the guest can abuse that control to cause e.g. PCIe Unsupported Request responses (by disabling memory and/or I/O decoding and subsequently causing [CPU side] accesses to the respective address ranges), which (depending on system configuration) may be fatal to the host. This is CVE-2015-2756 / XSA-126. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini Acked-by: Ian Campbell --- hw/pass-through.c | 54 ++++++++++++++++++---------------------------------- 1 files changed, 19 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 4821182..eb2704b 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -172,9 +172,6 @@ static int pt_word_reg_read(struct pt_dev *ptdev, static int pt_long_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); @@ -286,9 +283,9 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xF880, - .emu_mask = 0x0740, + .emu_mask = 0x0743, .init = pt_common_reg_init, - .u.w.read = pt_cmd_reg_read, + .u.w.read = pt_word_reg_read, .u.w.write = pt_cmd_reg_write, .u.w.restore = pt_cmd_reg_restore, }, @@ -1905,7 +1902,7 @@ static int pt_dev_is_virtfn(struct pci_dev *dev) return rc; } -static int pt_register_regions(struct pt_dev *assigned_device) +static int pt_register_regions(struct pt_dev *assigned_device, uint16_t *cmd) { int i = 0; uint32_t bar_data = 0; @@ -1925,17 +1922,26 @@ static int pt_register_regions(struct pt_dev *assigned_device) /* Register current region */ if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_IO ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_IO, pt_ioport_map); + *cmd |= PCI_COMMAND_IO; + } else if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_MEM_PREFETCH ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM_PREFETCH, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } else + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } PT_LOG("IO region registered (size=0x%08x base_addr=0x%08x)\n", (uint32_t)(pci_dev->size[i]), @@ -3263,27 +3269,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, return 0; } -/* read Command register */ -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = 0; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; - - /* emulate word register */ - valid_emu_mask = emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - /* read BAR */ static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3418,19 +3403,13 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, uint16_t writable_mask = 0; uint16_t throughable_mask = 0; uint16_t wr_value = *value; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; /* modify emulate register */ writable_mask = ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; if (*value & PCI_COMMAND_DISABLE_INTx) { @@ -4211,6 +4190,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, struct pt_dev *assigned_device = NULL; struct pci_dev *pci_dev; uint8_t e_device, e_intx; + uint16_t cmd = 0; char *key, *val; int msi_translate, power_mgmt; @@ -4300,7 +4280,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->dev.config[i] = pci_read_byte(pci_dev, i); /* Handle real device's MMIO/PIO BARs */ - pt_register_regions(assigned_device); + pt_register_regions(assigned_device, &cmd); /* Setup VGA bios for passthroughed gfx */ if ( setup_vga_pt(assigned_device) < 0 ) @@ -4378,6 +4358,10 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, } out: + if (cmd) + pci_write_word(pci_dev, PCI_COMMAND, + *(uint16_t *)(&assigned_device->dev.config[PCI_COMMAND]) | cmd); + PT_LOG("Real physical device %02x:%02x.%x registered successfuly!\n" "IRQ type = %s\n", r_bus, r_dev, r_func, assigned_device->msi_trans_en? "MSI-INTx":"INTx"); -- 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 Tue Mar 31 15:33:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 15:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyAI-0000cf-1B; Tue, 31 Mar 2015 15:33:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyAF-0000cA-Vh for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:16 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 77/07-27592-B3EBA155; Tue, 31 Mar 2015 15:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1427815993!14624284!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3443 invoked from network); 31 Mar 2015 15:33:14 -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; 31 Mar 2015 15:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyAD-0000u9-7H for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YcyAD-000679-2Y for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:13 +0000 Date: Tue, 31 Mar 2015 15:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen: limit guest control of PCI command register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit edb43a7abbec40fb601140fecdc29d693358963b Author: Jan Beulich AuthorDate: Tue Mar 31 16:27:45 2015 +0100 Commit: Ian Jackson CommitDate: Tue Mar 31 16:31:23 2015 +0100 xen: limit guest control of PCI command register Otherwise the guest can abuse that control to cause e.g. PCIe Unsupported Request responses (by disabling memory and/or I/O decoding and subsequently causing [CPU side] accesses to the respective address ranges), which (depending on system configuration) may be fatal to the host. This is CVE-2015-2756 / XSA-126. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini Acked-by: Ian Campbell (cherry picked from commit ab42b4408cb4fc4f869d73218e3d2034e6f5e8ac) (cherry picked from commit 62e41581f69c3fd4a8f829a773015eb4c17f1f3e) (cherry picked from commit a03c5a74e1774aeabcda55ecbfb2887027787755) --- hw/pass-through.c | 54 ++++++++++++++++++---------------------------------- 1 files changed, 19 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 4821182..eb2704b 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -172,9 +172,6 @@ static int pt_word_reg_read(struct pt_dev *ptdev, static int pt_long_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); @@ -286,9 +283,9 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xF880, - .emu_mask = 0x0740, + .emu_mask = 0x0743, .init = pt_common_reg_init, - .u.w.read = pt_cmd_reg_read, + .u.w.read = pt_word_reg_read, .u.w.write = pt_cmd_reg_write, .u.w.restore = pt_cmd_reg_restore, }, @@ -1905,7 +1902,7 @@ static int pt_dev_is_virtfn(struct pci_dev *dev) return rc; } -static int pt_register_regions(struct pt_dev *assigned_device) +static int pt_register_regions(struct pt_dev *assigned_device, uint16_t *cmd) { int i = 0; uint32_t bar_data = 0; @@ -1925,17 +1922,26 @@ static int pt_register_regions(struct pt_dev *assigned_device) /* Register current region */ if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_IO ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_IO, pt_ioport_map); + *cmd |= PCI_COMMAND_IO; + } else if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_MEM_PREFETCH ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM_PREFETCH, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } else + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } PT_LOG("IO region registered (size=0x%08x base_addr=0x%08x)\n", (uint32_t)(pci_dev->size[i]), @@ -3263,27 +3269,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, return 0; } -/* read Command register */ -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = 0; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; - - /* emulate word register */ - valid_emu_mask = emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - /* read BAR */ static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3418,19 +3403,13 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, uint16_t writable_mask = 0; uint16_t throughable_mask = 0; uint16_t wr_value = *value; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; /* modify emulate register */ writable_mask = ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; if (*value & PCI_COMMAND_DISABLE_INTx) { @@ -4211,6 +4190,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, struct pt_dev *assigned_device = NULL; struct pci_dev *pci_dev; uint8_t e_device, e_intx; + uint16_t cmd = 0; char *key, *val; int msi_translate, power_mgmt; @@ -4300,7 +4280,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->dev.config[i] = pci_read_byte(pci_dev, i); /* Handle real device's MMIO/PIO BARs */ - pt_register_regions(assigned_device); + pt_register_regions(assigned_device, &cmd); /* Setup VGA bios for passthroughed gfx */ if ( setup_vga_pt(assigned_device) < 0 ) @@ -4378,6 +4358,10 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, } out: + if (cmd) + pci_write_word(pci_dev, PCI_COMMAND, + *(uint16_t *)(&assigned_device->dev.config[PCI_COMMAND]) | cmd); + PT_LOG("Real physical device %02x:%02x.%x registered successfuly!\n" "IRQ type = %s\n", r_bus, r_dev, r_func, assigned_device->msi_trans_en? "MSI-INTx":"INTx"); -- 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 Tue Mar 31 15:33:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 15:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyAI-0000cf-1B; Tue, 31 Mar 2015 15:33:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyAF-0000cA-Vh for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:16 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 77/07-27592-B3EBA155; Tue, 31 Mar 2015 15:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1427815993!14624284!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3443 invoked from network); 31 Mar 2015 15:33:14 -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; 31 Mar 2015 15:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyAD-0000u9-7H for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YcyAD-000679-2Y for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:13 +0000 Date: Tue, 31 Mar 2015 15:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] xen: limit guest control of PCI command register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit edb43a7abbec40fb601140fecdc29d693358963b Author: Jan Beulich AuthorDate: Tue Mar 31 16:27:45 2015 +0100 Commit: Ian Jackson CommitDate: Tue Mar 31 16:31:23 2015 +0100 xen: limit guest control of PCI command register Otherwise the guest can abuse that control to cause e.g. PCIe Unsupported Request responses (by disabling memory and/or I/O decoding and subsequently causing [CPU side] accesses to the respective address ranges), which (depending on system configuration) may be fatal to the host. This is CVE-2015-2756 / XSA-126. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini Acked-by: Ian Campbell (cherry picked from commit ab42b4408cb4fc4f869d73218e3d2034e6f5e8ac) (cherry picked from commit 62e41581f69c3fd4a8f829a773015eb4c17f1f3e) (cherry picked from commit a03c5a74e1774aeabcda55ecbfb2887027787755) --- hw/pass-through.c | 54 ++++++++++++++++++---------------------------------- 1 files changed, 19 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 4821182..eb2704b 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -172,9 +172,6 @@ static int pt_word_reg_read(struct pt_dev *ptdev, static int pt_long_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); @@ -286,9 +283,9 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xF880, - .emu_mask = 0x0740, + .emu_mask = 0x0743, .init = pt_common_reg_init, - .u.w.read = pt_cmd_reg_read, + .u.w.read = pt_word_reg_read, .u.w.write = pt_cmd_reg_write, .u.w.restore = pt_cmd_reg_restore, }, @@ -1905,7 +1902,7 @@ static int pt_dev_is_virtfn(struct pci_dev *dev) return rc; } -static int pt_register_regions(struct pt_dev *assigned_device) +static int pt_register_regions(struct pt_dev *assigned_device, uint16_t *cmd) { int i = 0; uint32_t bar_data = 0; @@ -1925,17 +1922,26 @@ static int pt_register_regions(struct pt_dev *assigned_device) /* Register current region */ if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_IO ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_IO, pt_ioport_map); + *cmd |= PCI_COMMAND_IO; + } else if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_MEM_PREFETCH ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM_PREFETCH, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } else + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } PT_LOG("IO region registered (size=0x%08x base_addr=0x%08x)\n", (uint32_t)(pci_dev->size[i]), @@ -3263,27 +3269,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, return 0; } -/* read Command register */ -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = 0; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; - - /* emulate word register */ - valid_emu_mask = emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - /* read BAR */ static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3418,19 +3403,13 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, uint16_t writable_mask = 0; uint16_t throughable_mask = 0; uint16_t wr_value = *value; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; /* modify emulate register */ writable_mask = ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; if (*value & PCI_COMMAND_DISABLE_INTx) { @@ -4211,6 +4190,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, struct pt_dev *assigned_device = NULL; struct pci_dev *pci_dev; uint8_t e_device, e_intx; + uint16_t cmd = 0; char *key, *val; int msi_translate, power_mgmt; @@ -4300,7 +4280,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->dev.config[i] = pci_read_byte(pci_dev, i); /* Handle real device's MMIO/PIO BARs */ - pt_register_regions(assigned_device); + pt_register_regions(assigned_device, &cmd); /* Setup VGA bios for passthroughed gfx */ if ( setup_vga_pt(assigned_device) < 0 ) @@ -4378,6 +4358,10 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, } out: + if (cmd) + pci_write_word(pci_dev, PCI_COMMAND, + *(uint16_t *)(&assigned_device->dev.config[PCI_COMMAND]) | cmd); + PT_LOG("Real physical device %02x:%02x.%x registered successfuly!\n" "IRQ type = %s\n", r_bus, r_dev, r_func, assigned_device->msi_trans_en? "MSI-INTx":"INTx"); -- 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 Tue Mar 31 15:33:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 15:33:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyAW-0000fF-4A; Tue, 31 Mar 2015 15:33:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyAU-0000f1-Ip for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:30 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id CF/AF-02028-94EBA155; Tue, 31 Mar 2015 15:33:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1427816004!12974299!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18813 invoked from network); 31 Mar 2015 15:33:25 -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; 31 Mar 2015 15:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyAO-0000uM-8m for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YcyAN-00067r-UW for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:24 +0000 Date: Tue, 31 Mar 2015 15:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen: limit guest control of PCI command register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a03c5a74e1774aeabcda55ecbfb2887027787755 Author: Jan Beulich AuthorDate: Tue Mar 31 16:27:45 2015 +0100 Commit: Ian Jackson CommitDate: Tue Mar 31 16:30:26 2015 +0100 xen: limit guest control of PCI command register Otherwise the guest can abuse that control to cause e.g. PCIe Unsupported Request responses (by disabling memory and/or I/O decoding and subsequently causing [CPU side] accesses to the respective address ranges), which (depending on system configuration) may be fatal to the host. This is CVE-2015-2756 / XSA-126. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini Acked-by: Ian Campbell (cherry picked from commit ab42b4408cb4fc4f869d73218e3d2034e6f5e8ac) (cherry picked from commit 62e41581f69c3fd4a8f829a773015eb4c17f1f3e) --- hw/pass-through.c | 54 ++++++++++++++++++---------------------------------- 1 files changed, 19 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 4821182..eb2704b 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -172,9 +172,6 @@ static int pt_word_reg_read(struct pt_dev *ptdev, static int pt_long_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); @@ -286,9 +283,9 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xF880, - .emu_mask = 0x0740, + .emu_mask = 0x0743, .init = pt_common_reg_init, - .u.w.read = pt_cmd_reg_read, + .u.w.read = pt_word_reg_read, .u.w.write = pt_cmd_reg_write, .u.w.restore = pt_cmd_reg_restore, }, @@ -1905,7 +1902,7 @@ static int pt_dev_is_virtfn(struct pci_dev *dev) return rc; } -static int pt_register_regions(struct pt_dev *assigned_device) +static int pt_register_regions(struct pt_dev *assigned_device, uint16_t *cmd) { int i = 0; uint32_t bar_data = 0; @@ -1925,17 +1922,26 @@ static int pt_register_regions(struct pt_dev *assigned_device) /* Register current region */ if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_IO ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_IO, pt_ioport_map); + *cmd |= PCI_COMMAND_IO; + } else if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_MEM_PREFETCH ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM_PREFETCH, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } else + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } PT_LOG("IO region registered (size=0x%08x base_addr=0x%08x)\n", (uint32_t)(pci_dev->size[i]), @@ -3263,27 +3269,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, return 0; } -/* read Command register */ -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = 0; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; - - /* emulate word register */ - valid_emu_mask = emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - /* read BAR */ static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3418,19 +3403,13 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, uint16_t writable_mask = 0; uint16_t throughable_mask = 0; uint16_t wr_value = *value; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; /* modify emulate register */ writable_mask = ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; if (*value & PCI_COMMAND_DISABLE_INTx) { @@ -4211,6 +4190,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, struct pt_dev *assigned_device = NULL; struct pci_dev *pci_dev; uint8_t e_device, e_intx; + uint16_t cmd = 0; char *key, *val; int msi_translate, power_mgmt; @@ -4300,7 +4280,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->dev.config[i] = pci_read_byte(pci_dev, i); /* Handle real device's MMIO/PIO BARs */ - pt_register_regions(assigned_device); + pt_register_regions(assigned_device, &cmd); /* Setup VGA bios for passthroughed gfx */ if ( setup_vga_pt(assigned_device) < 0 ) @@ -4378,6 +4358,10 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, } out: + if (cmd) + pci_write_word(pci_dev, PCI_COMMAND, + *(uint16_t *)(&assigned_device->dev.config[PCI_COMMAND]) | cmd); + PT_LOG("Real physical device %02x:%02x.%x registered successfuly!\n" "IRQ type = %s\n", r_bus, r_dev, r_func, assigned_device->msi_trans_en? "MSI-INTx":"INTx"); -- 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 Tue Mar 31 15:33:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 15:33:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyAW-0000fF-4A; Tue, 31 Mar 2015 15:33:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyAU-0000f1-Ip for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:30 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id CF/AF-02028-94EBA155; Tue, 31 Mar 2015 15:33:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1427816004!12974299!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18813 invoked from network); 31 Mar 2015 15:33:25 -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; 31 Mar 2015 15:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyAO-0000uM-8m for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YcyAN-00067r-UW for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:24 +0000 Date: Tue, 31 Mar 2015 15:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] xen: limit guest control of PCI command register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a03c5a74e1774aeabcda55ecbfb2887027787755 Author: Jan Beulich AuthorDate: Tue Mar 31 16:27:45 2015 +0100 Commit: Ian Jackson CommitDate: Tue Mar 31 16:30:26 2015 +0100 xen: limit guest control of PCI command register Otherwise the guest can abuse that control to cause e.g. PCIe Unsupported Request responses (by disabling memory and/or I/O decoding and subsequently causing [CPU side] accesses to the respective address ranges), which (depending on system configuration) may be fatal to the host. This is CVE-2015-2756 / XSA-126. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini Acked-by: Ian Campbell (cherry picked from commit ab42b4408cb4fc4f869d73218e3d2034e6f5e8ac) (cherry picked from commit 62e41581f69c3fd4a8f829a773015eb4c17f1f3e) --- hw/pass-through.c | 54 ++++++++++++++++++---------------------------------- 1 files changed, 19 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 4821182..eb2704b 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -172,9 +172,6 @@ static int pt_word_reg_read(struct pt_dev *ptdev, static int pt_long_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); @@ -286,9 +283,9 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xF880, - .emu_mask = 0x0740, + .emu_mask = 0x0743, .init = pt_common_reg_init, - .u.w.read = pt_cmd_reg_read, + .u.w.read = pt_word_reg_read, .u.w.write = pt_cmd_reg_write, .u.w.restore = pt_cmd_reg_restore, }, @@ -1905,7 +1902,7 @@ static int pt_dev_is_virtfn(struct pci_dev *dev) return rc; } -static int pt_register_regions(struct pt_dev *assigned_device) +static int pt_register_regions(struct pt_dev *assigned_device, uint16_t *cmd) { int i = 0; uint32_t bar_data = 0; @@ -1925,17 +1922,26 @@ static int pt_register_regions(struct pt_dev *assigned_device) /* Register current region */ if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_IO ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_IO, pt_ioport_map); + *cmd |= PCI_COMMAND_IO; + } else if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_MEM_PREFETCH ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM_PREFETCH, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } else + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } PT_LOG("IO region registered (size=0x%08x base_addr=0x%08x)\n", (uint32_t)(pci_dev->size[i]), @@ -3263,27 +3269,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, return 0; } -/* read Command register */ -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = 0; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; - - /* emulate word register */ - valid_emu_mask = emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - /* read BAR */ static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3418,19 +3403,13 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, uint16_t writable_mask = 0; uint16_t throughable_mask = 0; uint16_t wr_value = *value; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; /* modify emulate register */ writable_mask = ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; if (*value & PCI_COMMAND_DISABLE_INTx) { @@ -4211,6 +4190,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, struct pt_dev *assigned_device = NULL; struct pci_dev *pci_dev; uint8_t e_device, e_intx; + uint16_t cmd = 0; char *key, *val; int msi_translate, power_mgmt; @@ -4300,7 +4280,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->dev.config[i] = pci_read_byte(pci_dev, i); /* Handle real device's MMIO/PIO BARs */ - pt_register_regions(assigned_device); + pt_register_regions(assigned_device, &cmd); /* Setup VGA bios for passthroughed gfx */ if ( setup_vga_pt(assigned_device) < 0 ) @@ -4378,6 +4358,10 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, } out: + if (cmd) + pci_write_word(pci_dev, PCI_COMMAND, + *(uint16_t *)(&assigned_device->dev.config[PCI_COMMAND]) | cmd); + PT_LOG("Real physical device %02x:%02x.%x registered successfuly!\n" "IRQ type = %s\n", r_bus, r_dev, r_func, assigned_device->msi_trans_en? "MSI-INTx":"INTx"); -- 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 Tue Mar 31 15:33:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 15:33: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 1YcyAh-0000hy-71; Tue, 31 Mar 2015 15:33:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyAe-0000hY-Ku for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:41 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 42/05-26324-35EBA155; Tue, 31 Mar 2015 15:33:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1427816015!12662748!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32690 invoked from network); 31 Mar 2015 15:33:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 31 Mar 2015 15:33:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyAZ-0000uU-44 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YcyAZ-00069C-2K for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:35 +0000 Date: Tue, 31 Mar 2015 15:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] xen: limit guest control of PCI command register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62e41581f69c3fd4a8f829a773015eb4c17f1f3e Author: Jan Beulich AuthorDate: Tue Mar 31 16:27:45 2015 +0100 Commit: Ian Jackson CommitDate: Tue Mar 31 16:29:42 2015 +0100 xen: limit guest control of PCI command register Otherwise the guest can abuse that control to cause e.g. PCIe Unsupported Request responses (by disabling memory and/or I/O decoding and subsequently causing [CPU side] accesses to the respective address ranges), which (depending on system configuration) may be fatal to the host. This is CVE-2015-2756 / XSA-126. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini Acked-by: Ian Campbell (cherry picked from commit ab42b4408cb4fc4f869d73218e3d2034e6f5e8ac) --- hw/pass-through.c | 54 ++++++++++++++++++---------------------------------- 1 files changed, 19 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 4821182..eb2704b 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -172,9 +172,6 @@ static int pt_word_reg_read(struct pt_dev *ptdev, static int pt_long_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); @@ -286,9 +283,9 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xF880, - .emu_mask = 0x0740, + .emu_mask = 0x0743, .init = pt_common_reg_init, - .u.w.read = pt_cmd_reg_read, + .u.w.read = pt_word_reg_read, .u.w.write = pt_cmd_reg_write, .u.w.restore = pt_cmd_reg_restore, }, @@ -1905,7 +1902,7 @@ static int pt_dev_is_virtfn(struct pci_dev *dev) return rc; } -static int pt_register_regions(struct pt_dev *assigned_device) +static int pt_register_regions(struct pt_dev *assigned_device, uint16_t *cmd) { int i = 0; uint32_t bar_data = 0; @@ -1925,17 +1922,26 @@ static int pt_register_regions(struct pt_dev *assigned_device) /* Register current region */ if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_IO ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_IO, pt_ioport_map); + *cmd |= PCI_COMMAND_IO; + } else if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_MEM_PREFETCH ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM_PREFETCH, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } else + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } PT_LOG("IO region registered (size=0x%08x base_addr=0x%08x)\n", (uint32_t)(pci_dev->size[i]), @@ -3263,27 +3269,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, return 0; } -/* read Command register */ -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = 0; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; - - /* emulate word register */ - valid_emu_mask = emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - /* read BAR */ static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3418,19 +3403,13 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, uint16_t writable_mask = 0; uint16_t throughable_mask = 0; uint16_t wr_value = *value; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; /* modify emulate register */ writable_mask = ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; if (*value & PCI_COMMAND_DISABLE_INTx) { @@ -4211,6 +4190,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, struct pt_dev *assigned_device = NULL; struct pci_dev *pci_dev; uint8_t e_device, e_intx; + uint16_t cmd = 0; char *key, *val; int msi_translate, power_mgmt; @@ -4300,7 +4280,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->dev.config[i] = pci_read_byte(pci_dev, i); /* Handle real device's MMIO/PIO BARs */ - pt_register_regions(assigned_device); + pt_register_regions(assigned_device, &cmd); /* Setup VGA bios for passthroughed gfx */ if ( setup_vga_pt(assigned_device) < 0 ) @@ -4378,6 +4358,10 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, } out: + if (cmd) + pci_write_word(pci_dev, PCI_COMMAND, + *(uint16_t *)(&assigned_device->dev.config[PCI_COMMAND]) | cmd); + PT_LOG("Real physical device %02x:%02x.%x registered successfuly!\n" "IRQ type = %s\n", r_bus, r_dev, r_func, assigned_device->msi_trans_en? "MSI-INTx":"INTx"); -- 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 Tue Mar 31 15:33:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 15:33: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 1YcyAh-0000hy-71; Tue, 31 Mar 2015 15:33:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyAe-0000hY-Ku for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:41 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 42/05-26324-35EBA155; Tue, 31 Mar 2015 15:33:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1427816015!12662748!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32690 invoked from network); 31 Mar 2015 15:33:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 31 Mar 2015 15:33:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyAZ-0000uU-44 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YcyAZ-00069C-2K for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:33:35 +0000 Date: Tue, 31 Mar 2015 15:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] xen: limit guest control of PCI command register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62e41581f69c3fd4a8f829a773015eb4c17f1f3e Author: Jan Beulich AuthorDate: Tue Mar 31 16:27:45 2015 +0100 Commit: Ian Jackson CommitDate: Tue Mar 31 16:29:42 2015 +0100 xen: limit guest control of PCI command register Otherwise the guest can abuse that control to cause e.g. PCIe Unsupported Request responses (by disabling memory and/or I/O decoding and subsequently causing [CPU side] accesses to the respective address ranges), which (depending on system configuration) may be fatal to the host. This is CVE-2015-2756 / XSA-126. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini Acked-by: Ian Campbell (cherry picked from commit ab42b4408cb4fc4f869d73218e3d2034e6f5e8ac) --- hw/pass-through.c | 54 ++++++++++++++++++---------------------------------- 1 files changed, 19 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 4821182..eb2704b 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -172,9 +172,6 @@ static int pt_word_reg_read(struct pt_dev *ptdev, static int pt_long_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); @@ -286,9 +283,9 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xF880, - .emu_mask = 0x0740, + .emu_mask = 0x0743, .init = pt_common_reg_init, - .u.w.read = pt_cmd_reg_read, + .u.w.read = pt_word_reg_read, .u.w.write = pt_cmd_reg_write, .u.w.restore = pt_cmd_reg_restore, }, @@ -1905,7 +1902,7 @@ static int pt_dev_is_virtfn(struct pci_dev *dev) return rc; } -static int pt_register_regions(struct pt_dev *assigned_device) +static int pt_register_regions(struct pt_dev *assigned_device, uint16_t *cmd) { int i = 0; uint32_t bar_data = 0; @@ -1925,17 +1922,26 @@ static int pt_register_regions(struct pt_dev *assigned_device) /* Register current region */ if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_IO ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_IO, pt_ioport_map); + *cmd |= PCI_COMMAND_IO; + } else if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_MEM_PREFETCH ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM_PREFETCH, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } else + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } PT_LOG("IO region registered (size=0x%08x base_addr=0x%08x)\n", (uint32_t)(pci_dev->size[i]), @@ -3263,27 +3269,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, return 0; } -/* read Command register */ -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = 0; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; - - /* emulate word register */ - valid_emu_mask = emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - /* read BAR */ static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3418,19 +3403,13 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, uint16_t writable_mask = 0; uint16_t throughable_mask = 0; uint16_t wr_value = *value; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; /* modify emulate register */ writable_mask = ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; if (*value & PCI_COMMAND_DISABLE_INTx) { @@ -4211,6 +4190,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, struct pt_dev *assigned_device = NULL; struct pci_dev *pci_dev; uint8_t e_device, e_intx; + uint16_t cmd = 0; char *key, *val; int msi_translate, power_mgmt; @@ -4300,7 +4280,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->dev.config[i] = pci_read_byte(pci_dev, i); /* Handle real device's MMIO/PIO BARs */ - pt_register_regions(assigned_device); + pt_register_regions(assigned_device, &cmd); /* Setup VGA bios for passthroughed gfx */ if ( setup_vga_pt(assigned_device) < 0 ) @@ -4378,6 +4358,10 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, } out: + if (cmd) + pci_write_word(pci_dev, PCI_COMMAND, + *(uint16_t *)(&assigned_device->dev.config[PCI_COMMAND]) | cmd); + PT_LOG("Real physical device %02x:%02x.%x registered successfuly!\n" "IRQ type = %s\n", r_bus, r_dev, r_func, assigned_device->msi_trans_en? "MSI-INTx":"INTx"); -- 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 Tue Mar 31 15:44:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 15: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 1YcyKo-0001qk-Gs; Tue, 31 Mar 2015 15: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 1YcyKn-0001qM-Qc for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:44:10 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 4E/CE-24632-9C0CA155; Tue, 31 Mar 2015 15:44:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1427816647!12765895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7908 invoked from network); 31 Mar 2015 15:44:08 -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; 31 Mar 2015 15:44:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyKk-00012G-U0 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:44:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YcyKk-0006dY-Rp for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:44:06 +0000 Date: Tue, 31 Mar 2015 15:44:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen: limit guest control of PCI command register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fb44e83c346436ae8dc07d91dfedb108b8a4e673 Author: Jan Beulich AuthorDate: Tue Mar 31 16:27:45 2015 +0100 Commit: Ian Jackson CommitDate: Tue Mar 31 16:34:27 2015 +0100 xen: limit guest control of PCI command register Otherwise the guest can abuse that control to cause e.g. PCIe Unsupported Request responses (by disabling memory and/or I/O decoding and subsequently causing [CPU side] accesses to the respective address ranges), which (depending on system configuration) may be fatal to the host. This is CVE-2015-2756 / XSA-126. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini Acked-by: Ian Campbell (cherry picked from commit ab42b4408cb4fc4f869d73218e3d2034e6f5e8ac) (cherry picked from commit 62e41581f69c3fd4a8f829a773015eb4c17f1f3e) (cherry picked from commit a03c5a74e1774aeabcda55ecbfb2887027787755) (cherry picked from commit edb43a7abbec40fb601140fecdc29d693358963b) --- hw/pass-through.c | 54 ++++++++++++++++++---------------------------------- 1 files changed, 19 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 304c438..1e06aba 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -172,9 +172,6 @@ static int pt_word_reg_read(struct pt_dev *ptdev, static int pt_long_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); @@ -286,9 +283,9 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xF880, - .emu_mask = 0x0740, + .emu_mask = 0x0743, .init = pt_common_reg_init, - .u.w.read = pt_cmd_reg_read, + .u.w.read = pt_word_reg_read, .u.w.write = pt_cmd_reg_write, .u.w.restore = pt_cmd_reg_restore, }, @@ -1905,7 +1902,7 @@ static int pt_dev_is_virtfn(struct pci_dev *dev) return rc; } -static int pt_register_regions(struct pt_dev *assigned_device) +static int pt_register_regions(struct pt_dev *assigned_device, uint16_t *cmd) { int i = 0; uint32_t bar_data = 0; @@ -1925,17 +1922,26 @@ static int pt_register_regions(struct pt_dev *assigned_device) /* Register current region */ if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_IO ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_IO, pt_ioport_map); + *cmd |= PCI_COMMAND_IO; + } else if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_MEM_PREFETCH ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM_PREFETCH, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } else + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } PT_LOG("IO region registered (size=0x%08x base_addr=0x%08x)\n", (uint32_t)(pci_dev->size[i]), @@ -3263,27 +3269,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, return 0; } -/* read Command register */ -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = 0; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; - - /* emulate word register */ - valid_emu_mask = emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - /* read BAR */ static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3418,19 +3403,13 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, uint16_t writable_mask = 0; uint16_t throughable_mask = 0; uint16_t wr_value = *value; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; /* modify emulate register */ writable_mask = ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; if (*value & PCI_COMMAND_DISABLE_INTx) { @@ -4205,6 +4184,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, struct pt_dev *assigned_device = NULL; struct pci_dev *pci_dev; uint8_t e_device, e_intx; + uint16_t cmd = 0; char *key, *val; int msi_translate, power_mgmt; @@ -4294,7 +4274,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->dev.config[i] = pci_read_byte(pci_dev, i); /* Handle real device's MMIO/PIO BARs */ - pt_register_regions(assigned_device); + pt_register_regions(assigned_device, &cmd); /* Setup VGA bios for passthroughed gfx */ if ( setup_vga_pt(assigned_device) < 0 ) @@ -4372,6 +4352,10 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, } out: + if (cmd) + pci_write_word(pci_dev, PCI_COMMAND, + *(uint16_t *)(&assigned_device->dev.config[PCI_COMMAND]) | cmd); + PT_LOG("Real physical device %02x:%02x.%x registered successfuly!\n" "IRQ type = %s\n", r_bus, r_dev, r_func, assigned_device->msi_trans_en? "MSI-INTx":"INTx"); -- 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 Tue Mar 31 15:44:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 31 Mar 2015 15: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 1YcyKo-0001qk-Gs; Tue, 31 Mar 2015 15: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 1YcyKn-0001qM-Qc for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:44:10 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 4E/CE-24632-9C0CA155; Tue, 31 Mar 2015 15:44:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1427816647!12765895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7908 invoked from network); 31 Mar 2015 15:44:08 -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; 31 Mar 2015 15:44:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YcyKk-00012G-U0 for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:44:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YcyKk-0006dY-Rp for xen-changelog@lists.xensource.com; Tue, 31 Mar 2015 15:44:06 +0000 Date: Tue, 31 Mar 2015 15:44:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] xen: limit guest control of PCI command register X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fb44e83c346436ae8dc07d91dfedb108b8a4e673 Author: Jan Beulich AuthorDate: Tue Mar 31 16:27:45 2015 +0100 Commit: Ian Jackson CommitDate: Tue Mar 31 16:34:27 2015 +0100 xen: limit guest control of PCI command register Otherwise the guest can abuse that control to cause e.g. PCIe Unsupported Request responses (by disabling memory and/or I/O decoding and subsequently causing [CPU side] accesses to the respective address ranges), which (depending on system configuration) may be fatal to the host. This is CVE-2015-2756 / XSA-126. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini Acked-by: Ian Campbell (cherry picked from commit ab42b4408cb4fc4f869d73218e3d2034e6f5e8ac) (cherry picked from commit 62e41581f69c3fd4a8f829a773015eb4c17f1f3e) (cherry picked from commit a03c5a74e1774aeabcda55ecbfb2887027787755) (cherry picked from commit edb43a7abbec40fb601140fecdc29d693358963b) --- hw/pass-through.c | 54 ++++++++++++++++++---------------------------------- 1 files changed, 19 insertions(+), 35 deletions(-) diff --git a/hw/pass-through.c b/hw/pass-through.c index 304c438..1e06aba 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -172,9 +172,6 @@ static int pt_word_reg_read(struct pt_dev *ptdev, static int pt_long_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask); static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, uint32_t *value, uint32_t valid_mask); @@ -286,9 +283,9 @@ static struct pt_reg_info_tbl pt_emu_reg_header0_tbl[] = { .size = 2, .init_val = 0x0000, .ro_mask = 0xF880, - .emu_mask = 0x0740, + .emu_mask = 0x0743, .init = pt_common_reg_init, - .u.w.read = pt_cmd_reg_read, + .u.w.read = pt_word_reg_read, .u.w.write = pt_cmd_reg_write, .u.w.restore = pt_cmd_reg_restore, }, @@ -1905,7 +1902,7 @@ static int pt_dev_is_virtfn(struct pci_dev *dev) return rc; } -static int pt_register_regions(struct pt_dev *assigned_device) +static int pt_register_regions(struct pt_dev *assigned_device, uint16_t *cmd) { int i = 0; uint32_t bar_data = 0; @@ -1925,17 +1922,26 @@ static int pt_register_regions(struct pt_dev *assigned_device) /* Register current region */ if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_IO ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_IO, pt_ioport_map); + *cmd |= PCI_COMMAND_IO; + } else if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_MEM_PREFETCH ) + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM_PREFETCH, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } else + { pci_register_io_region((PCIDevice *)assigned_device, i, (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM, pt_iomem_map); + *cmd |= PCI_COMMAND_MEMORY; + } PT_LOG("IO region registered (size=0x%08x base_addr=0x%08x)\n", (uint32_t)(pci_dev->size[i]), @@ -3263,27 +3269,6 @@ static int pt_long_reg_read(struct pt_dev *ptdev, return 0; } -/* read Command register */ -static int pt_cmd_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint16_t *value, uint16_t valid_mask) -{ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t valid_emu_mask = 0; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; - - /* emulate word register */ - valid_emu_mask = emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); - - return 0; -} - /* read BAR */ static int pt_bar_reg_read(struct pt_dev *ptdev, struct pt_reg_tbl *cfg_entry, @@ -3418,19 +3403,13 @@ static int pt_cmd_reg_write(struct pt_dev *ptdev, uint16_t writable_mask = 0; uint16_t throughable_mask = 0; uint16_t wr_value = *value; - uint16_t emu_mask = reg->emu_mask; - - if ( ptdev->is_virtfn ) - emu_mask |= PCI_COMMAND_MEMORY; - if ( pt_is_iomul(ptdev) ) - emu_mask |= PCI_COMMAND_IO; /* modify emulate register */ writable_mask = ~reg->ro_mask & valid_mask; cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); /* create value for writing to I/O device register */ - throughable_mask = ~emu_mask & valid_mask; + throughable_mask = ~reg->emu_mask & valid_mask; if (*value & PCI_COMMAND_DISABLE_INTx) { @@ -4205,6 +4184,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, struct pt_dev *assigned_device = NULL; struct pci_dev *pci_dev; uint8_t e_device, e_intx; + uint16_t cmd = 0; char *key, *val; int msi_translate, power_mgmt; @@ -4294,7 +4274,7 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, assigned_device->dev.config[i] = pci_read_byte(pci_dev, i); /* Handle real device's MMIO/PIO BARs */ - pt_register_regions(assigned_device); + pt_register_regions(assigned_device, &cmd); /* Setup VGA bios for passthroughed gfx */ if ( setup_vga_pt(assigned_device) < 0 ) @@ -4372,6 +4352,10 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, } out: + if (cmd) + pci_write_word(pci_dev, PCI_COMMAND, + *(uint16_t *)(&assigned_device->dev.config[PCI_COMMAND]) | cmd); + PT_LOG("Real physical device %02x:%02x.%x registered successfuly!\n" "IRQ type = %s\n", r_bus, r_dev, r_func, assigned_device->msi_trans_en? "MSI-INTx":"INTx"); -- 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