From xen-changelog-bounces@lists.xen.org Fri Jan 09 17:11:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Jan 2015 17:11:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y9d5W-0003P3-BT; Fri, 09 Jan 2015 17:11:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y9d5U-0003Oq-Lf for xen-changelog@lists.xensource.com; Fri, 09 Jan 2015 17:11:04 +0000 Content-Length: 2031 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 8A/F3-20609-8AB00B45; Fri, 09 Jan 2015 17:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1420823462!19581374!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16038 invoked from network); 9 Jan 2015 17: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; 9 Jan 2015 17:11:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y9d5S-0002cA-A2 for xen-changelog@lists.xensource.com; Fri, 09 Jan 2015 17:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y9d5S-0003hv-1Q for xen-changelog@lists.xensource.com; Fri, 09 Jan 2015 17:11:02 +0000 Date: Fri, 09 Jan 2015 17:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: prevent use-after-free when destroying 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: multipart/mixed; boundary="===============2825115592622908197==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2825115592622908197== Content-Length: 1624 Content-Transfer-Encoding: quoted-printable commit 95af3f09eeef089e0100a8518f7ca75206e33c7c Author: Mihai Don=C8=9Bu AuthorDate: Tue Jan 6 12:52:21 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 12:52:41 2015 +0000 x86/HVM: prevent use-after-free when destroying a domain hvm_domain_relinquish_resources() can free certain domain resources which can still be accessed, e.g. by HVMOP_set_param, while the domain is being cleaned up. Signed-off-by: Mihai Don=C8=9Bu Tested-by: R=C4=83zvan Cojocaru Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich This is CVE-2015-0361 / XSA-116. (cherry picked from commit 5d4e3ff19c33770ce01bec949c50326b11088fef) --- xen/arch/x86/hvm/hvm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 4be249e..dcac4ad 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -579,13 +579,13 @@ void hvm_domain_relinquish_resources(struct domain *d) hpet_deinit(d); } - xfree(d->arch.hvm_domain.io_handler); - xfree(d->arch.hvm_domain.params); xfree(d->arch.hvm_domain.pbuf); } void hvm_domain_destroy(struct domain *d) { + xfree(d->arch.hvm_domain.io_handler); + xfree(d->arch.hvm_domain.params); hvm_funcs.domain_destroy(d); rtc_deinit(d); stdvga_deinit(d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 --===============2825115592622908197== 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 --===============2825115592622908197==-- From xen-changelog-bounces@lists.xen.org Fri Jan 09 17:11:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Jan 2015 17:11:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y9d5W-0003P3-BT; Fri, 09 Jan 2015 17:11:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y9d5U-0003Oq-Lf for xen-changelog@lists.xensource.com; Fri, 09 Jan 2015 17:11:04 +0000 Content-Length: 2031 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 8A/F3-20609-8AB00B45; Fri, 09 Jan 2015 17:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1420823462!19581374!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16038 invoked from network); 9 Jan 2015 17: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; 9 Jan 2015 17:11:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y9d5S-0002cA-A2 for xen-changelog@lists.xensource.com; Fri, 09 Jan 2015 17:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y9d5S-0003hv-1Q for xen-changelog@lists.xensource.com; Fri, 09 Jan 2015 17:11:02 +0000 Date: Fri, 09 Jan 2015 17:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: prevent use-after-free when destroying 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: multipart/mixed; boundary="===============2825115592622908197==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2825115592622908197== Content-Length: 1624 Content-Transfer-Encoding: quoted-printable commit 95af3f09eeef089e0100a8518f7ca75206e33c7c Author: Mihai Don=C8=9Bu AuthorDate: Tue Jan 6 12:52:21 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 12:52:41 2015 +0000 x86/HVM: prevent use-after-free when destroying a domain hvm_domain_relinquish_resources() can free certain domain resources which can still be accessed, e.g. by HVMOP_set_param, while the domain is being cleaned up. Signed-off-by: Mihai Don=C8=9Bu Tested-by: R=C4=83zvan Cojocaru Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich This is CVE-2015-0361 / XSA-116. (cherry picked from commit 5d4e3ff19c33770ce01bec949c50326b11088fef) --- xen/arch/x86/hvm/hvm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 4be249e..dcac4ad 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -579,13 +579,13 @@ void hvm_domain_relinquish_resources(struct domain *d) hpet_deinit(d); } - xfree(d->arch.hvm_domain.io_handler); - xfree(d->arch.hvm_domain.params); xfree(d->arch.hvm_domain.pbuf); } void hvm_domain_destroy(struct domain *d) { + xfree(d->arch.hvm_domain.io_handler); + xfree(d->arch.hvm_domain.params); hvm_funcs.domain_destroy(d); rtc_deinit(d); stdvga_deinit(d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 --===============2825115592622908197== 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 --===============2825115592622908197==-- From xen-changelog-bounces@lists.xen.org Sat Jan 10 09:33:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jan 2015 09: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 1Y9sPq-0007d3-BD; Sat, 10 Jan 2015 09:33:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y9sPp-0007cw-0y for xen-changelog@lists.xensource.com; Sat, 10 Jan 2015 09:33:05 +0000 Content-Length: 2131 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id FD/D0-09842-0D1F0B45; Sat, 10 Jan 2015 09:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1420882382!20537279!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8598 invoked from network); 10 Jan 2015 09:33:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jan 2015 09:33:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y9sPm-0004Rr-JH for xen-changelog@lists.xensource.com; Sat, 10 Jan 2015 09:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y9sPm-0003UZ-FL for xen-changelog@lists.xensource.com; Sat, 10 Jan 2015 09:33:02 +0000 Date: Sat, 10 Jan 2015 09:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: prevent use-after-free when destroying 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: multipart/mixed; boundary="===============0607798116620251206==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0607798116620251206== Content-Length: 1728 Content-Transfer-Encoding: quoted-printable commit 089dd62211042011e26de1b87b558394cdfe388b Author: Mihai Don=C8=9Bu AuthorDate: Tue Jan 6 12:49:52 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 12:51:37 2015 +0000 x86/HVM: prevent use-after-free when destroying a domain hvm_domain_relinquish_resources() can free certain domain resources which can still be accessed, e.g. by HVMOP_set_param, while the domain is being cleaned up. This is CVE-2015-0361 / XSA-116. Signed-off-by: Mihai Don=C8=9Bu Tested-by: R=C4=83zvan Cojocaru Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit d3c151fd3a4365fc6107198bfc975807d40d157d) --- xen/arch/x86/hvm/hvm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 84efe48..86ae18a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -625,9 +625,6 @@ int hvm_domain_initialise(struct domain *d) void hvm_domain_relinquish_resources(struct domain *d) { - xfree(d->arch.hvm_domain.io_handler); - xfree(d->arch.hvm_domain.params); - if ( is_pvh_domain(d) ) return; @@ -650,6 +647,9 @@ void hvm_domain_relinquish_resources(struct domain *d) void hvm_domain_destroy(struct domain *d) { + xfree(d->arch.hvm_domain.io_handler); + xfree(d->arch.hvm_domain.params); + hvm_destroy_cacheattr_region_list(d); if ( is_pvh_domain(d) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 --===============0607798116620251206== 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 --===============0607798116620251206==-- From xen-changelog-bounces@lists.xen.org Sat Jan 10 09:33:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jan 2015 09: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 1Y9sPq-0007d3-BD; Sat, 10 Jan 2015 09:33:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y9sPp-0007cw-0y for xen-changelog@lists.xensource.com; Sat, 10 Jan 2015 09:33:05 +0000 Content-Length: 2131 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id FD/D0-09842-0D1F0B45; Sat, 10 Jan 2015 09:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1420882382!20537279!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8598 invoked from network); 10 Jan 2015 09:33:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jan 2015 09:33:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y9sPm-0004Rr-JH for xen-changelog@lists.xensource.com; Sat, 10 Jan 2015 09:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y9sPm-0003UZ-FL for xen-changelog@lists.xensource.com; Sat, 10 Jan 2015 09:33:02 +0000 Date: Sat, 10 Jan 2015 09:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: prevent use-after-free when destroying 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: multipart/mixed; boundary="===============0607798116620251206==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0607798116620251206== Content-Length: 1728 Content-Transfer-Encoding: quoted-printable commit 089dd62211042011e26de1b87b558394cdfe388b Author: Mihai Don=C8=9Bu AuthorDate: Tue Jan 6 12:49:52 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 12:51:37 2015 +0000 x86/HVM: prevent use-after-free when destroying a domain hvm_domain_relinquish_resources() can free certain domain resources which can still be accessed, e.g. by HVMOP_set_param, while the domain is being cleaned up. This is CVE-2015-0361 / XSA-116. Signed-off-by: Mihai Don=C8=9Bu Tested-by: R=C4=83zvan Cojocaru Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit d3c151fd3a4365fc6107198bfc975807d40d157d) --- xen/arch/x86/hvm/hvm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 84efe48..86ae18a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -625,9 +625,6 @@ int hvm_domain_initialise(struct domain *d) void hvm_domain_relinquish_resources(struct domain *d) { - xfree(d->arch.hvm_domain.io_handler); - xfree(d->arch.hvm_domain.params); - if ( is_pvh_domain(d) ) return; @@ -650,6 +647,9 @@ void hvm_domain_relinquish_resources(struct domain *d) void hvm_domain_destroy(struct domain *d) { + xfree(d->arch.hvm_domain.io_handler); + xfree(d->arch.hvm_domain.params); + hvm_destroy_cacheattr_region_list(d); if ( is_pvh_domain(d) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 --===============0607798116620251206== 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 --===============0607798116620251206==-- From xen-changelog-bounces@lists.xen.org Mon Jan 12 15:22:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgoi-0006V0-6p; Mon, 12 Jan 2015 15: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 1YAgog-0006Uf-Pg for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:06 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id AF/99-08051-E96E3B45; Mon, 12 Jan 2015 15:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1421076124!20072143!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32005 invoked from network); 12 Jan 2015 15:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgod-0005MV-R1 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgod-0003OI-Oc for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:03 +0000 Date: Mon, 12 Jan 2015 15:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86: don't deliver NMI to PVH 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 21c9fce8efbf407dc5d6bcc78bf65a1402623db9 Author: Jan Beulich AuthorDate: Thu Dec 11 10:47:21 2014 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 5 10:13:53 2015 -0500 x86: don't deliver NMI to PVH Dom0 ... for the time being: The mechanism used depends on the domain's use of the IRET hypercall - which PVH is not using. HVM code (which PVH uses) will deliver an NMI if it sees v->nmi_pending however that temporary affinity adjustment gets undone in the HYPERVISOR_iret handler, yet PVH can't call that hypercall. Also drop two bogus code lines spotted while going through the involved code paths: Addresses of per-CPU variables can't possibly be NULL, and the setting of st->vcpu in send_guest_trap()'s MCE case is redundant with an earlier cmpxchgptr(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- xen/arch/x86/traps.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 10fc2ca..3cd8746 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -3168,7 +3168,6 @@ static void nmi_mce_softirq(void) int cpu = smp_processor_id(); struct softirq_trap *st = &per_cpu(softirq_trap, cpu); - BUG_ON(st == NULL); BUG_ON(st->vcpu == NULL); /* Set the tmp value unconditionally, so that @@ -3233,7 +3232,7 @@ static void nmi_hwdom_report(unsigned int reason_idx) { struct domain *d = hardware_domain; - if ( (d == NULL) || (d->vcpu == NULL) || (d->vcpu[0] == NULL) ) + if ( !d || !d->vcpu || !d->vcpu[0] || !is_pv_domain(d) /* PVH fixme */ ) return; set_bit(reason_idx, nmi_reason(d)); @@ -3674,7 +3673,6 @@ int send_guest_trap(struct domain *d, uint16_t vcpuid, unsigned int trap_nr) if ( !test_and_set_bool(v->mce_pending) ) { st->domain = d; - st->vcpu = v; st->processor = v->processor; /* not safe to wake up a vcpu here */ -- 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 Jan 12 15:22:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgoi-0006V0-6p; Mon, 12 Jan 2015 15: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 1YAgog-0006Uf-Pg for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:06 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id AF/99-08051-E96E3B45; Mon, 12 Jan 2015 15:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1421076124!20072143!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32005 invoked from network); 12 Jan 2015 15:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgod-0005MV-R1 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgod-0003OI-Oc for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:03 +0000 Date: Mon, 12 Jan 2015 15:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86: don't deliver NMI to PVH 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 21c9fce8efbf407dc5d6bcc78bf65a1402623db9 Author: Jan Beulich AuthorDate: Thu Dec 11 10:47:21 2014 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 5 10:13:53 2015 -0500 x86: don't deliver NMI to PVH Dom0 ... for the time being: The mechanism used depends on the domain's use of the IRET hypercall - which PVH is not using. HVM code (which PVH uses) will deliver an NMI if it sees v->nmi_pending however that temporary affinity adjustment gets undone in the HYPERVISOR_iret handler, yet PVH can't call that hypercall. Also drop two bogus code lines spotted while going through the involved code paths: Addresses of per-CPU variables can't possibly be NULL, and the setting of st->vcpu in send_guest_trap()'s MCE case is redundant with an earlier cmpxchgptr(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- xen/arch/x86/traps.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 10fc2ca..3cd8746 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -3168,7 +3168,6 @@ static void nmi_mce_softirq(void) int cpu = smp_processor_id(); struct softirq_trap *st = &per_cpu(softirq_trap, cpu); - BUG_ON(st == NULL); BUG_ON(st->vcpu == NULL); /* Set the tmp value unconditionally, so that @@ -3233,7 +3232,7 @@ static void nmi_hwdom_report(unsigned int reason_idx) { struct domain *d = hardware_domain; - if ( (d == NULL) || (d->vcpu == NULL) || (d->vcpu[0] == NULL) ) + if ( !d || !d->vcpu || !d->vcpu[0] || !is_pv_domain(d) /* PVH fixme */ ) return; set_bit(reason_idx, nmi_reason(d)); @@ -3674,7 +3673,6 @@ int send_guest_trap(struct domain *d, uint16_t vcpuid, unsigned int trap_nr) if ( !test_and_set_bool(v->mce_pending) ) { st->domain = d; - st->vcpu = v; st->processor = v->processor; /* not safe to wake up a vcpu here */ -- 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 Jan 12 15:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15: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 1YAgos-0006Xs-9L; Mon, 12 Jan 2015 15:22:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgoq-0006XV-J7 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:16 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 9C/FD-19763-7A6E3B45; Mon, 12 Jan 2015 15:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1421076134!14208776!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17839 invoked from network); 12 Jan 2015 15:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgoo-0005Mb-1Q for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgon-0003Og-Vs for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:14 +0000 Date: Mon, 12 Jan 2015 15:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] domctl: fix IRQ permission granting/revocation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6fb3a07bc0ad656b5f76eb9fc961bcd1d3cace58 Author: Jan Beulich AuthorDate: Fri Dec 12 10:24:13 2014 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 5 10:20:24 2015 -0500 domctl: fix IRQ permission granting/revocation Commit 545607eb3c ("x86: fix various issues with handling guest IRQs") wasn't really consistent in one respect: The granting of access to an IRQ shouldn't assume the pIRQ->IRQ translation to be the same in both domains. In fact it is wrong to assume that a translation is already/ still in place at the time access is being granted/revoked. What is wanted is to translate the incoming pIRQ to an IRQ for the invoking domain (as the pIRQ is the only notion the invoking domain has of the IRQ), and grant the subject domain access to the resulting IRQ. Signed-off-by: Jan Beulich Reported-by: Sander Eikelenboom Acked-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/domctl.c | 15 +++++++++------ xen/include/xen/iocap.h | 17 +++-------------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index f15dcfe..8bca6da 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -981,18 +981,21 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) case XEN_DOMCTL_irq_permission: { - unsigned int pirq = op->u.irq_permission.pirq; + unsigned int pirq = op->u.irq_permission.pirq, irq; int allow = op->u.irq_permission.allow_access; - if ( pirq >= d->nr_pirqs ) + if ( pirq >= current->domain->nr_pirqs ) + { ret = -EINVAL; - else if ( !pirq_access_permitted(current->domain, pirq) || - xsm_irq_permission(XSM_HOOK, d, pirq, allow) ) + break; + } + irq = pirq_access_permitted(current->domain, pirq); + if ( !irq || xsm_irq_permission(XSM_HOOK, d, irq, allow) ) ret = -EPERM; else if ( allow ) - ret = pirq_permit_access(d, pirq); + ret = irq_permit_access(d, irq); else - ret = pirq_deny_access(d, pirq); + ret = irq_deny_access(d, irq); } break; diff --git a/xen/include/xen/iocap.h b/xen/include/xen/iocap.h index b755ecb..1ca3858 100644 --- a/xen/include/xen/iocap.h +++ b/xen/include/xen/iocap.h @@ -28,22 +28,11 @@ #define irq_access_permitted(d, i) \ rangeset_contains_singleton((d)->irq_caps, i) -#define pirq_permit_access(d, i) ({ \ - struct domain *d__ = (d); \ - int i__ = domain_pirq_to_irq(d__, i); \ - i__ > 0 ? rangeset_add_singleton(d__->irq_caps, i__)\ - : -EINVAL; \ -}) -#define pirq_deny_access(d, i) ({ \ - struct domain *d__ = (d); \ - int i__ = domain_pirq_to_irq(d__, i); \ - i__ > 0 ? rangeset_remove_singleton(d__->irq_caps, i__)\ - : -EINVAL; \ -}) #define pirq_access_permitted(d, i) ({ \ struct domain *d__ = (d); \ - rangeset_contains_singleton(d__->irq_caps, \ - domain_pirq_to_irq(d__, i));\ + int irq__ = domain_pirq_to_irq(d__, i); \ + irq__ > 0 && irq_access_permitted(d__, irq__) \ + ? irq__ : 0; \ }) #endif /* __XEN_IOCAP_H__ */ -- 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 Jan 12 15:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15: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 1YAgos-0006Xs-9L; Mon, 12 Jan 2015 15:22:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgoq-0006XV-J7 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:16 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 9C/FD-19763-7A6E3B45; Mon, 12 Jan 2015 15:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1421076134!14208776!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17839 invoked from network); 12 Jan 2015 15:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgoo-0005Mb-1Q for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgon-0003Og-Vs for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:14 +0000 Date: Mon, 12 Jan 2015 15:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] domctl: fix IRQ permission granting/revocation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6fb3a07bc0ad656b5f76eb9fc961bcd1d3cace58 Author: Jan Beulich AuthorDate: Fri Dec 12 10:24:13 2014 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 5 10:20:24 2015 -0500 domctl: fix IRQ permission granting/revocation Commit 545607eb3c ("x86: fix various issues with handling guest IRQs") wasn't really consistent in one respect: The granting of access to an IRQ shouldn't assume the pIRQ->IRQ translation to be the same in both domains. In fact it is wrong to assume that a translation is already/ still in place at the time access is being granted/revoked. What is wanted is to translate the incoming pIRQ to an IRQ for the invoking domain (as the pIRQ is the only notion the invoking domain has of the IRQ), and grant the subject domain access to the resulting IRQ. Signed-off-by: Jan Beulich Reported-by: Sander Eikelenboom Acked-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/domctl.c | 15 +++++++++------ xen/include/xen/iocap.h | 17 +++-------------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index f15dcfe..8bca6da 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -981,18 +981,21 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) case XEN_DOMCTL_irq_permission: { - unsigned int pirq = op->u.irq_permission.pirq; + unsigned int pirq = op->u.irq_permission.pirq, irq; int allow = op->u.irq_permission.allow_access; - if ( pirq >= d->nr_pirqs ) + if ( pirq >= current->domain->nr_pirqs ) + { ret = -EINVAL; - else if ( !pirq_access_permitted(current->domain, pirq) || - xsm_irq_permission(XSM_HOOK, d, pirq, allow) ) + break; + } + irq = pirq_access_permitted(current->domain, pirq); + if ( !irq || xsm_irq_permission(XSM_HOOK, d, irq, allow) ) ret = -EPERM; else if ( allow ) - ret = pirq_permit_access(d, pirq); + ret = irq_permit_access(d, irq); else - ret = pirq_deny_access(d, pirq); + ret = irq_deny_access(d, irq); } break; diff --git a/xen/include/xen/iocap.h b/xen/include/xen/iocap.h index b755ecb..1ca3858 100644 --- a/xen/include/xen/iocap.h +++ b/xen/include/xen/iocap.h @@ -28,22 +28,11 @@ #define irq_access_permitted(d, i) \ rangeset_contains_singleton((d)->irq_caps, i) -#define pirq_permit_access(d, i) ({ \ - struct domain *d__ = (d); \ - int i__ = domain_pirq_to_irq(d__, i); \ - i__ > 0 ? rangeset_add_singleton(d__->irq_caps, i__)\ - : -EINVAL; \ -}) -#define pirq_deny_access(d, i) ({ \ - struct domain *d__ = (d); \ - int i__ = domain_pirq_to_irq(d__, i); \ - i__ > 0 ? rangeset_remove_singleton(d__->irq_caps, i__)\ - : -EINVAL; \ -}) #define pirq_access_permitted(d, i) ({ \ struct domain *d__ = (d); \ - rangeset_contains_singleton(d__->irq_caps, \ - domain_pirq_to_irq(d__, i));\ + int irq__ = domain_pirq_to_irq(d__, i); \ + irq__ > 0 && irq_access_permitted(d__, irq__) \ + ? irq__ : 0; \ }) #endif /* __XEN_IOCAP_H__ */ -- 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 Jan 12 15:22:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgp2-0006bR-CB; Mon, 12 Jan 2015 15: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 1YAgp0-0006b7-RH for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:26 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 36/8E-02953-2B6E3B45; Mon, 12 Jan 2015 15:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1421076144!20046693!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28824 invoked from network); 12 Jan 2015 15:22:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgoy-0005Mh-6q for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgoy-0003P2-4O for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:24 +0000 Date: Mon, 12 Jan 2015 15:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/AMD-ucode: correct multiple container 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 4d9ba7b2188083a09d1b1a1bda7054cc3eb77f67 Author: Jan Beulich AuthorDate: Mon Dec 15 09:16:09 2014 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 5 10:20:31 2015 -0500 x86/AMD-ucode: correct multiple container handling Avoid emitting an error message referring to an incorrect or corrupt container file just because no entry was found for the running CPU. Additionally switch the order of data validation and consumption in cpu_request_microcode()'s first loop, and also check the types of skipped blocks in container_fast_forward(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Aravind Gopalakrishnan Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- xen/arch/x86/microcode_amd.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index b68cf93..f79b397 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -331,12 +331,17 @@ static int container_fast_forward(const void *data, size_t size_left, size_t *of header[1] == UCODE_EQUIV_CPU_TABLE_TYPE ) break; + if ( header[0] != UCODE_UCODE_TYPE ) + return -EINVAL; size = header[1] + SECTION_HDR_SIZE; if ( size < PATCH_HDR_SIZE || size_left < size ) return -EINVAL; size_left -= size; *offset += size; + + if ( !size_left ) + return -ENODATA; } return 0; @@ -386,10 +391,6 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) break; } - if ( find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id, - &equiv_cpu_id) ) - break; - /* * Could happen as we advance 'offset' early * in install_equiv_cpu_table @@ -401,7 +402,16 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) break; } + if ( find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id, + &equiv_cpu_id) ) + break; + error = container_fast_forward(buf, bufsize - offset, &offset); + if ( error == -ENODATA ) + { + ASSERT(offset == bufsize); + break; + } if ( error ) { printk(KERN_ERR "microcode: CPU%d incorrect or corrupt container file\n" -- 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 Jan 12 15:22:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgp2-0006bR-CB; Mon, 12 Jan 2015 15: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 1YAgp0-0006b7-RH for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:26 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 36/8E-02953-2B6E3B45; Mon, 12 Jan 2015 15:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1421076144!20046693!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28824 invoked from network); 12 Jan 2015 15:22:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgoy-0005Mh-6q for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgoy-0003P2-4O for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:24 +0000 Date: Mon, 12 Jan 2015 15:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/AMD-ucode: correct multiple container 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 4d9ba7b2188083a09d1b1a1bda7054cc3eb77f67 Author: Jan Beulich AuthorDate: Mon Dec 15 09:16:09 2014 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 5 10:20:31 2015 -0500 x86/AMD-ucode: correct multiple container handling Avoid emitting an error message referring to an incorrect or corrupt container file just because no entry was found for the running CPU. Additionally switch the order of data validation and consumption in cpu_request_microcode()'s first loop, and also check the types of skipped blocks in container_fast_forward(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Aravind Gopalakrishnan Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- xen/arch/x86/microcode_amd.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index b68cf93..f79b397 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -331,12 +331,17 @@ static int container_fast_forward(const void *data, size_t size_left, size_t *of header[1] == UCODE_EQUIV_CPU_TABLE_TYPE ) break; + if ( header[0] != UCODE_UCODE_TYPE ) + return -EINVAL; size = header[1] + SECTION_HDR_SIZE; if ( size < PATCH_HDR_SIZE || size_left < size ) return -EINVAL; size_left -= size; *offset += size; + + if ( !size_left ) + return -ENODATA; } return 0; @@ -386,10 +391,6 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) break; } - if ( find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id, - &equiv_cpu_id) ) - break; - /* * Could happen as we advance 'offset' early * in install_equiv_cpu_table @@ -401,7 +402,16 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) break; } + if ( find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id, + &equiv_cpu_id) ) + break; + error = container_fast_forward(buf, bufsize - offset, &offset); + if ( error == -ENODATA ) + { + ASSERT(offset == bufsize); + break; + } if ( error ) { printk(KERN_ERR "microcode: CPU%d incorrect or corrupt container file\n" -- 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 Jan 12 15:22:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpC-0006dS-El; Mon, 12 Jan 2015 15:22:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpA-0006d8-Vj for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:37 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id FE/1B-08051-CB6E3B45; Mon, 12 Jan 2015 15:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1421076154!12363073!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22175 invoked from network); 12 Jan 2015 15:22:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgp8-0005Mp-BX for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgp8-0003PS-AT for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:34 +0000 Date: Mon, 12 Jan 2015 15:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Initialise CTX->xce in domain suspend, as 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 6b511af68618a86d5a2258e649042a3f0b8ace52 Author: Ian Jackson AuthorDate: Mon Jan 5 14:31:00 2015 +0000 Commit: Ian Jackson CommitDate: Mon Jan 5 16:42:11 2015 +0000 libxl: Initialise CTX->xce in domain suspend, as needed When excuting xl migrate/Remus, the following error can occur: [root@master xen]# xl migrate 5 slaver migration target: Ready to receive domain. Saving to migration stream new xl format (info 0x1/0x0/1225) Loading new save file (new xl fmt info 0x1/0x0/12\ ) Savefile contains xl domain config in JSON format Parsing config from Segmentation fault (core dumped) This is because CTX->xce is used without been initialized. The bug was introduced by commit 2ffeb5d7f5d8 libxl: events: Deregister evtchn fd when not needed which removed the initialization of xce from libxl__ctx_alloc. In this patch we initialise the CTX->xce before using it. Also, we adjust the doc comment for libxl__ev_evtchn_* to mention the need to do so. Signed-off-by: Yang Hongyang Signed-off-by: Ian Jackson Acked-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk Cc: Wei Liu --- tools/libxl/libxl_dom.c | 3 +++ tools/libxl/libxl_internal.h | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 74ea84b..94ae818 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1824,6 +1824,9 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) port = xs_suspend_evtchn_port(dss->domid); if (port >= 0) { + rc = libxl__ctx_evtchn_init(gc); + if (rc) goto out; + dss->guest_evtchn.port = xc_suspend_evtchn_init_exclusive(CTX->xch, CTX->xce, dss->domid, port, &dss->guest_evtchn_lockfd); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 9695f18..6dac0f8 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -800,8 +800,10 @@ static inline int libxl__ev_xswatch_isregistered(const libxl__ev_xswatch *xw) /* * The evtchn facility is one-shot per call to libxl__ev_evtchn_wait. - * You should call some suitable xc bind function on (or to obtain) - * the port, then libxl__ev_evtchn_wait. + * You should: + * Use libxl__ctx_evtchn_init to make sure CTX->xce is valid; + * Call some suitable xc bind function on (or to obtain) the port; + * Then call libxl__ev_evtchn_wait. * * When the event is signaled then the callback will be made, once. * Then you must call libxl__ev_evtchn_wait again, if desired. -- 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 Jan 12 15:22:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpC-0006dS-El; Mon, 12 Jan 2015 15:22:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpA-0006d8-Vj for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:37 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id FE/1B-08051-CB6E3B45; Mon, 12 Jan 2015 15:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1421076154!12363073!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22175 invoked from network); 12 Jan 2015 15:22:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgp8-0005Mp-BX for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgp8-0003PS-AT for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:34 +0000 Date: Mon, 12 Jan 2015 15:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Initialise CTX->xce in domain suspend, as 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 6b511af68618a86d5a2258e649042a3f0b8ace52 Author: Ian Jackson AuthorDate: Mon Jan 5 14:31:00 2015 +0000 Commit: Ian Jackson CommitDate: Mon Jan 5 16:42:11 2015 +0000 libxl: Initialise CTX->xce in domain suspend, as needed When excuting xl migrate/Remus, the following error can occur: [root@master xen]# xl migrate 5 slaver migration target: Ready to receive domain. Saving to migration stream new xl format (info 0x1/0x0/1225) Loading new save file (new xl fmt info 0x1/0x0/12\ ) Savefile contains xl domain config in JSON format Parsing config from Segmentation fault (core dumped) This is because CTX->xce is used without been initialized. The bug was introduced by commit 2ffeb5d7f5d8 libxl: events: Deregister evtchn fd when not needed which removed the initialization of xce from libxl__ctx_alloc. In this patch we initialise the CTX->xce before using it. Also, we adjust the doc comment for libxl__ev_evtchn_* to mention the need to do so. Signed-off-by: Yang Hongyang Signed-off-by: Ian Jackson Acked-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk Cc: Wei Liu --- tools/libxl/libxl_dom.c | 3 +++ tools/libxl/libxl_internal.h | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 74ea84b..94ae818 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1824,6 +1824,9 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) port = xs_suspend_evtchn_port(dss->domid); if (port >= 0) { + rc = libxl__ctx_evtchn_init(gc); + if (rc) goto out; + dss->guest_evtchn.port = xc_suspend_evtchn_init_exclusive(CTX->xch, CTX->xce, dss->domid, port, &dss->guest_evtchn_lockfd); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 9695f18..6dac0f8 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -800,8 +800,10 @@ static inline int libxl__ev_xswatch_isregistered(const libxl__ev_xswatch *xw) /* * The evtchn facility is one-shot per call to libxl__ev_evtchn_wait. - * You should call some suitable xc bind function on (or to obtain) - * the port, then libxl__ev_evtchn_wait. + * You should: + * Use libxl__ctx_evtchn_init to make sure CTX->xce is valid; + * Call some suitable xc bind function on (or to obtain) the port; + * Then call libxl__ev_evtchn_wait. * * When the event is signaled then the callback will be made, once. * Then you must call libxl__ev_evtchn_wait again, if desired. -- 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 Jan 12 15:22:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:22:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpM-0006jK-C0; Mon, 12 Jan 2015 15:22:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpK-0006iE-Rf for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:46 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id A7/9D-25714-6C6E3B45; Mon, 12 Jan 2015 15:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1421076164!12157555!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31341 invoked from network); 12 Jan 2015 15:22:45 -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; 12 Jan 2015 15:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpI-0005N2-Fu for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgpI-0003QK-Et for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:44 +0000 Date: Mon, 12 Jan 2015 15:22:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Fix if{} nesting in do_pci_remove X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ca2558c048c7d5d2a6d401e58181a06a00f9eeb Author: Ian Jackson AuthorDate: Fri Nov 14 14:41:38 2014 +0000 Commit: Ian Jackson CommitDate: Mon Jan 5 16:45:13 2015 +0000 libxl: Fix if{} nesting in do_pci_remove do_pci_remove contained this: if (type == LIBXL_DOMAIN_TYPE_HVM) { [stuff] } else if (type != LIBXL_DOMAIN_TYPE_PV) abort(); { This is bizarre, and not correct. The effect is that HVM guests end up running both the proper code and that intended for PV guests. This causes (amongst other things) trouble when PCI devices are hot-unplugged from HVM guests. This bug was introduced in abfb006f "tools/libxl: explicitly grant access to needed I/O-memory ranges". This is clear candidate for Xen 4.5, being a bugfix to an important feature. Reported-by: Boris Ostrovsky Signed-off-by: Ian Jackson Tested-by: Robert Hu Rlease-Acked-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell CC: Sander Eikelenboom CC: George Dunlap --- tools/libxl/libxl_pci.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 316643c..9ae37fa 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1247,9 +1247,9 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, rc = ERROR_FAIL; goto out_fail; } - } else if (type != LIBXL_DOMAIN_TYPE_PV) - abort(); - { + } else { + assert(type == LIBXL_DOMAIN_TYPE_PV); + char *sysfs_path = libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/resource", pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); FILE *f = fopen(sysfs_path, "r"); -- 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 Jan 12 15:22:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:22:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpM-0006jK-C0; Mon, 12 Jan 2015 15:22:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpK-0006iE-Rf for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:46 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id A7/9D-25714-6C6E3B45; Mon, 12 Jan 2015 15:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1421076164!12157555!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31341 invoked from network); 12 Jan 2015 15:22:45 -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; 12 Jan 2015 15:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpI-0005N2-Fu for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgpI-0003QK-Et for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:44 +0000 Date: Mon, 12 Jan 2015 15:22:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Fix if{} nesting in do_pci_remove X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ca2558c048c7d5d2a6d401e58181a06a00f9eeb Author: Ian Jackson AuthorDate: Fri Nov 14 14:41:38 2014 +0000 Commit: Ian Jackson CommitDate: Mon Jan 5 16:45:13 2015 +0000 libxl: Fix if{} nesting in do_pci_remove do_pci_remove contained this: if (type == LIBXL_DOMAIN_TYPE_HVM) { [stuff] } else if (type != LIBXL_DOMAIN_TYPE_PV) abort(); { This is bizarre, and not correct. The effect is that HVM guests end up running both the proper code and that intended for PV guests. This causes (amongst other things) trouble when PCI devices are hot-unplugged from HVM guests. This bug was introduced in abfb006f "tools/libxl: explicitly grant access to needed I/O-memory ranges". This is clear candidate for Xen 4.5, being a bugfix to an important feature. Reported-by: Boris Ostrovsky Signed-off-by: Ian Jackson Tested-by: Robert Hu Rlease-Acked-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell CC: Sander Eikelenboom CC: George Dunlap --- tools/libxl/libxl_pci.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 316643c..9ae37fa 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1247,9 +1247,9 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, rc = ERROR_FAIL; goto out_fail; } - } else if (type != LIBXL_DOMAIN_TYPE_PV) - abort(); - { + } else { + assert(type == LIBXL_DOMAIN_TYPE_PV); + char *sysfs_path = libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/resource", pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); FILE *f = fopen(sysfs_path, "r"); -- 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 Jan 12 15:22:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15: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 1YAgpW-0006pA-Eq; Mon, 12 Jan 2015 15:22:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpV-0006ol-Db for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:57 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 4C/2B-27785-0D6E3B45; Mon, 12 Jan 2015 15:22:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1421076174!20066019!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25573 invoked from network); 12 Jan 2015 15:22:55 -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; 12 Jan 2015 15:22:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpS-0005NF-Lm for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgpS-0003Qg-KP for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:54 +0000 Date: Mon, 12 Jan 2015 15:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/libxl: Use of init()/dispose() to avoid leaking libxl_dominfo.ssid_label X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 54eb18cd63ed7243f1ab497e35807bf6f4a436ec Author: Andrew Cooper AuthorDate: Mon Jan 5 14:19:58 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jan 6 11:10:43 2015 +0000 tools/libxl: Use of init()/dispose() to avoid leaking libxl_dominfo.ssid_label libxl_dominfo contains a ssid_label pointer which will have memory allocated for it in libxl_domain_info() if the hypervisor has CONFIG_XSM compiled. However, the lack of appropriate use of libxl_dominfo_{init,dispose}() will cause the label string to be leaked, even in success cases. This was discovered by XenServers Coverity scanning, and are issues not identified by upstream Coverity Scan. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Konrad Rzeszutek Wilk Acked-by: Ian Campbell --- tools/libxl/libxl.c | 26 ++++++++++++++++++++++++-- tools/libxl/libxl_dom.c | 14 ++++++++++---- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 50a8928..372dd3b 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -364,6 +364,8 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, char *uuid; const char *vm_name_path; + libxl_dominfo_init(&info); + dom_path = libxl__xs_get_dompath(gc, domid); if (!dom_path) goto x_nomem; @@ -481,6 +483,7 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, rc = 0; x_rc: if (our_trans) xs_transaction_end(ctx->xsh, our_trans, 1); + libxl_dominfo_dispose(&info); return rc; x_fail: rc = ERROR_FAIL; goto x_rc; @@ -4594,6 +4597,8 @@ static int libxl__fill_dom0_memory_info(libxl__gc *gc, uint32_t *target_memkb, libxl_ctx *ctx = libxl__gc_owner(gc); uint32_t free_mem_slack_kb = 0; + libxl_dominfo_init(&info); + retry_transaction: t = xs_transaction_start(ctx->xsh); @@ -4626,6 +4631,8 @@ retry_transaction: } } + libxl_dominfo_dispose(&info); + libxl_dominfo_init(&info); rc = libxl_domain_info(ctx, &info, 0); if (rc < 0) goto out; @@ -4664,7 +4671,7 @@ out: rc = ERROR_FAIL; } - + libxl_dominfo_dispose(&info); return rc; } @@ -4999,6 +5006,8 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) uint32_t target_memkb = 0; libxl_dominfo info; + libxl_dominfo_init(&info); + do { wait_secs--; sleep(1); @@ -5007,9 +5016,11 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) if (rc < 0) goto out; + libxl_dominfo_dispose(&info); + libxl_dominfo_init(&info); rc = libxl_domain_info(ctx, &info, domid); if (rc < 0) - return rc; + goto out; } while (wait_secs > 0 && (info.current_memkb + info.outstanding_memkb) > target_memkb); if ((info.current_memkb + info.outstanding_memkb) <= target_memkb) @@ -5018,6 +5029,7 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) rc = ERROR_FAIL; out: + libxl_dominfo_dispose(&info); return rc; } @@ -5435,6 +5447,8 @@ static int libxl__set_vcpuonline_xenstore(libxl__gc *gc, uint32_t domid, xs_transaction_t t; int i, rc = ERROR_FAIL; + libxl_dominfo_init(&info); + if (libxl_domain_info(CTX, &info, domid) < 0) { LOGE(ERROR, "getting domain info list"); goto out; @@ -5454,6 +5468,7 @@ retry_transaction: } else rc = 0; out: + libxl_dominfo_dispose(&info); return rc; } @@ -5463,8 +5478,11 @@ static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, libxl_dominfo info; int i; + libxl_dominfo_init(&info); + if (libxl_domain_info(CTX, &info, domid) < 0) { LOGE(ERROR, "getting domain info list"); + libxl_dominfo_dispose(&info); return ERROR_FAIL; } for (i = 0; i <= info.vcpu_max_id; i++) { @@ -5477,6 +5495,7 @@ static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, libxl__qmp_cpu_add(gc, domid, i); } } + libxl_dominfo_dispose(&info); return 0; } @@ -6569,12 +6588,15 @@ int libxl_retrieve_domain_configuration(libxl_ctx *ctx, uint32_t domid, /* Domain UUID */ { libxl_dominfo info; + libxl_dominfo_init(&info); rc = libxl_domain_info(ctx, &info, domid); if (rc) { LOG(ERROR, "fail to get domain info for domain %d", domid); + libxl_dominfo_dispose(&info); goto out; } libxl_uuid_copy(ctx, &d_config->c_info.uuid, &info.uuid); + libxl_dominfo_dispose(&info); } /* Memory limits: diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 94ae818..1d33a18 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -2046,19 +2046,25 @@ const char *libxl__userdata_path(libxl__gc *gc, uint32_t domid, const char *wh) { libxl_ctx *ctx = libxl__gc_owner(gc); - char *uuid_string; + char *uuid_string, *path; libxl_dominfo info; int rc; + libxl_dominfo_init(&info); + rc = libxl_domain_info(ctx, &info, domid); if (rc) { LOGE(ERROR, "unable to find domain info for domain %"PRIu32, domid); - return NULL; + path = NULL; + goto out; } uuid_string = GCSPRINTF(LIBXL_UUID_FMT, LIBXL_UUID_BYTES(info.uuid)); - - return GCSPRINTF("/var/lib/xen/userdata-%s.%u.%s.%s", + path = GCSPRINTF("/var/lib/xen/userdata-%s.%u.%s.%s", wh, domid, uuid_string, userdata_userid); + + out: + libxl_dominfo_dispose(&info); + return path; } static int userdata_delete(libxl__gc *gc, const char *path) -- 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 Jan 12 15:22:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15: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 1YAgpW-0006pA-Eq; Mon, 12 Jan 2015 15:22:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpV-0006ol-Db for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:57 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 4C/2B-27785-0D6E3B45; Mon, 12 Jan 2015 15:22:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1421076174!20066019!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25573 invoked from network); 12 Jan 2015 15:22:55 -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; 12 Jan 2015 15:22:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpS-0005NF-Lm for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgpS-0003Qg-KP for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:22:54 +0000 Date: Mon, 12 Jan 2015 15:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/libxl: Use of init()/dispose() to avoid leaking libxl_dominfo.ssid_label X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 54eb18cd63ed7243f1ab497e35807bf6f4a436ec Author: Andrew Cooper AuthorDate: Mon Jan 5 14:19:58 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jan 6 11:10:43 2015 +0000 tools/libxl: Use of init()/dispose() to avoid leaking libxl_dominfo.ssid_label libxl_dominfo contains a ssid_label pointer which will have memory allocated for it in libxl_domain_info() if the hypervisor has CONFIG_XSM compiled. However, the lack of appropriate use of libxl_dominfo_{init,dispose}() will cause the label string to be leaked, even in success cases. This was discovered by XenServers Coverity scanning, and are issues not identified by upstream Coverity Scan. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Konrad Rzeszutek Wilk Acked-by: Ian Campbell --- tools/libxl/libxl.c | 26 ++++++++++++++++++++++++-- tools/libxl/libxl_dom.c | 14 ++++++++++---- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 50a8928..372dd3b 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -364,6 +364,8 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, char *uuid; const char *vm_name_path; + libxl_dominfo_init(&info); + dom_path = libxl__xs_get_dompath(gc, domid); if (!dom_path) goto x_nomem; @@ -481,6 +483,7 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, rc = 0; x_rc: if (our_trans) xs_transaction_end(ctx->xsh, our_trans, 1); + libxl_dominfo_dispose(&info); return rc; x_fail: rc = ERROR_FAIL; goto x_rc; @@ -4594,6 +4597,8 @@ static int libxl__fill_dom0_memory_info(libxl__gc *gc, uint32_t *target_memkb, libxl_ctx *ctx = libxl__gc_owner(gc); uint32_t free_mem_slack_kb = 0; + libxl_dominfo_init(&info); + retry_transaction: t = xs_transaction_start(ctx->xsh); @@ -4626,6 +4631,8 @@ retry_transaction: } } + libxl_dominfo_dispose(&info); + libxl_dominfo_init(&info); rc = libxl_domain_info(ctx, &info, 0); if (rc < 0) goto out; @@ -4664,7 +4671,7 @@ out: rc = ERROR_FAIL; } - + libxl_dominfo_dispose(&info); return rc; } @@ -4999,6 +5006,8 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) uint32_t target_memkb = 0; libxl_dominfo info; + libxl_dominfo_init(&info); + do { wait_secs--; sleep(1); @@ -5007,9 +5016,11 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) if (rc < 0) goto out; + libxl_dominfo_dispose(&info); + libxl_dominfo_init(&info); rc = libxl_domain_info(ctx, &info, domid); if (rc < 0) - return rc; + goto out; } while (wait_secs > 0 && (info.current_memkb + info.outstanding_memkb) > target_memkb); if ((info.current_memkb + info.outstanding_memkb) <= target_memkb) @@ -5018,6 +5029,7 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) rc = ERROR_FAIL; out: + libxl_dominfo_dispose(&info); return rc; } @@ -5435,6 +5447,8 @@ static int libxl__set_vcpuonline_xenstore(libxl__gc *gc, uint32_t domid, xs_transaction_t t; int i, rc = ERROR_FAIL; + libxl_dominfo_init(&info); + if (libxl_domain_info(CTX, &info, domid) < 0) { LOGE(ERROR, "getting domain info list"); goto out; @@ -5454,6 +5468,7 @@ retry_transaction: } else rc = 0; out: + libxl_dominfo_dispose(&info); return rc; } @@ -5463,8 +5478,11 @@ static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, libxl_dominfo info; int i; + libxl_dominfo_init(&info); + if (libxl_domain_info(CTX, &info, domid) < 0) { LOGE(ERROR, "getting domain info list"); + libxl_dominfo_dispose(&info); return ERROR_FAIL; } for (i = 0; i <= info.vcpu_max_id; i++) { @@ -5477,6 +5495,7 @@ static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, libxl__qmp_cpu_add(gc, domid, i); } } + libxl_dominfo_dispose(&info); return 0; } @@ -6569,12 +6588,15 @@ int libxl_retrieve_domain_configuration(libxl_ctx *ctx, uint32_t domid, /* Domain UUID */ { libxl_dominfo info; + libxl_dominfo_init(&info); rc = libxl_domain_info(ctx, &info, domid); if (rc) { LOG(ERROR, "fail to get domain info for domain %d", domid); + libxl_dominfo_dispose(&info); goto out; } libxl_uuid_copy(ctx, &d_config->c_info.uuid, &info.uuid); + libxl_dominfo_dispose(&info); } /* Memory limits: diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 94ae818..1d33a18 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -2046,19 +2046,25 @@ const char *libxl__userdata_path(libxl__gc *gc, uint32_t domid, const char *wh) { libxl_ctx *ctx = libxl__gc_owner(gc); - char *uuid_string; + char *uuid_string, *path; libxl_dominfo info; int rc; + libxl_dominfo_init(&info); + rc = libxl_domain_info(ctx, &info, domid); if (rc) { LOGE(ERROR, "unable to find domain info for domain %"PRIu32, domid); - return NULL; + path = NULL; + goto out; } uuid_string = GCSPRINTF(LIBXL_UUID_FMT, LIBXL_UUID_BYTES(info.uuid)); - - return GCSPRINTF("/var/lib/xen/userdata-%s.%u.%s.%s", + path = GCSPRINTF("/var/lib/xen/userdata-%s.%u.%s.%s", wh, domid, uuid_string, userdata_userid); + + out: + libxl_dominfo_dispose(&info); + return path; } static int userdata_delete(libxl__gc *gc, const char *path) -- 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 Jan 12 15:23:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:23: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 1YAgpg-0006w4-Kx; Mon, 12 Jan 2015 15:23:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpf-0006vZ-FL for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:07 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 3D/A6-26652-AD6E3B45; Mon, 12 Jan 2015 15:23:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1421076185!13642003!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2120 invoked from network); 12 Jan 2015 15:23: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; 12 Jan 2015 15:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpc-0005No-RJ for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgpc-0003RG-Pl for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:04 +0000 Date: Mon, 12 Jan 2015 15:23:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xen: arm: correct off-by-one error in consider_modules X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dea3ff6ed2af2fe3ab084733d3e71daf4dcfb8a0 Author: Ian Campbell AuthorDate: Sun Dec 21 11:18:53 2014 +0000 Commit: Ian Campbell CommitDate: Tue Jan 6 11:12:19 2015 +0000 xen: arm: correct off-by-one error in consider_modules By iterating up to <= mi->nr_mods we are running off the end of the boot modules, but more importantly it causes us to then skip the first FDT reserved region, meaning we might clobber it. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/setup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 3991d64..f49569d 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -286,7 +286,7 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, return 0; /* First check the boot modules */ - for ( i = first_mod; i <= mi->nr_mods; i++ ) + for ( i = first_mod; i < mi->nr_mods; i++ ) { paddr_t mod_s = mi->module[i].start; paddr_t mod_e = mod_s + mi->module[i].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 Mon Jan 12 15:23:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:23: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 1YAgpg-0006w4-Kx; Mon, 12 Jan 2015 15:23:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpf-0006vZ-FL for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:07 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 3D/A6-26652-AD6E3B45; Mon, 12 Jan 2015 15:23:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1421076185!13642003!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2120 invoked from network); 12 Jan 2015 15:23: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; 12 Jan 2015 15:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpc-0005No-RJ for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgpc-0003RG-Pl for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:04 +0000 Date: Mon, 12 Jan 2015 15:23:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xen: arm: correct off-by-one error in consider_modules X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dea3ff6ed2af2fe3ab084733d3e71daf4dcfb8a0 Author: Ian Campbell AuthorDate: Sun Dec 21 11:18:53 2014 +0000 Commit: Ian Campbell CommitDate: Tue Jan 6 11:12:19 2015 +0000 xen: arm: correct off-by-one error in consider_modules By iterating up to <= mi->nr_mods we are running off the end of the boot modules, but more importantly it causes us to then skip the first FDT reserved region, meaning we might clobber it. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/setup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 3991d64..f49569d 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -286,7 +286,7 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, return 0; /* First check the boot modules */ - for ( i = first_mod; i <= mi->nr_mods; i++ ) + for ( i = first_mod; i < mi->nr_mods; i++ ) { paddr_t mod_s = mi->module[i].start; paddr_t mod_e = mod_s + mi->module[i].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 Mon Jan 12 15:23:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:23: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 1YAgpq-000710-No; Mon, 12 Jan 2015 15:23:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpp-00070e-J7 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:17 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 7A/66-11581-4E6E3B45; Mon, 12 Jan 2015 15:23:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1421076195!17558012!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10529 invoked from network); 12 Jan 2015 15:23:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpn-0005Nu-Av for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgpn-0003Re-9p for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:15 +0000 Date: Mon, 12 Jan 2015 15:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools: libxl: link libxlu against libxl. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ec4e3336d413cc489813669e58c47e9156e03d8 Author: Ian Campbell AuthorDate: Mon Aug 4 10:58:25 2014 +0100 Commit: Ian Campbell CommitDate: Tue Jan 6 11:13:44 2015 +0000 tools: libxl: link libxlu against libxl. It uses libxl_defbool_set and must therefore be linked against the right library. Spotted by dpkg-shlibdeps and pointed out by Bastian Blank: dpkg-shlibdeps: warning: symbol libxl_defbool_set used by debian/libxen-4.4/usr/lib/libxlutil-4.4.so found in none of the libraries This required switching the make rule from $^ to an explicit LIBXLU_OBJS since the former now includes libxenlight.so. Signed-off-by: Ian Campbell Acked-by: Wei Liu Cc: Bastian Blank --- tools/libxl/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index df08c8a..b417372 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -41,7 +41,7 @@ LDFLAGS += $(PTHREAD_LDFLAGS) LIBXL_LIBS += $(PTHREAD_LIBS) LIBXL_LIBS += $(LIBXL_LIBS-y) -LIBXLU_LIBS = +LIBXLU_LIBS = libxenlight.so LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o flexarray.o ifeq ($(LIBXL_BLKTAP),y) @@ -227,8 +227,8 @@ libxlutil.so: libxlutil.so.$(XLUMAJOR) libxlutil.so.$(XLUMAJOR): libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(SYMLINK_SHLIB) $< $@ -libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS) - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXLU_LIBS) $(APPEND_LDFLAGS) +libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS) libxenlight.so + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $(LIBXLU_OBJS) $(LIBXLU_LIBS) $(APPEND_LDFLAGS) libxlutil.a: $(LIBXLU_OBJS) $(AR) rcs libxlutil.a $^ -- 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 Jan 12 15:23:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:23: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 1YAgpq-000710-No; Mon, 12 Jan 2015 15:23:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpp-00070e-J7 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:17 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 7A/66-11581-4E6E3B45; Mon, 12 Jan 2015 15:23:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1421076195!17558012!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10529 invoked from network); 12 Jan 2015 15:23:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpn-0005Nu-Av for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgpn-0003Re-9p for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:15 +0000 Date: Mon, 12 Jan 2015 15:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools: libxl: link libxlu against libxl. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ec4e3336d413cc489813669e58c47e9156e03d8 Author: Ian Campbell AuthorDate: Mon Aug 4 10:58:25 2014 +0100 Commit: Ian Campbell CommitDate: Tue Jan 6 11:13:44 2015 +0000 tools: libxl: link libxlu against libxl. It uses libxl_defbool_set and must therefore be linked against the right library. Spotted by dpkg-shlibdeps and pointed out by Bastian Blank: dpkg-shlibdeps: warning: symbol libxl_defbool_set used by debian/libxen-4.4/usr/lib/libxlutil-4.4.so found in none of the libraries This required switching the make rule from $^ to an explicit LIBXLU_OBJS since the former now includes libxenlight.so. Signed-off-by: Ian Campbell Acked-by: Wei Liu Cc: Bastian Blank --- tools/libxl/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index df08c8a..b417372 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -41,7 +41,7 @@ LDFLAGS += $(PTHREAD_LDFLAGS) LIBXL_LIBS += $(PTHREAD_LIBS) LIBXL_LIBS += $(LIBXL_LIBS-y) -LIBXLU_LIBS = +LIBXLU_LIBS = libxenlight.so LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o flexarray.o ifeq ($(LIBXL_BLKTAP),y) @@ -227,8 +227,8 @@ libxlutil.so: libxlutil.so.$(XLUMAJOR) libxlutil.so.$(XLUMAJOR): libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(SYMLINK_SHLIB) $< $@ -libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS) - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXLU_LIBS) $(APPEND_LDFLAGS) +libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS) libxenlight.so + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $(LIBXLU_OBJS) $(LIBXLU_LIBS) $(APPEND_LDFLAGS) libxlutil.a: $(LIBXLU_OBJS) $(AR) rcs libxlutil.a $^ -- 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 Jan 12 15:23:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:23:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgq1-00075J-7G; Mon, 12 Jan 2015 15:23:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpz-00074d-PM for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:27 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id B2/93-27584-FE6E3B45; Mon, 12 Jan 2015 15:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1421076205!17558068!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11922 invoked from network); 12 Jan 2015 15:23:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:23:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpx-0005O0-Hi for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgpx-0003S0-FH for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:25 +0000 Date: Mon, 12 Jan 2015 15:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xen/arm: Initialize the domain vgic lock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 876367befa26b12bfdecd6697faa7b8102e4b287 Author: Julien Grall AuthorDate: Wed Dec 17 15:40:15 2014 +0000 Commit: Ian Campbell CommitDate: Tue Jan 6 11:14:48 2015 +0000 xen/arm: Initialize the domain vgic lock The domain vgic lock is used uninitialized. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 97061ce..b8bd38b 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -90,6 +90,8 @@ int domain_vgic_init(struct domain *d) return -ENODEV; } + spin_lock_init(&d->arch.vgic.lock); + d->arch.vgic.shared_irqs = xzalloc_array(struct vgic_irq_rank, DOMAIN_NR_RANKS(d)); if ( d->arch.vgic.shared_irqs == NULL ) -- 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 Jan 12 15:23:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:23:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgq1-00075J-7G; Mon, 12 Jan 2015 15:23:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpz-00074d-PM for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:27 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id B2/93-27584-FE6E3B45; Mon, 12 Jan 2015 15:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1421076205!17558068!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11922 invoked from network); 12 Jan 2015 15:23:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:23:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgpx-0005O0-Hi for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgpx-0003S0-FH for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:25 +0000 Date: Mon, 12 Jan 2015 15:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xen/arm: Initialize the domain vgic lock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 876367befa26b12bfdecd6697faa7b8102e4b287 Author: Julien Grall AuthorDate: Wed Dec 17 15:40:15 2014 +0000 Commit: Ian Campbell CommitDate: Tue Jan 6 11:14:48 2015 +0000 xen/arm: Initialize the domain vgic lock The domain vgic lock is used uninitialized. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 97061ce..b8bd38b 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -90,6 +90,8 @@ int domain_vgic_init(struct domain *d) return -ENODEV; } + spin_lock_init(&d->arch.vgic.lock); + d->arch.vgic.shared_irqs = xzalloc_array(struct vgic_irq_rank, DOMAIN_NR_RANKS(d)); if ( d->arch.vgic.shared_irqs == NULL ) -- 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 Jan 12 15:23:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:23: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 1YAgqA-00079A-AT; Mon, 12 Jan 2015 15:23:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgq9-00078f-Mg for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:37 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 28/65-09842-9F6E3B45; Mon, 12 Jan 2015 15:23:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1421076215!20860835!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31923 invoked from network); 12 Jan 2015 15:23:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:23:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgq7-0005O8-Mf for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgq7-0003Sp-LI for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:35 +0000 Date: Mon, 12 Jan 2015 15:23:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] reset PCI devices on force removal even when QEMU returns 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 8233ca53adf008da54c01d55d3309c4b0999ddb5 Author: Stefano Stabellini AuthorDate: Fri Nov 28 16:53:09 2014 +0000 Commit: Ian Campbell CommitDate: Tue Jan 6 11:15:45 2015 +0000 reset PCI devices on force removal even when QEMU returns error On do_pci_remove when QEMU returns error, we just bail out early without resetting the device. On domain shutdown we are racing with QEMU exiting and most often QEMU closes the QMP connection before executing the requested command. In these cases if force=1, it makes sense to go ahead with rest of the PCI device removal, that includes resetting the device and calling xc_deassign_device. Otherwise we risk not resetting the device properly on domain shutdown. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl_pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 9ae37fa..f3ae132 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1243,7 +1243,7 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, rc = ERROR_INVAL; goto out_fail; } - if (rc) { + if (rc && !force) { rc = ERROR_FAIL; goto out_fail; } -- 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 Jan 12 15:23:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:23: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 1YAgqA-00079A-AT; Mon, 12 Jan 2015 15:23:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgq9-00078f-Mg for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:37 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 28/65-09842-9F6E3B45; Mon, 12 Jan 2015 15:23:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1421076215!20860835!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31923 invoked from network); 12 Jan 2015 15:23:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:23:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgq7-0005O8-Mf for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgq7-0003Sp-LI for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:35 +0000 Date: Mon, 12 Jan 2015 15:23:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] reset PCI devices on force removal even when QEMU returns 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 8233ca53adf008da54c01d55d3309c4b0999ddb5 Author: Stefano Stabellini AuthorDate: Fri Nov 28 16:53:09 2014 +0000 Commit: Ian Campbell CommitDate: Tue Jan 6 11:15:45 2015 +0000 reset PCI devices on force removal even when QEMU returns error On do_pci_remove when QEMU returns error, we just bail out early without resetting the device. On domain shutdown we are racing with QEMU exiting and most often QEMU closes the QMP connection before executing the requested command. In these cases if force=1, it makes sense to go ahead with rest of the PCI device removal, that includes resetting the device and calling xc_deassign_device. Otherwise we risk not resetting the device properly on domain shutdown. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl_pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 9ae37fa..f3ae132 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1243,7 +1243,7 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, rc = ERROR_INVAL; goto out_fail; } - if (rc) { + if (rc && !force) { rc = ERROR_FAIL; goto out_fail; } -- 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 Jan 12 15:23:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:23: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 1YAgqK-0007Cs-DW; Mon, 12 Jan 2015 15:23:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqJ-0007CV-Sy for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:47 +0000 Content-Length: 2062 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id AD/ED-15461-307E3B45; Mon, 12 Jan 2015 15:23:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1421076226!20907574!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22336 invoked from network); 12 Jan 2015 15:23:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:23:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqH-0005OE-S5 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgqH-0003Tu-R6 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:45 +0000 Date: Mon, 12 Jan 2015 15:23:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/HVM: prevent use-after-free when destroying 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: multipart/mixed; boundary="===============0291352990717417658==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0291352990717417658== Content-Length: 1658 Content-Transfer-Encoding: quoted-printable commit d3c151fd3a4365fc6107198bfc975807d40d157d Author: Mihai Don=C8=9Bu AuthorDate: Tue Jan 6 12:49:52 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 12:50:44 2015 +0000 x86/HVM: prevent use-after-free when destroying a domain hvm_domain_relinquish_resources() can free certain domain resources which can still be accessed, e.g. by HVMOP_set_param, while the domain is being cleaned up. This is CVE-2015-0361 / XSA-116. Signed-off-by: Mihai Don=C8=9Bu Tested-by: R=C4=83zvan Cojocaru Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index bc414ff..72be5b9 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1487,9 +1487,6 @@ int hvm_domain_initialise(struct domain *d) void hvm_domain_relinquish_resources(struct domain *d) { - xfree(d->arch.hvm_domain.io_handler); - xfree(d->arch.hvm_domain.params); - if ( is_pvh_domain(d) ) return; @@ -1511,6 +1508,9 @@ void hvm_domain_relinquish_resources(struct domain *d) void hvm_domain_destroy(struct domain *d) { + xfree(d->arch.hvm_domain.io_handler); + xfree(d->arch.hvm_domain.params); + hvm_destroy_cacheattr_region_list(d); if ( is_pvh_domain(d) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 --===============0291352990717417658== 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 --===============0291352990717417658==-- From xen-changelog-bounces@lists.xen.org Mon Jan 12 15:23:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:23: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 1YAgqK-0007Cs-DW; Mon, 12 Jan 2015 15:23:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqJ-0007CV-Sy for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:47 +0000 Content-Length: 2062 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id AD/ED-15461-307E3B45; Mon, 12 Jan 2015 15:23:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1421076226!20907574!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22336 invoked from network); 12 Jan 2015 15:23:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:23:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqH-0005OE-S5 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgqH-0003Tu-R6 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:45 +0000 Date: Mon, 12 Jan 2015 15:23:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/HVM: prevent use-after-free when destroying 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: multipart/mixed; boundary="===============0291352990717417658==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0291352990717417658== Content-Length: 1658 Content-Transfer-Encoding: quoted-printable commit d3c151fd3a4365fc6107198bfc975807d40d157d Author: Mihai Don=C8=9Bu AuthorDate: Tue Jan 6 12:49:52 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 12:50:44 2015 +0000 x86/HVM: prevent use-after-free when destroying a domain hvm_domain_relinquish_resources() can free certain domain resources which can still be accessed, e.g. by HVMOP_set_param, while the domain is being cleaned up. This is CVE-2015-0361 / XSA-116. Signed-off-by: Mihai Don=C8=9Bu Tested-by: R=C4=83zvan Cojocaru Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index bc414ff..72be5b9 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1487,9 +1487,6 @@ int hvm_domain_initialise(struct domain *d) void hvm_domain_relinquish_resources(struct domain *d) { - xfree(d->arch.hvm_domain.io_handler); - xfree(d->arch.hvm_domain.params); - if ( is_pvh_domain(d) ) return; @@ -1511,6 +1508,9 @@ void hvm_domain_relinquish_resources(struct domain *d) void hvm_domain_destroy(struct domain *d) { + xfree(d->arch.hvm_domain.io_handler); + xfree(d->arch.hvm_domain.params); + hvm_destroy_cacheattr_region_list(d); if ( is_pvh_domain(d) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 --===============0291352990717417658== 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 --===============0291352990717417658==-- From xen-changelog-bounces@lists.xen.org Mon Jan 12 15:23:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:23: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 1YAgqV-0007GR-GQ; Mon, 12 Jan 2015 15:23:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqU-0007G2-G0 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:58 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 01/5E-02954-D07E3B45; Mon, 12 Jan 2015 15:23:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1421076236!20038186!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19990 invoked from network); 12 Jan 2015 15:23:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqS-0005ON-0u for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgqR-0003UJ-W3 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:56 +0000 Date: Mon, 12 Jan 2015 15:23:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] EFI: suppress bogus loader 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 commit 926e680aadde774557b92a4a3e9457f63e963e84 Author: Jan Beulich AuthorDate: Fri Dec 19 11:17:02 2014 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:07:34 2015 -0500 EFI: suppress bogus loader warning This was accidentally lost in commit fbc3d9a220 ("EFI: add efi_arch_handle_cmdline() for processing commandline"), leading to the "Unknown command line option" warning being printed whenever options get passed to the core hypervisor or the Dom0 kernel. Signed-off-by: Jan Beulich Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/efi/boot.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index c68efdb..ac6881e 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -311,6 +311,7 @@ static unsigned int __init get_argv(unsigned int argc, CHAR16 **argv, ++argc; else if ( prev && wstrcmp(prev, L"--") == 0 ) { + --argv; if ( options ) *options = cmdline; break; -- 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 Jan 12 15:23:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:23: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 1YAgqV-0007GR-GQ; Mon, 12 Jan 2015 15:23:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqU-0007G2-G0 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:58 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 01/5E-02954-D07E3B45; Mon, 12 Jan 2015 15:23:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1421076236!20038186!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19990 invoked from network); 12 Jan 2015 15:23:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqS-0005ON-0u for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgqR-0003UJ-W3 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:23:56 +0000 Date: Mon, 12 Jan 2015 15:23:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] EFI: suppress bogus loader 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 commit 926e680aadde774557b92a4a3e9457f63e963e84 Author: Jan Beulich AuthorDate: Fri Dec 19 11:17:02 2014 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:07:34 2015 -0500 EFI: suppress bogus loader warning This was accidentally lost in commit fbc3d9a220 ("EFI: add efi_arch_handle_cmdline() for processing commandline"), leading to the "Unknown command line option" warning being printed whenever options get passed to the core hypervisor or the Dom0 kernel. Signed-off-by: Jan Beulich Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/efi/boot.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index c68efdb..ac6881e 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -311,6 +311,7 @@ static unsigned int __init get_argv(unsigned int argc, CHAR16 **argv, ++argc; else if ( prev && wstrcmp(prev, L"--") == 0 ) { + --argv; if ( options ) *options = cmdline; break; -- 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 Jan 12 15:24:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:24:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqf-0007Iv-JC; Mon, 12 Jan 2015 15:24:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqe-0007IU-CY for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:08 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 26/8E-15461-717E3B45; Mon, 12 Jan 2015 15:24:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1421076246!20900372!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21654 invoked from network); 12 Jan 2015 15:24:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:24:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqc-0005Ow-6l for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgqc-0003Up-5Q for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:06 +0000 Date: Mon, 12 Jan 2015 15:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Renegerate flex output 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 3bd8559e5e3f406fa4159e12cdd1323c62f4eac8 Author: Ian Jackson AuthorDate: Tue Jan 6 15:15:15 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 15:28:17 2015 +0000 libxl: Renegerate flex output files Regenerate libxl_*_l.* with flex 2.5.35-10.1 as in current Debian wheezy. The differences are trivial: addition of declarations of xlu__cfg_yyget_column and xlu__cfg_yyset_column, but no code body changes. Signed-off-by: Ian Jackson Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxlu_cfg_l.c | 8 ++++++-- tools/libxl/libxlu_cfg_l.h | 6 +++++- tools/libxl/libxlu_disk_l.c | 8 ++++++-- tools/libxl/libxlu_disk_l.h | 6 +++++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxlu_cfg_l.c b/tools/libxl/libxlu_cfg_l.c index df352aa..450863a 100644 --- a/tools/libxl/libxlu_cfg_l.c +++ b/tools/libxl/libxlu_cfg_l.c @@ -610,6 +610,10 @@ int xlu__cfg_yyget_lineno (yyscan_t yyscanner ); void xlu__cfg_yyset_lineno (int line_number ,yyscan_t yyscanner ); +int xlu__cfg_yyget_column (yyscan_t yyscanner ); + +void xlu__cfg_yyset_column (int column_no ,yyscan_t yyscanner ); + YYSTYPE * xlu__cfg_yyget_lval (yyscan_t yyscanner ); void xlu__cfg_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); @@ -762,7 +766,7 @@ YY_DECL #line 53 "libxlu_cfg_l.l" -#line 766 "libxlu_cfg_l.c" +#line 770 "libxlu_cfg_l.c" yylval = yylval_param; @@ -971,7 +975,7 @@ YY_RULE_SETUP #line 104 "libxlu_cfg_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 975 "libxlu_cfg_l.c" +#line 979 "libxlu_cfg_l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(lexerr): yyterminate(); diff --git a/tools/libxl/libxlu_cfg_l.h b/tools/libxl/libxlu_cfg_l.h index 4078302..151064e 100644 --- a/tools/libxl/libxlu_cfg_l.h +++ b/tools/libxl/libxlu_cfg_l.h @@ -276,6 +276,10 @@ int xlu__cfg_yyget_lineno (yyscan_t yyscanner ); void xlu__cfg_yyset_lineno (int line_number ,yyscan_t yyscanner ); +int xlu__cfg_yyget_column (yyscan_t yyscanner ); + +void xlu__cfg_yyset_column (int column_no ,yyscan_t yyscanner ); + YYSTYPE * xlu__cfg_yyget_lval (yyscan_t yyscanner ); void xlu__cfg_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); @@ -352,6 +356,6 @@ extern int xlu__cfg_yylex \ #line 104 "libxlu_cfg_l.l" -#line 356 "libxlu_cfg_l.h" +#line 360 "libxlu_cfg_l.h" #undef xlu__cfg_yyIN_HEADER #endif /* xlu__cfg_yyHEADER_H */ diff --git a/tools/libxl/libxlu_disk_l.c b/tools/libxl/libxlu_disk_l.c index 2c6e8e3..beea7f9 100644 --- a/tools/libxl/libxlu_disk_l.c +++ b/tools/libxl/libxlu_disk_l.c @@ -1011,6 +1011,10 @@ int xlu__disk_yyget_lineno (yyscan_t yyscanner ); void xlu__disk_yyset_lineno (int line_number ,yyscan_t yyscanner ); +int xlu__disk_yyget_column (yyscan_t yyscanner ); + +void xlu__disk_yyset_column (int column_no ,yyscan_t yyscanner ); + /* Macros after this point can all be overridden by user definitions in * section 1. */ @@ -1155,7 +1159,7 @@ YY_DECL /*----- the scanner rules which do the parsing -----*/ -#line 1159 "libxlu_disk_l.c" +#line 1163 "libxlu_disk_l.c" if ( !yyg->yy_init ) { @@ -1498,7 +1502,7 @@ YY_RULE_SETUP #line 259 "libxlu_disk_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1502 "libxlu_disk_l.c" +#line 1506 "libxlu_disk_l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(LEXERR): yyterminate(); diff --git a/tools/libxl/libxlu_disk_l.h b/tools/libxl/libxlu_disk_l.h index 08f60e5..f615582 100644 --- a/tools/libxl/libxlu_disk_l.h +++ b/tools/libxl/libxlu_disk_l.h @@ -280,6 +280,10 @@ int xlu__disk_yyget_lineno (yyscan_t yyscanner ); void xlu__disk_yyset_lineno (int line_number ,yyscan_t yyscanner ); +int xlu__disk_yyget_column (yyscan_t yyscanner ); + +void xlu__disk_yyset_column (int column_no ,yyscan_t yyscanner ); + /* Macros after this point can all be overridden by user definitions in * section 1. */ @@ -346,6 +350,6 @@ extern int xlu__disk_yylex (yyscan_t yyscanner); #line 259 "libxlu_disk_l.l" -#line 350 "libxlu_disk_l.h" +#line 354 "libxlu_disk_l.h" #undef xlu__disk_yyIN_HEADER #endif /* xlu__disk_yyHEADER_H */ -- 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 Jan 12 15:24:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:24:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqf-0007Iv-JC; Mon, 12 Jan 2015 15:24:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqe-0007IU-CY for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:08 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 26/8E-15461-717E3B45; Mon, 12 Jan 2015 15:24:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1421076246!20900372!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21654 invoked from network); 12 Jan 2015 15:24:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:24:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqc-0005Ow-6l for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgqc-0003Up-5Q for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:06 +0000 Date: Mon, 12 Jan 2015 15:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Renegerate flex output 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 3bd8559e5e3f406fa4159e12cdd1323c62f4eac8 Author: Ian Jackson AuthorDate: Tue Jan 6 15:15:15 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 15:28:17 2015 +0000 libxl: Renegerate flex output files Regenerate libxl_*_l.* with flex 2.5.35-10.1 as in current Debian wheezy. The differences are trivial: addition of declarations of xlu__cfg_yyget_column and xlu__cfg_yyset_column, but no code body changes. Signed-off-by: Ian Jackson Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxlu_cfg_l.c | 8 ++++++-- tools/libxl/libxlu_cfg_l.h | 6 +++++- tools/libxl/libxlu_disk_l.c | 8 ++++++-- tools/libxl/libxlu_disk_l.h | 6 +++++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxlu_cfg_l.c b/tools/libxl/libxlu_cfg_l.c index df352aa..450863a 100644 --- a/tools/libxl/libxlu_cfg_l.c +++ b/tools/libxl/libxlu_cfg_l.c @@ -610,6 +610,10 @@ int xlu__cfg_yyget_lineno (yyscan_t yyscanner ); void xlu__cfg_yyset_lineno (int line_number ,yyscan_t yyscanner ); +int xlu__cfg_yyget_column (yyscan_t yyscanner ); + +void xlu__cfg_yyset_column (int column_no ,yyscan_t yyscanner ); + YYSTYPE * xlu__cfg_yyget_lval (yyscan_t yyscanner ); void xlu__cfg_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); @@ -762,7 +766,7 @@ YY_DECL #line 53 "libxlu_cfg_l.l" -#line 766 "libxlu_cfg_l.c" +#line 770 "libxlu_cfg_l.c" yylval = yylval_param; @@ -971,7 +975,7 @@ YY_RULE_SETUP #line 104 "libxlu_cfg_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 975 "libxlu_cfg_l.c" +#line 979 "libxlu_cfg_l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(lexerr): yyterminate(); diff --git a/tools/libxl/libxlu_cfg_l.h b/tools/libxl/libxlu_cfg_l.h index 4078302..151064e 100644 --- a/tools/libxl/libxlu_cfg_l.h +++ b/tools/libxl/libxlu_cfg_l.h @@ -276,6 +276,10 @@ int xlu__cfg_yyget_lineno (yyscan_t yyscanner ); void xlu__cfg_yyset_lineno (int line_number ,yyscan_t yyscanner ); +int xlu__cfg_yyget_column (yyscan_t yyscanner ); + +void xlu__cfg_yyset_column (int column_no ,yyscan_t yyscanner ); + YYSTYPE * xlu__cfg_yyget_lval (yyscan_t yyscanner ); void xlu__cfg_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); @@ -352,6 +356,6 @@ extern int xlu__cfg_yylex \ #line 104 "libxlu_cfg_l.l" -#line 356 "libxlu_cfg_l.h" +#line 360 "libxlu_cfg_l.h" #undef xlu__cfg_yyIN_HEADER #endif /* xlu__cfg_yyHEADER_H */ diff --git a/tools/libxl/libxlu_disk_l.c b/tools/libxl/libxlu_disk_l.c index 2c6e8e3..beea7f9 100644 --- a/tools/libxl/libxlu_disk_l.c +++ b/tools/libxl/libxlu_disk_l.c @@ -1011,6 +1011,10 @@ int xlu__disk_yyget_lineno (yyscan_t yyscanner ); void xlu__disk_yyset_lineno (int line_number ,yyscan_t yyscanner ); +int xlu__disk_yyget_column (yyscan_t yyscanner ); + +void xlu__disk_yyset_column (int column_no ,yyscan_t yyscanner ); + /* Macros after this point can all be overridden by user definitions in * section 1. */ @@ -1155,7 +1159,7 @@ YY_DECL /*----- the scanner rules which do the parsing -----*/ -#line 1159 "libxlu_disk_l.c" +#line 1163 "libxlu_disk_l.c" if ( !yyg->yy_init ) { @@ -1498,7 +1502,7 @@ YY_RULE_SETUP #line 259 "libxlu_disk_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1502 "libxlu_disk_l.c" +#line 1506 "libxlu_disk_l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(LEXERR): yyterminate(); diff --git a/tools/libxl/libxlu_disk_l.h b/tools/libxl/libxlu_disk_l.h index 08f60e5..f615582 100644 --- a/tools/libxl/libxlu_disk_l.h +++ b/tools/libxl/libxlu_disk_l.h @@ -280,6 +280,10 @@ int xlu__disk_yyget_lineno (yyscan_t yyscanner ); void xlu__disk_yyset_lineno (int line_number ,yyscan_t yyscanner ); +int xlu__disk_yyget_column (yyscan_t yyscanner ); + +void xlu__disk_yyset_column (int column_no ,yyscan_t yyscanner ); + /* Macros after this point can all be overridden by user definitions in * section 1. */ @@ -346,6 +350,6 @@ extern int xlu__disk_yylex (yyscan_t yyscanner); #line 259 "libxlu_disk_l.l" -#line 350 "libxlu_disk_l.h" +#line 354 "libxlu_disk_l.h" #undef xlu__disk_yyIN_HEADER #endif /* xlu__disk_yyHEADER_H */ -- 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 Jan 12 15:24:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:24:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqq-0007Ou-MY; Mon, 12 Jan 2015 15:24:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqp-0007OW-6X for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:19 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id DD/AA-26858-227E3B45; Mon, 12 Jan 2015 15:24:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1421076256!16499390!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13488 invoked from network); 12 Jan 2015 15:24:17 -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; 12 Jan 2015 15:24:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqm-0005P6-CG for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgqm-0003VH-Au for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:16 +0000 Date: Mon, 12 Jan 2015 15:24:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Fix building libxlu_cfg_y.y with bison 3.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 7ba4cdfadd4f3c45d65ffe50e621759f458fedc0 Author: Ed Swierk AuthorDate: Tue Jan 6 15:21:07 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 15:28:17 2015 +0000 libxl: Fix building libxlu_cfg_y.y with bison 3.0 - Use %lex-param instead of obsolete YYLEX_PARAM to override lex scanner parameter - Change deprecated %name-prefix= to %name-prefix Tested against bison 2.4.1 and 3.0.2. This is expected to sometimes (depending on timestamps and whether the bison input files are edited) break building on systems with ancient versions of bison. Bison 2.4.1 is known to work and was released in December 2008. Also, consquentially, regenerate bison output files with bison 1:2.5.dfsg-2.1 from Debian wheezy. Signed-off-by: Ed Swierk Acked-by: Ian Jackson Tested-by: Wei Liu Signed-off-by: Ian Jackson Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxlu_cfg_y.c | 4 ++-- tools/libxl/libxlu_cfg_y.y | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxlu_cfg_y.c b/tools/libxl/libxlu_cfg_y.c index 4437e05..07b5a1d 100644 --- a/tools/libxl/libxlu_cfg_y.c +++ b/tools/libxl/libxlu_cfg_y.c @@ -76,7 +76,7 @@ /* Line 268 of yacc.c */ #line 19 "libxlu_cfg_y.y" -#define YYLEX_PARAM ctx->scanner +#define ctx_scanner ctx->scanner #include "libxlu_cfg_i.h" #include "libxlu_cfg_l.h" @@ -656,7 +656,7 @@ while (YYID (0)) #ifdef YYLEX_PARAM # define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) #else -# define YYLEX yylex (&yylval, &yylloc, scanner) +# define YYLEX yylex (&yylval, &yylloc, ctx_scanner) #endif /* Enable debugging if requested. */ diff --git a/tools/libxl/libxlu_cfg_y.y b/tools/libxl/libxlu_cfg_y.y index aa9f787..5acd438 100644 --- a/tools/libxl/libxlu_cfg_y.y +++ b/tools/libxl/libxlu_cfg_y.y @@ -17,7 +17,7 @@ */ %{ -#define YYLEX_PARAM ctx->scanner +#define ctx_scanner ctx->scanner #include "libxlu_cfg_i.h" #include "libxlu_cfg_l.h" %} @@ -31,9 +31,9 @@ %pure-parser %defines %error-verbose -%name-prefix="xlu__cfg_yy" +%name-prefix "xlu__cfg_yy" %parse-param { CfgParseContext *ctx } -%lex-param { void *scanner } +%lex-param { ctx_scanner } %token IDENT STRING NUMBER NEWLINE %type atom -- 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 Jan 12 15:24:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:24:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqq-0007Ou-MY; Mon, 12 Jan 2015 15:24:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqp-0007OW-6X for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:19 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id DD/AA-26858-227E3B45; Mon, 12 Jan 2015 15:24:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1421076256!16499390!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13488 invoked from network); 12 Jan 2015 15:24:17 -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; 12 Jan 2015 15:24:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqm-0005P6-CG for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgqm-0003VH-Au for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:16 +0000 Date: Mon, 12 Jan 2015 15:24:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Fix building libxlu_cfg_y.y with bison 3.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 7ba4cdfadd4f3c45d65ffe50e621759f458fedc0 Author: Ed Swierk AuthorDate: Tue Jan 6 15:21:07 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 15:28:17 2015 +0000 libxl: Fix building libxlu_cfg_y.y with bison 3.0 - Use %lex-param instead of obsolete YYLEX_PARAM to override lex scanner parameter - Change deprecated %name-prefix= to %name-prefix Tested against bison 2.4.1 and 3.0.2. This is expected to sometimes (depending on timestamps and whether the bison input files are edited) break building on systems with ancient versions of bison. Bison 2.4.1 is known to work and was released in December 2008. Also, consquentially, regenerate bison output files with bison 1:2.5.dfsg-2.1 from Debian wheezy. Signed-off-by: Ed Swierk Acked-by: Ian Jackson Tested-by: Wei Liu Signed-off-by: Ian Jackson Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxlu_cfg_y.c | 4 ++-- tools/libxl/libxlu_cfg_y.y | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxlu_cfg_y.c b/tools/libxl/libxlu_cfg_y.c index 4437e05..07b5a1d 100644 --- a/tools/libxl/libxlu_cfg_y.c +++ b/tools/libxl/libxlu_cfg_y.c @@ -76,7 +76,7 @@ /* Line 268 of yacc.c */ #line 19 "libxlu_cfg_y.y" -#define YYLEX_PARAM ctx->scanner +#define ctx_scanner ctx->scanner #include "libxlu_cfg_i.h" #include "libxlu_cfg_l.h" @@ -656,7 +656,7 @@ while (YYID (0)) #ifdef YYLEX_PARAM # define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) #else -# define YYLEX yylex (&yylval, &yylloc, scanner) +# define YYLEX yylex (&yylval, &yylloc, ctx_scanner) #endif /* Enable debugging if requested. */ diff --git a/tools/libxl/libxlu_cfg_y.y b/tools/libxl/libxlu_cfg_y.y index aa9f787..5acd438 100644 --- a/tools/libxl/libxlu_cfg_y.y +++ b/tools/libxl/libxlu_cfg_y.y @@ -17,7 +17,7 @@ */ %{ -#define YYLEX_PARAM ctx->scanner +#define ctx_scanner ctx->scanner #include "libxlu_cfg_i.h" #include "libxlu_cfg_l.h" %} @@ -31,9 +31,9 @@ %pure-parser %defines %error-verbose -%name-prefix="xlu__cfg_yy" +%name-prefix "xlu__cfg_yy" %parse-param { CfgParseContext *ctx } -%lex-param { void *scanner } +%lex-param { ctx_scanner } %token IDENT STRING NUMBER NEWLINE %type atom -- 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 Jan 12 15:24:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:24: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 1YAgr0-0007TI-Sx; Mon, 12 Jan 2015 15:24:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqz-0007RN-7y for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:29 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id D4/1A-26652-C27E3B45; Mon, 12 Jan 2015 15:24:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1421076266!17560900!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29327 invoked from network); 12 Jan 2015 15:24:27 -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; 12 Jan 2015 15:24:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqw-0005PC-IC for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgqw-0003Vd-GO for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:26 +0000 Date: Mon, 12 Jan 2015 15:24:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/hotplug: remove SELinux options from var-lib-xenstored.mount X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a6b04352b72e38744ddf3395bf15232e5e7e7393 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:27 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: remove SELinux options from var-lib-xenstored.mount Using SELinux mount options per default breaks several systems. Either the context= mount option is not known at all to the kernel, as reported for ArchLinux. Or the default value "none" is unknown to SELinux, as reported for Fedora. In both cases the unit will fail. The proper place to specify mount options is /etc/fstab. Apparently systemd is kind enough to use values from there even if Options= or What= is specified in a .mount file. Remove XENSTORED_MOUNT_CTX, the reference to a non-existent EnvironmentFile and trim default Options= for the mount point. The removed code was first mentioned in the patch referenced below, with the following description: ... * Some systems define the selinux context in the systemd Option for the /var/lib/xenstored tmpfs: Options=mode=755,context="system_u:object_r:xenstored_var_lib_t:s0" For the upstream version we remove that and let systems specify the context on their system /etc/default/xenstored or /etc/sysconfig/xenstored $XENSTORED_MOUNT_CTX variable ... It is nowhere stated (on xen-devel) what "Some systems" means, which is unfortunately common practice in nearly all opensource projects. http://lists.xenproject.org/archives/html/xen-devel/2014-03/msg02462.html Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Cc: Wei Liu Cc: Anthony PERARD Cc: M A Young Cc: Luis R. Rodriguez Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- .../Linux/systemd/var-lib-xenstored.mount.in | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in index d5e04db..11a7d50 100644 --- a/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in +++ b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in @@ -6,9 +6,7 @@ ConditionPathExists=/proc/xen/capabilities RefuseManualStop=true [Mount] -Environment=XENSTORED_MOUNT_CTX=none -EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored What=xenstore Where=@XEN_LIB_STORED@ Type=tmpfs -Options=mode=755,context="$XENSTORED_MOUNT_CTX" +Options=mode=755 -- 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 Jan 12 15:24:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:24: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 1YAgr0-0007TI-Sx; Mon, 12 Jan 2015 15:24:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqz-0007RN-7y for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:29 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id D4/1A-26652-C27E3B45; Mon, 12 Jan 2015 15:24:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1421076266!17560900!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29327 invoked from network); 12 Jan 2015 15:24:27 -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; 12 Jan 2015 15:24:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgqw-0005PC-IC for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgqw-0003Vd-GO for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:26 +0000 Date: Mon, 12 Jan 2015 15:24:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/hotplug: remove SELinux options from var-lib-xenstored.mount X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a6b04352b72e38744ddf3395bf15232e5e7e7393 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:27 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: remove SELinux options from var-lib-xenstored.mount Using SELinux mount options per default breaks several systems. Either the context= mount option is not known at all to the kernel, as reported for ArchLinux. Or the default value "none" is unknown to SELinux, as reported for Fedora. In both cases the unit will fail. The proper place to specify mount options is /etc/fstab. Apparently systemd is kind enough to use values from there even if Options= or What= is specified in a .mount file. Remove XENSTORED_MOUNT_CTX, the reference to a non-existent EnvironmentFile and trim default Options= for the mount point. The removed code was first mentioned in the patch referenced below, with the following description: ... * Some systems define the selinux context in the systemd Option for the /var/lib/xenstored tmpfs: Options=mode=755,context="system_u:object_r:xenstored_var_lib_t:s0" For the upstream version we remove that and let systems specify the context on their system /etc/default/xenstored or /etc/sysconfig/xenstored $XENSTORED_MOUNT_CTX variable ... It is nowhere stated (on xen-devel) what "Some systems" means, which is unfortunately common practice in nearly all opensource projects. http://lists.xenproject.org/archives/html/xen-devel/2014-03/msg02462.html Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Cc: Wei Liu Cc: Anthony PERARD Cc: M A Young Cc: Luis R. Rodriguez Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- .../Linux/systemd/var-lib-xenstored.mount.in | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in index d5e04db..11a7d50 100644 --- a/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in +++ b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in @@ -6,9 +6,7 @@ ConditionPathExists=/proc/xen/capabilities RefuseManualStop=true [Mount] -Environment=XENSTORED_MOUNT_CTX=none -EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored What=xenstore Where=@XEN_LIB_STORED@ Type=tmpfs -Options=mode=755,context="$XENSTORED_MOUNT_CTX" +Options=mode=755 -- 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 Jan 12 15:24:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:24: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 1YAgrA-0007XR-1f; Mon, 12 Jan 2015 15:24:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgr9-0007XC-2T for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:39 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 03/B3-02953-637E3B45; Mon, 12 Jan 2015 15:24:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1421076276!20038430!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24873 invoked from network); 12 Jan 2015 15:24:37 -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; 12 Jan 2015 15:24:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgr6-0005PK-NX for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgr6-0003W3-M6 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:36 +0000 Date: Mon, 12 Jan 2015 15:24:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/hotplug: remove XENSTORED_ROOTDIR from xenstored.service X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae978c555877cd97fb8eec96a27c08c4f72b70bb Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:28 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: remove XENSTORED_ROOTDIR from xenstored.service There is no need to export XENSTORED_ROOTDIR. This variable can be enabled in sysconfig/xencommons. If the variable is unset xenstored will automatically use @XEN_LIB_STORED@. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- tools/hotplug/Linux/systemd/xenstored.service.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in index 780bdd6..0f0ac58 100644 --- a/tools/hotplug/Linux/systemd/xenstored.service.in +++ b/tools/hotplug/Linux/systemd/xenstored.service.in @@ -9,7 +9,6 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=notify Environment=XENSTORED_ARGS= -Environment=XENSTORED_ROOTDIR=@XEN_LIB_STORED@ Environment=XENSTORED=@XENSTORED@ EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities -- 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 Jan 12 15:24:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:24: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 1YAgrA-0007XR-1f; Mon, 12 Jan 2015 15:24:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgr9-0007XC-2T for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:39 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 03/B3-02953-637E3B45; Mon, 12 Jan 2015 15:24:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1421076276!20038430!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24873 invoked from network); 12 Jan 2015 15:24:37 -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; 12 Jan 2015 15:24:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgr6-0005PK-NX for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgr6-0003W3-M6 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:36 +0000 Date: Mon, 12 Jan 2015 15:24:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/hotplug: remove XENSTORED_ROOTDIR from xenstored.service X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae978c555877cd97fb8eec96a27c08c4f72b70bb Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:28 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: remove XENSTORED_ROOTDIR from xenstored.service There is no need to export XENSTORED_ROOTDIR. This variable can be enabled in sysconfig/xencommons. If the variable is unset xenstored will automatically use @XEN_LIB_STORED@. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- tools/hotplug/Linux/systemd/xenstored.service.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in index 780bdd6..0f0ac58 100644 --- a/tools/hotplug/Linux/systemd/xenstored.service.in +++ b/tools/hotplug/Linux/systemd/xenstored.service.in @@ -9,7 +9,6 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=notify Environment=XENSTORED_ARGS= -Environment=XENSTORED_ROOTDIR=@XEN_LIB_STORED@ Environment=XENSTORED=@XENSTORED@ EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities -- 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 Jan 12 15:24:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:24: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 1YAgrL-0007aY-4d; Mon, 12 Jan 2015 15:24:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrJ-0007a8-CT for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:49 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 88/65-25547-047E3B45; Mon, 12 Jan 2015 15:24:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1421076287!18987195!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26572 invoked from network); 12 Jan 2015 15:24:48 -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; 12 Jan 2015 15:24:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrG-0005PQ-Sz for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgrG-0003Wv-RI for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:46 +0000 Date: Mon, 12 Jan 2015 15:24:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/hotplug: xendomains.service depends on network X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 37cc9d9a5b344d0c63d93d9d357b8c07aeb351c9 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:29 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: xendomains.service depends on network Starting domains during boot will most likely require network for the local bridge and it may need access to remote filesystems. Add ordering tags to systemd service file. Signed-off-by: Olaf Hering Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- tools/hotplug/Linux/systemd/xendomains.service.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xendomains.service.in b/tools/hotplug/Linux/systemd/xendomains.service.in index 9962671..66e2065 100644 --- a/tools/hotplug/Linux/systemd/xendomains.service.in +++ b/tools/hotplug/Linux/systemd/xendomains.service.in @@ -2,6 +2,8 @@ Description=Xendomains - start and stop guests on boot and shutdown Requires=proc-xen.mount xenstored.service After=proc-xen.mount xenstored.service xenconsoled.service xen-init-dom0.service +After=network-online.target +After=remote-fs.target ConditionPathExists=/proc/xen/capabilities [Service] -- 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 Jan 12 15:24:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:24: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 1YAgrL-0007aY-4d; Mon, 12 Jan 2015 15:24:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrJ-0007a8-CT for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:49 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 88/65-25547-047E3B45; Mon, 12 Jan 2015 15:24:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1421076287!18987195!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26572 invoked from network); 12 Jan 2015 15:24:48 -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; 12 Jan 2015 15:24:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrG-0005PQ-Sz for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgrG-0003Wv-RI for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:46 +0000 Date: Mon, 12 Jan 2015 15:24:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/hotplug: xendomains.service depends on network X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 37cc9d9a5b344d0c63d93d9d357b8c07aeb351c9 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:29 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: xendomains.service depends on network Starting domains during boot will most likely require network for the local bridge and it may need access to remote filesystems. Add ordering tags to systemd service file. Signed-off-by: Olaf Hering Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- tools/hotplug/Linux/systemd/xendomains.service.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xendomains.service.in b/tools/hotplug/Linux/systemd/xendomains.service.in index 9962671..66e2065 100644 --- a/tools/hotplug/Linux/systemd/xendomains.service.in +++ b/tools/hotplug/Linux/systemd/xendomains.service.in @@ -2,6 +2,8 @@ Description=Xendomains - start and stop guests on boot and shutdown Requires=proc-xen.mount xenstored.service After=proc-xen.mount xenstored.service xenconsoled.service xen-init-dom0.service +After=network-online.target +After=remote-fs.target ConditionPathExists=/proc/xen/capabilities [Service] -- 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 Jan 12 15:25:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:25:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrU-0007fF-7p; Mon, 12 Jan 2015 15:25:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrT-0007f2-81 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:59 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 8C/28-09842-A47E3B45; Mon, 12 Jan 2015 15:24:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1421076297!20907929!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29969 invoked from network); 12 Jan 2015 15:24:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:24:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrR-0005PZ-2A for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgrR-0003XN-0o for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:57 +0000 Date: Mon, 12 Jan 2015 15:24:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/hotplug: use xencommons as EnvironmentFile in xenconsoled.service X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9fd87d31ce0f4632cce74c29ea62c9c05ac927e4 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:30 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: use xencommons as EnvironmentFile in xenconsoled.service The referenced sysconfig/xenconsoled does not exist. If anything needs to be specified it has to go into the existing sysconfig/xencommons file. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Cc: Wei Liu Signed-off-by: Konrad Rzeszutek Wilk --- tools/hotplug/Linux/systemd/xenconsoled.service.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xenconsoled.service.in b/tools/hotplug/Linux/systemd/xenconsoled.service.in index cb44cd6..9e71444 100644 --- a/tools/hotplug/Linux/systemd/xenconsoled.service.in +++ b/tools/hotplug/Linux/systemd/xenconsoled.service.in @@ -9,7 +9,7 @@ Type=simple Environment=XENCONSOLED_ARGS= Environment=XENCONSOLED_LOG=none Environment=XENCONSOLED_LOG_DIR=@XEN_LOG_DIR@/console -EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenconsoled +EnvironmentFile=@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons PIDFile=@XEN_RUN_DIR@/xenconsoled.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p ${XENCONSOLED_LOG_DIR} -- 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 Jan 12 15:25:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:25:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrU-0007fF-7p; Mon, 12 Jan 2015 15:25:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrT-0007f2-81 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:59 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 8C/28-09842-A47E3B45; Mon, 12 Jan 2015 15:24:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1421076297!20907929!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29969 invoked from network); 12 Jan 2015 15:24:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:24:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrR-0005PZ-2A for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgrR-0003XN-0o for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:24:57 +0000 Date: Mon, 12 Jan 2015 15:24:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/hotplug: use xencommons as EnvironmentFile in xenconsoled.service X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9fd87d31ce0f4632cce74c29ea62c9c05ac927e4 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:30 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: use xencommons as EnvironmentFile in xenconsoled.service The referenced sysconfig/xenconsoled does not exist. If anything needs to be specified it has to go into the existing sysconfig/xencommons file. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Cc: Wei Liu Signed-off-by: Konrad Rzeszutek Wilk --- tools/hotplug/Linux/systemd/xenconsoled.service.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xenconsoled.service.in b/tools/hotplug/Linux/systemd/xenconsoled.service.in index cb44cd6..9e71444 100644 --- a/tools/hotplug/Linux/systemd/xenconsoled.service.in +++ b/tools/hotplug/Linux/systemd/xenconsoled.service.in @@ -9,7 +9,7 @@ Type=simple Environment=XENCONSOLED_ARGS= Environment=XENCONSOLED_LOG=none Environment=XENCONSOLED_LOG_DIR=@XEN_LOG_DIR@/console -EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenconsoled +EnvironmentFile=@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons PIDFile=@XEN_RUN_DIR@/xenconsoled.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p ${XENCONSOLED_LOG_DIR} -- 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 Jan 12 15:25:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:25: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 1YAgrj-0007is-OV; Mon, 12 Jan 2015 15:25:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgri-0007iS-Ve for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:15 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id DE/A2-16982-A57E3B45; Mon, 12 Jan 2015 15:25:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1421076312!18931958!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12068 invoked from network); 12 Jan 2015 15:25: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; 12 Jan 2015 15:25:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrb-0005Q8-7X for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgrb-0003Xw-66 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:07 +0000 Date: Mon, 12 Jan 2015 15:25:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/hotplug: use XENCONSOLED_TRACE in xenconsoled.service X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 098f91390340691c0603f75ab1694e3ccce26c56 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:31 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: use XENCONSOLED_TRACE in xenconsoled.service Instead of inventing a new XENCONSOLED_LOG= variable reuse the existing XENCONSOLED_TRACE= variable in xenconsoled.service. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Cc: Wei Liu Signed-off-by: Konrad Rzeszutek Wilk --- tools/hotplug/Linux/systemd/xenconsoled.service.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xenconsoled.service.in b/tools/hotplug/Linux/systemd/xenconsoled.service.in index 9e71444..cd282bf 100644 --- a/tools/hotplug/Linux/systemd/xenconsoled.service.in +++ b/tools/hotplug/Linux/systemd/xenconsoled.service.in @@ -7,13 +7,13 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=simple Environment=XENCONSOLED_ARGS= -Environment=XENCONSOLED_LOG=none +Environment=XENCONSOLED_TRACE=none Environment=XENCONSOLED_LOG_DIR=@XEN_LOG_DIR@/console EnvironmentFile=@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons PIDFile=@XEN_RUN_DIR@/xenconsoled.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p ${XENCONSOLED_LOG_DIR} -ExecStart=@sbindir@/xenconsoled --pid-file @XEN_RUN_DIR@/xenconsoled.pid --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS +ExecStart=@sbindir@/xenconsoled --pid-file @XEN_RUN_DIR@/xenconsoled.pid --log=${XENCONSOLED_TRACE} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS [Install] WantedBy=multi-user.target -- 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 Jan 12 15:25:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:25: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 1YAgrj-0007is-OV; Mon, 12 Jan 2015 15:25:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgri-0007iS-Ve for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:15 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id DE/A2-16982-A57E3B45; Mon, 12 Jan 2015 15:25:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1421076312!18931958!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12068 invoked from network); 12 Jan 2015 15:25: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; 12 Jan 2015 15:25:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrb-0005Q8-7X for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgrb-0003Xw-66 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:07 +0000 Date: Mon, 12 Jan 2015 15:25:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/hotplug: use XENCONSOLED_TRACE in xenconsoled.service X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 098f91390340691c0603f75ab1694e3ccce26c56 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:31 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: use XENCONSOLED_TRACE in xenconsoled.service Instead of inventing a new XENCONSOLED_LOG= variable reuse the existing XENCONSOLED_TRACE= variable in xenconsoled.service. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Cc: Wei Liu Signed-off-by: Konrad Rzeszutek Wilk --- tools/hotplug/Linux/systemd/xenconsoled.service.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xenconsoled.service.in b/tools/hotplug/Linux/systemd/xenconsoled.service.in index 9e71444..cd282bf 100644 --- a/tools/hotplug/Linux/systemd/xenconsoled.service.in +++ b/tools/hotplug/Linux/systemd/xenconsoled.service.in @@ -7,13 +7,13 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=simple Environment=XENCONSOLED_ARGS= -Environment=XENCONSOLED_LOG=none +Environment=XENCONSOLED_TRACE=none Environment=XENCONSOLED_LOG_DIR=@XEN_LOG_DIR@/console EnvironmentFile=@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons PIDFile=@XEN_RUN_DIR@/xenconsoled.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p ${XENCONSOLED_LOG_DIR} -ExecStart=@sbindir@/xenconsoled --pid-file @XEN_RUN_DIR@/xenconsoled.pid --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS +ExecStart=@sbindir@/xenconsoled --pid-file @XEN_RUN_DIR@/xenconsoled.pid --log=${XENCONSOLED_TRACE} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS [Install] WantedBy=multi-user.target -- 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 Jan 12 15:25:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:25: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 1YAgro-0007kc-R5; Mon, 12 Jan 2015 15:25:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrn-0007jz-Nz for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:19 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id FC/78-27584-F57E3B45; Mon, 12 Jan 2015 15:25:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1421076317!13642694!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19116 invoked from network); 12 Jan 2015 15:25:18 -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; 12 Jan 2015 15:25:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrl-0005QE-Dj for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgrl-0003YU-BI for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:17 +0000 Date: Mon, 12 Jan 2015 15:25:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/hotplug: remove EnvironmentFile from xen-qemu-dom0-disk-backend.service X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 88ef4e4e5265242bd0cc073fcfdeda8e349c1ff5 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:32 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: remove EnvironmentFile from xen-qemu-dom0-disk-backend.service The referenced Environment file does not exist, and the service file does not make use of variables anyway. N.B. If we start honouring env settings for any reason this will have to be changed. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Cc: Wei Liu Signed-off-by: Konrad Rzeszutek Wilk --- .../systemd/xen-qemu-dom0-disk-backend.service.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in index 0a5807a..274cec0 100644 --- a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in +++ b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in @@ -8,7 +8,6 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=simple -EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored PIDFile=@XEN_RUN_DIR@/qemu-dom0.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@ -- 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 Jan 12 15:25:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:25: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 1YAgro-0007kc-R5; Mon, 12 Jan 2015 15:25:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrn-0007jz-Nz for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:19 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id FC/78-27584-F57E3B45; Mon, 12 Jan 2015 15:25:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1421076317!13642694!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19116 invoked from network); 12 Jan 2015 15:25:18 -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; 12 Jan 2015 15:25:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrl-0005QE-Dj for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgrl-0003YU-BI for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:17 +0000 Date: Mon, 12 Jan 2015 15:25:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools/hotplug: remove EnvironmentFile from xen-qemu-dom0-disk-backend.service X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 88ef4e4e5265242bd0cc073fcfdeda8e349c1ff5 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:32 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: remove EnvironmentFile from xen-qemu-dom0-disk-backend.service The referenced Environment file does not exist, and the service file does not make use of variables anyway. N.B. If we start honouring env settings for any reason this will have to be changed. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Cc: Wei Liu Signed-off-by: Konrad Rzeszutek Wilk --- .../systemd/xen-qemu-dom0-disk-backend.service.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in index 0a5807a..274cec0 100644 --- a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in +++ b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in @@ -8,7 +8,6 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=simple -EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored PIDFile=@XEN_RUN_DIR@/qemu-dom0.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@ -- 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 Jan 12 15:25:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:25: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 1YAgs0-0007qc-MV; Mon, 12 Jan 2015 15:25:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgry-0007po-Ss for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:30 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id A5/23-24124-A67E3B45; Mon, 12 Jan 2015 15:25:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1421076327!13444823!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10670 invoked from network); 12 Jan 2015 15:25:28 -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; 12 Jan 2015 15:25:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrv-0005QW-Mw for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgrv-0003Yq-Hi for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:27 +0000 Date: Mon, 12 Jan 2015 15:25:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Config.mk: Non-debug build by default. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 48a0b164f6bbaead8fe27ded394f77f3ecf13775 Author: Konrad Rzeszutek Wilk AuthorDate: Tue Jan 6 10:38:33 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:41:23 2015 -0500 Config.mk: Non-debug build by default. Set debug ?= n, in preperation for releasing. Signed-off-by: Konrad Rzeszutek Wilk --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 0e22057..b6dcf98 100644 --- a/Config.mk +++ b/Config.mk @@ -17,7 +17,7 @@ or = $(if $(strip $(1)),$(1),$(if $(strip $(2)),$(2),$(if $(strip $(3)),$( -include $(XEN_ROOT)/.config # A debug build of Xen and tools? -debug ?= y +debug ?= n debug_symbols ?= $(debug) # Test coverage support -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jan 12 15:25:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:25: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 1YAgs0-0007qc-MV; Mon, 12 Jan 2015 15:25:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgry-0007po-Ss for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:30 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id A5/23-24124-A67E3B45; Mon, 12 Jan 2015 15:25:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1421076327!13444823!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10670 invoked from network); 12 Jan 2015 15:25:28 -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; 12 Jan 2015 15:25:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgrv-0005QW-Mw for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgrv-0003Yq-Hi for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:27 +0000 Date: Mon, 12 Jan 2015 15:25:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Config.mk: Non-debug build by default. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 48a0b164f6bbaead8fe27ded394f77f3ecf13775 Author: Konrad Rzeszutek Wilk AuthorDate: Tue Jan 6 10:38:33 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:41:23 2015 -0500 Config.mk: Non-debug build by default. Set debug ?= n, in preperation for releasing. Signed-off-by: Konrad Rzeszutek Wilk --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 0e22057..b6dcf98 100644 --- a/Config.mk +++ b/Config.mk @@ -17,7 +17,7 @@ or = $(if $(strip $(1)),$(1),$(if $(strip $(2)),$(2),$(if $(strip $(3)),$( -include $(XEN_ROOT)/.config # A debug build of Xen and tools? -debug ?= y +debug ?= n debug_symbols ?= $(debug) # Test coverage support -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jan 12 15:25:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:25: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 1YAgs9-0007uB-PP; Mon, 12 Jan 2015 15:25:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgs8-0007tO-0z for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:40 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id A6/71-15461-377E3B45; Mon, 12 Jan 2015 15:25:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1421076338!20893549!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1907 invoked from network); 12 Jan 2015 15:25:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:25:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgs5-0005Qj-SM for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgs5-0003ZH-Qx for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:37 +0000 Date: Mon, 12 Jan 2015 15:25:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Config.mk: Update cloned trees' urls to 4.5 repos X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e34fbb3401cf2a8c78c605427c1ad21660a2f09b Author: Ian Jackson AuthorDate: Tue Jan 6 16:29:59 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 16:29:59 2015 +0000 Config.mk: Update cloned trees' urls to 4.5 repos These repos have branched for 4.5, along with xen.git. At the moment, they have a repo per Xen branch. Signed-off-by: Ian Jackson --- Config.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index b6dcf98..3e9341c 100644 --- a/Config.mk +++ b/Config.mk @@ -242,13 +242,13 @@ endif ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git -QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git -QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git +QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-4.5.git +QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-4.5.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git -QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git -QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git +QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.5.git +QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.5.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jan 12 15:25:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:25: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 1YAgs9-0007uB-PP; Mon, 12 Jan 2015 15:25:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgs8-0007tO-0z for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:40 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id A6/71-15461-377E3B45; Mon, 12 Jan 2015 15:25:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1421076338!20893549!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1907 invoked from network); 12 Jan 2015 15:25:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:25:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgs5-0005Qj-SM for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgs5-0003ZH-Qx for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:37 +0000 Date: Mon, 12 Jan 2015 15:25:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Config.mk: Update cloned trees' urls to 4.5 repos X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e34fbb3401cf2a8c78c605427c1ad21660a2f09b Author: Ian Jackson AuthorDate: Tue Jan 6 16:29:59 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 16:29:59 2015 +0000 Config.mk: Update cloned trees' urls to 4.5 repos These repos have branched for 4.5, along with xen.git. At the moment, they have a repo per Xen branch. Signed-off-by: Ian Jackson --- Config.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index b6dcf98..3e9341c 100644 --- a/Config.mk +++ b/Config.mk @@ -242,13 +242,13 @@ endif ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git -QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git -QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git +QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-4.5.git +QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-4.5.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git -QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git -QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git +QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.5.git +QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.5.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jan 12 15:25:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:25: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 1YAgsJ-0007yN-Ub; Mon, 12 Jan 2015 15:25:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsI-0007xo-LB for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:50 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id A9/14-14214-D77E3B45; Mon, 12 Jan 2015 15:25:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1421076348!14209896!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13771 invoked from network); 12 Jan 2015 15:25:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:25:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsG-0005Qp-13 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgsG-0003aN-05 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:48 +0000 Date: Mon, 12 Jan 2015 15:25:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Config.mk: Update cloned trees' urls to 4.5 repo (missing -testing) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ed671d444ebf27f2529721ef0f8eb03754a8295 Author: Konrad Rzeszutek Wilk AuthorDate: Tue Jan 6 12:11:51 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 12:12:39 2015 -0500 Config.mk: Update cloned trees' urls to 4.5 repo (missing -testing) It was missing the the '-testing' postfix. Signed-off-by: Konrad Rzeszutek Wilk --- Config.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 3e9341c..f5462fb 100644 --- a/Config.mk +++ b/Config.mk @@ -242,13 +242,13 @@ endif ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git -QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-4.5.git -QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-4.5.git +QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-4.5-testing.git +QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-4.5-testing.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git -QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.5.git -QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.5.git +QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.5-testing.git +QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.5-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -- 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 Jan 12 15:25:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:25: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 1YAgsJ-0007yN-Ub; Mon, 12 Jan 2015 15:25:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsI-0007xo-LB for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:50 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id A9/14-14214-D77E3B45; Mon, 12 Jan 2015 15:25:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1421076348!14209896!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13771 invoked from network); 12 Jan 2015 15:25:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:25:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsG-0005Qp-13 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgsG-0003aN-05 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:48 +0000 Date: Mon, 12 Jan 2015 15:25:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Config.mk: Update cloned trees' urls to 4.5 repo (missing -testing) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ed671d444ebf27f2529721ef0f8eb03754a8295 Author: Konrad Rzeszutek Wilk AuthorDate: Tue Jan 6 12:11:51 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 12:12:39 2015 -0500 Config.mk: Update cloned trees' urls to 4.5 repo (missing -testing) It was missing the the '-testing' postfix. Signed-off-by: Konrad Rzeszutek Wilk --- Config.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 3e9341c..f5462fb 100644 --- a/Config.mk +++ b/Config.mk @@ -242,13 +242,13 @@ endif ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git -QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-4.5.git -QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-4.5.git +QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-4.5-testing.git +QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-4.5-testing.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git -QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.5.git -QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.5.git +QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.5-testing.git +QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.5-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -- 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 Jan 12 15:26:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:26: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 1YAgsW-000826-1A; Mon, 12 Jan 2015 15:26:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsS-00081E-T5 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:01 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 9E/84-14214-887E3B45; Mon, 12 Jan 2015 15:26:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1421076358!12158522!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23243 invoked from network); 12 Jan 2015 15:25:59 -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; 12 Jan 2015 15:25:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsQ-0005R5-6e for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgsQ-0003aj-57 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:58 +0000 Date: Mon, 12 Jan 2015 15:25:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Config.mk: Update with proper QEMU tags for Xen 4.5.0 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 1260a99d17b00ae45ca86916008d821aac01b2bf Author: Konrad Rzeszutek Wilk AuthorDate: Tue Jan 6 11:44:36 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 12:12:39 2015 -0500 Config.mk: Update with proper QEMU tags for Xen 4.5.0 release The trees are tagged. Signed-off-by: Konrad Rzeszutek Wilk --- Config.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index f5462fb..7288326 100644 --- a/Config.mk +++ b/Config.mk @@ -252,7 +252,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.5-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc4 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. @@ -260,7 +260,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.5.0-rc1 +QEMU_TRADITIONAL_REVISION ?= xen-4.5.0 # Mon Oct 6 16:24:46 2014 +0100 # qemu-xen-trad: Switch to $(LIBEXEC_BIN) from $(LIBEXEC) -- 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 Jan 12 15:26:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:26: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 1YAgsW-000826-1A; Mon, 12 Jan 2015 15:26:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsS-00081E-T5 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:01 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 9E/84-14214-887E3B45; Mon, 12 Jan 2015 15:26:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1421076358!12158522!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23243 invoked from network); 12 Jan 2015 15:25:59 -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; 12 Jan 2015 15:25:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsQ-0005R5-6e for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgsQ-0003aj-57 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:25:58 +0000 Date: Mon, 12 Jan 2015 15:25:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Config.mk: Update with proper QEMU tags for Xen 4.5.0 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 1260a99d17b00ae45ca86916008d821aac01b2bf Author: Konrad Rzeszutek Wilk AuthorDate: Tue Jan 6 11:44:36 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 12:12:39 2015 -0500 Config.mk: Update with proper QEMU tags for Xen 4.5.0 release The trees are tagged. Signed-off-by: Konrad Rzeszutek Wilk --- Config.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index f5462fb..7288326 100644 --- a/Config.mk +++ b/Config.mk @@ -252,7 +252,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.5-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc4 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. @@ -260,7 +260,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.5.0-rc1 +QEMU_TRADITIONAL_REVISION ?= xen-4.5.0 # Mon Oct 6 16:24:46 2014 +0100 # qemu-xen-trad: Switch to $(LIBEXEC_BIN) from $(LIBEXEC) -- 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 Jan 12 15:26:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:26: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 1YAgsg-00084Z-48; Mon, 12 Jan 2015 15:26:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgse-000847-3k for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:12 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id F8/08-20609-397E3B45; Mon, 12 Jan 2015 15:26:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1421076368!20079020!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28647 invoked from network); 12 Jan 2015 15:26:09 -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; 12 Jan 2015 15:26:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsa-0005Re-Cn for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgsa-0003bG-BA for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:08 +0000 Date: Mon, 12 Jan 2015 15:26:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] README, xen/Makefile: Update to Xen 4.5.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 0e766eae87da07816a8c39ca7b32e52ee9d081b4 Author: Konrad Rzeszutek Wilk AuthorDate: Tue Jan 6 12:03:10 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 13:30:42 2015 -0500 README, xen/Makefile: Update to Xen 4.5.0 Expand the README file to give a brief view of what went in Xen 4.5.0. Also change the Makefile to not use the '-rc' postfix. Reviewed-by: Andrew Cooper Signed-off-by: Konrad Rzeszutek Wilk --- README | 45 ++++++++++++++++++++++++++++++++------------- xen/Makefile | 2 +- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/README b/README index 412607a..8c7603f 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ ################################# -__ __ _ _ ____ _ _ _ -\ \/ /___ _ __ | || | | ___| _ _ _ __ ___| |_ __ _| |__ | | ___ - \ // _ \ '_ \ | || |_ |___ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ - / \ __/ | | | |__ _| ___) |_____| |_| | | | \__ \ || (_| | |_) | | __/ -/_/\_\___|_| |_| |_|(_)____/ \__,_|_| |_|___/\__\__,_|_.__/|_|\___| +__ __ _ _ ____ ___ +\ \/ /___ _ __ | || | | ___| / _ \ + \ // _ \ '_ \ | || |_ |___ \| | | | + / \ __/ | | | |__ _| ___) | |_| | +/_/\_\___|_| |_| |_|(_)____(_)___/ ################################# @@ -19,14 +19,33 @@ is freely-distributable Open Source software, released under the GNU GPL. Since its initial public release, Xen has grown a large development community, spearheaded by xen.org (http://www.xen.org). -The 4.3 release offers a number of improvements, including NUMA -scheduling affinity, openvswitch integration, and defaulting to -qemu-xen rather than qemu-traditional for non-stubdom guests. -(qemu-xen is kept very close to the upstream project.) We also have a -number of updates to vTPM, and improvements to XSM and Flask to allow -greater disaggregation. Additionally, 4.3 contains a basic version of -Xen for the new ARM server architecture, both 32- and 64-bit. And as -always, there are a number of performance, stability, and security +The 4.5 release offers a number of improvements, including: improvements for +large scale machines during bootup and for PCI passthrough; multiple IO-REQ +servers (many QEMUs for a guest); soft affinity for vCPUs (aka NUMA affinity); +and API expansion for guest introspection. We also have number of updates for +CPU specific changes, such as: Broadwell Supervisor Mode Access Prevention; +Haswell Server Cache QoS Monitoring aka Intel Resource Director Technology; +further extensions to vAPIC (SandyBridge feature); fixes in AMD microcode +loading; Data Breaking Extensions and further MSR masking support on AMD. + +On the experimental side we have added a new Real-Time Deferrable Server Based +CPU Scheduler (rtds), and PVH initial domain (dom0) support for Intel CPUs. + +Additionally, 4.5 has a huge update to the ARM code, including support for: +up to 1TB in guests; up to 8 CPUs; Power State Coordination Interface (0.2) +to power up and down CPUs; UEFI booting; IOMMU support (SMMUv1); Super Page +(2MB) support; passthrough of MMIO regions to guests; and lower interrupt +latency. + +The toolstack has expanded to include support for: VM Generation ID (a Windows +2012 Server requirement); Remus initial support (for high availability) +in libxl (since xend has been removed); libxenlight JSON support and persistent +configuration support, systemd support; and support in QEMU for expanding the +PCI hole. + +Lastly, we have removed the Python toolstack (xend). + +And as always, there are a number of performance, stability, and security improvements under-the hood. This file contains some quick-start instructions to install Xen on diff --git a/xen/Makefile b/xen/Makefile index 72c1313..5d70741 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 5 -export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .0$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jan 12 15:26:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:26: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 1YAgsg-00084Z-48; Mon, 12 Jan 2015 15:26:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgse-000847-3k for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:12 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id F8/08-20609-397E3B45; Mon, 12 Jan 2015 15:26:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1421076368!20079020!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28647 invoked from network); 12 Jan 2015 15:26:09 -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; 12 Jan 2015 15:26:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsa-0005Re-Cn for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgsa-0003bG-BA for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:08 +0000 Date: Mon, 12 Jan 2015 15:26:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] README, xen/Makefile: Update to Xen 4.5.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 0e766eae87da07816a8c39ca7b32e52ee9d081b4 Author: Konrad Rzeszutek Wilk AuthorDate: Tue Jan 6 12:03:10 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 13:30:42 2015 -0500 README, xen/Makefile: Update to Xen 4.5.0 Expand the README file to give a brief view of what went in Xen 4.5.0. Also change the Makefile to not use the '-rc' postfix. Reviewed-by: Andrew Cooper Signed-off-by: Konrad Rzeszutek Wilk --- README | 45 ++++++++++++++++++++++++++++++++------------- xen/Makefile | 2 +- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/README b/README index 412607a..8c7603f 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ ################################# -__ __ _ _ ____ _ _ _ -\ \/ /___ _ __ | || | | ___| _ _ _ __ ___| |_ __ _| |__ | | ___ - \ // _ \ '_ \ | || |_ |___ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ - / \ __/ | | | |__ _| ___) |_____| |_| | | | \__ \ || (_| | |_) | | __/ -/_/\_\___|_| |_| |_|(_)____/ \__,_|_| |_|___/\__\__,_|_.__/|_|\___| +__ __ _ _ ____ ___ +\ \/ /___ _ __ | || | | ___| / _ \ + \ // _ \ '_ \ | || |_ |___ \| | | | + / \ __/ | | | |__ _| ___) | |_| | +/_/\_\___|_| |_| |_|(_)____(_)___/ ################################# @@ -19,14 +19,33 @@ is freely-distributable Open Source software, released under the GNU GPL. Since its initial public release, Xen has grown a large development community, spearheaded by xen.org (http://www.xen.org). -The 4.3 release offers a number of improvements, including NUMA -scheduling affinity, openvswitch integration, and defaulting to -qemu-xen rather than qemu-traditional for non-stubdom guests. -(qemu-xen is kept very close to the upstream project.) We also have a -number of updates to vTPM, and improvements to XSM and Flask to allow -greater disaggregation. Additionally, 4.3 contains a basic version of -Xen for the new ARM server architecture, both 32- and 64-bit. And as -always, there are a number of performance, stability, and security +The 4.5 release offers a number of improvements, including: improvements for +large scale machines during bootup and for PCI passthrough; multiple IO-REQ +servers (many QEMUs for a guest); soft affinity for vCPUs (aka NUMA affinity); +and API expansion for guest introspection. We also have number of updates for +CPU specific changes, such as: Broadwell Supervisor Mode Access Prevention; +Haswell Server Cache QoS Monitoring aka Intel Resource Director Technology; +further extensions to vAPIC (SandyBridge feature); fixes in AMD microcode +loading; Data Breaking Extensions and further MSR masking support on AMD. + +On the experimental side we have added a new Real-Time Deferrable Server Based +CPU Scheduler (rtds), and PVH initial domain (dom0) support for Intel CPUs. + +Additionally, 4.5 has a huge update to the ARM code, including support for: +up to 1TB in guests; up to 8 CPUs; Power State Coordination Interface (0.2) +to power up and down CPUs; UEFI booting; IOMMU support (SMMUv1); Super Page +(2MB) support; passthrough of MMIO regions to guests; and lower interrupt +latency. + +The toolstack has expanded to include support for: VM Generation ID (a Windows +2012 Server requirement); Remus initial support (for high availability) +in libxl (since xend has been removed); libxenlight JSON support and persistent +configuration support, systemd support; and support in QEMU for expanding the +PCI hole. + +Lastly, we have removed the Python toolstack (xend). + +And as always, there are a number of performance, stability, and security improvements under-the hood. This file contains some quick-start instructions to install Xen on diff --git a/xen/Makefile b/xen/Makefile index 72c1313..5d70741 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 5 -export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .0$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jan 12 15:26:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:26: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 1YAgsp-00086t-70; Mon, 12 Jan 2015 15:26:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsn-00086K-1s for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:21 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id BE/8C-02699-C97E3B45; Mon, 12 Jan 2015 15:26:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1421076378!20013748!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8884 invoked from network); 12 Jan 2015 15:26:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:26:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsk-0005Rk-Kz for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgsk-0003be-Go for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:18 +0000 Date: Mon, 12 Jan 2015 15:26:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] README: Minor punctuation and grammar changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 59b572e35fef68a222d58ae626b4e52afbc9d457 Author: Ian Jackson AuthorDate: Tue Jan 6 18:40:18 2015 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 13:43:14 2015 -0500 README: Minor punctuation and grammar changes * Add two missing "and"s and a missing semicolon (a la Oxford comma). * Use a double-space after full stop (like the first paragraph does). Signed-off-by: Ian Jackson CC: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- README | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index 8c7603f..3863c9e 100644 --- a/README +++ b/README @@ -22,11 +22,11 @@ development community, spearheaded by xen.org (http://www.xen.org). The 4.5 release offers a number of improvements, including: improvements for large scale machines during bootup and for PCI passthrough; multiple IO-REQ servers (many QEMUs for a guest); soft affinity for vCPUs (aka NUMA affinity); -and API expansion for guest introspection. We also have number of updates for +and API expansion for guest introspection. We also have number of updates for CPU specific changes, such as: Broadwell Supervisor Mode Access Prevention; Haswell Server Cache QoS Monitoring aka Intel Resource Director Technology; further extensions to vAPIC (SandyBridge feature); fixes in AMD microcode -loading; Data Breaking Extensions and further MSR masking support on AMD. +loading; Data Breaking Extensions; and further MSR masking support on AMD. On the experimental side we have added a new Real-Time Deferrable Server Based CPU Scheduler (rtds), and PVH initial domain (dom0) support for Intel CPUs. @@ -40,8 +40,8 @@ latency. The toolstack has expanded to include support for: VM Generation ID (a Windows 2012 Server requirement); Remus initial support (for high availability) in libxl (since xend has been removed); libxenlight JSON support and persistent -configuration support, systemd support; and support in QEMU for expanding the -PCI hole. +configuration support, and systemd support; and support in QEMU for expanding +the PCI hole. Lastly, we have removed the Python toolstack (xend). -- 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 Jan 12 15:26:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:26: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 1YAgsp-00086t-70; Mon, 12 Jan 2015 15:26:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsn-00086K-1s for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:21 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id BE/8C-02699-C97E3B45; Mon, 12 Jan 2015 15:26:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1421076378!20013748!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8884 invoked from network); 12 Jan 2015 15:26:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:26:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsk-0005Rk-Kz for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgsk-0003be-Go for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:18 +0000 Date: Mon, 12 Jan 2015 15:26:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] README: Minor punctuation and grammar changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 59b572e35fef68a222d58ae626b4e52afbc9d457 Author: Ian Jackson AuthorDate: Tue Jan 6 18:40:18 2015 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 13:43:14 2015 -0500 README: Minor punctuation and grammar changes * Add two missing "and"s and a missing semicolon (a la Oxford comma). * Use a double-space after full stop (like the first paragraph does). Signed-off-by: Ian Jackson CC: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- README | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index 8c7603f..3863c9e 100644 --- a/README +++ b/README @@ -22,11 +22,11 @@ development community, spearheaded by xen.org (http://www.xen.org). The 4.5 release offers a number of improvements, including: improvements for large scale machines during bootup and for PCI passthrough; multiple IO-REQ servers (many QEMUs for a guest); soft affinity for vCPUs (aka NUMA affinity); -and API expansion for guest introspection. We also have number of updates for +and API expansion for guest introspection. We also have number of updates for CPU specific changes, such as: Broadwell Supervisor Mode Access Prevention; Haswell Server Cache QoS Monitoring aka Intel Resource Director Technology; further extensions to vAPIC (SandyBridge feature); fixes in AMD microcode -loading; Data Breaking Extensions and further MSR masking support on AMD. +loading; Data Breaking Extensions; and further MSR masking support on AMD. On the experimental side we have added a new Real-Time Deferrable Server Based CPU Scheduler (rtds), and PVH initial domain (dom0) support for Intel CPUs. @@ -40,8 +40,8 @@ latency. The toolstack has expanded to include support for: VM Generation ID (a Windows 2012 Server requirement); Remus initial support (for high availability) in libxl (since xend has been removed); libxenlight JSON support and persistent -configuration support, systemd support; and support in QEMU for expanding the -PCI hole. +configuration support, and systemd support; and support in QEMU for expanding +the PCI hole. Lastly, we have removed the Python toolstack (xend). -- 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 Jan 12 15:26:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:26: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 1YAgsy-00089K-AA; Mon, 12 Jan 2015 15:26:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsx-000893-ER for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:31 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 8A/43-02702-6A7E3B45; Mon, 12 Jan 2015 15:26:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1421076389!20056736!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5402 invoked from network); 12 Jan 2015 15:26:29 -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; 12 Jan 2015 15:26:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsu-0005Rs-Rg for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgsu-0003c0-PD for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:28 +0000 Date: Mon, 12 Jan 2015 15:26:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] README: Rewrap to 70 columns. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit babb7908db4c52af6343f2ea1e03d632c27ad100 Author: Ian Jackson AuthorDate: Tue Jan 6 18:40:19 2015 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 13:43:14 2015 -0500 README: Rewrap to 70 columns. The first paragraph seems to have been wrapped to 70, so do the other new paragraphs to 70 too for visual consistency. No non-whitespace change. Signed-off-by: Ian Jackson CC: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- README | 43 +++++++++++++++++++++++-------------------- 1 files changed, 23 insertions(+), 20 deletions(-) diff --git a/README b/README index 3863c9e..4a9cac1 100644 --- a/README +++ b/README @@ -19,29 +19,32 @@ is freely-distributable Open Source software, released under the GNU GPL. Since its initial public release, Xen has grown a large development community, spearheaded by xen.org (http://www.xen.org). -The 4.5 release offers a number of improvements, including: improvements for -large scale machines during bootup and for PCI passthrough; multiple IO-REQ -servers (many QEMUs for a guest); soft affinity for vCPUs (aka NUMA affinity); -and API expansion for guest introspection. We also have number of updates for -CPU specific changes, such as: Broadwell Supervisor Mode Access Prevention; -Haswell Server Cache QoS Monitoring aka Intel Resource Director Technology; -further extensions to vAPIC (SandyBridge feature); fixes in AMD microcode -loading; Data Breaking Extensions; and further MSR masking support on AMD. - -On the experimental side we have added a new Real-Time Deferrable Server Based -CPU Scheduler (rtds), and PVH initial domain (dom0) support for Intel CPUs. - -Additionally, 4.5 has a huge update to the ARM code, including support for: -up to 1TB in guests; up to 8 CPUs; Power State Coordination Interface (0.2) -to power up and down CPUs; UEFI booting; IOMMU support (SMMUv1); Super Page -(2MB) support; passthrough of MMIO regions to guests; and lower interrupt -latency. - -The toolstack has expanded to include support for: VM Generation ID (a Windows -2012 Server requirement); Remus initial support (for high availability) -in libxl (since xend has been removed); libxenlight JSON support and persistent -configuration support, and systemd support; and support in QEMU for expanding -the PCI hole. +The 4.5 release offers a number of improvements, including: +improvements for large scale machines during bootup and for PCI +passthrough; multiple IO-REQ servers (many QEMUs for a guest); soft +affinity for vCPUs (aka NUMA affinity); and API expansion for guest +introspection. We also have number of updates for CPU specific +changes, such as: Broadwell Supervisor Mode Access Prevention; Haswell +Server Cache QoS Monitoring aka Intel Resource Director Technology; +further extensions to vAPIC (SandyBridge feature); fixes in AMD +microcode loading; Data Breaking Extensions; and further MSR masking +support on AMD. + +On the experimental side we have added a new Real-Time Deferrable +Server Based CPU Scheduler (rtds), and PVH initial domain (dom0) +support for Intel CPUs. + +Additionally, 4.5 has a huge update to the ARM code, including support +for: up to 1TB in guests; up to 8 CPUs; Power State Coordination +Interface (0.2) to power up and down CPUs; UEFI booting; IOMMU support +(SMMUv1); Super Page (2MB) support; passthrough of MMIO regions to +guests; and lower interrupt latency. + +The toolstack has expanded to include support for: VM Generation ID (a +Windows 2012 Server requirement); Remus initial support (for high +availability) in libxl (since xend has been removed); libxenlight JSON +support and persistent configuration support, and systemd support; and +support in QEMU for expanding the PCI hole. Lastly, we have removed the Python toolstack (xend). -- 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 Jan 12 15:26:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:26: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 1YAgsy-00089K-AA; Mon, 12 Jan 2015 15:26:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsx-000893-ER for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:31 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 8A/43-02702-6A7E3B45; Mon, 12 Jan 2015 15:26:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1421076389!20056736!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5402 invoked from network); 12 Jan 2015 15:26:29 -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; 12 Jan 2015 15:26:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgsu-0005Rs-Rg for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgsu-0003c0-PD for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:28 +0000 Date: Mon, 12 Jan 2015 15:26:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] README: Rewrap to 70 columns. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit babb7908db4c52af6343f2ea1e03d632c27ad100 Author: Ian Jackson AuthorDate: Tue Jan 6 18:40:19 2015 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 13:43:14 2015 -0500 README: Rewrap to 70 columns. The first paragraph seems to have been wrapped to 70, so do the other new paragraphs to 70 too for visual consistency. No non-whitespace change. Signed-off-by: Ian Jackson CC: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- README | 43 +++++++++++++++++++++++-------------------- 1 files changed, 23 insertions(+), 20 deletions(-) diff --git a/README b/README index 3863c9e..4a9cac1 100644 --- a/README +++ b/README @@ -19,29 +19,32 @@ is freely-distributable Open Source software, released under the GNU GPL. Since its initial public release, Xen has grown a large development community, spearheaded by xen.org (http://www.xen.org). -The 4.5 release offers a number of improvements, including: improvements for -large scale machines during bootup and for PCI passthrough; multiple IO-REQ -servers (many QEMUs for a guest); soft affinity for vCPUs (aka NUMA affinity); -and API expansion for guest introspection. We also have number of updates for -CPU specific changes, such as: Broadwell Supervisor Mode Access Prevention; -Haswell Server Cache QoS Monitoring aka Intel Resource Director Technology; -further extensions to vAPIC (SandyBridge feature); fixes in AMD microcode -loading; Data Breaking Extensions; and further MSR masking support on AMD. - -On the experimental side we have added a new Real-Time Deferrable Server Based -CPU Scheduler (rtds), and PVH initial domain (dom0) support for Intel CPUs. - -Additionally, 4.5 has a huge update to the ARM code, including support for: -up to 1TB in guests; up to 8 CPUs; Power State Coordination Interface (0.2) -to power up and down CPUs; UEFI booting; IOMMU support (SMMUv1); Super Page -(2MB) support; passthrough of MMIO regions to guests; and lower interrupt -latency. - -The toolstack has expanded to include support for: VM Generation ID (a Windows -2012 Server requirement); Remus initial support (for high availability) -in libxl (since xend has been removed); libxenlight JSON support and persistent -configuration support, and systemd support; and support in QEMU for expanding -the PCI hole. +The 4.5 release offers a number of improvements, including: +improvements for large scale machines during bootup and for PCI +passthrough; multiple IO-REQ servers (many QEMUs for a guest); soft +affinity for vCPUs (aka NUMA affinity); and API expansion for guest +introspection. We also have number of updates for CPU specific +changes, such as: Broadwell Supervisor Mode Access Prevention; Haswell +Server Cache QoS Monitoring aka Intel Resource Director Technology; +further extensions to vAPIC (SandyBridge feature); fixes in AMD +microcode loading; Data Breaking Extensions; and further MSR masking +support on AMD. + +On the experimental side we have added a new Real-Time Deferrable +Server Based CPU Scheduler (rtds), and PVH initial domain (dom0) +support for Intel CPUs. + +Additionally, 4.5 has a huge update to the ARM code, including support +for: up to 1TB in guests; up to 8 CPUs; Power State Coordination +Interface (0.2) to power up and down CPUs; UEFI booting; IOMMU support +(SMMUv1); Super Page (2MB) support; passthrough of MMIO regions to +guests; and lower interrupt latency. + +The toolstack has expanded to include support for: VM Generation ID (a +Windows 2012 Server requirement); Remus initial support (for high +availability) in libxl (since xend has been removed); libxenlight JSON +support and persistent configuration support, and systemd support; and +support in QEMU for expanding the PCI hole. Lastly, we have removed the Python toolstack (xend). -- 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 Jan 12 15:26:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:26: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 1YAgt8-0008C5-Lz; Mon, 12 Jan 2015 15:26:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgt7-0008Bj-Eg for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:41 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 49/86-03148-0B7E3B45; Mon, 12 Jan 2015 15:26:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1421076399!20073693!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8129 invoked from network); 12 Jan 2015 15:26:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:26:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgt5-0005Ry-0p for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgt4-0003cw-VU for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:38 +0000 Date: Mon, 12 Jan 2015 15:26:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/VPMU: Clear last_vcpu when destroying VPMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 31a410085b0a25deacedbaf5d0c2ae58cd71bd11 Author: Boris Ostrovsky AuthorDate: Wed Jan 7 11:19:17 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:19:17 2015 +0100 x86/VPMU: Clear last_vcpu when destroying VPMU We need to make sure that last_vcpu is not pointing to VCPU whose VPMU is being destroyed. Otherwise we may try to dereference it in the future, when VCPU is gone. We have to do this via IPI since otherwise there is a (somewheat theoretical) chance that between test and subsequent clearing of last_vcpu the remote processor (i.e. vpmu->last_pcpu) might do both vpmu_load() and then vpmu_save() for another VCPU. The former will clear last_vcpu and the latter will set it to something else. Performing this operation via IPI will guarantee that nothing can happen on the remote processor between testing and clearing of last_vcpu. We should also check for VPMU_CONTEXT_ALLOCATED in vpmu_destroy() to avoid unnecessary percpu tests and arch-specific destroy ops. Thus checks in AMD and Intel routines are no longer needed. Signed-off-by: Boris Ostrovsky Acked-by: Kevin Tian Release-Acked-by: Konrad Rzeszutek Wilk master commit: ed8017155607db1bbe1f6ca41eac696b7ef8082b master date: 2015-01-07 11:12:27 +0100 --- xen/arch/x86/hvm/svm/vpmu.c | 3 --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 2 -- xen/arch/x86/hvm/vpmu.c | 20 ++++++++++++++++++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/svm/vpmu.c b/xen/arch/x86/hvm/svm/vpmu.c index 8e07a98..4c448bb 100644 --- a/xen/arch/x86/hvm/svm/vpmu.c +++ b/xen/arch/x86/hvm/svm/vpmu.c @@ -403,9 +403,6 @@ static void amd_vpmu_destroy(struct vcpu *v) { struct vpmu_struct *vpmu = vcpu_vpmu(v); - if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) - return; - if ( ((struct amd_vpmu_context *)vpmu->context)->msr_bitmap_set ) amd_vpmu_unset_msr_bitmap(v); diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 68b6272..590c2a9 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -818,8 +818,6 @@ static void core2_vpmu_destroy(struct vcpu *v) struct vpmu_struct *vpmu = vcpu_vpmu(v); struct core2_vpmu_context *core2_vpmu_cxt = vpmu->context; - if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) - return; xfree(core2_vpmu_cxt->pmu_enable); xfree(vpmu->context); if ( cpu_has_vmx_msr_bitmap ) diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/hvm/vpmu.c index 1df74c2..37f0d9f 100644 --- a/xen/arch/x86/hvm/vpmu.c +++ b/xen/arch/x86/hvm/vpmu.c @@ -247,10 +247,30 @@ void vpmu_initialise(struct vcpu *v) } } +static void vpmu_clear_last(void *arg) +{ + if ( this_cpu(last_vcpu) == arg ) + this_cpu(last_vcpu) = NULL; +} + void vpmu_destroy(struct vcpu *v) { struct vpmu_struct *vpmu = vcpu_vpmu(v); + if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) + return; + + /* + * Need to clear last_vcpu in case it points to v. + * We can check here non-atomically whether it is 'v' since + * last_vcpu can never become 'v' again at this point. + * We will test it again in vpmu_clear_last() with interrupts + * disabled to make sure we don't clear someone else. + */ + if ( per_cpu(last_vcpu, vpmu->last_pcpu) == v ) + on_selected_cpus(cpumask_of(vpmu->last_pcpu), + vpmu_clear_last, v, 1); + if ( vpmu->arch_vpmu_ops && vpmu->arch_vpmu_ops->arch_vpmu_destroy ) vpmu->arch_vpmu_ops->arch_vpmu_destroy(v); } -- 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 Jan 12 15:26:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:26: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 1YAgt8-0008C5-Lz; Mon, 12 Jan 2015 15:26:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgt7-0008Bj-Eg for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:41 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 49/86-03148-0B7E3B45; Mon, 12 Jan 2015 15:26:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1421076399!20073693!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8129 invoked from network); 12 Jan 2015 15:26:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:26:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgt5-0005Ry-0p for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgt4-0003cw-VU for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:38 +0000 Date: Mon, 12 Jan 2015 15:26:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/VPMU: Clear last_vcpu when destroying VPMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 31a410085b0a25deacedbaf5d0c2ae58cd71bd11 Author: Boris Ostrovsky AuthorDate: Wed Jan 7 11:19:17 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:19:17 2015 +0100 x86/VPMU: Clear last_vcpu when destroying VPMU We need to make sure that last_vcpu is not pointing to VCPU whose VPMU is being destroyed. Otherwise we may try to dereference it in the future, when VCPU is gone. We have to do this via IPI since otherwise there is a (somewheat theoretical) chance that between test and subsequent clearing of last_vcpu the remote processor (i.e. vpmu->last_pcpu) might do both vpmu_load() and then vpmu_save() for another VCPU. The former will clear last_vcpu and the latter will set it to something else. Performing this operation via IPI will guarantee that nothing can happen on the remote processor between testing and clearing of last_vcpu. We should also check for VPMU_CONTEXT_ALLOCATED in vpmu_destroy() to avoid unnecessary percpu tests and arch-specific destroy ops. Thus checks in AMD and Intel routines are no longer needed. Signed-off-by: Boris Ostrovsky Acked-by: Kevin Tian Release-Acked-by: Konrad Rzeszutek Wilk master commit: ed8017155607db1bbe1f6ca41eac696b7ef8082b master date: 2015-01-07 11:12:27 +0100 --- xen/arch/x86/hvm/svm/vpmu.c | 3 --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 2 -- xen/arch/x86/hvm/vpmu.c | 20 ++++++++++++++++++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/svm/vpmu.c b/xen/arch/x86/hvm/svm/vpmu.c index 8e07a98..4c448bb 100644 --- a/xen/arch/x86/hvm/svm/vpmu.c +++ b/xen/arch/x86/hvm/svm/vpmu.c @@ -403,9 +403,6 @@ static void amd_vpmu_destroy(struct vcpu *v) { struct vpmu_struct *vpmu = vcpu_vpmu(v); - if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) - return; - if ( ((struct amd_vpmu_context *)vpmu->context)->msr_bitmap_set ) amd_vpmu_unset_msr_bitmap(v); diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 68b6272..590c2a9 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -818,8 +818,6 @@ static void core2_vpmu_destroy(struct vcpu *v) struct vpmu_struct *vpmu = vcpu_vpmu(v); struct core2_vpmu_context *core2_vpmu_cxt = vpmu->context; - if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) - return; xfree(core2_vpmu_cxt->pmu_enable); xfree(vpmu->context); if ( cpu_has_vmx_msr_bitmap ) diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/hvm/vpmu.c index 1df74c2..37f0d9f 100644 --- a/xen/arch/x86/hvm/vpmu.c +++ b/xen/arch/x86/hvm/vpmu.c @@ -247,10 +247,30 @@ void vpmu_initialise(struct vcpu *v) } } +static void vpmu_clear_last(void *arg) +{ + if ( this_cpu(last_vcpu) == arg ) + this_cpu(last_vcpu) = NULL; +} + void vpmu_destroy(struct vcpu *v) { struct vpmu_struct *vpmu = vcpu_vpmu(v); + if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) + return; + + /* + * Need to clear last_vcpu in case it points to v. + * We can check here non-atomically whether it is 'v' since + * last_vcpu can never become 'v' again at this point. + * We will test it again in vpmu_clear_last() with interrupts + * disabled to make sure we don't clear someone else. + */ + if ( per_cpu(last_vcpu, vpmu->last_pcpu) == v ) + on_selected_cpus(cpumask_of(vpmu->last_pcpu), + vpmu_clear_last, v, 1); + if ( vpmu->arch_vpmu_ops && vpmu->arch_vpmu_ops->arch_vpmu_destroy ) vpmu->arch_vpmu_ops->arch_vpmu_destroy(v); } -- 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 Jan 12 15:26:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:26: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 1YAgtI-0008FL-Rt; Mon, 12 Jan 2015 15:26:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgtH-0008Eu-Qy for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:52 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 42/E3-15461-BB7E3B45; Mon, 12 Jan 2015 15:26:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1421076409!20919375!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23065 invoked from network); 12 Jan 2015 15:26:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:26:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgtF-0005S6-90 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgtF-0003dL-4d for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:49 +0000 Date: Mon, 12 Jan 2015 15:26:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] VT-d: don't crash when PTE bits 52 and up are non-zero X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad6f6585f9f255e466e2d59422dd94011d66a8d1 Author: Jan Beulich AuthorDate: Wed Jan 7 16:25:08 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 16:25:08 2015 +0100 VT-d: don't crash when PTE bits 52 and up are non-zero This can (and will) be legitimately the case when sharing page tables with EPT (more of a problem before p2m_access_rwx became zero, but still possible even now when other than that is the default for a guest), leading to an unconditional crash (in print_vtd_entries()) when a DMA remapping fault occurs. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian Release-Acked-by: Konrad Rzeszutek Wilk master commit: 46e0baf59105200d43612cf0c59de216958b008d master date: 2015-01-07 11:13:58 +0100 --- xen/drivers/passthrough/vtd/iommu.c | 26 ++++++++------------------ xen/drivers/passthrough/vtd/iommu.h | 2 +- xen/drivers/passthrough/vtd/utils.c | 6 +++--- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 19d8165..2e113d7 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -258,8 +258,7 @@ static u64 addr_to_dma_page_maddr(struct domain *domain, u64 addr, int alloc) struct dma_pte *parent, *pte = NULL; int level = agaw_to_level(hd->arch.agaw); int offset; - u64 pte_maddr = 0, maddr; - u64 *vaddr = NULL; + u64 pte_maddr = 0; addr &= (((u64)1) << addr_width) - 1; ASSERT(spin_is_locked(&hd->arch.mapping_lock)); @@ -281,19 +280,19 @@ static u64 addr_to_dma_page_maddr(struct domain *domain, u64 addr, int alloc) offset = address_level_offset(addr, level); pte = &parent[offset]; - if ( dma_pte_addr(*pte) == 0 ) + pte_maddr = dma_pte_addr(*pte); + if ( !pte_maddr ) { if ( !alloc ) break; pdev = pci_get_pdev_by_domain(domain, -1, -1, -1); drhd = acpi_find_matched_drhd_unit(pdev); - maddr = alloc_pgtable_maddr(drhd, 1); - if ( !maddr ) + pte_maddr = alloc_pgtable_maddr(drhd, 1); + if ( !pte_maddr ) break; - dma_set_pte_addr(*pte, maddr); - vaddr = map_vtd_domain_page(maddr); + dma_set_pte_addr(*pte, pte_maddr); /* * high level table always sets r/w, last level @@ -303,21 +302,12 @@ static u64 addr_to_dma_page_maddr(struct domain *domain, u64 addr, int alloc) dma_set_pte_writable(*pte); iommu_flush_cache_entry(pte, sizeof(struct dma_pte)); } - else - { - vaddr = map_vtd_domain_page(pte->val); - } if ( level == 2 ) - { - pte_maddr = pte->val & PAGE_MASK_4K; - unmap_vtd_domain_page(vaddr); break; - } unmap_vtd_domain_page(parent); - parent = (struct dma_pte *)vaddr; - vaddr = NULL; + parent = map_vtd_domain_page(pte_maddr); level--; } @@ -2449,7 +2439,7 @@ static void vtd_dump_p2m_table_level(paddr_t pt_maddr, int level, paddr_t gpa, printk("%*sgfn: %08lx mfn: %08lx\n", indent, "", (unsigned long)(address >> PAGE_SHIFT_4K), - (unsigned long)(pte->val >> PAGE_SHIFT_4K)); + (unsigned long)(dma_pte_addr(*pte) >> PAGE_SHIFT_4K)); } unmap_vtd_domain_page(pt_vaddr); diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index 6b2cf1a..c3e5181 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -276,7 +276,7 @@ struct dma_pte { #define dma_set_pte_snp(p) do {(p).val |= DMA_PTE_SNP;} while(0) #define dma_set_pte_prot(p, prot) \ do {(p).val = ((p).val & ~3) | ((prot) & 3); } while (0) -#define dma_pte_addr(p) ((p).val & PAGE_MASK_4K) +#define dma_pte_addr(p) ((p).val & PADDR_MASK & PAGE_MASK_4K) #define dma_set_pte_addr(p, addr) do {\ (p).val |= ((addr) & PAGE_MASK_4K); } while (0) #define dma_pte_present(p) (((p).val & 3) != 0) diff --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/vtd/utils.c index a33564b..db4c326 100644 --- a/xen/drivers/passthrough/vtd/utils.c +++ b/xen/drivers/passthrough/vtd/utils.c @@ -170,16 +170,16 @@ void print_vtd_entries(struct iommu *iommu, int bus, int devfn, u64 gmfn) l_index = get_level_index(gmfn, level); printk(" l%d_index = %x\n", level, l_index); - pte.val = val = l[l_index]; + pte.val = l[l_index]; unmap_vtd_domain_page(l); - printk(" l%d[%x] = %"PRIx64"\n", level, l_index, val); + printk(" l%d[%x] = %"PRIx64"\n", level, l_index, pte.val); - pte.val = val; if ( !dma_pte_present(pte) ) { printk(" l%d[%x] not present\n", level, l_index); break; } + val = dma_pte_addr(pte); } while ( --level ); } -- 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 Jan 12 15:26:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:26: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 1YAgtI-0008FL-Rt; Mon, 12 Jan 2015 15:26:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgtH-0008Eu-Qy for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:52 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 42/E3-15461-BB7E3B45; Mon, 12 Jan 2015 15:26:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1421076409!20919375!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23065 invoked from network); 12 Jan 2015 15:26:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:26:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgtF-0005S6-90 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgtF-0003dL-4d for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:49 +0000 Date: Mon, 12 Jan 2015 15:26:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] VT-d: don't crash when PTE bits 52 and up are non-zero X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad6f6585f9f255e466e2d59422dd94011d66a8d1 Author: Jan Beulich AuthorDate: Wed Jan 7 16:25:08 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 16:25:08 2015 +0100 VT-d: don't crash when PTE bits 52 and up are non-zero This can (and will) be legitimately the case when sharing page tables with EPT (more of a problem before p2m_access_rwx became zero, but still possible even now when other than that is the default for a guest), leading to an unconditional crash (in print_vtd_entries()) when a DMA remapping fault occurs. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian Release-Acked-by: Konrad Rzeszutek Wilk master commit: 46e0baf59105200d43612cf0c59de216958b008d master date: 2015-01-07 11:13:58 +0100 --- xen/drivers/passthrough/vtd/iommu.c | 26 ++++++++------------------ xen/drivers/passthrough/vtd/iommu.h | 2 +- xen/drivers/passthrough/vtd/utils.c | 6 +++--- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 19d8165..2e113d7 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -258,8 +258,7 @@ static u64 addr_to_dma_page_maddr(struct domain *domain, u64 addr, int alloc) struct dma_pte *parent, *pte = NULL; int level = agaw_to_level(hd->arch.agaw); int offset; - u64 pte_maddr = 0, maddr; - u64 *vaddr = NULL; + u64 pte_maddr = 0; addr &= (((u64)1) << addr_width) - 1; ASSERT(spin_is_locked(&hd->arch.mapping_lock)); @@ -281,19 +280,19 @@ static u64 addr_to_dma_page_maddr(struct domain *domain, u64 addr, int alloc) offset = address_level_offset(addr, level); pte = &parent[offset]; - if ( dma_pte_addr(*pte) == 0 ) + pte_maddr = dma_pte_addr(*pte); + if ( !pte_maddr ) { if ( !alloc ) break; pdev = pci_get_pdev_by_domain(domain, -1, -1, -1); drhd = acpi_find_matched_drhd_unit(pdev); - maddr = alloc_pgtable_maddr(drhd, 1); - if ( !maddr ) + pte_maddr = alloc_pgtable_maddr(drhd, 1); + if ( !pte_maddr ) break; - dma_set_pte_addr(*pte, maddr); - vaddr = map_vtd_domain_page(maddr); + dma_set_pte_addr(*pte, pte_maddr); /* * high level table always sets r/w, last level @@ -303,21 +302,12 @@ static u64 addr_to_dma_page_maddr(struct domain *domain, u64 addr, int alloc) dma_set_pte_writable(*pte); iommu_flush_cache_entry(pte, sizeof(struct dma_pte)); } - else - { - vaddr = map_vtd_domain_page(pte->val); - } if ( level == 2 ) - { - pte_maddr = pte->val & PAGE_MASK_4K; - unmap_vtd_domain_page(vaddr); break; - } unmap_vtd_domain_page(parent); - parent = (struct dma_pte *)vaddr; - vaddr = NULL; + parent = map_vtd_domain_page(pte_maddr); level--; } @@ -2449,7 +2439,7 @@ static void vtd_dump_p2m_table_level(paddr_t pt_maddr, int level, paddr_t gpa, printk("%*sgfn: %08lx mfn: %08lx\n", indent, "", (unsigned long)(address >> PAGE_SHIFT_4K), - (unsigned long)(pte->val >> PAGE_SHIFT_4K)); + (unsigned long)(dma_pte_addr(*pte) >> PAGE_SHIFT_4K)); } unmap_vtd_domain_page(pt_vaddr); diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index 6b2cf1a..c3e5181 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -276,7 +276,7 @@ struct dma_pte { #define dma_set_pte_snp(p) do {(p).val |= DMA_PTE_SNP;} while(0) #define dma_set_pte_prot(p, prot) \ do {(p).val = ((p).val & ~3) | ((prot) & 3); } while (0) -#define dma_pte_addr(p) ((p).val & PAGE_MASK_4K) +#define dma_pte_addr(p) ((p).val & PADDR_MASK & PAGE_MASK_4K) #define dma_set_pte_addr(p, addr) do {\ (p).val |= ((addr) & PAGE_MASK_4K); } while (0) #define dma_pte_present(p) (((p).val & 3) != 0) diff --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/vtd/utils.c index a33564b..db4c326 100644 --- a/xen/drivers/passthrough/vtd/utils.c +++ b/xen/drivers/passthrough/vtd/utils.c @@ -170,16 +170,16 @@ void print_vtd_entries(struct iommu *iommu, int bus, int devfn, u64 gmfn) l_index = get_level_index(gmfn, level); printk(" l%d_index = %x\n", level, l_index); - pte.val = val = l[l_index]; + pte.val = l[l_index]; unmap_vtd_domain_page(l); - printk(" l%d[%x] = %"PRIx64"\n", level, l_index, val); + printk(" l%d[%x] = %"PRIx64"\n", level, l_index, pte.val); - pte.val = val; if ( !dma_pte_present(pte) ) { printk(" l%d[%x] not present\n", level, l_index); break; } + val = dma_pte_addr(pte); } while ( --level ); } -- 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 Jan 12 15:27:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:27: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 1YAgtT-0008Hm-Up; Mon, 12 Jan 2015 15:27:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgtR-0008HS-O3 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:27:02 +0000 Content-Length: 1746 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 44/9C-09842-5C7E3B45; Mon, 12 Jan 2015 15:27:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1421076419!17458691!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32411 invoked from network); 12 Jan 2015 15:27:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:27:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgtP-0005SH-DL for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgtP-0003dk-CM for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:59 +0000 Date: Mon, 12 Jan 2015 15:26:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] README: Expand to enumerate other toolstack features X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============4889647370346354938==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4889647370346354938== Content-Length: 1326 Content-Transfer-Encoding: quoted-printable commit 3508d75155dae3154d10cd5c33d44336f6f4bf1c Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jan 7 10:29:35 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Jan 7 12:56:06 2015 -0500 README: Expand to enumerate other toolstack features Reported-by: Pasi K=C3=A4rkk=C3=A4inen Signed-off-by: Konrad Rzeszutek Wilk --- README | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README b/README index 4a9cac1..3bdc74e 100644 --- a/README +++ b/README @@ -43,8 +43,9 @@ guests; and lower interrupt latency. The toolstack has expanded to include support for: VM Generation ID (a Windows 2012 Server requirement); Remus initial support (for high availability) in libxl (since xend has been removed); libxenlight JSON -support and persistent configuration support, and systemd support; and -support in QEMU for expanding the PCI hole. +support, HVM guest direct kernel boot, and persistent configuration +support; systemd support; performance optimizations in oxenstored; +and support in QEMU for expanding the PCI hole. Lastly, we have removed the Python toolstack (xend). -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 --===============4889647370346354938== 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 --===============4889647370346354938==-- From xen-changelog-bounces@lists.xen.org Mon Jan 12 15:27:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Jan 2015 15:27: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 1YAgtT-0008Hm-Up; Mon, 12 Jan 2015 15:27:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgtR-0008HS-O3 for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:27:02 +0000 Content-Length: 1746 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 44/9C-09842-5C7E3B45; Mon, 12 Jan 2015 15:27:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1421076419!17458691!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32411 invoked from network); 12 Jan 2015 15:27:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jan 2015 15:27:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAgtP-0005SH-DL for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAgtP-0003dk-CM for xen-changelog@lists.xensource.com; Mon, 12 Jan 2015 15:26:59 +0000 Date: Mon, 12 Jan 2015 15:26:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] README: Expand to enumerate other toolstack features X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============4889647370346354938==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4889647370346354938== Content-Length: 1326 Content-Transfer-Encoding: quoted-printable commit 3508d75155dae3154d10cd5c33d44336f6f4bf1c Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jan 7 10:29:35 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Jan 7 12:56:06 2015 -0500 README: Expand to enumerate other toolstack features Reported-by: Pasi K=C3=A4rkk=C3=A4inen Signed-off-by: Konrad Rzeszutek Wilk --- README | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README b/README index 4a9cac1..3bdc74e 100644 --- a/README +++ b/README @@ -43,8 +43,9 @@ guests; and lower interrupt latency. The toolstack has expanded to include support for: VM Generation ID (a Windows 2012 Server requirement); Remus initial support (for high availability) in libxl (since xend has been removed); libxenlight JSON -support and persistent configuration support, and systemd support; and -support in QEMU for expanding the PCI hole. +support, HVM guest direct kernel boot, and persistent configuration +support; systemd support; performance optimizations in oxenstored; +and support in QEMU for expanding the PCI hole. Lastly, we have removed the Python toolstack (xend). -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 --===============4889647370346354938== 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 --===============4889647370346354938==-- From xen-changelog-bounces@lists.xen.org Tue Jan 13 09:44:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Jan 2015 09:44: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 1YAy18-0007sU-9E; Tue, 13 Jan 2015 09:44:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAy17-0007sP-Im for xen-changelog@lists.xensource.com; Tue, 13 Jan 2015 09:44:05 +0000 Content-Length: 1958 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 2F/0C-22819-4E8E4B45; Tue, 13 Jan 2015 09:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1421142243!13582085!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8495 invoked from network); 13 Jan 2015 09:44: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; 13 Jan 2015 09:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAy14-0000Vj-Tq for xen-changelog@lists.xensource.com; Tue, 13 Jan 2015 09:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAy14-0008CE-KM for xen-changelog@lists.xensource.com; Tue, 13 Jan 2015 09:44:02 +0000 Date: Tue, 13 Jan 2015 09:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: prevent use-after-free when destroying 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: multipart/mixed; boundary="===============8954083829770051888==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8954083829770051888== Content-Length: 1550 Content-Transfer-Encoding: quoted-printable commit 5d4e3ff19c33770ce01bec949c50326b11088fef Author: Mihai Don=C8=9Bu AuthorDate: Tue Jan 6 12:52:21 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 12:52:21 2015 +0000 x86/HVM: prevent use-after-free when destroying a domain hvm_domain_relinquish_resources() can free certain domain resources which can still be accessed, e.g. by HVMOP_set_param, while the domain is being cleaned up. Signed-off-by: Mihai Don=C8=9Bu Tested-by: R=C4=83zvan Cojocaru Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich This is CVE-2015-0361 / XSA-116. --- xen/arch/x86/hvm/hvm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index edf6491..c731cc4 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -602,13 +602,13 @@ void hvm_domain_relinquish_resources(struct domain *d) hpet_deinit(d); } - xfree(d->arch.hvm_domain.io_handler); - xfree(d->arch.hvm_domain.params); xfree(d->arch.hvm_domain.pbuf); } void hvm_domain_destroy(struct domain *d) { + xfree(d->arch.hvm_domain.io_handler); + xfree(d->arch.hvm_domain.params); hvm_funcs.domain_destroy(d); rtc_deinit(d); stdvga_deinit(d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 --===============8954083829770051888== 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 --===============8954083829770051888==-- From xen-changelog-bounces@lists.xen.org Tue Jan 13 09:44:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Jan 2015 09:44: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 1YAy18-0007sU-9E; Tue, 13 Jan 2015 09:44:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAy17-0007sP-Im for xen-changelog@lists.xensource.com; Tue, 13 Jan 2015 09:44:05 +0000 Content-Length: 1958 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 2F/0C-22819-4E8E4B45; Tue, 13 Jan 2015 09:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1421142243!13582085!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8495 invoked from network); 13 Jan 2015 09:44: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; 13 Jan 2015 09:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAy14-0000Vj-Tq for xen-changelog@lists.xensource.com; Tue, 13 Jan 2015 09:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YAy14-0008CE-KM for xen-changelog@lists.xensource.com; Tue, 13 Jan 2015 09:44:02 +0000 Date: Tue, 13 Jan 2015 09:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: prevent use-after-free when destroying 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: multipart/mixed; boundary="===============8954083829770051888==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8954083829770051888== Content-Length: 1550 Content-Transfer-Encoding: quoted-printable commit 5d4e3ff19c33770ce01bec949c50326b11088fef Author: Mihai Don=C8=9Bu AuthorDate: Tue Jan 6 12:52:21 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 12:52:21 2015 +0000 x86/HVM: prevent use-after-free when destroying a domain hvm_domain_relinquish_resources() can free certain domain resources which can still be accessed, e.g. by HVMOP_set_param, while the domain is being cleaned up. Signed-off-by: Mihai Don=C8=9Bu Tested-by: R=C4=83zvan Cojocaru Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich This is CVE-2015-0361 / XSA-116. --- xen/arch/x86/hvm/hvm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index edf6491..c731cc4 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -602,13 +602,13 @@ void hvm_domain_relinquish_resources(struct domain *d) hpet_deinit(d); } - xfree(d->arch.hvm_domain.io_handler); - xfree(d->arch.hvm_domain.params); xfree(d->arch.hvm_domain.pbuf); } void hvm_domain_destroy(struct domain *d) { + xfree(d->arch.hvm_domain.io_handler); + xfree(d->arch.hvm_domain.params); hvm_funcs.domain_destroy(d); rtc_deinit(d); stdvga_deinit(d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 --===============8954083829770051888== 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 --===============8954083829770051888==-- From xen-changelog-bounces@lists.xen.org Wed Jan 14 10:22:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jan 2015 10:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBL5U-0003mf-8j; Wed, 14 Jan 2015 10:22:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBL5S-0003mV-96 for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 10:22:06 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 91/8D-27785-D4346B45; Wed, 14 Jan 2015 10:22:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1421230923!20491351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4721 invoked from network); 14 Jan 2015 10:22:04 -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; 14 Jan 2015 10:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBL5P-00086m-MZ for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 10:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YBL5P-00011p-DI for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 10:22:03 +0000 Message-Id: Date: Wed, 14 Jan 2015 10:22:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] scsifront: avoid acquiring same lock twice if ring is full X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1421228828 -3600 # Node ID 3015a92b2b53825d00dc81c2dd131fc77ce8ab00 # Parent 078f1bb69ea5e3772f3df4b4ee21f3c52e381e51 scsifront: avoid acquiring same lock twice if ring is full The locking in scsifront_dev_reset_handler() as introduced by c/s 1209:4d1471ca031e is obviously wrong. In case of a full ring the host lock is acquired twice. Fixing this issue enables to get rid of the endless fo loop with an explicit break statement. Signed-off-by: Juergen Gross Also add a missing version check. Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r 078f1bb69ea5 -r 3015a92b2b53 drivers/xen/scsifront/scsifront.c --- a/drivers/xen/scsifront/scsifront.c Wed Dec 10 10:22:39 2014 +0100 +++ b/drivers/xen/scsifront/scsifront.c Wed Jan 14 10:47:08 2015 +0100 @@ -447,12 +447,10 @@ static int scsifront_dev_reset_handler(s uint16_t rqid; int err = 0; - for (;;) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) - spin_lock_irq(host->host_lock); + spin_lock_irq(host->host_lock); #endif - if (!RING_FULL(&info->ring)) - break; + while (RING_FULL(&info->ring)) { if (err) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) spin_unlock_irq(host->host_lock); @@ -463,7 +461,9 @@ static int scsifront_dev_reset_handler(s spin_unlock_irq(host->host_lock); err = wait_event_interruptible(info->wq_sync, !info->waiting_sync); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) spin_lock_irq(host->host_lock); +#endif } ring_req = scsifront_pre_request(info); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jan 14 10:22:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jan 2015 10:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBL5X-0003mu-BC; Wed, 14 Jan 2015 10:22:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBL5V-0003mk-G5 for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 10:22:09 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 11/E1-11608-05346B45; Wed, 14 Jan 2015 10:22:08 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-31.messagelabs.com!1421230924!19340348!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28659 invoked from network); 14 Jan 2015 10:22:05 -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; 14 Jan 2015 10:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBL5P-00086p-Tp for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 10:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YBL5P-000124-Rn for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 10:22:03 +0000 Message-Id: Date: Wed, 14 Jan 2015 10:22:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] sync Xen public headers to 4.5.0 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 # HG changeset patch # User Jan Beulich # Date 1421230306 -3600 # Node ID 98807b11f32914c956e14ece2e6d5541dc70148d # Parent 3015a92b2b53825d00dc81c2dd131fc77ce8ab00 sync Xen public headers to 4.5.0 level --- diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/arch-arm.h --- a/include/xen/interface/arch-arm.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/arch-arm.h Wed Jan 14 11:11:46 2015 +0100 @@ -364,15 +364,50 @@ typedef uint64_t xen_callback_t; */ /* Physical Address Space */ -#define GUEST_GICD_BASE 0x2c001000ULL -#define GUEST_GICD_SIZE 0x1000ULL -#define GUEST_GICC_BASE 0x2c002000ULL -#define GUEST_GICC_SIZE 0x100ULL -#define GUEST_RAM_BASE 0x80000000ULL +/* vGIC mappings: Only one set of mapping is used by the guest. + * Therefore they can overlap. + */ -#define GUEST_GNTTAB_BASE 0xb0000000ULL -#define GUEST_GNTTAB_SIZE 0x00020000ULL +/* 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 diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/arch-x86/cpuid.h --- a/include/xen/interface/arch-x86/cpuid.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/arch-x86/cpuid.h Wed Jan 14 11:11:46 2015 +0100 @@ -30,12 +30,20 @@ #ifndef __XEN_PUBLIC_ARCH_X86_CPUID_H__ #define __XEN_PUBLIC_ARCH_X86_CPUID_H__ -/* Xen identification leaves start at 0x40000000. */ +/* + * For compatibility with other hypervisor interfaces, the Xen cpuid leaves + * can be found at the first otherwise unused 0x100 aligned boundary starting + * from 0x40000000. + * + * e.g If viridian extensions are enabled for an HVM domain, the Xen cpuid + * leaves will start at 0x40000100 + */ + #define XEN_CPUID_FIRST_LEAF 0x40000000 #define XEN_CPUID_LEAF(i) (XEN_CPUID_FIRST_LEAF + (i)) /* - * Leaf 1 (0x40000000) + * Leaf 1 (0x40000x00) * EAX: Largest Xen-information leaf. All leaves up to an including @EAX * are supported by the Xen host. * EBX-EDX: "XenVMMXenVMM" signature, allowing positive identification @@ -46,14 +54,14 @@ #define XEN_CPUID_SIGNATURE_EDX 0x4d4d566e /* "nVMM" */ /* - * Leaf 2 (0x40000001) + * Leaf 2 (0x40000x01) * EAX[31:16]: Xen major version. * EAX[15: 0]: Xen minor version. * EBX-EDX: Reserved (currently all zeroes). */ /* - * Leaf 3 (0x40000002) + * Leaf 3 (0x40000x02) * EAX: Number of hypercall transfer pages. This register is always guaranteed * to specify one hypercall page. * EBX: Base address of Xen-specific MSRs. @@ -65,4 +73,17 @@ #define _XEN_CPUID_FEAT1_MMU_PT_UPDATE_PRESERVE_AD 0 #define XEN_CPUID_FEAT1_MMU_PT_UPDATE_PRESERVE_AD (1u<<0) +/* + * Leaf 5 (0x40000x04) + * HVM-specific features + */ + +/* EAX Features */ +#define XEN_HVM_CPUID_APIC_ACCESS_VIRT (1u << 0) /* Virtualized APIC registers */ +#define XEN_HVM_CPUID_X2APIC_VIRT (1u << 1) /* Virtualized x2APIC accesses */ +/* Memory mapped from other domains has valid IOMMU entries */ +#define XEN_HVM_CPUID_IOMMU_MAPPINGS (1u << 2) + +#define XEN_CPUID_MAX_NUM_LEAVES 4 + #endif /* __XEN_PUBLIC_ARCH_X86_CPUID_H__ */ diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/arch-x86/hvm/save.h --- a/include/xen/interface/arch-x86/hvm/save.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/arch-x86/hvm/save.h Wed Jan 14 11:11:46 2015 +0100 @@ -544,7 +544,7 @@ DECLARE_HVM_SAVE_TYPE(MTRR, 14, struct h */ struct hvm_hw_cpu_xsave { - uint64_t xfeature_mask; + uint64_t xfeature_mask; /* Ignored */ uint64_t xcr0; /* Updated by XSETBV */ uint64_t xcr0_accum; /* Updated by XSETBV */ struct { @@ -568,6 +568,7 @@ struct hvm_hw_cpu_xsave { struct hvm_viridian_domain_context { uint64_t hypercall_gpa; uint64_t guest_os_id; + uint64_t time_ref_count; }; DECLARE_HVM_SAVE_TYPE(VIRIDIAN_DOMAIN, 15, struct hvm_viridian_domain_context); @@ -592,9 +593,27 @@ struct hvm_tsc_adjust { DECLARE_HVM_SAVE_TYPE(TSC_ADJUST, 19, struct hvm_tsc_adjust); + +struct hvm_msr { + uint32_t count; + struct hvm_one_msr { + uint32_t index; + uint32_t _rsvd; + uint64_t val; +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + } msr[]; +#elif defined(__GNUC__) + } msr[0]; +#else + } msr[1 /* variable size */]; +#endif +}; + +#define CPU_MSR_CODE 20 + /* * Largest type-code in use */ -#define HVM_SAVE_CODE_MAX 19 +#define HVM_SAVE_CODE_MAX 20 #endif /* __XEN_PUBLIC_HVM_SAVE_X86_H__ */ diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/domctl.h --- a/include/xen/interface/domctl.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/domctl.h Wed Jan 14 11:11:46 2015 +0100 @@ -35,8 +35,9 @@ #include "xen.h" #include "grant_table.h" #include "hvm/save.h" +#include "memory.h" -#define XEN_DOMCTL_INTERFACE_VERSION 0x00000009 +#define XEN_DOMCTL_INTERFACE_VERSION 0x0000000a /* * NB. xen_domctl.domain is an IN/OUT parameter for this operation. @@ -67,6 +68,19 @@ struct xen_domctl_createdomain { typedef struct xen_domctl_createdomain xen_domctl_createdomain_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_createdomain_t); +#if defined(__arm__) || defined(__aarch64__) +#define XEN_DOMCTL_CONFIG_GIC_DEFAULT 0 +#define XEN_DOMCTL_CONFIG_GIC_V2 1 +#define XEN_DOMCTL_CONFIG_GIC_V3 2 +/* XEN_DOMCTL_configure_domain */ +struct xen_domctl_arm_configuredomain { + /* IN/OUT parameters */ + uint8_t gic_version; +}; +typedef struct xen_domctl_arm_configuredomain xen_domctl_arm_configuredomain_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_arm_configuredomain_t); +#endif + /* XEN_DOMCTL_getdomaininfo */ struct xen_domctl_getdomaininfo { /* OUT variables. */ @@ -107,6 +121,7 @@ struct xen_domctl_getdomaininfo { uint64_aligned_t shared_info_frame; /* GMFN of shared_info struct */ uint64_aligned_t cpu_time; uint32_t nr_online_vcpus; /* Number of VCPUs currently online. */ +#define XEN_INVALID_MAX_VCPU_ID (~0U) /* Domain has no vcpus? */ uint32_t max_vcpu_id; /* Maximum VCPUID in use by this domain. */ uint32_t ssidref; xen_domain_handle_t handle; @@ -300,8 +315,33 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_nodea /* XEN_DOMCTL_setvcpuaffinity */ /* XEN_DOMCTL_getvcpuaffinity */ struct xen_domctl_vcpuaffinity { - uint32_t vcpu; /* IN */ - struct xenctl_bitmap cpumap; /* IN/OUT */ + /* IN variables. */ + uint32_t vcpu; + /* Set/get the hard affinity for vcpu */ +#define _XEN_VCPUAFFINITY_HARD 0 +#define XEN_VCPUAFFINITY_HARD (1U<<_XEN_VCPUAFFINITY_HARD) + /* Set/get the soft affinity for vcpu */ +#define _XEN_VCPUAFFINITY_SOFT 1 +#define XEN_VCPUAFFINITY_SOFT (1U<<_XEN_VCPUAFFINITY_SOFT) + uint32_t flags; + /* + * IN/OUT variables. + * + * Both are IN/OUT for XEN_DOMCTL_setvcpuaffinity, in which case they + * contain effective hard or/and soft affinity. That is, upon successful + * return, cpumap_soft, contains the intersection of the soft affinity, + * hard affinity and the cpupool's online CPUs for the domain (if + * XEN_VCPUAFFINITY_SOFT was set in flags). cpumap_hard contains the + * intersection between hard affinity and the cpupool's online CPUs (if + * XEN_VCPUAFFINITY_HARD was set in flags). + * + * Both are OUT-only for XEN_DOMCTL_getvcpuaffinity, in which case they + * contain the plain hard and/or soft affinity masks that were set during + * previous successful calls to XEN_DOMCTL_setvcpuaffinity (or the + * default values), without intersecting or altering them in any way. + */ + struct xenctl_bitmap cpumap_hard; + struct xenctl_bitmap cpumap_soft; }; typedef struct xen_domctl_vcpuaffinity xen_domctl_vcpuaffinity_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vcpuaffinity_t); @@ -321,6 +361,8 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_max_v #define XEN_SCHEDULER_CREDIT 5 #define XEN_SCHEDULER_CREDIT2 6 #define XEN_SCHEDULER_ARINC653 7 +#define XEN_SCHEDULER_RTDS 8 + /* Set or get info? */ #define XEN_DOMCTL_SCHEDOP_putinfo 0 #define XEN_DOMCTL_SCHEDOP_getinfo 1 @@ -342,6 +384,10 @@ struct xen_domctl_scheduler_op { struct xen_domctl_sched_credit2 { uint16_t weight; } credit2; + struct xen_domctl_sched_rtds { + uint32_t period; + uint32_t budget; + } rtds; } u; }; typedef struct xen_domctl_scheduler_op xen_domctl_scheduler_op_t; @@ -562,6 +608,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_iopor #define XEN_DOMCTL_MEM_CACHEATTR_WP 5 #define XEN_DOMCTL_MEM_CACHEATTR_WB 6 #define XEN_DOMCTL_MEM_CACHEATTR_UCM 7 +#define XEN_DOMCTL_DELETE_MEM_CACHEATTR (~(uint32_t)0) struct xen_domctl_pin_mem_cacheattr { uint64_aligned_t start, end; uint32_t type; /* XEN_DOMCTL_MEM_CACHEATTR_* */ @@ -789,10 +836,11 @@ struct xen_domctl_gdbsx_domstatus { * ENODEV - host lacks HAP support (EPT/NPT) or HAP is disabled in guest * EBUSY - guest has or had access enabled, ring buffer still active */ -#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS 2 +#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS 2 -#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE 0 -#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_DISABLE 1 +#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE 0 +#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_DISABLE 1 +#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE_INTROSPECTION 2 /* * Sharing ENOMEM helper. @@ -862,7 +910,7 @@ struct xen_domctl_vcpuextstate { /* IN: VCPU that this call applies to. */ uint32_t vcpu; /* - * SET: xfeature support mask of struct (IN) + * SET: Ignored. * GET: xfeature support mask of struct (IN/OUT) * xfeature mask is served as identifications of the saving format * so that compatible CPUs can have a check on format to decide @@ -918,6 +966,78 @@ struct xen_domctl_cacheflush { typedef struct xen_domctl_cacheflush xen_domctl_cacheflush_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_cacheflush_t); +#if defined(__i386__) || defined(__x86_64__) +struct xen_domctl_vcpu_msr { + uint32_t index; + uint32_t reserved; + uint64_aligned_t value; +}; +typedef struct xen_domctl_vcpu_msr xen_domctl_vcpu_msr_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_vcpu_msr_t); + +/* + * XEN_DOMCTL_set_vcpu_msrs / XEN_DOMCTL_get_vcpu_msrs. + * + * Input: + * - A NULL 'msrs' guest handle is a request for the maximum 'msr_count'. + * - Otherwise, 'msr_count' is the number of entries in 'msrs'. + * + * Output for get: + * - If 'msr_count' is less than the number Xen needs to write, -ENOBUFS shall + * be returned and 'msr_count' updated to reflect the intended number. + * - On success, 'msr_count' shall indicate the number of MSRs written, which + * may be less than the maximum if some are not currently used by the vcpu. + * + * Output for set: + * - If Xen encounters an error with a specific MSR, -EINVAL shall be returned + * and 'msr_count' shall be set to the offending index, to aid debugging. + */ +struct xen_domctl_vcpu_msrs { + uint32_t vcpu; /* IN */ + uint32_t msr_count; /* IN/OUT */ + XEN_GUEST_HANDLE_64(xen_domctl_vcpu_msr_t) msrs; /* IN/OUT */ +}; +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. + */ +struct xen_domctl_vnuma { + uint32_t nr_vnodes; + uint32_t nr_vmemranges; + uint32_t nr_vcpus; + uint32_t pad; + XEN_GUEST_HANDLE_64(uint) vdistance; + 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. + */ + XEN_GUEST_HANDLE_64(uint) vnode_to_pnode; + + /* + * memory rages for each vNUMA node + */ + XEN_GUEST_HANDLE_64(xen_vmemrange_t) vmemrange; +}; +typedef struct xen_domctl_vnuma xen_domctl_vnuma_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_vnuma_t); + +struct xen_domctl_psr_cmt_op { +#define XEN_DOMCTL_PSR_CMT_OP_DETACH 0 +#define XEN_DOMCTL_PSR_CMT_OP_ATTACH 1 +#define XEN_DOMCTL_PSR_CMT_OP_QUERY_RMID 2 + uint32_t cmd; + uint32_t data; +}; +typedef struct xen_domctl_psr_cmt_op xen_domctl_psr_cmt_op_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_psr_cmt_op_t); + struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 1 @@ -988,6 +1108,11 @@ struct xen_domctl { #define XEN_DOMCTL_getnodeaffinity 69 #define XEN_DOMCTL_set_max_evtchn 70 #define XEN_DOMCTL_cacheflush 71 +#define XEN_DOMCTL_get_vcpu_msrs 72 +#define XEN_DOMCTL_set_vcpu_msrs 73 +#define XEN_DOMCTL_setvnumainfo 74 +#define XEN_DOMCTL_psr_cmt_op 75 +#define XEN_DOMCTL_arm_configure_domain 76 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -996,6 +1121,9 @@ struct xen_domctl { domid_t domain; union { struct xen_domctl_createdomain createdomain; +#if defined(__arm__) || defined(__aarch64__) + struct xen_domctl_arm_configuredomain configuredomain; +#endif struct xen_domctl_getdomaininfo getdomaininfo; struct xen_domctl_getmemlist getmemlist; struct xen_domctl_getpageframeinfo getpageframeinfo; @@ -1040,6 +1168,7 @@ struct xen_domctl { #if defined(__i386__) || defined(__x86_64__) struct xen_domctl_cpuid cpuid; struct xen_domctl_vcpuextstate vcpuextstate; + struct xen_domctl_vcpu_msrs vcpu_msrs; #endif struct xen_domctl_set_access_required access_required; struct xen_domctl_audit_p2m audit_p2m; @@ -1050,6 +1179,8 @@ struct xen_domctl { struct xen_domctl_cacheflush cacheflush; struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; + struct xen_domctl_vnuma vnuma; + struct xen_domctl_psr_cmt_op psr_cmt_op; uint8_t pad[128]; } u; }; diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/event_channel.h --- a/include/xen/interface/event_channel.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/event_channel.h Wed Jan 14 11:11:46 2015 +0100 @@ -264,6 +264,10 @@ typedef struct evtchn_unmask evtchn_unma * NOTES: * 1. may be specified as DOMID_SELF. * 2. Only a sufficiently-privileged domain may specify other than DOMID_SELF. + * 3. Destroys all control blocks and event array, resets event channel + * operations to 2-level ABI if called with == DOMID_SELF and FIFO + * ABI was used. Guests should not bind events during EVTCHNOP_reset call + * as these events are likely to be lost. */ struct evtchn_reset { /* IN parameters. */ diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/features.h --- a/include/xen/interface/features.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/features.h Wed Jan 14 11:11:46 2015 +0100 @@ -94,6 +94,11 @@ /* operation as Dom0 is supported */ #define XENFEAT_dom0 11 +/* Xen also maps grant references at pfn = mfn. + * This feature flag is deprecated and should not be used. +#define XENFEAT_grant_map_identity 12 + */ + #define XENFEAT_NR_SUBMAPS 1 #endif /* __XEN_PUBLIC_FEATURES_H__ */ diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/grant_table.h --- a/include/xen/interface/grant_table.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/grant_table.h Wed Jan 14 11:11:46 2015 +0100 @@ -309,6 +309,7 @@ typedef uint16_t grant_status_t; #define GNTTABOP_get_status_frames 9 #define GNTTABOP_get_version 10 #define GNTTABOP_swap_grant_ref 11 +#define GNTTABOP_cache_flush 12 #endif /* __XEN_INTERFACE_VERSION__ */ /* ` } */ @@ -574,6 +575,25 @@ struct gnttab_swap_grant_ref { typedef struct gnttab_swap_grant_ref gnttab_swap_grant_ref_t; DEFINE_XEN_GUEST_HANDLE(gnttab_swap_grant_ref_t); +/* + * Issue one or more cache maintenance operations on a portion of a + * page granted to the calling domain by a foreign domain. + */ +struct gnttab_cache_flush { + union { + uint64_t dev_bus_addr; + grant_ref_t ref; + } a; + uint16_t offset; /* offset from start of grant */ + uint16_t length; /* size within the grant */ +#define GNTTAB_CACHE_CLEAN (1<<0) +#define GNTTAB_CACHE_INVAL (1<<1) +#define GNTTAB_CACHE_SOURCE_GREF (1<<31) + uint32_t op; +}; +typedef struct gnttab_cache_flush gnttab_cache_flush_t; +DEFINE_XEN_GUEST_HANDLE(gnttab_cache_flush_t); + #endif /* __XEN_INTERFACE_VERSION__ */ /* diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/hvm/hvm_op.h --- a/include/xen/interface/hvm/hvm_op.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/hvm/hvm_op.h Wed Jan 14 11:11:46 2015 +0100 @@ -23,6 +23,7 @@ #include "../xen.h" #include "../trace.h" +#include "../event_channel.h" /* Get/set subcommands: extra argument == pointer to xen_hvm_param struct. */ #define HVMOP_set_param 0 @@ -90,10 +91,10 @@ typedef enum { struct xen_hvm_track_dirty_vram { /* Domain to be tracked. */ domid_t domid; + /* Number of pages to track. */ + uint32_t nr; /* First pfn to track. */ uint64_aligned_t first_pfn; - /* Number of pages to track. */ - uint64_aligned_t nr; /* OUT variable. */ /* Dirty bitmap buffer. */ XEN_GUEST_HANDLE_64(uint8) dirty_bitmap; @@ -106,10 +107,10 @@ DEFINE_XEN_GUEST_HANDLE(xen_hvm_track_di struct xen_hvm_modified_memory { /* Domain to be updated. */ domid_t domid; + /* Number of pages. */ + uint32_t nr; /* First pfn. */ uint64_aligned_t first_pfn; - /* Number of pages. */ - uint64_aligned_t nr; }; typedef struct xen_hvm_modified_memory xen_hvm_modified_memory_t; DEFINE_XEN_GUEST_HANDLE(xen_hvm_modified_memory_t); @@ -162,49 +163,11 @@ DEFINE_XEN_GUEST_HANDLE(xen_hvm_xentrace /* Following tools-only interfaces may change in future. */ #if defined(__XEN__) || defined(__XEN_TOOLS__) +/* Deprecated by XENMEM_access_op_set_access */ #define HVMOP_set_mem_access 12 -typedef enum { - HVMMEM_access_n, - HVMMEM_access_r, - HVMMEM_access_w, - HVMMEM_access_rw, - HVMMEM_access_x, - HVMMEM_access_rx, - HVMMEM_access_wx, - HVMMEM_access_rwx, - HVMMEM_access_rx2rw, /* Page starts off as r-x, but automatically - * change to r-w on a write */ - HVMMEM_access_n2rwx, /* Log access: starts off as n, automatically - * goes to rwx, generating an event without - * pausing the vcpu */ - HVMMEM_access_default /* Take the domain default */ -} hvmmem_access_t; -/* Notify that a region of memory is to have specific access types */ -struct xen_hvm_set_mem_access { - /* Domain to be updated. */ - domid_t domid; - /* Memory type */ - uint16_t hvmmem_access; /* hvm_access_t */ - /* Number of pages, ignored on setting default access */ - uint32_t nr; - /* First pfn, or ~0ull to set the default access for new pages */ - uint64_aligned_t first_pfn; -}; -typedef struct xen_hvm_set_mem_access xen_hvm_set_mem_access_t; -DEFINE_XEN_GUEST_HANDLE(xen_hvm_set_mem_access_t); +/* Deprecated by XENMEM_access_op_get_access */ #define HVMOP_get_mem_access 13 -/* Get the specific access type for that region of memory */ -struct xen_hvm_get_mem_access { - /* Domain to be queried. */ - domid_t domid; - /* Memory type: OUT */ - uint16_t hvmmem_access; /* hvm_access_t */ - /* pfn, or ~0ull for default access for new pages. IN */ - uint64_aligned_t pfn; -}; -typedef struct xen_hvm_get_mem_access xen_hvm_get_mem_access_t; -DEFINE_XEN_GUEST_HANDLE(xen_hvm_get_mem_access_t); #define HVMOP_inject_trap 14 /* Inject a trap into a VCPU, which will get taken up on the next @@ -270,6 +233,150 @@ struct xen_hvm_inject_msi { typedef struct xen_hvm_inject_msi xen_hvm_inject_msi_t; DEFINE_XEN_GUEST_HANDLE(xen_hvm_inject_msi_t); +/* + * IOREQ Servers + * + * The interface between an I/O emulator an Xen is called an IOREQ Server. + * A domain supports a single 'legacy' IOREQ Server which is instantiated if + * parameter... + * + * HVM_PARAM_IOREQ_PFN is read (to get the gmfn containing the synchronous + * ioreq structures), or... + * HVM_PARAM_BUFIOREQ_PFN is read (to get the gmfn containing the buffered + * ioreq ring), or... + * HVM_PARAM_BUFIOREQ_EVTCHN is read (to get the event channel that Xen uses + * to request buffered I/O emulation). + * + * The following hypercalls facilitate the creation of IOREQ Servers for + * 'secondary' emulators which are invoked to implement port I/O, memory, or + * PCI config space ranges which they explicitly register. + */ + +typedef uint16_t ioservid_t; + +/* + * HVMOP_create_ioreq_server: Instantiate a new IOREQ Server for a secondary + * emulator servicing domain . + * + * The handed back is unique for . If is zero + * the buffered ioreq ring will not be allocated and hence all emulation + * requestes to this server will be synchronous. + */ +#define HVMOP_create_ioreq_server 17 +struct xen_hvm_create_ioreq_server { + domid_t domid; /* IN - domain to be serviced */ + uint8_t handle_bufioreq; /* IN - should server handle buffered ioreqs */ + ioservid_t id; /* OUT - server id */ +}; +typedef struct xen_hvm_create_ioreq_server xen_hvm_create_ioreq_server_t; +DEFINE_XEN_GUEST_HANDLE(xen_hvm_create_ioreq_server_t); + +/* + * HVMOP_get_ioreq_server_info: Get all the information necessary to access + * IOREQ Server . + * + * The emulator needs to map the synchronous ioreq structures and buffered + * ioreq ring (if it exists) that Xen uses to request emulation. These are + * hosted in domain 's gmfns and + * respectively. In addition, if the IOREQ Server is handling buffered + * emulation requests, the emulator needs to bind to event channel + * to listen for them. (The event channels used for + * synchronous emulation requests are specified in the per-CPU ioreq + * structures in ). + * If the IOREQ Server is not handling buffered emulation requests then the + * values handed back in and will both be 0. + */ +#define HVMOP_get_ioreq_server_info 18 +struct xen_hvm_get_ioreq_server_info { + domid_t domid; /* IN - domain to be serviced */ + ioservid_t id; /* IN - server id */ + evtchn_port_t bufioreq_port; /* OUT - buffered ioreq port */ + uint64_aligned_t ioreq_pfn; /* OUT - sync ioreq pfn */ + uint64_aligned_t bufioreq_pfn; /* OUT - buffered ioreq pfn */ +}; +typedef struct xen_hvm_get_ioreq_server_info xen_hvm_get_ioreq_server_info_t; +DEFINE_XEN_GUEST_HANDLE(xen_hvm_get_ioreq_server_info_t); + +/* + * HVM_map_io_range_to_ioreq_server: Register an I/O range of domain + * for emulation by the client of IOREQ + * Server + * HVM_unmap_io_range_from_ioreq_server: Deregister an I/O range of + * for emulation by the client of IOREQ + * Server + * + * There are three types of I/O that can be emulated: port I/O, memory accesses + * and PCI config space accesses. The field denotes which type of range + * the and (inclusive) fields are specifying. + * PCI config space ranges are specified by segment/bus/device/function values + * which should be encoded using the HVMOP_PCI_SBDF helper macro below. + * + * NOTE: unless an emulation request falls entirely within a range mapped + * by a secondary emulator, it will not be passed to that emulator. + */ +#define HVMOP_map_io_range_to_ioreq_server 19 +#define HVMOP_unmap_io_range_from_ioreq_server 20 +struct xen_hvm_io_range { + domid_t domid; /* IN - domain to be serviced */ + ioservid_t id; /* IN - server id */ + uint32_t type; /* IN - type of range */ +# define HVMOP_IO_RANGE_PORT 0 /* I/O port range */ +# define HVMOP_IO_RANGE_MEMORY 1 /* MMIO range */ +# define HVMOP_IO_RANGE_PCI 2 /* PCI segment/bus/dev/func range */ + uint64_aligned_t start, end; /* IN - inclusive start and end of range */ +}; +typedef struct xen_hvm_io_range xen_hvm_io_range_t; +DEFINE_XEN_GUEST_HANDLE(xen_hvm_io_range_t); + +#define HVMOP_PCI_SBDF(s,b,d,f) \ + ((((s) & 0xffff) << 16) | \ + (((b) & 0xff) << 8) | \ + (((d) & 0x1f) << 3) | \ + ((f) & 0x07)) + +/* + * HVMOP_destroy_ioreq_server: Destroy the IOREQ Server servicing domain + * . + * + * Any registered I/O ranges will be automatically deregistered. + */ +#define HVMOP_destroy_ioreq_server 21 +struct xen_hvm_destroy_ioreq_server { + domid_t domid; /* IN - domain to be serviced */ + ioservid_t id; /* IN - server id */ +}; +typedef struct xen_hvm_destroy_ioreq_server xen_hvm_destroy_ioreq_server_t; +DEFINE_XEN_GUEST_HANDLE(xen_hvm_destroy_ioreq_server_t); + +/* + * HVMOP_set_ioreq_server_state: Enable or disable the IOREQ Server servicing + * domain . + * + * The IOREQ Server will not be passed any emulation requests until it is in the + * enabled state. + * Note that the contents of the ioreq_pfn and bufioreq_fn (see + * HVMOP_get_ioreq_server_info) are not meaningful until the IOREQ Server is in + * the enabled state. + */ +#define HVMOP_set_ioreq_server_state 22 +struct xen_hvm_set_ioreq_server_state { + domid_t domid; /* IN - domain to be serviced */ + ioservid_t id; /* IN - server id */ + uint8_t enabled; /* IN - enabled? */ +}; +typedef struct xen_hvm_set_ioreq_server_state xen_hvm_set_ioreq_server_state_t; +DEFINE_XEN_GUEST_HANDLE(xen_hvm_set_ioreq_server_state_t); + #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ #endif /* __XEN_PUBLIC_HVM_HVM_OP_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/hvm/ioreq.h --- a/include/xen/interface/hvm/ioreq.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/hvm/ioreq.h Wed Jan 14 11:11:46 2015 +0100 @@ -34,13 +34,20 @@ #define IOREQ_TYPE_PIO 0 /* pio */ #define IOREQ_TYPE_COPY 1 /* mmio ops */ +#define IOREQ_TYPE_PCI_CONFIG 2 #define IOREQ_TYPE_TIMEOFFSET 7 #define IOREQ_TYPE_INVALIDATE 8 /* mapcache */ /* * VMExit dispatcher should cooperate with instruction decoder to * prepare this structure and notify service OS and DM by sending - * virq + * virq. + * + * For I/O type IOREQ_TYPE_PCI_CONFIG, the physical address is formatted + * as follows: + * + * 63....48|47..40|39..35|34..32|31........0 + * SEGMENT |BUS |DEV |FN |OFFSET */ struct ioreq { uint64_t addr; /* physical address */ diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/hvm/params.h --- a/include/xen/interface/hvm/params.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/hvm/params.h Wed Jan 14 11:11:46 2015 +0100 @@ -61,9 +61,46 @@ #define HVM_PARAM_BUFPIOREQ_PFN 9 #elif defined(__i386__) || defined(__x86_64__) +/* + * Viridian enlightenments + * + * (See http://download.microsoft.com/download/A/B/4/AB43A34E-BDD0-4FA6-BDEF-79EEF16E880B/Hypervisor%20Top%20Level%20Functional%20Specification%20v4.0.docx) + * + * To expose viridian enlightenments to the guest set this parameter + * to the desired feature mask. The base feature set must be present + * in any valid feature mask. + */ +#define HVM_PARAM_VIRIDIAN 9 -/* Expose Viridian interfaces to this HVM guest? */ -#define HVM_PARAM_VIRIDIAN 9 +/* Base+Freq viridian feature sets: + * + * - Hypercall MSRs (HV_X64_MSR_GUEST_OS_ID and HV_X64_MSR_HYPERCALL) + * - APIC access MSRs (HV_X64_MSR_EOI, HV_X64_MSR_ICR and HV_X64_MSR_TPR) + * - Virtual Processor index MSR (HV_X64_MSR_VP_INDEX) + * - Timer frequency MSRs (HV_X64_MSR_TSC_FREQUENCY and + * HV_X64_MSR_APIC_FREQUENCY) + */ +#define _HVMPV_base_freq 0 +#define HVMPV_base_freq (1 << _HVMPV_base_freq) + +/* Feature set modifications */ + +/* Disable timer frequency MSRs (HV_X64_MSR_TSC_FREQUENCY and + * HV_X64_MSR_APIC_FREQUENCY). + * This modification restores the viridian feature set to the + * original 'base' set exposed in releases prior to Xen 4.4. + */ +#define _HVMPV_no_freq 1 +#define HVMPV_no_freq (1 << _HVMPV_no_freq) + +/* Enable Partition Time Reference Counter (HV_X64_MSR_TIME_REF_COUNT) */ +#define _HVMPV_time_ref_count 2 +#define HVMPV_time_ref_count (1 << _HVMPV_time_ref_count) + +#define HVMPV_feature_mask \ + (HVMPV_base_freq | \ + HVMPV_no_freq | \ + HVMPV_time_ref_count) #endif @@ -151,6 +188,12 @@ /* SHUTDOWN_* action in case of a triple fault */ #define HVM_PARAM_TRIPLE_FAULT_REASON 31 -#define HVM_NR_PARAMS 32 +#define HVM_PARAM_IOREQ_SERVER_PFN 32 +#define HVM_PARAM_NR_IOREQ_SERVER_PAGES 33 + +/* Location of the VM Generation ID in guest physical address space. */ +#define HVM_PARAM_VM_GENERATION_ID_ADDR 34 + +#define HVM_NR_PARAMS 35 #endif /* __XEN_PUBLIC_HVM_PARAMS_H__ */ diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/io/blkif.h --- a/include/xen/interface/io/blkif.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/io/blkif.h Wed Jan 14 11:11:46 2015 +0100 @@ -97,6 +97,28 @@ * * The type of the backing device/object. * + * + * direct-io-safe + * Values: 0/1 (boolean) + * Default Value: 0 + * + * The underlying storage is not affected by the direct IO memory + * lifetime bug. See: + * http://lists.xen.org/archives/html/xen-devel/2012-12/msg01154.html + * + * Therefore this option gives the backend permission to use + * O_DIRECT, notwithstanding that bug. + * + * That is, if this option is enabled, use of O_DIRECT is safe, + * in circumstances where we would normally have avoided it as a + * workaround for that bug. This option is not relevant for all + * backends, and even not necessarily supported for those for + * which it is relevant. A backend which knows that it is not + * affected by the bug can ignore this option. + * + * This option doesn't require a backend to use O_DIRECT, so it + * should not be used to try to control the caching behaviour. + * *--------------------------------- Features --------------------------------- * * feature-barrier @@ -175,6 +197,16 @@ * *------------------------- Backend Device Properties ------------------------- * + * discard-enable + * Values: 0/1 (boolean) + * Default Value: 1 + * + * This optional property, set by the toolstack, instructs the backend + * to offer discard to the frontend. If the property is missing the + * backend should offer discard if the backing storage actually supports + * it. This optional property, set by the toolstack, requests that the + * backend offer, or not offer, discard to the frontend. + * * discard-alignment * Values: * Default Value: 0 diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/io/netif.h --- a/include/xen/interface/io/netif.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/io/netif.h Wed Jan 14 11:11:46 2015 +0100 @@ -69,6 +69,59 @@ */ /* + * Multiple transmit and receive queues: + * If supported, the backend will write the key "multi-queue-max-queues" to + * the directory for that vif, and set its value to the maximum supported + * number of queues. + * Frontends that are aware of this feature and wish to use it can write the + * key "multi-queue-num-queues", set to the number they wish to use, which + * must be greater than zero, and no more than the value reported by the backend + * in "multi-queue-max-queues". + * + * Queues replicate the shared rings and event channels. + * "feature-split-event-channels" may optionally be used when using + * multiple queues, but is not mandatory. + * + * Each queue consists of one shared ring pair, i.e. there must be the same + * number of tx and rx rings. + * + * For frontends requesting just one queue, the usual event-channel and + * ring-ref keys are written as before, simplifying the backend processing + * to avoid distinguishing between a frontend that doesn't understand the + * multi-queue feature, and one that does, but requested only one queue. + * + * Frontends requesting two or more queues must not write the toplevel + * event-channel (or event-channel-{tx,rx}) and {tx,rx}-ring-ref keys, + * instead writing those keys under sub-keys having the name "queue-N" where + * N is the integer ID of the queue for which those keys belong. Queues + * are indexed from zero. For example, a frontend with two queues and split + * event channels must write the following set of queue-related keys: + * + * /local/domain/1/device/vif/0/multi-queue-num-queues = "2" + * /local/domain/1/device/vif/0/queue-0 = "" + * /local/domain/1/device/vif/0/queue-0/tx-ring-ref = "" + * /local/domain/1/device/vif/0/queue-0/rx-ring-ref = "" + * /local/domain/1/device/vif/0/queue-0/event-channel-tx = "" + * /local/domain/1/device/vif/0/queue-0/event-channel-rx = "" + * /local/domain/1/device/vif/0/queue-1 = "" + * /local/domain/1/device/vif/0/queue-1/tx-ring-ref = "" + * /local/domain/1/device/vif/0/queue-1/rx-ring-ref = " Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jan 2015 10:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBL5X-0003mu-BC; Wed, 14 Jan 2015 10:22:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBL5V-0003mk-G5 for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 10:22:09 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 11/E1-11608-05346B45; Wed, 14 Jan 2015 10:22:08 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-31.messagelabs.com!1421230924!19340348!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28659 invoked from network); 14 Jan 2015 10:22:05 -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; 14 Jan 2015 10:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBL5P-00086p-Tp for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 10:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YBL5P-000124-Rn for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 10:22:03 +0000 Message-Id: Date: Wed, 14 Jan 2015 10:22:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] sync Xen public headers to 4.5.0 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 # HG changeset patch # User Jan Beulich # Date 1421230306 -3600 # Node ID 98807b11f32914c956e14ece2e6d5541dc70148d # Parent 3015a92b2b53825d00dc81c2dd131fc77ce8ab00 sync Xen public headers to 4.5.0 level --- diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/arch-arm.h --- a/include/xen/interface/arch-arm.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/arch-arm.h Wed Jan 14 11:11:46 2015 +0100 @@ -364,15 +364,50 @@ typedef uint64_t xen_callback_t; */ /* Physical Address Space */ -#define GUEST_GICD_BASE 0x2c001000ULL -#define GUEST_GICD_SIZE 0x1000ULL -#define GUEST_GICC_BASE 0x2c002000ULL -#define GUEST_GICC_SIZE 0x100ULL -#define GUEST_RAM_BASE 0x80000000ULL +/* vGIC mappings: Only one set of mapping is used by the guest. + * Therefore they can overlap. + */ -#define GUEST_GNTTAB_BASE 0xb0000000ULL -#define GUEST_GNTTAB_SIZE 0x00020000ULL +/* 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 diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/arch-x86/cpuid.h --- a/include/xen/interface/arch-x86/cpuid.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/arch-x86/cpuid.h Wed Jan 14 11:11:46 2015 +0100 @@ -30,12 +30,20 @@ #ifndef __XEN_PUBLIC_ARCH_X86_CPUID_H__ #define __XEN_PUBLIC_ARCH_X86_CPUID_H__ -/* Xen identification leaves start at 0x40000000. */ +/* + * For compatibility with other hypervisor interfaces, the Xen cpuid leaves + * can be found at the first otherwise unused 0x100 aligned boundary starting + * from 0x40000000. + * + * e.g If viridian extensions are enabled for an HVM domain, the Xen cpuid + * leaves will start at 0x40000100 + */ + #define XEN_CPUID_FIRST_LEAF 0x40000000 #define XEN_CPUID_LEAF(i) (XEN_CPUID_FIRST_LEAF + (i)) /* - * Leaf 1 (0x40000000) + * Leaf 1 (0x40000x00) * EAX: Largest Xen-information leaf. All leaves up to an including @EAX * are supported by the Xen host. * EBX-EDX: "XenVMMXenVMM" signature, allowing positive identification @@ -46,14 +54,14 @@ #define XEN_CPUID_SIGNATURE_EDX 0x4d4d566e /* "nVMM" */ /* - * Leaf 2 (0x40000001) + * Leaf 2 (0x40000x01) * EAX[31:16]: Xen major version. * EAX[15: 0]: Xen minor version. * EBX-EDX: Reserved (currently all zeroes). */ /* - * Leaf 3 (0x40000002) + * Leaf 3 (0x40000x02) * EAX: Number of hypercall transfer pages. This register is always guaranteed * to specify one hypercall page. * EBX: Base address of Xen-specific MSRs. @@ -65,4 +73,17 @@ #define _XEN_CPUID_FEAT1_MMU_PT_UPDATE_PRESERVE_AD 0 #define XEN_CPUID_FEAT1_MMU_PT_UPDATE_PRESERVE_AD (1u<<0) +/* + * Leaf 5 (0x40000x04) + * HVM-specific features + */ + +/* EAX Features */ +#define XEN_HVM_CPUID_APIC_ACCESS_VIRT (1u << 0) /* Virtualized APIC registers */ +#define XEN_HVM_CPUID_X2APIC_VIRT (1u << 1) /* Virtualized x2APIC accesses */ +/* Memory mapped from other domains has valid IOMMU entries */ +#define XEN_HVM_CPUID_IOMMU_MAPPINGS (1u << 2) + +#define XEN_CPUID_MAX_NUM_LEAVES 4 + #endif /* __XEN_PUBLIC_ARCH_X86_CPUID_H__ */ diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/arch-x86/hvm/save.h --- a/include/xen/interface/arch-x86/hvm/save.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/arch-x86/hvm/save.h Wed Jan 14 11:11:46 2015 +0100 @@ -544,7 +544,7 @@ DECLARE_HVM_SAVE_TYPE(MTRR, 14, struct h */ struct hvm_hw_cpu_xsave { - uint64_t xfeature_mask; + uint64_t xfeature_mask; /* Ignored */ uint64_t xcr0; /* Updated by XSETBV */ uint64_t xcr0_accum; /* Updated by XSETBV */ struct { @@ -568,6 +568,7 @@ struct hvm_hw_cpu_xsave { struct hvm_viridian_domain_context { uint64_t hypercall_gpa; uint64_t guest_os_id; + uint64_t time_ref_count; }; DECLARE_HVM_SAVE_TYPE(VIRIDIAN_DOMAIN, 15, struct hvm_viridian_domain_context); @@ -592,9 +593,27 @@ struct hvm_tsc_adjust { DECLARE_HVM_SAVE_TYPE(TSC_ADJUST, 19, struct hvm_tsc_adjust); + +struct hvm_msr { + uint32_t count; + struct hvm_one_msr { + uint32_t index; + uint32_t _rsvd; + uint64_t val; +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + } msr[]; +#elif defined(__GNUC__) + } msr[0]; +#else + } msr[1 /* variable size */]; +#endif +}; + +#define CPU_MSR_CODE 20 + /* * Largest type-code in use */ -#define HVM_SAVE_CODE_MAX 19 +#define HVM_SAVE_CODE_MAX 20 #endif /* __XEN_PUBLIC_HVM_SAVE_X86_H__ */ diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/domctl.h --- a/include/xen/interface/domctl.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/domctl.h Wed Jan 14 11:11:46 2015 +0100 @@ -35,8 +35,9 @@ #include "xen.h" #include "grant_table.h" #include "hvm/save.h" +#include "memory.h" -#define XEN_DOMCTL_INTERFACE_VERSION 0x00000009 +#define XEN_DOMCTL_INTERFACE_VERSION 0x0000000a /* * NB. xen_domctl.domain is an IN/OUT parameter for this operation. @@ -67,6 +68,19 @@ struct xen_domctl_createdomain { typedef struct xen_domctl_createdomain xen_domctl_createdomain_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_createdomain_t); +#if defined(__arm__) || defined(__aarch64__) +#define XEN_DOMCTL_CONFIG_GIC_DEFAULT 0 +#define XEN_DOMCTL_CONFIG_GIC_V2 1 +#define XEN_DOMCTL_CONFIG_GIC_V3 2 +/* XEN_DOMCTL_configure_domain */ +struct xen_domctl_arm_configuredomain { + /* IN/OUT parameters */ + uint8_t gic_version; +}; +typedef struct xen_domctl_arm_configuredomain xen_domctl_arm_configuredomain_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_arm_configuredomain_t); +#endif + /* XEN_DOMCTL_getdomaininfo */ struct xen_domctl_getdomaininfo { /* OUT variables. */ @@ -107,6 +121,7 @@ struct xen_domctl_getdomaininfo { uint64_aligned_t shared_info_frame; /* GMFN of shared_info struct */ uint64_aligned_t cpu_time; uint32_t nr_online_vcpus; /* Number of VCPUs currently online. */ +#define XEN_INVALID_MAX_VCPU_ID (~0U) /* Domain has no vcpus? */ uint32_t max_vcpu_id; /* Maximum VCPUID in use by this domain. */ uint32_t ssidref; xen_domain_handle_t handle; @@ -300,8 +315,33 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_nodea /* XEN_DOMCTL_setvcpuaffinity */ /* XEN_DOMCTL_getvcpuaffinity */ struct xen_domctl_vcpuaffinity { - uint32_t vcpu; /* IN */ - struct xenctl_bitmap cpumap; /* IN/OUT */ + /* IN variables. */ + uint32_t vcpu; + /* Set/get the hard affinity for vcpu */ +#define _XEN_VCPUAFFINITY_HARD 0 +#define XEN_VCPUAFFINITY_HARD (1U<<_XEN_VCPUAFFINITY_HARD) + /* Set/get the soft affinity for vcpu */ +#define _XEN_VCPUAFFINITY_SOFT 1 +#define XEN_VCPUAFFINITY_SOFT (1U<<_XEN_VCPUAFFINITY_SOFT) + uint32_t flags; + /* + * IN/OUT variables. + * + * Both are IN/OUT for XEN_DOMCTL_setvcpuaffinity, in which case they + * contain effective hard or/and soft affinity. That is, upon successful + * return, cpumap_soft, contains the intersection of the soft affinity, + * hard affinity and the cpupool's online CPUs for the domain (if + * XEN_VCPUAFFINITY_SOFT was set in flags). cpumap_hard contains the + * intersection between hard affinity and the cpupool's online CPUs (if + * XEN_VCPUAFFINITY_HARD was set in flags). + * + * Both are OUT-only for XEN_DOMCTL_getvcpuaffinity, in which case they + * contain the plain hard and/or soft affinity masks that were set during + * previous successful calls to XEN_DOMCTL_setvcpuaffinity (or the + * default values), without intersecting or altering them in any way. + */ + struct xenctl_bitmap cpumap_hard; + struct xenctl_bitmap cpumap_soft; }; typedef struct xen_domctl_vcpuaffinity xen_domctl_vcpuaffinity_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vcpuaffinity_t); @@ -321,6 +361,8 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_max_v #define XEN_SCHEDULER_CREDIT 5 #define XEN_SCHEDULER_CREDIT2 6 #define XEN_SCHEDULER_ARINC653 7 +#define XEN_SCHEDULER_RTDS 8 + /* Set or get info? */ #define XEN_DOMCTL_SCHEDOP_putinfo 0 #define XEN_DOMCTL_SCHEDOP_getinfo 1 @@ -342,6 +384,10 @@ struct xen_domctl_scheduler_op { struct xen_domctl_sched_credit2 { uint16_t weight; } credit2; + struct xen_domctl_sched_rtds { + uint32_t period; + uint32_t budget; + } rtds; } u; }; typedef struct xen_domctl_scheduler_op xen_domctl_scheduler_op_t; @@ -562,6 +608,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_iopor #define XEN_DOMCTL_MEM_CACHEATTR_WP 5 #define XEN_DOMCTL_MEM_CACHEATTR_WB 6 #define XEN_DOMCTL_MEM_CACHEATTR_UCM 7 +#define XEN_DOMCTL_DELETE_MEM_CACHEATTR (~(uint32_t)0) struct xen_domctl_pin_mem_cacheattr { uint64_aligned_t start, end; uint32_t type; /* XEN_DOMCTL_MEM_CACHEATTR_* */ @@ -789,10 +836,11 @@ struct xen_domctl_gdbsx_domstatus { * ENODEV - host lacks HAP support (EPT/NPT) or HAP is disabled in guest * EBUSY - guest has or had access enabled, ring buffer still active */ -#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS 2 +#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS 2 -#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE 0 -#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_DISABLE 1 +#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE 0 +#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_DISABLE 1 +#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE_INTROSPECTION 2 /* * Sharing ENOMEM helper. @@ -862,7 +910,7 @@ struct xen_domctl_vcpuextstate { /* IN: VCPU that this call applies to. */ uint32_t vcpu; /* - * SET: xfeature support mask of struct (IN) + * SET: Ignored. * GET: xfeature support mask of struct (IN/OUT) * xfeature mask is served as identifications of the saving format * so that compatible CPUs can have a check on format to decide @@ -918,6 +966,78 @@ struct xen_domctl_cacheflush { typedef struct xen_domctl_cacheflush xen_domctl_cacheflush_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_cacheflush_t); +#if defined(__i386__) || defined(__x86_64__) +struct xen_domctl_vcpu_msr { + uint32_t index; + uint32_t reserved; + uint64_aligned_t value; +}; +typedef struct xen_domctl_vcpu_msr xen_domctl_vcpu_msr_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_vcpu_msr_t); + +/* + * XEN_DOMCTL_set_vcpu_msrs / XEN_DOMCTL_get_vcpu_msrs. + * + * Input: + * - A NULL 'msrs' guest handle is a request for the maximum 'msr_count'. + * - Otherwise, 'msr_count' is the number of entries in 'msrs'. + * + * Output for get: + * - If 'msr_count' is less than the number Xen needs to write, -ENOBUFS shall + * be returned and 'msr_count' updated to reflect the intended number. + * - On success, 'msr_count' shall indicate the number of MSRs written, which + * may be less than the maximum if some are not currently used by the vcpu. + * + * Output for set: + * - If Xen encounters an error with a specific MSR, -EINVAL shall be returned + * and 'msr_count' shall be set to the offending index, to aid debugging. + */ +struct xen_domctl_vcpu_msrs { + uint32_t vcpu; /* IN */ + uint32_t msr_count; /* IN/OUT */ + XEN_GUEST_HANDLE_64(xen_domctl_vcpu_msr_t) msrs; /* IN/OUT */ +}; +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. + */ +struct xen_domctl_vnuma { + uint32_t nr_vnodes; + uint32_t nr_vmemranges; + uint32_t nr_vcpus; + uint32_t pad; + XEN_GUEST_HANDLE_64(uint) vdistance; + 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. + */ + XEN_GUEST_HANDLE_64(uint) vnode_to_pnode; + + /* + * memory rages for each vNUMA node + */ + XEN_GUEST_HANDLE_64(xen_vmemrange_t) vmemrange; +}; +typedef struct xen_domctl_vnuma xen_domctl_vnuma_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_vnuma_t); + +struct xen_domctl_psr_cmt_op { +#define XEN_DOMCTL_PSR_CMT_OP_DETACH 0 +#define XEN_DOMCTL_PSR_CMT_OP_ATTACH 1 +#define XEN_DOMCTL_PSR_CMT_OP_QUERY_RMID 2 + uint32_t cmd; + uint32_t data; +}; +typedef struct xen_domctl_psr_cmt_op xen_domctl_psr_cmt_op_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_psr_cmt_op_t); + struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 1 @@ -988,6 +1108,11 @@ struct xen_domctl { #define XEN_DOMCTL_getnodeaffinity 69 #define XEN_DOMCTL_set_max_evtchn 70 #define XEN_DOMCTL_cacheflush 71 +#define XEN_DOMCTL_get_vcpu_msrs 72 +#define XEN_DOMCTL_set_vcpu_msrs 73 +#define XEN_DOMCTL_setvnumainfo 74 +#define XEN_DOMCTL_psr_cmt_op 75 +#define XEN_DOMCTL_arm_configure_domain 76 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -996,6 +1121,9 @@ struct xen_domctl { domid_t domain; union { struct xen_domctl_createdomain createdomain; +#if defined(__arm__) || defined(__aarch64__) + struct xen_domctl_arm_configuredomain configuredomain; +#endif struct xen_domctl_getdomaininfo getdomaininfo; struct xen_domctl_getmemlist getmemlist; struct xen_domctl_getpageframeinfo getpageframeinfo; @@ -1040,6 +1168,7 @@ struct xen_domctl { #if defined(__i386__) || defined(__x86_64__) struct xen_domctl_cpuid cpuid; struct xen_domctl_vcpuextstate vcpuextstate; + struct xen_domctl_vcpu_msrs vcpu_msrs; #endif struct xen_domctl_set_access_required access_required; struct xen_domctl_audit_p2m audit_p2m; @@ -1050,6 +1179,8 @@ struct xen_domctl { struct xen_domctl_cacheflush cacheflush; struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; + struct xen_domctl_vnuma vnuma; + struct xen_domctl_psr_cmt_op psr_cmt_op; uint8_t pad[128]; } u; }; diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/event_channel.h --- a/include/xen/interface/event_channel.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/event_channel.h Wed Jan 14 11:11:46 2015 +0100 @@ -264,6 +264,10 @@ typedef struct evtchn_unmask evtchn_unma * NOTES: * 1. may be specified as DOMID_SELF. * 2. Only a sufficiently-privileged domain may specify other than DOMID_SELF. + * 3. Destroys all control blocks and event array, resets event channel + * operations to 2-level ABI if called with == DOMID_SELF and FIFO + * ABI was used. Guests should not bind events during EVTCHNOP_reset call + * as these events are likely to be lost. */ struct evtchn_reset { /* IN parameters. */ diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/features.h --- a/include/xen/interface/features.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/features.h Wed Jan 14 11:11:46 2015 +0100 @@ -94,6 +94,11 @@ /* operation as Dom0 is supported */ #define XENFEAT_dom0 11 +/* Xen also maps grant references at pfn = mfn. + * This feature flag is deprecated and should not be used. +#define XENFEAT_grant_map_identity 12 + */ + #define XENFEAT_NR_SUBMAPS 1 #endif /* __XEN_PUBLIC_FEATURES_H__ */ diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/grant_table.h --- a/include/xen/interface/grant_table.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/grant_table.h Wed Jan 14 11:11:46 2015 +0100 @@ -309,6 +309,7 @@ typedef uint16_t grant_status_t; #define GNTTABOP_get_status_frames 9 #define GNTTABOP_get_version 10 #define GNTTABOP_swap_grant_ref 11 +#define GNTTABOP_cache_flush 12 #endif /* __XEN_INTERFACE_VERSION__ */ /* ` } */ @@ -574,6 +575,25 @@ struct gnttab_swap_grant_ref { typedef struct gnttab_swap_grant_ref gnttab_swap_grant_ref_t; DEFINE_XEN_GUEST_HANDLE(gnttab_swap_grant_ref_t); +/* + * Issue one or more cache maintenance operations on a portion of a + * page granted to the calling domain by a foreign domain. + */ +struct gnttab_cache_flush { + union { + uint64_t dev_bus_addr; + grant_ref_t ref; + } a; + uint16_t offset; /* offset from start of grant */ + uint16_t length; /* size within the grant */ +#define GNTTAB_CACHE_CLEAN (1<<0) +#define GNTTAB_CACHE_INVAL (1<<1) +#define GNTTAB_CACHE_SOURCE_GREF (1<<31) + uint32_t op; +}; +typedef struct gnttab_cache_flush gnttab_cache_flush_t; +DEFINE_XEN_GUEST_HANDLE(gnttab_cache_flush_t); + #endif /* __XEN_INTERFACE_VERSION__ */ /* diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/hvm/hvm_op.h --- a/include/xen/interface/hvm/hvm_op.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/hvm/hvm_op.h Wed Jan 14 11:11:46 2015 +0100 @@ -23,6 +23,7 @@ #include "../xen.h" #include "../trace.h" +#include "../event_channel.h" /* Get/set subcommands: extra argument == pointer to xen_hvm_param struct. */ #define HVMOP_set_param 0 @@ -90,10 +91,10 @@ typedef enum { struct xen_hvm_track_dirty_vram { /* Domain to be tracked. */ domid_t domid; + /* Number of pages to track. */ + uint32_t nr; /* First pfn to track. */ uint64_aligned_t first_pfn; - /* Number of pages to track. */ - uint64_aligned_t nr; /* OUT variable. */ /* Dirty bitmap buffer. */ XEN_GUEST_HANDLE_64(uint8) dirty_bitmap; @@ -106,10 +107,10 @@ DEFINE_XEN_GUEST_HANDLE(xen_hvm_track_di struct xen_hvm_modified_memory { /* Domain to be updated. */ domid_t domid; + /* Number of pages. */ + uint32_t nr; /* First pfn. */ uint64_aligned_t first_pfn; - /* Number of pages. */ - uint64_aligned_t nr; }; typedef struct xen_hvm_modified_memory xen_hvm_modified_memory_t; DEFINE_XEN_GUEST_HANDLE(xen_hvm_modified_memory_t); @@ -162,49 +163,11 @@ DEFINE_XEN_GUEST_HANDLE(xen_hvm_xentrace /* Following tools-only interfaces may change in future. */ #if defined(__XEN__) || defined(__XEN_TOOLS__) +/* Deprecated by XENMEM_access_op_set_access */ #define HVMOP_set_mem_access 12 -typedef enum { - HVMMEM_access_n, - HVMMEM_access_r, - HVMMEM_access_w, - HVMMEM_access_rw, - HVMMEM_access_x, - HVMMEM_access_rx, - HVMMEM_access_wx, - HVMMEM_access_rwx, - HVMMEM_access_rx2rw, /* Page starts off as r-x, but automatically - * change to r-w on a write */ - HVMMEM_access_n2rwx, /* Log access: starts off as n, automatically - * goes to rwx, generating an event without - * pausing the vcpu */ - HVMMEM_access_default /* Take the domain default */ -} hvmmem_access_t; -/* Notify that a region of memory is to have specific access types */ -struct xen_hvm_set_mem_access { - /* Domain to be updated. */ - domid_t domid; - /* Memory type */ - uint16_t hvmmem_access; /* hvm_access_t */ - /* Number of pages, ignored on setting default access */ - uint32_t nr; - /* First pfn, or ~0ull to set the default access for new pages */ - uint64_aligned_t first_pfn; -}; -typedef struct xen_hvm_set_mem_access xen_hvm_set_mem_access_t; -DEFINE_XEN_GUEST_HANDLE(xen_hvm_set_mem_access_t); +/* Deprecated by XENMEM_access_op_get_access */ #define HVMOP_get_mem_access 13 -/* Get the specific access type for that region of memory */ -struct xen_hvm_get_mem_access { - /* Domain to be queried. */ - domid_t domid; - /* Memory type: OUT */ - uint16_t hvmmem_access; /* hvm_access_t */ - /* pfn, or ~0ull for default access for new pages. IN */ - uint64_aligned_t pfn; -}; -typedef struct xen_hvm_get_mem_access xen_hvm_get_mem_access_t; -DEFINE_XEN_GUEST_HANDLE(xen_hvm_get_mem_access_t); #define HVMOP_inject_trap 14 /* Inject a trap into a VCPU, which will get taken up on the next @@ -270,6 +233,150 @@ struct xen_hvm_inject_msi { typedef struct xen_hvm_inject_msi xen_hvm_inject_msi_t; DEFINE_XEN_GUEST_HANDLE(xen_hvm_inject_msi_t); +/* + * IOREQ Servers + * + * The interface between an I/O emulator an Xen is called an IOREQ Server. + * A domain supports a single 'legacy' IOREQ Server which is instantiated if + * parameter... + * + * HVM_PARAM_IOREQ_PFN is read (to get the gmfn containing the synchronous + * ioreq structures), or... + * HVM_PARAM_BUFIOREQ_PFN is read (to get the gmfn containing the buffered + * ioreq ring), or... + * HVM_PARAM_BUFIOREQ_EVTCHN is read (to get the event channel that Xen uses + * to request buffered I/O emulation). + * + * The following hypercalls facilitate the creation of IOREQ Servers for + * 'secondary' emulators which are invoked to implement port I/O, memory, or + * PCI config space ranges which they explicitly register. + */ + +typedef uint16_t ioservid_t; + +/* + * HVMOP_create_ioreq_server: Instantiate a new IOREQ Server for a secondary + * emulator servicing domain . + * + * The handed back is unique for . If is zero + * the buffered ioreq ring will not be allocated and hence all emulation + * requestes to this server will be synchronous. + */ +#define HVMOP_create_ioreq_server 17 +struct xen_hvm_create_ioreq_server { + domid_t domid; /* IN - domain to be serviced */ + uint8_t handle_bufioreq; /* IN - should server handle buffered ioreqs */ + ioservid_t id; /* OUT - server id */ +}; +typedef struct xen_hvm_create_ioreq_server xen_hvm_create_ioreq_server_t; +DEFINE_XEN_GUEST_HANDLE(xen_hvm_create_ioreq_server_t); + +/* + * HVMOP_get_ioreq_server_info: Get all the information necessary to access + * IOREQ Server . + * + * The emulator needs to map the synchronous ioreq structures and buffered + * ioreq ring (if it exists) that Xen uses to request emulation. These are + * hosted in domain 's gmfns and + * respectively. In addition, if the IOREQ Server is handling buffered + * emulation requests, the emulator needs to bind to event channel + * to listen for them. (The event channels used for + * synchronous emulation requests are specified in the per-CPU ioreq + * structures in ). + * If the IOREQ Server is not handling buffered emulation requests then the + * values handed back in and will both be 0. + */ +#define HVMOP_get_ioreq_server_info 18 +struct xen_hvm_get_ioreq_server_info { + domid_t domid; /* IN - domain to be serviced */ + ioservid_t id; /* IN - server id */ + evtchn_port_t bufioreq_port; /* OUT - buffered ioreq port */ + uint64_aligned_t ioreq_pfn; /* OUT - sync ioreq pfn */ + uint64_aligned_t bufioreq_pfn; /* OUT - buffered ioreq pfn */ +}; +typedef struct xen_hvm_get_ioreq_server_info xen_hvm_get_ioreq_server_info_t; +DEFINE_XEN_GUEST_HANDLE(xen_hvm_get_ioreq_server_info_t); + +/* + * HVM_map_io_range_to_ioreq_server: Register an I/O range of domain + * for emulation by the client of IOREQ + * Server + * HVM_unmap_io_range_from_ioreq_server: Deregister an I/O range of + * for emulation by the client of IOREQ + * Server + * + * There are three types of I/O that can be emulated: port I/O, memory accesses + * and PCI config space accesses. The field denotes which type of range + * the and (inclusive) fields are specifying. + * PCI config space ranges are specified by segment/bus/device/function values + * which should be encoded using the HVMOP_PCI_SBDF helper macro below. + * + * NOTE: unless an emulation request falls entirely within a range mapped + * by a secondary emulator, it will not be passed to that emulator. + */ +#define HVMOP_map_io_range_to_ioreq_server 19 +#define HVMOP_unmap_io_range_from_ioreq_server 20 +struct xen_hvm_io_range { + domid_t domid; /* IN - domain to be serviced */ + ioservid_t id; /* IN - server id */ + uint32_t type; /* IN - type of range */ +# define HVMOP_IO_RANGE_PORT 0 /* I/O port range */ +# define HVMOP_IO_RANGE_MEMORY 1 /* MMIO range */ +# define HVMOP_IO_RANGE_PCI 2 /* PCI segment/bus/dev/func range */ + uint64_aligned_t start, end; /* IN - inclusive start and end of range */ +}; +typedef struct xen_hvm_io_range xen_hvm_io_range_t; +DEFINE_XEN_GUEST_HANDLE(xen_hvm_io_range_t); + +#define HVMOP_PCI_SBDF(s,b,d,f) \ + ((((s) & 0xffff) << 16) | \ + (((b) & 0xff) << 8) | \ + (((d) & 0x1f) << 3) | \ + ((f) & 0x07)) + +/* + * HVMOP_destroy_ioreq_server: Destroy the IOREQ Server servicing domain + * . + * + * Any registered I/O ranges will be automatically deregistered. + */ +#define HVMOP_destroy_ioreq_server 21 +struct xen_hvm_destroy_ioreq_server { + domid_t domid; /* IN - domain to be serviced */ + ioservid_t id; /* IN - server id */ +}; +typedef struct xen_hvm_destroy_ioreq_server xen_hvm_destroy_ioreq_server_t; +DEFINE_XEN_GUEST_HANDLE(xen_hvm_destroy_ioreq_server_t); + +/* + * HVMOP_set_ioreq_server_state: Enable or disable the IOREQ Server servicing + * domain . + * + * The IOREQ Server will not be passed any emulation requests until it is in the + * enabled state. + * Note that the contents of the ioreq_pfn and bufioreq_fn (see + * HVMOP_get_ioreq_server_info) are not meaningful until the IOREQ Server is in + * the enabled state. + */ +#define HVMOP_set_ioreq_server_state 22 +struct xen_hvm_set_ioreq_server_state { + domid_t domid; /* IN - domain to be serviced */ + ioservid_t id; /* IN - server id */ + uint8_t enabled; /* IN - enabled? */ +}; +typedef struct xen_hvm_set_ioreq_server_state xen_hvm_set_ioreq_server_state_t; +DEFINE_XEN_GUEST_HANDLE(xen_hvm_set_ioreq_server_state_t); + #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ #endif /* __XEN_PUBLIC_HVM_HVM_OP_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/hvm/ioreq.h --- a/include/xen/interface/hvm/ioreq.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/hvm/ioreq.h Wed Jan 14 11:11:46 2015 +0100 @@ -34,13 +34,20 @@ #define IOREQ_TYPE_PIO 0 /* pio */ #define IOREQ_TYPE_COPY 1 /* mmio ops */ +#define IOREQ_TYPE_PCI_CONFIG 2 #define IOREQ_TYPE_TIMEOFFSET 7 #define IOREQ_TYPE_INVALIDATE 8 /* mapcache */ /* * VMExit dispatcher should cooperate with instruction decoder to * prepare this structure and notify service OS and DM by sending - * virq + * virq. + * + * For I/O type IOREQ_TYPE_PCI_CONFIG, the physical address is formatted + * as follows: + * + * 63....48|47..40|39..35|34..32|31........0 + * SEGMENT |BUS |DEV |FN |OFFSET */ struct ioreq { uint64_t addr; /* physical address */ diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/hvm/params.h --- a/include/xen/interface/hvm/params.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/hvm/params.h Wed Jan 14 11:11:46 2015 +0100 @@ -61,9 +61,46 @@ #define HVM_PARAM_BUFPIOREQ_PFN 9 #elif defined(__i386__) || defined(__x86_64__) +/* + * Viridian enlightenments + * + * (See http://download.microsoft.com/download/A/B/4/AB43A34E-BDD0-4FA6-BDEF-79EEF16E880B/Hypervisor%20Top%20Level%20Functional%20Specification%20v4.0.docx) + * + * To expose viridian enlightenments to the guest set this parameter + * to the desired feature mask. The base feature set must be present + * in any valid feature mask. + */ +#define HVM_PARAM_VIRIDIAN 9 -/* Expose Viridian interfaces to this HVM guest? */ -#define HVM_PARAM_VIRIDIAN 9 +/* Base+Freq viridian feature sets: + * + * - Hypercall MSRs (HV_X64_MSR_GUEST_OS_ID and HV_X64_MSR_HYPERCALL) + * - APIC access MSRs (HV_X64_MSR_EOI, HV_X64_MSR_ICR and HV_X64_MSR_TPR) + * - Virtual Processor index MSR (HV_X64_MSR_VP_INDEX) + * - Timer frequency MSRs (HV_X64_MSR_TSC_FREQUENCY and + * HV_X64_MSR_APIC_FREQUENCY) + */ +#define _HVMPV_base_freq 0 +#define HVMPV_base_freq (1 << _HVMPV_base_freq) + +/* Feature set modifications */ + +/* Disable timer frequency MSRs (HV_X64_MSR_TSC_FREQUENCY and + * HV_X64_MSR_APIC_FREQUENCY). + * This modification restores the viridian feature set to the + * original 'base' set exposed in releases prior to Xen 4.4. + */ +#define _HVMPV_no_freq 1 +#define HVMPV_no_freq (1 << _HVMPV_no_freq) + +/* Enable Partition Time Reference Counter (HV_X64_MSR_TIME_REF_COUNT) */ +#define _HVMPV_time_ref_count 2 +#define HVMPV_time_ref_count (1 << _HVMPV_time_ref_count) + +#define HVMPV_feature_mask \ + (HVMPV_base_freq | \ + HVMPV_no_freq | \ + HVMPV_time_ref_count) #endif @@ -151,6 +188,12 @@ /* SHUTDOWN_* action in case of a triple fault */ #define HVM_PARAM_TRIPLE_FAULT_REASON 31 -#define HVM_NR_PARAMS 32 +#define HVM_PARAM_IOREQ_SERVER_PFN 32 +#define HVM_PARAM_NR_IOREQ_SERVER_PAGES 33 + +/* Location of the VM Generation ID in guest physical address space. */ +#define HVM_PARAM_VM_GENERATION_ID_ADDR 34 + +#define HVM_NR_PARAMS 35 #endif /* __XEN_PUBLIC_HVM_PARAMS_H__ */ diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/io/blkif.h --- a/include/xen/interface/io/blkif.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/io/blkif.h Wed Jan 14 11:11:46 2015 +0100 @@ -97,6 +97,28 @@ * * The type of the backing device/object. * + * + * direct-io-safe + * Values: 0/1 (boolean) + * Default Value: 0 + * + * The underlying storage is not affected by the direct IO memory + * lifetime bug. See: + * http://lists.xen.org/archives/html/xen-devel/2012-12/msg01154.html + * + * Therefore this option gives the backend permission to use + * O_DIRECT, notwithstanding that bug. + * + * That is, if this option is enabled, use of O_DIRECT is safe, + * in circumstances where we would normally have avoided it as a + * workaround for that bug. This option is not relevant for all + * backends, and even not necessarily supported for those for + * which it is relevant. A backend which knows that it is not + * affected by the bug can ignore this option. + * + * This option doesn't require a backend to use O_DIRECT, so it + * should not be used to try to control the caching behaviour. + * *--------------------------------- Features --------------------------------- * * feature-barrier @@ -175,6 +197,16 @@ * *------------------------- Backend Device Properties ------------------------- * + * discard-enable + * Values: 0/1 (boolean) + * Default Value: 1 + * + * This optional property, set by the toolstack, instructs the backend + * to offer discard to the frontend. If the property is missing the + * backend should offer discard if the backing storage actually supports + * it. This optional property, set by the toolstack, requests that the + * backend offer, or not offer, discard to the frontend. + * * discard-alignment * Values: * Default Value: 0 diff -r 3015a92b2b53 -r 98807b11f329 include/xen/interface/io/netif.h --- a/include/xen/interface/io/netif.h Wed Jan 14 10:47:08 2015 +0100 +++ b/include/xen/interface/io/netif.h Wed Jan 14 11:11:46 2015 +0100 @@ -69,6 +69,59 @@ */ /* + * Multiple transmit and receive queues: + * If supported, the backend will write the key "multi-queue-max-queues" to + * the directory for that vif, and set its value to the maximum supported + * number of queues. + * Frontends that are aware of this feature and wish to use it can write the + * key "multi-queue-num-queues", set to the number they wish to use, which + * must be greater than zero, and no more than the value reported by the backend + * in "multi-queue-max-queues". + * + * Queues replicate the shared rings and event channels. + * "feature-split-event-channels" may optionally be used when using + * multiple queues, but is not mandatory. + * + * Each queue consists of one shared ring pair, i.e. there must be the same + * number of tx and rx rings. + * + * For frontends requesting just one queue, the usual event-channel and + * ring-ref keys are written as before, simplifying the backend processing + * to avoid distinguishing between a frontend that doesn't understand the + * multi-queue feature, and one that does, but requested only one queue. + * + * Frontends requesting two or more queues must not write the toplevel + * event-channel (or event-channel-{tx,rx}) and {tx,rx}-ring-ref keys, + * instead writing those keys under sub-keys having the name "queue-N" where + * N is the integer ID of the queue for which those keys belong. Queues + * are indexed from zero. For example, a frontend with two queues and split + * event channels must write the following set of queue-related keys: + * + * /local/domain/1/device/vif/0/multi-queue-num-queues = "2" + * /local/domain/1/device/vif/0/queue-0 = "" + * /local/domain/1/device/vif/0/queue-0/tx-ring-ref = "" + * /local/domain/1/device/vif/0/queue-0/rx-ring-ref = "" + * /local/domain/1/device/vif/0/queue-0/event-channel-tx = "" + * /local/domain/1/device/vif/0/queue-0/event-channel-rx = "" + * /local/domain/1/device/vif/0/queue-1 = "" + * /local/domain/1/device/vif/0/queue-1/tx-ring-ref = "" + * /local/domain/1/device/vif/0/queue-1/rx-ring-ref = " Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jan 2015 10:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBL5U-0003mf-8j; Wed, 14 Jan 2015 10:22:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBL5S-0003mV-96 for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 10:22:06 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 91/8D-27785-D4346B45; Wed, 14 Jan 2015 10:22:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1421230923!20491351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4721 invoked from network); 14 Jan 2015 10:22:04 -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; 14 Jan 2015 10:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBL5P-00086m-MZ for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 10:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YBL5P-00011p-DI for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 10:22:03 +0000 Message-Id: Date: Wed, 14 Jan 2015 10:22:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] scsifront: avoid acquiring same lock twice if ring is full X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1421228828 -3600 # Node ID 3015a92b2b53825d00dc81c2dd131fc77ce8ab00 # Parent 078f1bb69ea5e3772f3df4b4ee21f3c52e381e51 scsifront: avoid acquiring same lock twice if ring is full The locking in scsifront_dev_reset_handler() as introduced by c/s 1209:4d1471ca031e is obviously wrong. In case of a full ring the host lock is acquired twice. Fixing this issue enables to get rid of the endless fo loop with an explicit break statement. Signed-off-by: Juergen Gross Also add a missing version check. Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r 078f1bb69ea5 -r 3015a92b2b53 drivers/xen/scsifront/scsifront.c --- a/drivers/xen/scsifront/scsifront.c Wed Dec 10 10:22:39 2014 +0100 +++ b/drivers/xen/scsifront/scsifront.c Wed Jan 14 10:47:08 2015 +0100 @@ -447,12 +447,10 @@ static int scsifront_dev_reset_handler(s uint16_t rqid; int err = 0; - for (;;) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) - spin_lock_irq(host->host_lock); + spin_lock_irq(host->host_lock); #endif - if (!RING_FULL(&info->ring)) - break; + while (RING_FULL(&info->ring)) { if (err) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) spin_unlock_irq(host->host_lock); @@ -463,7 +461,9 @@ static int scsifront_dev_reset_handler(s spin_unlock_irq(host->host_lock); err = wait_event_interruptible(info->wq_sync, !info->waiting_sync); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) spin_lock_irq(host->host_lock); +#endif } ring_req = scsifront_pre_request(info); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jan 14 11:11:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jan 2015 11:11: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 1YBLqt-0000BK-0d; Wed, 14 Jan 2015 11:11:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBLqr-0000B9-RH for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 11:11:05 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id EA/B5-09842-9CE46B45; Wed, 14 Jan 2015 11:11:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1421233863!21308718!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13207 invoked from network); 14 Jan 2015 11:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jan 2015 11:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBLqp-0000DB-9w for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 11:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YBLqp-000356-6a for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 11:11:03 +0000 Message-Id: Date: Wed, 14 Jan 2015 11:11:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] scsifront: undo broken version 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 # HG changeset patch # User Jan Beulich # Date 1421233546 -3600 # Node ID 3feb5ddb543433f1d1d36f8e27ce3d9c113b1704 # Parent 98807b11f32914c956e14ece2e6d5541dc70148d scsifront: undo broken version check Revert erroneous version check added by c/s 1273:3015a92b2b53 around lock re-acquire. Reported-by: Juergen Gross Signed-off-by: Jan Beulich --- diff -r 98807b11f329 -r 3feb5ddb5434 drivers/xen/scsifront/scsifront.c --- a/drivers/xen/scsifront/scsifront.c Wed Jan 14 11:11:46 2015 +0100 +++ b/drivers/xen/scsifront/scsifront.c Wed Jan 14 12:05:46 2015 +0100 @@ -461,9 +461,7 @@ static int scsifront_dev_reset_handler(s spin_unlock_irq(host->host_lock); err = wait_event_interruptible(info->wq_sync, !info->waiting_sync); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) spin_lock_irq(host->host_lock); -#endif } ring_req = scsifront_pre_request(info); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jan 14 11:11:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jan 2015 11:11: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 1YBLqt-0000BK-0d; Wed, 14 Jan 2015 11:11:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBLqr-0000B9-RH for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 11:11:05 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id EA/B5-09842-9CE46B45; Wed, 14 Jan 2015 11:11:05 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1421233863!21308718!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13207 invoked from network); 14 Jan 2015 11:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jan 2015 11:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBLqp-0000DB-9w for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 11:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YBLqp-000356-6a for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 11:11:03 +0000 Message-Id: Date: Wed, 14 Jan 2015 11:11:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] scsifront: undo broken version 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 # HG changeset patch # User Jan Beulich # Date 1421233546 -3600 # Node ID 3feb5ddb543433f1d1d36f8e27ce3d9c113b1704 # Parent 98807b11f32914c956e14ece2e6d5541dc70148d scsifront: undo broken version check Revert erroneous version check added by c/s 1273:3015a92b2b53 around lock re-acquire. Reported-by: Juergen Gross Signed-off-by: Jan Beulich --- diff -r 98807b11f329 -r 3feb5ddb5434 drivers/xen/scsifront/scsifront.c --- a/drivers/xen/scsifront/scsifront.c Wed Jan 14 11:11:46 2015 +0100 +++ b/drivers/xen/scsifront/scsifront.c Wed Jan 14 12:05:46 2015 +0100 @@ -461,9 +461,7 @@ static int scsifront_dev_reset_handler(s spin_unlock_irq(host->host_lock); err = wait_event_interruptible(info->wq_sync, !info->waiting_sync); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) spin_lock_irq(host->host_lock); -#endif } ring_req = scsifront_pre_request(info); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jan 14 16:11:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jan 2015 16: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 1YBQXF-00028b-3y; Wed, 14 Jan 2015 16:11:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBQXD-00028R-U4 for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:08 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id CA/41-09842-B1596B45; Wed, 14 Jan 2015 16:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1421251865!18016726!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23410 invoked from network); 14 Jan 2015 16:11:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jan 2015 16:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBQX9-0003w7-28 for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YBQX8-0005t6-Vb for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:03 +0000 Date: Wed, 14 Jan 2015 16:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Revert "dpci: add 'masked' as a gate for hvm_dirq_assist to process" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1965728cd5a1635859158f5800d844fc16774668 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jan 12 11:29:33 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 12 11:29:33 2015 -0500 Revert "dpci: add 'masked' as a gate for hvm_dirq_assist to process" This reverts commit 104072fc1c7e6ed117c70fa7f91ecc9946f8f654. As there are issues with huge amount of MSI-X going off. Signed-off-by: Konrad Rzeszutek Wilk --- xen/drivers/passthrough/io.c | 12 ++---------- xen/include/xen/hvm/irq.h | 1 - 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index ae050df..efc66dc 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -129,13 +129,6 @@ static void pt_pirq_softirq_reset(struct hvm_pirq_dpci *pirq_dpci) pirq_dpci->dom = NULL; break; } - /* - * Inhibit 'hvm_dirq_assist' from doing anything useful and at worst - * calling 'set_timer' which will blow up (as we have called kill_timer - * or never initialized it). Note that we hold the lock that - * 'hvm_dirq_assist' could be spinning on. - */ - pirq_dpci->masked = 0; } bool_t pt_irq_need_timer(uint32_t flags) @@ -149,7 +142,7 @@ static int pt_irq_guest_eoi(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, if ( __test_and_clear_bit(_HVM_IRQ_DPCI_EOI_LATCH_SHIFT, &pirq_dpci->flags) ) { - pirq_dpci->masked = 0; + pirq_dpci->state = 0; pirq_dpci->pending = 0; pirq_guest_eoi(dpci_pirq(pirq_dpci)); } @@ -617,7 +610,6 @@ int hvm_do_IRQ_dpci(struct domain *d, struct pirq *pirq) !(pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) ) return 0; - pirq_dpci->masked = 1; raise_softirq_for(pirq_dpci); return 1; } @@ -677,7 +669,7 @@ static void hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci) ASSERT(d->arch.hvm_domain.irq.dpci); spin_lock(&d->event_lock); - if ( test_and_clear_bool(pirq_dpci->masked) ) + if ( pirq_dpci->state ) { struct pirq *pirq = dpci_pirq(pirq_dpci); const struct dev_intx_gsi_link *digl; diff --git a/xen/include/xen/hvm/irq.h b/xen/include/xen/hvm/irq.h index 3996f1f..9709397 100644 --- a/xen/include/xen/hvm/irq.h +++ b/xen/include/xen/hvm/irq.h @@ -94,7 +94,6 @@ struct hvm_irq_dpci { struct hvm_pirq_dpci { uint32_t flags; unsigned int state; - bool_t masked; uint16_t pending; struct list_head digl_list; struct domain *dom; -- 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 Jan 14 16:11:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jan 2015 16: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 1YBQXF-00028b-3y; Wed, 14 Jan 2015 16:11:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBQXD-00028R-U4 for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:08 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id CA/41-09842-B1596B45; Wed, 14 Jan 2015 16:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1421251865!18016726!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23410 invoked from network); 14 Jan 2015 16:11:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jan 2015 16:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBQX9-0003w7-28 for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YBQX8-0005t6-Vb for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:03 +0000 Date: Wed, 14 Jan 2015 16:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Revert "dpci: add 'masked' as a gate for hvm_dirq_assist to process" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1965728cd5a1635859158f5800d844fc16774668 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jan 12 11:29:33 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 12 11:29:33 2015 -0500 Revert "dpci: add 'masked' as a gate for hvm_dirq_assist to process" This reverts commit 104072fc1c7e6ed117c70fa7f91ecc9946f8f654. As there are issues with huge amount of MSI-X going off. Signed-off-by: Konrad Rzeszutek Wilk --- xen/drivers/passthrough/io.c | 12 ++---------- xen/include/xen/hvm/irq.h | 1 - 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index ae050df..efc66dc 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -129,13 +129,6 @@ static void pt_pirq_softirq_reset(struct hvm_pirq_dpci *pirq_dpci) pirq_dpci->dom = NULL; break; } - /* - * Inhibit 'hvm_dirq_assist' from doing anything useful and at worst - * calling 'set_timer' which will blow up (as we have called kill_timer - * or never initialized it). Note that we hold the lock that - * 'hvm_dirq_assist' could be spinning on. - */ - pirq_dpci->masked = 0; } bool_t pt_irq_need_timer(uint32_t flags) @@ -149,7 +142,7 @@ static int pt_irq_guest_eoi(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, if ( __test_and_clear_bit(_HVM_IRQ_DPCI_EOI_LATCH_SHIFT, &pirq_dpci->flags) ) { - pirq_dpci->masked = 0; + pirq_dpci->state = 0; pirq_dpci->pending = 0; pirq_guest_eoi(dpci_pirq(pirq_dpci)); } @@ -617,7 +610,6 @@ int hvm_do_IRQ_dpci(struct domain *d, struct pirq *pirq) !(pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) ) return 0; - pirq_dpci->masked = 1; raise_softirq_for(pirq_dpci); return 1; } @@ -677,7 +669,7 @@ static void hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci) ASSERT(d->arch.hvm_domain.irq.dpci); spin_lock(&d->event_lock); - if ( test_and_clear_bool(pirq_dpci->masked) ) + if ( pirq_dpci->state ) { struct pirq *pirq = dpci_pirq(pirq_dpci); const struct dev_intx_gsi_link *digl; diff --git a/xen/include/xen/hvm/irq.h b/xen/include/xen/hvm/irq.h index 3996f1f..9709397 100644 --- a/xen/include/xen/hvm/irq.h +++ b/xen/include/xen/hvm/irq.h @@ -94,7 +94,6 @@ struct hvm_irq_dpci { struct hvm_pirq_dpci { uint32_t flags; unsigned int state; - bool_t masked; uint16_t pending; struct list_head digl_list; struct domain *dom; -- 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 Jan 14 16:11:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jan 2015 16:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBQXQ-00029d-6Y; Wed, 14 Jan 2015 16:11:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBQXO-00029R-QN for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:19 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 6D/91-09842-62596B45; Wed, 14 Jan 2015 16:11:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1421251876!14148347!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5603 invoked from network); 14 Jan 2015 16:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jan 2015 16:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBQXL-0003wA-RO for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YBQXL-0005tX-PK for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:15 +0000 Date: Wed, 14 Jan 2015 16:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Revert "dpci: replace tasklet with softirq" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72f3c1e26e96686a41d2de1663e578538659f99a Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jan 12 11:30:00 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 12 11:30:00 2015 -0500 Revert "dpci: replace tasklet with softirq" This reverts commit f6dd295381f4b6a66acddacf46bca8940586c8d8. As there are issues with huge amount of MSI-X going off. Signed-off-by: Konrad Rzeszutek Wilk --- xen/arch/x86/domain.c | 4 +- xen/drivers/passthrough/io.c | 251 +++++------------------------------------ xen/drivers/passthrough/pci.c | 31 ++---- xen/include/asm-x86/softirq.h | 3 +- xen/include/xen/hvm/irq.h | 5 +- xen/include/xen/pci.h | 2 +- 6 files changed, 41 insertions(+), 255 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 11c7d9f..f1fc993 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1969,9 +1969,7 @@ int domain_relinquish_resources(struct domain *d) switch ( d->arch.relmem ) { case RELMEM_not_started: - ret = pci_release_devices(d); - if ( ret ) - return ret; + pci_release_devices(d); /* Tear down paging-assistance stuff. */ ret = paging_teardown(d); diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index efc66dc..dceb17e 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -20,116 +20,14 @@ #include #include -#include #include #include #include #include #include +#include -static DEFINE_PER_CPU(struct list_head, dpci_list); - -/* - * These two bit states help to safely schedule, deschedule, and wait until - * the softirq has finished. - * - * The semantics behind these two bits is as follow: - * - STATE_SCHED - whoever modifies it has to ref-count the domain (->dom). - * - STATE_RUN - only softirq is allowed to set and clear it. If it has - * been set hvm_dirq_assist will RUN with a saved value of the - * 'struct domain' copied from 'pirq_dpci->dom' before STATE_RUN was set. - * - * The usual states are: STATE_SCHED(set) -> STATE_RUN(set) -> - * STATE_SCHED(unset) -> STATE_RUN(unset). - * - * However the states can also diverge such as: STATE_SCHED(set) -> - * STATE_SCHED(unset) -> STATE_RUN(set) -> STATE_RUN(unset). That means - * the 'hvm_dirq_assist' never run and that the softirq did not do any - * ref-counting. - */ - -enum { - STATE_SCHED, - STATE_RUN -}; - -/* - * This can be called multiple times, but the softirq is only raised once. - * That is until the STATE_SCHED state has been cleared. The state can be - * cleared by: the 'dpci_softirq' (when it has executed 'hvm_dirq_assist'), - * or by 'pt_pirq_softirq_reset' (which will try to clear the state before - * the softirq had a chance to run). - */ -static void raise_softirq_for(struct hvm_pirq_dpci *pirq_dpci) -{ - unsigned long flags; - - if ( test_and_set_bit(STATE_SCHED, &pirq_dpci->state) ) - return; - - get_knownalive_domain(pirq_dpci->dom); - - local_irq_save(flags); - list_add_tail(&pirq_dpci->softirq_list, &this_cpu(dpci_list)); - local_irq_restore(flags); - - raise_softirq(HVM_DPCI_SOFTIRQ); -} - -/* - * If we are racing with softirq_dpci (STATE_SCHED) we return - * true. Otherwise we return false. - * - * If it is false, it is the callers responsibility to make sure - * that the softirq (with the event_lock dropped) has ran. - */ -bool_t pt_pirq_softirq_active(struct hvm_pirq_dpci *pirq_dpci) -{ - if ( pirq_dpci->state & ((1 << STATE_RUN) | (1 << STATE_SCHED)) ) - return 1; - - /* - * If in the future we would call 'raise_softirq_for' right away - * after 'pt_pirq_softirq_active' we MUST reset the list (otherwise it - * might have stale data). - */ - return 0; -} - -/* - * Reset the pirq_dpci->dom parameter to NULL. - * - * This function checks the different states to make sure it can do it - * at the right time. If it unschedules the 'hvm_dirq_assist' from running - * it also refcounts (which is what the softirq would have done) properly. - */ -static void pt_pirq_softirq_reset(struct hvm_pirq_dpci *pirq_dpci) -{ - struct domain *d = pirq_dpci->dom; - - ASSERT(spin_is_locked(&d->event_lock)); - - switch ( cmpxchg(&pirq_dpci->state, 1 << STATE_SCHED, 0) ) - { - case (1 << STATE_SCHED): - /* - * We are going to try to de-schedule the softirq before it goes in - * STATE_RUN. Whoever clears STATE_SCHED MUST refcount the 'dom'. - */ - put_domain(d); - /* fallthrough. */ - case (1 << STATE_RUN): - case (1 << STATE_RUN) | (1 << STATE_SCHED): - /* - * The reason it is OK to reset 'dom' when STATE_RUN bit is set is due - * to a shortcut the 'dpci_softirq' implements. It stashes the 'dom' - * in local variable before it sets STATE_RUN - and therefore will not - * dereference '->dom' which would crash. - */ - pirq_dpci->dom = NULL; - break; - } -} +static void hvm_dirq_assist(unsigned long arg); bool_t pt_irq_need_timer(uint32_t flags) { @@ -142,7 +40,7 @@ static int pt_irq_guest_eoi(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, if ( __test_and_clear_bit(_HVM_IRQ_DPCI_EOI_LATCH_SHIFT, &pirq_dpci->flags) ) { - pirq_dpci->state = 0; + pirq_dpci->masked = 0; pirq_dpci->pending = 0; pirq_guest_eoi(dpci_pirq(pirq_dpci)); } @@ -203,7 +101,6 @@ int pt_irq_create_bind( if ( pirq < 0 || pirq >= d->nr_pirqs ) return -EINVAL; - restart: spin_lock(&d->event_lock); hvm_irq_dpci = domain_get_irq_dpci(d); @@ -231,21 +128,6 @@ int pt_irq_create_bind( } pirq_dpci = pirq_dpci(info); - /* - * A crude 'while' loop with us dropping the spinlock and giving - * the softirq_dpci a chance to run. - * We MUST check for this condition as the softirq could be scheduled - * and hasn't run yet. Note that this code replaced tasklet_kill which - * would have spun forever and would do the same thing (wait to flush out - * outstanding hvm_dirq_assist calls. - */ - if ( pt_pirq_softirq_active(pirq_dpci) ) - { - spin_unlock(&d->event_lock); - cpu_relax(); - goto restart; - } - switch ( pt_irq_bind->irq_type ) { case PT_IRQ_TYPE_MSI: @@ -277,16 +159,7 @@ int pt_irq_create_bind( { rc = msixtbl_pt_register(d, info, pt_irq_bind->u.msi.gtable); if ( unlikely(rc) ) - { pirq_guest_unbind(d, info); - /* - * Between 'pirq_guest_bind' and before 'pirq_guest_unbind' - * an interrupt can be scheduled. No more of them are going - * to be scheduled but we must deal with the one that may be - * in the queue. - */ - pt_pirq_softirq_reset(pirq_dpci); - } } if ( unlikely(rc) ) { @@ -396,10 +269,6 @@ int pt_irq_create_bind( { if ( pt_irq_need_timer(pirq_dpci->flags) ) kill_timer(&pirq_dpci->timer); - /* - * There is no path for __do_IRQ to schedule softirq as - * IRQ_GUEST is not set. As such we can reset 'dom' directly. - */ pirq_dpci->dom = NULL; list_del(&girq->list); list_del(&digl->list); @@ -533,13 +402,8 @@ int pt_irq_destroy_bind( msixtbl_pt_unregister(d, pirq); if ( pt_irq_need_timer(pirq_dpci->flags) ) kill_timer(&pirq_dpci->timer); + pirq_dpci->dom = NULL; pirq_dpci->flags = 0; - /* - * See comment in pt_irq_create_bind's PT_IRQ_TYPE_MSI before the - * call to pt_pirq_softirq_reset. - */ - pt_pirq_softirq_reset(pirq_dpci); - pirq_cleanup_check(pirq, d); } @@ -562,12 +426,14 @@ void pt_pirq_init(struct domain *d, struct hvm_pirq_dpci *dpci) { INIT_LIST_HEAD(&dpci->digl_list); dpci->gmsi.dest_vcpu_id = -1; + softirq_tasklet_init(&dpci->tasklet, hvm_dirq_assist, (unsigned long)dpci); } bool_t pt_pirq_cleanup_check(struct hvm_pirq_dpci *dpci) { - if ( !dpci->flags && !pt_pirq_softirq_active(dpci) ) + if ( !dpci->flags ) { + tasklet_kill(&dpci->tasklet); dpci->dom = NULL; return 1; } @@ -610,7 +476,8 @@ int hvm_do_IRQ_dpci(struct domain *d, struct pirq *pirq) !(pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) ) return 0; - raise_softirq_for(pirq_dpci); + pirq_dpci->masked = 1; + tasklet_schedule(&pirq_dpci->tasklet); return 1; } @@ -664,12 +531,28 @@ void hvm_dpci_msi_eoi(struct domain *d, int vector) spin_unlock(&d->event_lock); } -static void hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci) +static void hvm_dirq_assist(unsigned long arg) { + struct hvm_pirq_dpci *pirq_dpci = (struct hvm_pirq_dpci *)arg; + struct domain *d = pirq_dpci->dom; + + /* + * We can be racing with 'pt_irq_destroy_bind' - with us being scheduled + * right before 'pirq_guest_unbind' gets called - but us not yet executed. + * + * And '->dom' gets cleared later in the destroy path. We exit and clear + * 'masked' - which is OK as later in this code we would + * do nothing except clear the ->masked field anyhow. + */ + if ( !d ) + { + pirq_dpci->masked = 0; + return; + } ASSERT(d->arch.hvm_domain.irq.dpci); spin_lock(&d->event_lock); - if ( pirq_dpci->state ) + if ( test_and_clear_bool(pirq_dpci->masked) ) { struct pirq *pirq = dpci_pirq(pirq_dpci); const struct dev_intx_gsi_link *digl; @@ -771,83 +654,3 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, unlock: spin_unlock(&d->event_lock); } - -/* - * Note: 'pt_pirq_softirq_reset' can clear the STATE_SCHED before we get to - * doing it. If that is the case we let 'pt_pirq_softirq_reset' do ref-counting. - */ -static void dpci_softirq(void) -{ - unsigned int cpu = smp_processor_id(); - LIST_HEAD(our_list); - - local_irq_disable(); - list_splice_init(&per_cpu(dpci_list, cpu), &our_list); - local_irq_enable(); - - while ( !list_empty(&our_list) ) - { - struct hvm_pirq_dpci *pirq_dpci; - struct domain *d; - - pirq_dpci = list_entry(our_list.next, struct hvm_pirq_dpci, softirq_list); - list_del(&pirq_dpci->softirq_list); - - d = pirq_dpci->dom; - smp_mb(); /* 'd' MUST be saved before we set/clear the bits. */ - if ( test_and_set_bit(STATE_RUN, &pirq_dpci->state) ) - BUG(); - /* - * The one who clears STATE_SCHED MUST refcount the domain. - */ - if ( test_and_clear_bit(STATE_SCHED, &pirq_dpci->state) ) - { - hvm_dirq_assist(d, pirq_dpci); - put_domain(d); - } - clear_bit(STATE_RUN, &pirq_dpci->state); - } -} - -static int cpu_callback( - struct notifier_block *nfb, unsigned long action, void *hcpu) -{ - unsigned int cpu = (unsigned long)hcpu; - - switch ( action ) - { - case CPU_UP_PREPARE: - INIT_LIST_HEAD(&per_cpu(dpci_list, cpu)); - break; - case CPU_UP_CANCELED: - case CPU_DEAD: - /* - * On CPU_DYING this callback is called (on the CPU that is dying) - * with an possible HVM_DPIC_SOFTIRQ pending - at which point we can - * clear out any outstanding domains (by the virtue of the idle loop - * calling the softirq later). In CPU_DEAD case the CPU is deaf and - * there are no pending softirqs for us to handle so we can chill. - */ - ASSERT(list_empty(&per_cpu(dpci_list, cpu))); - break; - } - - return NOTIFY_DONE; -} - -static struct notifier_block cpu_nfb = { - .notifier_call = cpu_callback, -}; - -static int __init setup_dpci_softirq(void) -{ - unsigned int cpu; - - for_each_online_cpu(cpu) - INIT_LIST_HEAD(&per_cpu(dpci_list, cpu)); - - open_softirq(HVM_DPCI_SOFTIRQ, dpci_softirq); - register_cpu_notifier(&cpu_nfb); - return 0; -} -__initcall(setup_dpci_softirq); diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 78c6977..81e8a3a 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -767,51 +767,40 @@ static int pci_clean_dpci_irq(struct domain *d, xfree(digl); } - return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0; + tasklet_kill(&pirq_dpci->tasklet); + + return 0; } -static int pci_clean_dpci_irqs(struct domain *d) +static void pci_clean_dpci_irqs(struct domain *d) { struct hvm_irq_dpci *hvm_irq_dpci = NULL; if ( !iommu_enabled ) - return 0; + return; if ( !is_hvm_domain(d) ) - return 0; + return; spin_lock(&d->event_lock); hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); - - if ( ret ) - { - spin_unlock(&d->event_lock); - return ret; - } + pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); d->arch.hvm_domain.irq.dpci = NULL; free_hvm_irq_dpci(hvm_irq_dpci); } spin_unlock(&d->event_lock); - return 0; } -int pci_release_devices(struct domain *d) +void pci_release_devices(struct domain *d) { struct pci_dev *pdev; u8 bus, devfn; - int ret; spin_lock(&pcidevs_lock); - ret = pci_clean_dpci_irqs(d); - if ( ret ) - { - spin_unlock(&pcidevs_lock); - return ret; - } + pci_clean_dpci_irqs(d); while ( (pdev = pci_get_pdev_by_domain(d, -1, -1, -1)) ) { bus = pdev->bus; @@ -822,8 +811,6 @@ int pci_release_devices(struct domain *d) PCI_SLOT(devfn), PCI_FUNC(devfn)); } spin_unlock(&pcidevs_lock); - - return 0; } #define PCI_CLASS_BRIDGE_HOST 0x0600 diff --git a/xen/include/asm-x86/softirq.h b/xen/include/asm-x86/softirq.h index ec787d6..7225dea 100644 --- a/xen/include/asm-x86/softirq.h +++ b/xen/include/asm-x86/softirq.h @@ -7,8 +7,7 @@ #define MACHINE_CHECK_SOFTIRQ (NR_COMMON_SOFTIRQS + 3) #define PCI_SERR_SOFTIRQ (NR_COMMON_SOFTIRQS + 4) -#define HVM_DPCI_SOFTIRQ (NR_COMMON_SOFTIRQS + 5) -#define NR_ARCH_SOFTIRQS 6 +#define NR_ARCH_SOFTIRQS 5 bool_t arch_skip_send_event_check(unsigned int cpu); diff --git a/xen/include/xen/hvm/irq.h b/xen/include/xen/hvm/irq.h index 9709397..94a550a 100644 --- a/xen/include/xen/hvm/irq.h +++ b/xen/include/xen/hvm/irq.h @@ -93,13 +93,13 @@ struct hvm_irq_dpci { /* Machine IRQ to guest device/intx mapping. */ struct hvm_pirq_dpci { uint32_t flags; - unsigned int state; + bool_t masked; uint16_t pending; struct list_head digl_list; struct domain *dom; struct hvm_gmsi_info gmsi; struct timer timer; - struct list_head softirq_list; + struct tasklet tasklet; }; void pt_pirq_init(struct domain *, struct hvm_pirq_dpci *); @@ -109,7 +109,6 @@ int pt_pirq_iterate(struct domain *d, struct hvm_pirq_dpci *, void *arg), void *arg); -bool_t pt_pirq_softirq_active(struct hvm_pirq_dpci *); /* Modify state of a PCI INTx wire. */ void hvm_pci_intx_assert( struct domain *d, unsigned int device, unsigned int intx); diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 5f295f3..91520bc 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -99,7 +99,7 @@ struct pci_dev *pci_lock_domain_pdev( void setup_hwdom_pci_devices(struct domain *, int (*)(u8 devfn, struct pci_dev *)); -int pci_release_devices(struct domain *d); +void pci_release_devices(struct domain *d); int pci_add_segment(u16 seg); const unsigned long *pci_get_ro_map(u16 seg); int pci_add_device(u16 seg, u8 bus, u8 devfn, const struct pci_dev_info *); -- 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 Jan 14 16:11:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jan 2015 16:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBQXQ-00029d-6Y; Wed, 14 Jan 2015 16:11:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBQXO-00029R-QN for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:19 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 6D/91-09842-62596B45; Wed, 14 Jan 2015 16:11:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1421251876!14148347!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5603 invoked from network); 14 Jan 2015 16:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Jan 2015 16:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBQXL-0003wA-RO for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YBQXL-0005tX-PK for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:15 +0000 Date: Wed, 14 Jan 2015 16:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Revert "dpci: replace tasklet with softirq" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72f3c1e26e96686a41d2de1663e578538659f99a Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jan 12 11:30:00 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 12 11:30:00 2015 -0500 Revert "dpci: replace tasklet with softirq" This reverts commit f6dd295381f4b6a66acddacf46bca8940586c8d8. As there are issues with huge amount of MSI-X going off. Signed-off-by: Konrad Rzeszutek Wilk --- xen/arch/x86/domain.c | 4 +- xen/drivers/passthrough/io.c | 251 +++++------------------------------------ xen/drivers/passthrough/pci.c | 31 ++---- xen/include/asm-x86/softirq.h | 3 +- xen/include/xen/hvm/irq.h | 5 +- xen/include/xen/pci.h | 2 +- 6 files changed, 41 insertions(+), 255 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 11c7d9f..f1fc993 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1969,9 +1969,7 @@ int domain_relinquish_resources(struct domain *d) switch ( d->arch.relmem ) { case RELMEM_not_started: - ret = pci_release_devices(d); - if ( ret ) - return ret; + pci_release_devices(d); /* Tear down paging-assistance stuff. */ ret = paging_teardown(d); diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index efc66dc..dceb17e 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -20,116 +20,14 @@ #include #include -#include #include #include #include #include #include +#include -static DEFINE_PER_CPU(struct list_head, dpci_list); - -/* - * These two bit states help to safely schedule, deschedule, and wait until - * the softirq has finished. - * - * The semantics behind these two bits is as follow: - * - STATE_SCHED - whoever modifies it has to ref-count the domain (->dom). - * - STATE_RUN - only softirq is allowed to set and clear it. If it has - * been set hvm_dirq_assist will RUN with a saved value of the - * 'struct domain' copied from 'pirq_dpci->dom' before STATE_RUN was set. - * - * The usual states are: STATE_SCHED(set) -> STATE_RUN(set) -> - * STATE_SCHED(unset) -> STATE_RUN(unset). - * - * However the states can also diverge such as: STATE_SCHED(set) -> - * STATE_SCHED(unset) -> STATE_RUN(set) -> STATE_RUN(unset). That means - * the 'hvm_dirq_assist' never run and that the softirq did not do any - * ref-counting. - */ - -enum { - STATE_SCHED, - STATE_RUN -}; - -/* - * This can be called multiple times, but the softirq is only raised once. - * That is until the STATE_SCHED state has been cleared. The state can be - * cleared by: the 'dpci_softirq' (when it has executed 'hvm_dirq_assist'), - * or by 'pt_pirq_softirq_reset' (which will try to clear the state before - * the softirq had a chance to run). - */ -static void raise_softirq_for(struct hvm_pirq_dpci *pirq_dpci) -{ - unsigned long flags; - - if ( test_and_set_bit(STATE_SCHED, &pirq_dpci->state) ) - return; - - get_knownalive_domain(pirq_dpci->dom); - - local_irq_save(flags); - list_add_tail(&pirq_dpci->softirq_list, &this_cpu(dpci_list)); - local_irq_restore(flags); - - raise_softirq(HVM_DPCI_SOFTIRQ); -} - -/* - * If we are racing with softirq_dpci (STATE_SCHED) we return - * true. Otherwise we return false. - * - * If it is false, it is the callers responsibility to make sure - * that the softirq (with the event_lock dropped) has ran. - */ -bool_t pt_pirq_softirq_active(struct hvm_pirq_dpci *pirq_dpci) -{ - if ( pirq_dpci->state & ((1 << STATE_RUN) | (1 << STATE_SCHED)) ) - return 1; - - /* - * If in the future we would call 'raise_softirq_for' right away - * after 'pt_pirq_softirq_active' we MUST reset the list (otherwise it - * might have stale data). - */ - return 0; -} - -/* - * Reset the pirq_dpci->dom parameter to NULL. - * - * This function checks the different states to make sure it can do it - * at the right time. If it unschedules the 'hvm_dirq_assist' from running - * it also refcounts (which is what the softirq would have done) properly. - */ -static void pt_pirq_softirq_reset(struct hvm_pirq_dpci *pirq_dpci) -{ - struct domain *d = pirq_dpci->dom; - - ASSERT(spin_is_locked(&d->event_lock)); - - switch ( cmpxchg(&pirq_dpci->state, 1 << STATE_SCHED, 0) ) - { - case (1 << STATE_SCHED): - /* - * We are going to try to de-schedule the softirq before it goes in - * STATE_RUN. Whoever clears STATE_SCHED MUST refcount the 'dom'. - */ - put_domain(d); - /* fallthrough. */ - case (1 << STATE_RUN): - case (1 << STATE_RUN) | (1 << STATE_SCHED): - /* - * The reason it is OK to reset 'dom' when STATE_RUN bit is set is due - * to a shortcut the 'dpci_softirq' implements. It stashes the 'dom' - * in local variable before it sets STATE_RUN - and therefore will not - * dereference '->dom' which would crash. - */ - pirq_dpci->dom = NULL; - break; - } -} +static void hvm_dirq_assist(unsigned long arg); bool_t pt_irq_need_timer(uint32_t flags) { @@ -142,7 +40,7 @@ static int pt_irq_guest_eoi(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, if ( __test_and_clear_bit(_HVM_IRQ_DPCI_EOI_LATCH_SHIFT, &pirq_dpci->flags) ) { - pirq_dpci->state = 0; + pirq_dpci->masked = 0; pirq_dpci->pending = 0; pirq_guest_eoi(dpci_pirq(pirq_dpci)); } @@ -203,7 +101,6 @@ int pt_irq_create_bind( if ( pirq < 0 || pirq >= d->nr_pirqs ) return -EINVAL; - restart: spin_lock(&d->event_lock); hvm_irq_dpci = domain_get_irq_dpci(d); @@ -231,21 +128,6 @@ int pt_irq_create_bind( } pirq_dpci = pirq_dpci(info); - /* - * A crude 'while' loop with us dropping the spinlock and giving - * the softirq_dpci a chance to run. - * We MUST check for this condition as the softirq could be scheduled - * and hasn't run yet. Note that this code replaced tasklet_kill which - * would have spun forever and would do the same thing (wait to flush out - * outstanding hvm_dirq_assist calls. - */ - if ( pt_pirq_softirq_active(pirq_dpci) ) - { - spin_unlock(&d->event_lock); - cpu_relax(); - goto restart; - } - switch ( pt_irq_bind->irq_type ) { case PT_IRQ_TYPE_MSI: @@ -277,16 +159,7 @@ int pt_irq_create_bind( { rc = msixtbl_pt_register(d, info, pt_irq_bind->u.msi.gtable); if ( unlikely(rc) ) - { pirq_guest_unbind(d, info); - /* - * Between 'pirq_guest_bind' and before 'pirq_guest_unbind' - * an interrupt can be scheduled. No more of them are going - * to be scheduled but we must deal with the one that may be - * in the queue. - */ - pt_pirq_softirq_reset(pirq_dpci); - } } if ( unlikely(rc) ) { @@ -396,10 +269,6 @@ int pt_irq_create_bind( { if ( pt_irq_need_timer(pirq_dpci->flags) ) kill_timer(&pirq_dpci->timer); - /* - * There is no path for __do_IRQ to schedule softirq as - * IRQ_GUEST is not set. As such we can reset 'dom' directly. - */ pirq_dpci->dom = NULL; list_del(&girq->list); list_del(&digl->list); @@ -533,13 +402,8 @@ int pt_irq_destroy_bind( msixtbl_pt_unregister(d, pirq); if ( pt_irq_need_timer(pirq_dpci->flags) ) kill_timer(&pirq_dpci->timer); + pirq_dpci->dom = NULL; pirq_dpci->flags = 0; - /* - * See comment in pt_irq_create_bind's PT_IRQ_TYPE_MSI before the - * call to pt_pirq_softirq_reset. - */ - pt_pirq_softirq_reset(pirq_dpci); - pirq_cleanup_check(pirq, d); } @@ -562,12 +426,14 @@ void pt_pirq_init(struct domain *d, struct hvm_pirq_dpci *dpci) { INIT_LIST_HEAD(&dpci->digl_list); dpci->gmsi.dest_vcpu_id = -1; + softirq_tasklet_init(&dpci->tasklet, hvm_dirq_assist, (unsigned long)dpci); } bool_t pt_pirq_cleanup_check(struct hvm_pirq_dpci *dpci) { - if ( !dpci->flags && !pt_pirq_softirq_active(dpci) ) + if ( !dpci->flags ) { + tasklet_kill(&dpci->tasklet); dpci->dom = NULL; return 1; } @@ -610,7 +476,8 @@ int hvm_do_IRQ_dpci(struct domain *d, struct pirq *pirq) !(pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) ) return 0; - raise_softirq_for(pirq_dpci); + pirq_dpci->masked = 1; + tasklet_schedule(&pirq_dpci->tasklet); return 1; } @@ -664,12 +531,28 @@ void hvm_dpci_msi_eoi(struct domain *d, int vector) spin_unlock(&d->event_lock); } -static void hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci) +static void hvm_dirq_assist(unsigned long arg) { + struct hvm_pirq_dpci *pirq_dpci = (struct hvm_pirq_dpci *)arg; + struct domain *d = pirq_dpci->dom; + + /* + * We can be racing with 'pt_irq_destroy_bind' - with us being scheduled + * right before 'pirq_guest_unbind' gets called - but us not yet executed. + * + * And '->dom' gets cleared later in the destroy path. We exit and clear + * 'masked' - which is OK as later in this code we would + * do nothing except clear the ->masked field anyhow. + */ + if ( !d ) + { + pirq_dpci->masked = 0; + return; + } ASSERT(d->arch.hvm_domain.irq.dpci); spin_lock(&d->event_lock); - if ( pirq_dpci->state ) + if ( test_and_clear_bool(pirq_dpci->masked) ) { struct pirq *pirq = dpci_pirq(pirq_dpci); const struct dev_intx_gsi_link *digl; @@ -771,83 +654,3 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, unlock: spin_unlock(&d->event_lock); } - -/* - * Note: 'pt_pirq_softirq_reset' can clear the STATE_SCHED before we get to - * doing it. If that is the case we let 'pt_pirq_softirq_reset' do ref-counting. - */ -static void dpci_softirq(void) -{ - unsigned int cpu = smp_processor_id(); - LIST_HEAD(our_list); - - local_irq_disable(); - list_splice_init(&per_cpu(dpci_list, cpu), &our_list); - local_irq_enable(); - - while ( !list_empty(&our_list) ) - { - struct hvm_pirq_dpci *pirq_dpci; - struct domain *d; - - pirq_dpci = list_entry(our_list.next, struct hvm_pirq_dpci, softirq_list); - list_del(&pirq_dpci->softirq_list); - - d = pirq_dpci->dom; - smp_mb(); /* 'd' MUST be saved before we set/clear the bits. */ - if ( test_and_set_bit(STATE_RUN, &pirq_dpci->state) ) - BUG(); - /* - * The one who clears STATE_SCHED MUST refcount the domain. - */ - if ( test_and_clear_bit(STATE_SCHED, &pirq_dpci->state) ) - { - hvm_dirq_assist(d, pirq_dpci); - put_domain(d); - } - clear_bit(STATE_RUN, &pirq_dpci->state); - } -} - -static int cpu_callback( - struct notifier_block *nfb, unsigned long action, void *hcpu) -{ - unsigned int cpu = (unsigned long)hcpu; - - switch ( action ) - { - case CPU_UP_PREPARE: - INIT_LIST_HEAD(&per_cpu(dpci_list, cpu)); - break; - case CPU_UP_CANCELED: - case CPU_DEAD: - /* - * On CPU_DYING this callback is called (on the CPU that is dying) - * with an possible HVM_DPIC_SOFTIRQ pending - at which point we can - * clear out any outstanding domains (by the virtue of the idle loop - * calling the softirq later). In CPU_DEAD case the CPU is deaf and - * there are no pending softirqs for us to handle so we can chill. - */ - ASSERT(list_empty(&per_cpu(dpci_list, cpu))); - break; - } - - return NOTIFY_DONE; -} - -static struct notifier_block cpu_nfb = { - .notifier_call = cpu_callback, -}; - -static int __init setup_dpci_softirq(void) -{ - unsigned int cpu; - - for_each_online_cpu(cpu) - INIT_LIST_HEAD(&per_cpu(dpci_list, cpu)); - - open_softirq(HVM_DPCI_SOFTIRQ, dpci_softirq); - register_cpu_notifier(&cpu_nfb); - return 0; -} -__initcall(setup_dpci_softirq); diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 78c6977..81e8a3a 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -767,51 +767,40 @@ static int pci_clean_dpci_irq(struct domain *d, xfree(digl); } - return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0; + tasklet_kill(&pirq_dpci->tasklet); + + return 0; } -static int pci_clean_dpci_irqs(struct domain *d) +static void pci_clean_dpci_irqs(struct domain *d) { struct hvm_irq_dpci *hvm_irq_dpci = NULL; if ( !iommu_enabled ) - return 0; + return; if ( !is_hvm_domain(d) ) - return 0; + return; spin_lock(&d->event_lock); hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); - - if ( ret ) - { - spin_unlock(&d->event_lock); - return ret; - } + pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); d->arch.hvm_domain.irq.dpci = NULL; free_hvm_irq_dpci(hvm_irq_dpci); } spin_unlock(&d->event_lock); - return 0; } -int pci_release_devices(struct domain *d) +void pci_release_devices(struct domain *d) { struct pci_dev *pdev; u8 bus, devfn; - int ret; spin_lock(&pcidevs_lock); - ret = pci_clean_dpci_irqs(d); - if ( ret ) - { - spin_unlock(&pcidevs_lock); - return ret; - } + pci_clean_dpci_irqs(d); while ( (pdev = pci_get_pdev_by_domain(d, -1, -1, -1)) ) { bus = pdev->bus; @@ -822,8 +811,6 @@ int pci_release_devices(struct domain *d) PCI_SLOT(devfn), PCI_FUNC(devfn)); } spin_unlock(&pcidevs_lock); - - return 0; } #define PCI_CLASS_BRIDGE_HOST 0x0600 diff --git a/xen/include/asm-x86/softirq.h b/xen/include/asm-x86/softirq.h index ec787d6..7225dea 100644 --- a/xen/include/asm-x86/softirq.h +++ b/xen/include/asm-x86/softirq.h @@ -7,8 +7,7 @@ #define MACHINE_CHECK_SOFTIRQ (NR_COMMON_SOFTIRQS + 3) #define PCI_SERR_SOFTIRQ (NR_COMMON_SOFTIRQS + 4) -#define HVM_DPCI_SOFTIRQ (NR_COMMON_SOFTIRQS + 5) -#define NR_ARCH_SOFTIRQS 6 +#define NR_ARCH_SOFTIRQS 5 bool_t arch_skip_send_event_check(unsigned int cpu); diff --git a/xen/include/xen/hvm/irq.h b/xen/include/xen/hvm/irq.h index 9709397..94a550a 100644 --- a/xen/include/xen/hvm/irq.h +++ b/xen/include/xen/hvm/irq.h @@ -93,13 +93,13 @@ struct hvm_irq_dpci { /* Machine IRQ to guest device/intx mapping. */ struct hvm_pirq_dpci { uint32_t flags; - unsigned int state; + bool_t masked; uint16_t pending; struct list_head digl_list; struct domain *dom; struct hvm_gmsi_info gmsi; struct timer timer; - struct list_head softirq_list; + struct tasklet tasklet; }; void pt_pirq_init(struct domain *, struct hvm_pirq_dpci *); @@ -109,7 +109,6 @@ int pt_pirq_iterate(struct domain *d, struct hvm_pirq_dpci *, void *arg), void *arg); -bool_t pt_pirq_softirq_active(struct hvm_pirq_dpci *); /* Modify state of a PCI INTx wire. */ void hvm_pci_intx_assert( struct domain *d, unsigned int device, unsigned int intx); diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 5f295f3..91520bc 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -99,7 +99,7 @@ struct pci_dev *pci_lock_domain_pdev( void setup_hwdom_pci_devices(struct domain *, int (*)(u8 devfn, struct pci_dev *)); -int pci_release_devices(struct domain *d); +void pci_release_devices(struct domain *d); int pci_add_segment(u16 seg); const unsigned long *pci_get_ro_map(u16 seg); int pci_add_device(u16 seg, u8 bus, u8 devfn, const struct pci_dev_info *); -- 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 Jan 14 16:11:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jan 2015 16:11: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 1YBQXa-0002B5-9Z; Wed, 14 Jan 2015 16:11:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBQXY-0002At-Mu for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:28 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 2D/D7-27584-03596B45; Wed, 14 Jan 2015 16:11:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1421251886!18035218!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24492 invoked from network); 14 Jan 2015 16:11:27 -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; 14 Jan 2015 16:11:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBQXW-0003wJ-0O for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YBQXV-0005ui-VL for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:25 +0000 Date: Wed, 14 Jan 2015 16:11:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Revert "dpci: move from an hvm_irq_dpci (and struct domain) to an hvm_dirq_dpci model" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a8ac2290ed95dbbc0dc1bdde86fc3a49fe784b28 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jan 12 11:30:05 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 12 11:53:24 2015 -0500 Revert "dpci: move from an hvm_irq_dpci (and struct domain) to an hvm_dirq_dpci model" This reverts commit aeeea485bcfe2a517ed9bcb3ba1c3be0f6824e07. As there are issues with huge amount of MSI-X going off. Signed-off-by: Konrad Rzeszutek Wilk --- xen/drivers/passthrough/io.c | 75 ++++++++++++---------------------------- xen/drivers/passthrough/pci.c | 4 +- xen/include/xen/hvm/irq.h | 2 +- 3 files changed, 26 insertions(+), 55 deletions(-) diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index dceb17e..4cd32b5 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -27,7 +27,7 @@ #include #include -static void hvm_dirq_assist(unsigned long arg); +static void hvm_dirq_assist(unsigned long _d); bool_t pt_irq_need_timer(uint32_t flags) { @@ -114,6 +114,9 @@ int pt_irq_create_bind( spin_unlock(&d->event_lock); return -ENOMEM; } + softirq_tasklet_init( + &hvm_irq_dpci->dirq_tasklet, + hvm_dirq_assist, (unsigned long)d); for ( i = 0; i < NR_HVM_IRQS; i++ ) INIT_LIST_HEAD(&hvm_irq_dpci->girq[i]); @@ -141,18 +144,6 @@ int pt_irq_create_bind( HVM_IRQ_DPCI_GUEST_MSI; pirq_dpci->gmsi.gvec = pt_irq_bind->u.msi.gvec; pirq_dpci->gmsi.gflags = pt_irq_bind->u.msi.gflags; - /* - * 'pt_irq_create_bind' can be called after 'pt_irq_destroy_bind'. - * The 'pirq_cleanup_check' which would free the structure is only - * called if the event channel for the PIRQ is active. However - * OS-es that use event channels usually bind PIRQs to eventds - * and unbind them before calling 'pt_irq_destroy_bind' - with the - * result that we re-use the 'dpci' structure. This can be - * reproduced with unloading and loading the driver for a device. - * - * As such on every 'pt_irq_create_bind' call we MUST set it. - */ - pirq_dpci->dom = d; /* bind after hvm_irq_dpci is setup to avoid race with irq handler*/ rc = pirq_guest_bind(d->vcpu[0], info, 0); if ( rc == 0 && pt_irq_bind->u.msi.gtable ) @@ -165,7 +156,6 @@ int pt_irq_create_bind( { pirq_dpci->gmsi.gflags = 0; pirq_dpci->gmsi.gvec = 0; - pirq_dpci->dom = NULL; pirq_dpci->flags = 0; pirq_cleanup_check(info, d); spin_unlock(&d->event_lock); @@ -242,7 +232,6 @@ int pt_irq_create_bind( { unsigned int share; - /* MUST be set, as the pirq_dpci can be re-used. */ pirq_dpci->dom = d; if ( pt_irq_bind->irq_type == PT_IRQ_TYPE_MSI_TRANSLATE ) { @@ -426,18 +415,11 @@ void pt_pirq_init(struct domain *d, struct hvm_pirq_dpci *dpci) { INIT_LIST_HEAD(&dpci->digl_list); dpci->gmsi.dest_vcpu_id = -1; - softirq_tasklet_init(&dpci->tasklet, hvm_dirq_assist, (unsigned long)dpci); } bool_t pt_pirq_cleanup_check(struct hvm_pirq_dpci *dpci) { - if ( !dpci->flags ) - { - tasklet_kill(&dpci->tasklet); - dpci->dom = NULL; - return 1; - } - return 0; + return !dpci->flags; } int pt_pirq_iterate(struct domain *d, @@ -477,7 +459,7 @@ int hvm_do_IRQ_dpci(struct domain *d, struct pirq *pirq) return 0; pirq_dpci->masked = 1; - tasklet_schedule(&pirq_dpci->tasklet); + tasklet_schedule(&dpci->dirq_tasklet); return 1; } @@ -531,27 +513,9 @@ void hvm_dpci_msi_eoi(struct domain *d, int vector) spin_unlock(&d->event_lock); } -static void hvm_dirq_assist(unsigned long arg) +static int _hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, + void *arg) { - struct hvm_pirq_dpci *pirq_dpci = (struct hvm_pirq_dpci *)arg; - struct domain *d = pirq_dpci->dom; - - /* - * We can be racing with 'pt_irq_destroy_bind' - with us being scheduled - * right before 'pirq_guest_unbind' gets called - but us not yet executed. - * - * And '->dom' gets cleared later in the destroy path. We exit and clear - * 'masked' - which is OK as later in this code we would - * do nothing except clear the ->masked field anyhow. - */ - if ( !d ) - { - pirq_dpci->masked = 0; - return; - } - ASSERT(d->arch.hvm_domain.irq.dpci); - - spin_lock(&d->event_lock); if ( test_and_clear_bool(pirq_dpci->masked) ) { struct pirq *pirq = dpci_pirq(pirq_dpci); @@ -562,17 +526,13 @@ static void hvm_dirq_assist(unsigned long arg) send_guest_pirq(d, pirq); if ( pirq_dpci->flags & HVM_IRQ_DPCI_GUEST_MSI ) - { - spin_unlock(&d->event_lock); - return; - } + return 0; } if ( pirq_dpci->flags & HVM_IRQ_DPCI_GUEST_MSI ) { vmsi_deliver_pirq(d, pirq_dpci); - spin_unlock(&d->event_lock); - return; + return 0; } list_for_each_entry ( digl, &pirq_dpci->digl_list, list ) @@ -585,8 +545,7 @@ static void hvm_dirq_assist(unsigned long arg) { /* for translated MSI to INTx interrupt, eoi as early as possible */ __msi_pirq_eoi(pirq_dpci); - spin_unlock(&d->event_lock); - return; + return 0; } /* @@ -599,6 +558,18 @@ static void hvm_dirq_assist(unsigned long arg) ASSERT(pt_irq_need_timer(pirq_dpci->flags)); set_timer(&pirq_dpci->timer, NOW() + PT_IRQ_TIME_OUT); } + + return 0; +} + +static void hvm_dirq_assist(unsigned long _d) +{ + struct domain *d = (struct domain *)_d; + + ASSERT(d->arch.hvm_domain.irq.dpci); + + spin_lock(&d->event_lock); + pt_pirq_iterate(d, _hvm_dirq_assist, NULL); spin_unlock(&d->event_lock); } diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 81e8a3a..1eba833 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -767,8 +767,6 @@ static int pci_clean_dpci_irq(struct domain *d, xfree(digl); } - tasklet_kill(&pirq_dpci->tasklet); - return 0; } @@ -786,6 +784,8 @@ static void pci_clean_dpci_irqs(struct domain *d) hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { + tasklet_kill(&hvm_irq_dpci->dirq_tasklet); + pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); d->arch.hvm_domain.irq.dpci = NULL; diff --git a/xen/include/xen/hvm/irq.h b/xen/include/xen/hvm/irq.h index 94a550a..c89f4b1 100644 --- a/xen/include/xen/hvm/irq.h +++ b/xen/include/xen/hvm/irq.h @@ -88,6 +88,7 @@ struct hvm_irq_dpci { DECLARE_BITMAP(isairq_map, NR_ISAIRQS); /* Record of mapped Links */ uint8_t link_cnt[NR_LINK]; + struct tasklet dirq_tasklet; }; /* Machine IRQ to guest device/intx mapping. */ @@ -99,7 +100,6 @@ struct hvm_pirq_dpci { struct domain *dom; struct hvm_gmsi_info gmsi; struct timer timer; - struct tasklet tasklet; }; void pt_pirq_init(struct domain *, struct hvm_pirq_dpci *); -- 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 Jan 14 16:11:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jan 2015 16:11: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 1YBQXa-0002B5-9Z; Wed, 14 Jan 2015 16:11:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBQXY-0002At-Mu for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:28 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 2D/D7-27584-03596B45; Wed, 14 Jan 2015 16:11:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1421251886!18035218!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24492 invoked from network); 14 Jan 2015 16:11:27 -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; 14 Jan 2015 16:11:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YBQXW-0003wJ-0O for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YBQXV-0005ui-VL for xen-changelog@lists.xensource.com; Wed, 14 Jan 2015 16:11:25 +0000 Date: Wed, 14 Jan 2015 16:11:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Revert "dpci: move from an hvm_irq_dpci (and struct domain) to an hvm_dirq_dpci model" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a8ac2290ed95dbbc0dc1bdde86fc3a49fe784b28 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jan 12 11:30:05 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 12 11:53:24 2015 -0500 Revert "dpci: move from an hvm_irq_dpci (and struct domain) to an hvm_dirq_dpci model" This reverts commit aeeea485bcfe2a517ed9bcb3ba1c3be0f6824e07. As there are issues with huge amount of MSI-X going off. Signed-off-by: Konrad Rzeszutek Wilk --- xen/drivers/passthrough/io.c | 75 ++++++++++++---------------------------- xen/drivers/passthrough/pci.c | 4 +- xen/include/xen/hvm/irq.h | 2 +- 3 files changed, 26 insertions(+), 55 deletions(-) diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index dceb17e..4cd32b5 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -27,7 +27,7 @@ #include #include -static void hvm_dirq_assist(unsigned long arg); +static void hvm_dirq_assist(unsigned long _d); bool_t pt_irq_need_timer(uint32_t flags) { @@ -114,6 +114,9 @@ int pt_irq_create_bind( spin_unlock(&d->event_lock); return -ENOMEM; } + softirq_tasklet_init( + &hvm_irq_dpci->dirq_tasklet, + hvm_dirq_assist, (unsigned long)d); for ( i = 0; i < NR_HVM_IRQS; i++ ) INIT_LIST_HEAD(&hvm_irq_dpci->girq[i]); @@ -141,18 +144,6 @@ int pt_irq_create_bind( HVM_IRQ_DPCI_GUEST_MSI; pirq_dpci->gmsi.gvec = pt_irq_bind->u.msi.gvec; pirq_dpci->gmsi.gflags = pt_irq_bind->u.msi.gflags; - /* - * 'pt_irq_create_bind' can be called after 'pt_irq_destroy_bind'. - * The 'pirq_cleanup_check' which would free the structure is only - * called if the event channel for the PIRQ is active. However - * OS-es that use event channels usually bind PIRQs to eventds - * and unbind them before calling 'pt_irq_destroy_bind' - with the - * result that we re-use the 'dpci' structure. This can be - * reproduced with unloading and loading the driver for a device. - * - * As such on every 'pt_irq_create_bind' call we MUST set it. - */ - pirq_dpci->dom = d; /* bind after hvm_irq_dpci is setup to avoid race with irq handler*/ rc = pirq_guest_bind(d->vcpu[0], info, 0); if ( rc == 0 && pt_irq_bind->u.msi.gtable ) @@ -165,7 +156,6 @@ int pt_irq_create_bind( { pirq_dpci->gmsi.gflags = 0; pirq_dpci->gmsi.gvec = 0; - pirq_dpci->dom = NULL; pirq_dpci->flags = 0; pirq_cleanup_check(info, d); spin_unlock(&d->event_lock); @@ -242,7 +232,6 @@ int pt_irq_create_bind( { unsigned int share; - /* MUST be set, as the pirq_dpci can be re-used. */ pirq_dpci->dom = d; if ( pt_irq_bind->irq_type == PT_IRQ_TYPE_MSI_TRANSLATE ) { @@ -426,18 +415,11 @@ void pt_pirq_init(struct domain *d, struct hvm_pirq_dpci *dpci) { INIT_LIST_HEAD(&dpci->digl_list); dpci->gmsi.dest_vcpu_id = -1; - softirq_tasklet_init(&dpci->tasklet, hvm_dirq_assist, (unsigned long)dpci); } bool_t pt_pirq_cleanup_check(struct hvm_pirq_dpci *dpci) { - if ( !dpci->flags ) - { - tasklet_kill(&dpci->tasklet); - dpci->dom = NULL; - return 1; - } - return 0; + return !dpci->flags; } int pt_pirq_iterate(struct domain *d, @@ -477,7 +459,7 @@ int hvm_do_IRQ_dpci(struct domain *d, struct pirq *pirq) return 0; pirq_dpci->masked = 1; - tasklet_schedule(&pirq_dpci->tasklet); + tasklet_schedule(&dpci->dirq_tasklet); return 1; } @@ -531,27 +513,9 @@ void hvm_dpci_msi_eoi(struct domain *d, int vector) spin_unlock(&d->event_lock); } -static void hvm_dirq_assist(unsigned long arg) +static int _hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, + void *arg) { - struct hvm_pirq_dpci *pirq_dpci = (struct hvm_pirq_dpci *)arg; - struct domain *d = pirq_dpci->dom; - - /* - * We can be racing with 'pt_irq_destroy_bind' - with us being scheduled - * right before 'pirq_guest_unbind' gets called - but us not yet executed. - * - * And '->dom' gets cleared later in the destroy path. We exit and clear - * 'masked' - which is OK as later in this code we would - * do nothing except clear the ->masked field anyhow. - */ - if ( !d ) - { - pirq_dpci->masked = 0; - return; - } - ASSERT(d->arch.hvm_domain.irq.dpci); - - spin_lock(&d->event_lock); if ( test_and_clear_bool(pirq_dpci->masked) ) { struct pirq *pirq = dpci_pirq(pirq_dpci); @@ -562,17 +526,13 @@ static void hvm_dirq_assist(unsigned long arg) send_guest_pirq(d, pirq); if ( pirq_dpci->flags & HVM_IRQ_DPCI_GUEST_MSI ) - { - spin_unlock(&d->event_lock); - return; - } + return 0; } if ( pirq_dpci->flags & HVM_IRQ_DPCI_GUEST_MSI ) { vmsi_deliver_pirq(d, pirq_dpci); - spin_unlock(&d->event_lock); - return; + return 0; } list_for_each_entry ( digl, &pirq_dpci->digl_list, list ) @@ -585,8 +545,7 @@ static void hvm_dirq_assist(unsigned long arg) { /* for translated MSI to INTx interrupt, eoi as early as possible */ __msi_pirq_eoi(pirq_dpci); - spin_unlock(&d->event_lock); - return; + return 0; } /* @@ -599,6 +558,18 @@ static void hvm_dirq_assist(unsigned long arg) ASSERT(pt_irq_need_timer(pirq_dpci->flags)); set_timer(&pirq_dpci->timer, NOW() + PT_IRQ_TIME_OUT); } + + return 0; +} + +static void hvm_dirq_assist(unsigned long _d) +{ + struct domain *d = (struct domain *)_d; + + ASSERT(d->arch.hvm_domain.irq.dpci); + + spin_lock(&d->event_lock); + pt_pirq_iterate(d, _hvm_dirq_assist, NULL); spin_unlock(&d->event_lock); } diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 81e8a3a..1eba833 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -767,8 +767,6 @@ static int pci_clean_dpci_irq(struct domain *d, xfree(digl); } - tasklet_kill(&pirq_dpci->tasklet); - return 0; } @@ -786,6 +784,8 @@ static void pci_clean_dpci_irqs(struct domain *d) hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { + tasklet_kill(&hvm_irq_dpci->dirq_tasklet); + pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); d->arch.hvm_domain.irq.dpci = NULL; diff --git a/xen/include/xen/hvm/irq.h b/xen/include/xen/hvm/irq.h index 94a550a..c89f4b1 100644 --- a/xen/include/xen/hvm/irq.h +++ b/xen/include/xen/hvm/irq.h @@ -88,6 +88,7 @@ struct hvm_irq_dpci { DECLARE_BITMAP(isairq_map, NR_ISAIRQS); /* Record of mapped Links */ uint8_t link_cnt[NR_LINK]; + struct tasklet dirq_tasklet; }; /* Machine IRQ to guest device/intx mapping. */ @@ -99,7 +100,6 @@ struct hvm_pirq_dpci { struct domain *dom; struct hvm_gmsi_info gmsi; struct timer timer; - struct tasklet tasklet; }; void pt_pirq_init(struct domain *, struct hvm_pirq_dpci *); -- 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 Jan 16 12:44:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 Jan 2015 12:44: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 1YC6Fz-00061L-6K; Fri, 16 Jan 2015 12:44:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6Fx-00061C-Py for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:05 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id C5/E9-28865-59709B45; Fri, 16 Jan 2015 12:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1421412243!14327284!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3192 invoked from network); 16 Jan 2015 12:44: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; 16 Jan 2015 12:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6Fu-0006y6-W7 for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YC6Fu-0001S9-Q5 for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:02 +0000 Date: Fri, 16 Jan 2015 12:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxc: check return values on mmap() and madvise() on xc_alloc_hypercall_buffer() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5b3620f87135abeddc2b40739cc95498f3d5c40f Author: Luis R. Rodriguez AuthorDate: Tue May 20 05:37:35 2014 -0700 Commit: Ian Jackson CommitDate: Mon Jan 12 15:40:03 2015 +0000 libxc: check return values on mmap() and madvise() on xc_alloc_hypercall_buffer() On a Thinkpad T4440p with OpenSUSE tumbleweed with v3.15-rc4 and today's latest xen tip from the git tree strace -f reveals we end up on a never ending wait shortly after write(20, "backend/console/5\0", 18 This is right before we just wait on the qemu process which we had mmap'd for. Without this you'll end up getting stuck on a loop if mmap() worked but madvise() did not. While at it I noticed even the mmap() error fail was not being checked, fix that too. Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell (cherry picked from commit e86539a388314cd3dca88f5e69d7873343197cd8) --- tools/libxc/xc_linux_osdep.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_linux_osdep.c b/tools/libxc/xc_linux_osdep.c index 73860a2..86bff3e 100644 --- a/tools/libxc/xc_linux_osdep.c +++ b/tools/libxc/xc_linux_osdep.c @@ -92,14 +92,32 @@ static void *linux_privcmd_alloc_hypercall_buffer(xc_interface *xch, xc_osdep_ha { size_t size = npages * XC_PAGE_SIZE; void *p; + int rc, saved_errno; /* Address returned by mmap is page aligned. */ p = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_LOCKED, -1, 0); + if ( p == MAP_FAILED ) + { + PERROR("xc_alloc_hypercall_buffer: mmap failed"); + return NULL; + } /* Do not copy the VMA to child process on fork. Avoid the page being COW on hypercall. */ - madvise(p, npages * XC_PAGE_SIZE, MADV_DONTFORK); + rc = madvise(p, npages * XC_PAGE_SIZE, MADV_DONTFORK); + if ( rc < 0 ) + { + PERROR("xc_alloc_hypercall_buffer: madvise failed"); + goto out; + } + return p; + +out: + saved_errno = errno; + (void)munmap(p, size); + errno = saved_errno; + return NULL; } static void linux_privcmd_free_hypercall_buffer(xc_interface *xch, xc_osdep_handle h, void *ptr, int npages) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jan 16 12:44:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 Jan 2015 12:44: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 1YC6Fz-00061L-6K; Fri, 16 Jan 2015 12:44:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6Fx-00061C-Py for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:05 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id C5/E9-28865-59709B45; Fri, 16 Jan 2015 12:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1421412243!14327284!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3192 invoked from network); 16 Jan 2015 12:44: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; 16 Jan 2015 12:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6Fu-0006y6-W7 for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YC6Fu-0001S9-Q5 for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:02 +0000 Date: Fri, 16 Jan 2015 12:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxc: check return values on mmap() and madvise() on xc_alloc_hypercall_buffer() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5b3620f87135abeddc2b40739cc95498f3d5c40f Author: Luis R. Rodriguez AuthorDate: Tue May 20 05:37:35 2014 -0700 Commit: Ian Jackson CommitDate: Mon Jan 12 15:40:03 2015 +0000 libxc: check return values on mmap() and madvise() on xc_alloc_hypercall_buffer() On a Thinkpad T4440p with OpenSUSE tumbleweed with v3.15-rc4 and today's latest xen tip from the git tree strace -f reveals we end up on a never ending wait shortly after write(20, "backend/console/5\0", 18 This is right before we just wait on the qemu process which we had mmap'd for. Without this you'll end up getting stuck on a loop if mmap() worked but madvise() did not. While at it I noticed even the mmap() error fail was not being checked, fix that too. Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell (cherry picked from commit e86539a388314cd3dca88f5e69d7873343197cd8) --- tools/libxc/xc_linux_osdep.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_linux_osdep.c b/tools/libxc/xc_linux_osdep.c index 73860a2..86bff3e 100644 --- a/tools/libxc/xc_linux_osdep.c +++ b/tools/libxc/xc_linux_osdep.c @@ -92,14 +92,32 @@ static void *linux_privcmd_alloc_hypercall_buffer(xc_interface *xch, xc_osdep_ha { size_t size = npages * XC_PAGE_SIZE; void *p; + int rc, saved_errno; /* Address returned by mmap is page aligned. */ p = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_LOCKED, -1, 0); + if ( p == MAP_FAILED ) + { + PERROR("xc_alloc_hypercall_buffer: mmap failed"); + return NULL; + } /* Do not copy the VMA to child process on fork. Avoid the page being COW on hypercall. */ - madvise(p, npages * XC_PAGE_SIZE, MADV_DONTFORK); + rc = madvise(p, npages * XC_PAGE_SIZE, MADV_DONTFORK); + if ( rc < 0 ) + { + PERROR("xc_alloc_hypercall_buffer: madvise failed"); + goto out; + } + return p; + +out: + saved_errno = errno; + (void)munmap(p, size); + errno = saved_errno; + return NULL; } static void linux_privcmd_free_hypercall_buffer(xc_interface *xch, xc_osdep_handle h, void *ptr, int npages) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jan 16 12:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 Jan 2015 12: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 1YC6GA-00062c-9W; Fri, 16 Jan 2015 12:44:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6G9-00062P-5a for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:17 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id DD/6F-25276-0A709B45; Fri, 16 Jan 2015 12:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1421412253!18484611!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17856 invoked from network); 16 Jan 2015 12:44:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Jan 2015 12:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6G5-0006y9-Ck for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YC6G5-0001Sa-3t for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:13 +0000 Date: Fri, 16 Jan 2015 12:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools: libxl: do not overrun input buffer in libxl__parse_mac X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9503b44a90ad14c863382ae7784a1078570ffcdd Author: Ian Campbell AuthorDate: Thu Nov 6 13:59:43 2014 +0000 Commit: Ian Jackson CommitDate: Mon Jan 12 15:41:03 2015 +0000 tools: libxl: do not overrun input buffer in libxl__parse_mac Valgrind reports: ==7971== Invalid read of size 1 ==7971== at 0x40877BE: libxl__parse_mac (libxl_internal.c:288) ==7971== by 0x405C5F8: libxl__device_nic_from_xs_be (libxl.c:3405) ==7971== by 0x4065542: libxl__append_nic_list_of_type (libxl.c:3484) ==7971== by 0x4065542: libxl_device_nic_list (libxl.c:3504) ==7971== by 0x406F561: libxl_retrieve_domain_configuration (libxl.c:6661) ==7971== by 0x805671C: reload_domain_config (xl_cmdimpl.c:2037) ==7971== by 0x8057F30: handle_domain_death (xl_cmdimpl.c:2116) ==7971== by 0x8057F30: create_domain (xl_cmdimpl.c:2580) ==7971== by 0x805B4B2: main_create (xl_cmdimpl.c:4652) ==7971== by 0x804EAB2: main (xl.c:378) This is because on the final iteration the tok += 3 skips over the terminating NUL to the next byte, and then *tok reads it. Fix this by using endptr as the iterator. Signed-off-by: Ian Campbell Reviewed-by: Don Slutz Acked-by: Wei Liu (cherry picked from commit 5a430eca0b27354456d1245ed3f637d5f2e17883) --- tools/libxl/libxl_internal.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 5a8cd38..4d50221 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -275,10 +275,12 @@ _hidden int libxl__parse_mac(const char *s, libxl_mac mac) char *endptr; int i; - for (i = 0, tok = s; *tok && (i < 6); ++i, tok += 3) { + for (i = 0, tok = s; *tok && (i < 6); ++i, tok = endptr) { mac[i] = strtol(tok, &endptr, 16); if (endptr != (tok + 2) || (*endptr != '\0' && *endptr != ':') ) return ERROR_INVAL; + if (*endptr == ':') + endptr++; } if ( i != 6 ) return ERROR_INVAL; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jan 16 12:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 Jan 2015 12: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 1YC6GA-00062c-9W; Fri, 16 Jan 2015 12:44:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6G9-00062P-5a for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:17 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id DD/6F-25276-0A709B45; Fri, 16 Jan 2015 12:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1421412253!18484611!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17856 invoked from network); 16 Jan 2015 12:44:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Jan 2015 12:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6G5-0006y9-Ck for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YC6G5-0001Sa-3t for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:13 +0000 Date: Fri, 16 Jan 2015 12:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools: libxl: do not overrun input buffer in libxl__parse_mac X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9503b44a90ad14c863382ae7784a1078570ffcdd Author: Ian Campbell AuthorDate: Thu Nov 6 13:59:43 2014 +0000 Commit: Ian Jackson CommitDate: Mon Jan 12 15:41:03 2015 +0000 tools: libxl: do not overrun input buffer in libxl__parse_mac Valgrind reports: ==7971== Invalid read of size 1 ==7971== at 0x40877BE: libxl__parse_mac (libxl_internal.c:288) ==7971== by 0x405C5F8: libxl__device_nic_from_xs_be (libxl.c:3405) ==7971== by 0x4065542: libxl__append_nic_list_of_type (libxl.c:3484) ==7971== by 0x4065542: libxl_device_nic_list (libxl.c:3504) ==7971== by 0x406F561: libxl_retrieve_domain_configuration (libxl.c:6661) ==7971== by 0x805671C: reload_domain_config (xl_cmdimpl.c:2037) ==7971== by 0x8057F30: handle_domain_death (xl_cmdimpl.c:2116) ==7971== by 0x8057F30: create_domain (xl_cmdimpl.c:2580) ==7971== by 0x805B4B2: main_create (xl_cmdimpl.c:4652) ==7971== by 0x804EAB2: main (xl.c:378) This is because on the final iteration the tok += 3 skips over the terminating NUL to the next byte, and then *tok reads it. Fix this by using endptr as the iterator. Signed-off-by: Ian Campbell Reviewed-by: Don Slutz Acked-by: Wei Liu (cherry picked from commit 5a430eca0b27354456d1245ed3f637d5f2e17883) --- tools/libxl/libxl_internal.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 5a8cd38..4d50221 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -275,10 +275,12 @@ _hidden int libxl__parse_mac(const char *s, libxl_mac mac) char *endptr; int i; - for (i = 0, tok = s; *tok && (i < 6); ++i, tok += 3) { + for (i = 0, tok = s; *tok && (i < 6); ++i, tok = endptr) { mac[i] = strtol(tok, &endptr, 16); if (endptr != (tok + 2) || (*endptr != '\0' && *endptr != ':') ) return ERROR_INVAL; + if (*endptr == ':') + endptr++; } if ( i != 6 ) return ERROR_INVAL; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jan 16 12:44:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 Jan 2015 12:44:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6GJ-00064G-CL; Fri, 16 Jan 2015 12:44:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6GI-000646-3X for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:26 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 41/43-17694-9A709B45; Fri, 16 Jan 2015 12:44:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1421412263!11217640!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29509 invoked from network); 16 Jan 2015 12:44:24 -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; 16 Jan 2015 12:44:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6GF-0006yI-Hq for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YC6GF-0001T2-Gl for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:23 +0000 Date: Fri, 16 Jan 2015 12:44:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools: libxl: do not leak diskpath during local disk attach X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 59ec057efa4cc9f27eacc197bc4f929612d473d0 Author: Ian Campbell AuthorDate: Thu Nov 6 13:00:31 2014 +0000 Commit: Ian Jackson CommitDate: Mon Jan 12 15:41:18 2015 +0000 tools: libxl: do not leak diskpath during local disk attach libxl__device_disk_local_initiate_attach is assigning dls->diskpath with a strdup of the device path. This is then passed to the callback, e.g. parse_bootloader_result but bootloader_cleanup will not free it. Since the callback is within the scope of the (e)gc and therefore doesn't need to be malloc'd, a gc'd alloc will do. All other assignments to this field use the gc. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767295 Reported-by: Gedalya Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu (cherry picked from commit 379b351889a8f02abe30a06e2ce9ba8b381b91ab) --- tools/libxl/libxl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 75f5053..ece9a1f 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2652,7 +2652,7 @@ void libxl__device_disk_local_initiate_attach(libxl__egc *egc, } if (dev != NULL) - dls->diskpath = strdup(dev); + dls->diskpath = libxl__strdup(gc, dev); dls->callback(egc, dls, 0); return; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jan 16 12:44:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 Jan 2015 12:44:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6GJ-00064G-CL; Fri, 16 Jan 2015 12:44:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6GI-000646-3X for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:26 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 41/43-17694-9A709B45; Fri, 16 Jan 2015 12:44:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1421412263!11217640!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29509 invoked from network); 16 Jan 2015 12:44:24 -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; 16 Jan 2015 12:44:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6GF-0006yI-Hq for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YC6GF-0001T2-Gl for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:23 +0000 Date: Fri, 16 Jan 2015 12:44:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools: libxl: do not leak diskpath during local disk attach X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 59ec057efa4cc9f27eacc197bc4f929612d473d0 Author: Ian Campbell AuthorDate: Thu Nov 6 13:00:31 2014 +0000 Commit: Ian Jackson CommitDate: Mon Jan 12 15:41:18 2015 +0000 tools: libxl: do not leak diskpath during local disk attach libxl__device_disk_local_initiate_attach is assigning dls->diskpath with a strdup of the device path. This is then passed to the callback, e.g. parse_bootloader_result but bootloader_cleanup will not free it. Since the callback is within the scope of the (e)gc and therefore doesn't need to be malloc'd, a gc'd alloc will do. All other assignments to this field use the gc. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767295 Reported-by: Gedalya Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu (cherry picked from commit 379b351889a8f02abe30a06e2ce9ba8b381b91ab) --- tools/libxl/libxl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 75f5053..ece9a1f 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2652,7 +2652,7 @@ void libxl__device_disk_local_initiate_attach(libxl__egc *egc, } if (dev != NULL) - dls->diskpath = strdup(dev); + dls->diskpath = libxl__strdup(gc, dev); dls->callback(egc, dls, 0); return; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jan 16 12:44:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 Jan 2015 12:44: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 1YC6GT-000664-Et; Fri, 16 Jan 2015 12:44:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6GR-00065k-Sj for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:35 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id FC/CF-25276-3B709B45; Fri, 16 Jan 2015 12:44:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1421412273!21921588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11253 invoked from network); 16 Jan 2015 12:44:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Jan 2015 12:44:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6GP-0006yQ-O2 for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YC6GP-0001TS-Md for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:33 +0000 Date: Fri, 16 Jan 2015 12:44:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools/hotplug: set mtu from bridge for tap 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 d07266e83fe6e70fa052618ed205a7ecd0ad7318 Author: Charles Arnold AuthorDate: Mon Jan 12 09:37:03 2015 -0700 Commit: Ian Jackson CommitDate: Mon Jan 12 17:05:46 2015 +0000 tools/hotplug: set mtu from bridge for tap interface With changeset 22885 support was added for setting the MTU in the vif-bridge script for when a vif interface was set to 'online'. The was not done for the 'add' operation. The 'add' operation was added to the script for when tap devices were specified (c/s 21944). With the setting of the MTU for the 'online' case was there a reason for omitting the 'add'? This patch sets the MTU for both 'online' and 'add' in the vif-bridge script. Backport for Xen version 4.3. [ Removed spurious addition of blank line. Backport of f3f5f1927f0d (as it is in staging-4.4). -iwj ] Signed-off-by: Charles Arnold --- tools/hotplug/Linux/vif-bridge | 7 ++----- tools/hotplug/Linux/xen-network-common.sh | 10 ++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/hotplug/Linux/vif-bridge b/tools/hotplug/Linux/vif-bridge index f489519..da8a0f8 100644 --- a/tools/hotplug/Linux/vif-bridge +++ b/tools/hotplug/Linux/vif-bridge @@ -82,11 +82,7 @@ fi case "$command" in online) setup_virtual_bridge_port "$dev" - mtu="`ip link show $bridge | awk '/mtu/ { print $5 }'`" - if [ -n "$mtu" ] && [ "$mtu" -gt 0 ] - then - ip link set $dev mtu $mtu || : - fi + set_mtu "$bridge" "$dev" add_to_bridge "$bridge" "$dev" ;; @@ -97,6 +93,7 @@ case "$command" in add) setup_virtual_bridge_port "$dev" + set_mtu "$bridge" "$dev" add_to_bridge "$bridge" "$dev" ;; esac diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linux/xen-network-common.sh index 8cff156..50b8711 100644 --- a/tools/hotplug/Linux/xen-network-common.sh +++ b/tools/hotplug/Linux/xen-network-common.sh @@ -132,3 +132,13 @@ add_to_bridge () { ip link set ${dev} up } +# Usage: set_mtu bridge dev +set_mtu () { + local bridge=$1 + local dev=$2 + mtu="`ip link show ${bridge}| awk '/mtu/ { print $5 }'`" + if [ -n "$mtu" ] && [ "$mtu" -gt 0 ] + then + ip link set ${dev} mtu $mtu || : + fi +} -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jan 16 12:44:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 16 Jan 2015 12:44: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 1YC6GT-000664-Et; Fri, 16 Jan 2015 12:44:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6GR-00065k-Sj for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:35 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id FC/CF-25276-3B709B45; Fri, 16 Jan 2015 12:44:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1421412273!21921588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11253 invoked from network); 16 Jan 2015 12:44:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Jan 2015 12:44:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YC6GP-0006yQ-O2 for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YC6GP-0001TS-Md for xen-changelog@lists.xensource.com; Fri, 16 Jan 2015 12:44:33 +0000 Date: Fri, 16 Jan 2015 12:44:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools/hotplug: set mtu from bridge for tap 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 d07266e83fe6e70fa052618ed205a7ecd0ad7318 Author: Charles Arnold AuthorDate: Mon Jan 12 09:37:03 2015 -0700 Commit: Ian Jackson CommitDate: Mon Jan 12 17:05:46 2015 +0000 tools/hotplug: set mtu from bridge for tap interface With changeset 22885 support was added for setting the MTU in the vif-bridge script for when a vif interface was set to 'online'. The was not done for the 'add' operation. The 'add' operation was added to the script for when tap devices were specified (c/s 21944). With the setting of the MTU for the 'online' case was there a reason for omitting the 'add'? This patch sets the MTU for both 'online' and 'add' in the vif-bridge script. Backport for Xen version 4.3. [ Removed spurious addition of blank line. Backport of f3f5f1927f0d (as it is in staging-4.4). -iwj ] Signed-off-by: Charles Arnold --- tools/hotplug/Linux/vif-bridge | 7 ++----- tools/hotplug/Linux/xen-network-common.sh | 10 ++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/hotplug/Linux/vif-bridge b/tools/hotplug/Linux/vif-bridge index f489519..da8a0f8 100644 --- a/tools/hotplug/Linux/vif-bridge +++ b/tools/hotplug/Linux/vif-bridge @@ -82,11 +82,7 @@ fi case "$command" in online) setup_virtual_bridge_port "$dev" - mtu="`ip link show $bridge | awk '/mtu/ { print $5 }'`" - if [ -n "$mtu" ] && [ "$mtu" -gt 0 ] - then - ip link set $dev mtu $mtu || : - fi + set_mtu "$bridge" "$dev" add_to_bridge "$bridge" "$dev" ;; @@ -97,6 +93,7 @@ case "$command" in add) setup_virtual_bridge_port "$dev" + set_mtu "$bridge" "$dev" add_to_bridge "$bridge" "$dev" ;; esac diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linux/xen-network-common.sh index 8cff156..50b8711 100644 --- a/tools/hotplug/Linux/xen-network-common.sh +++ b/tools/hotplug/Linux/xen-network-common.sh @@ -132,3 +132,13 @@ add_to_bridge () { ip link set ${dev} up } +# Usage: set_mtu bridge dev +set_mtu () { + local bridge=$1 + local dev=$2 + mtu="`ip link show ${bridge}| awk '/mtu/ { print $5 }'`" + if [ -n "$mtu" ] && [ "$mtu" -gt 0 ] + then + ip link set ${dev} mtu $mtu || : + fi +} -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 16:57:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 16:57: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 1YCtAR-00046Y-JC; Sun, 18 Jan 2015 16:57:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCtAP-00046T-8v for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 16:57:37 +0000 Content-Length: 145046 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 4D/60-24859-006EBB45; Sun, 18 Jan 2015 16:57:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1421600242!20372423!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, ML_RADAR_SPEW_LINKS_8,spamassassin: ,async_handler: YXN5bmNfZGVsYXk6IDcwNjQ4NDcgKHRpbWVvdXQp\n X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25804 invoked from network); 18 Jan 2015 16:57: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; 18 Jan 2015 16:57:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCtAA-0006fz-0X for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 16:57:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCtA9-0003Ey-HB for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 16:57:21 +0000 Date: Sun, 18 Jan 2015 16:57:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Merge remote-tracking branch 'xen-staging/master' into temp2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============8943858755590866684==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8943858755590866684== Content-Length: 147587 Content-Transfer-Encoding: quoted-printable =3D=3D=3D This changeset includes merge from high-traffic branch =3D=3D=3D Commits on that branch are not reported individually. commit 0d37748342e29854db7c9f6c47d7f58c6cfba6b2 Merge: 45e1611de8be0eae55967694dd6e627c2dc354f2 1ebb75b1fee779621b63e84fefa7b07354c43a99 Author: Stefano Stabellini AuthorDate: Fri Jan 16 15:20:40 2015 +0000 Commit: Stefano Stabellini CommitDate: Fri Jan 16 15:20:40 2015 +0000 Merge remote-tracking branch 'xen-staging/master' into temp2 .gitignore | 24 +- .gitmodules | 3 + .travis.yml | 63 +- CODING_STYLE | 14 + MAINTAINERS | 178 +- Makefile | 77 +- Makefile.objs | 22 +- Makefile.target | 78 +- VERSION | 2 +- accel.c | 157 + aio-posix.c | 50 +- aio-win32.c | 268 +- arch_init.c | 413 +- async.c | 74 +- audio/Makefile.objs | 2 +- audio/alsaaudio.c | 12 +- audio/audio.c | 3 +- audio/audio_template.h | 15 +- audio/ossaudio.c | 6 +- audio/spiceaudio.c | 2 +- audio/wavcapture.c | 3 +- backends/Makefile.objs | 7 +- backends/baum.c | 4 +- backends/hostmem-file.c | 134 + backends/hostmem-ram.c | 53 + backends/hostmem.c | 365 + backends/msmouse.c | 4 +- backends/rng-egd.c | 1 + backends/rng-random.c | 5 +- backends/rng.c | 11 +- backends/testdev.c | 131 + backends/tpm.c | 11 +- balloon.c | 13 - block-migration.c | 95 +- block.c | 1972 +++-- block/Makefile.objs | 11 +- block/accounting.c | 54 + block/archipelago.c | 1084 +++ block/backup.c | 27 +- block/blkdebug.c | 170 +- block/blkverify.c | 112 +- block/block-backend.c | 631 ++ block/bochs.c | 29 +- block/cloop.c | 35 +- block/commit.c | 79 +- block/cow.c | 432 - block/curl.c | 475 +- block/dmg.c | 27 +- block/gluster.c | 100 +- block/iscsi.c | 732 ++- block/linux-aio.c | 236 +- block/mirror.c | 194 +- block/nbd-client.c | 24 +- block/nbd-client.h | 4 + block/nbd.c | 139 +- block/nfs.c | 142 +- block/null.c | 168 + block/parallels.c | 60 +- block/qapi.c | 70 +- block/qcow.c | 118 +- block/qcow2-cache.c | 22 +- block/qcow2-cluster.c | 264 +- block/qcow2-refcount.c | 1014 ++- block/qcow2-snapshot.c | 31 +- block/qcow2.c | 828 ++- block/qcow2.h | 30 +- block/qed-check.c | 6 +- block/qed-gencb.c | 4 +- block/qed-table.c | 18 +- block/qed.c | 282 +- block/qed.h | 16 +- block/quorum.c | 406 +- block/raw-aio.h | 18 +- block/raw-posix.c | 617 +- block/raw-win32.c | 113 +- block/raw_bsd.c | 36 +- block/rbd.c | 246 +- block/sheepdog.c | 491 +- block/snapshot.c | 4 + block/ssh.c | 228 +- block/stream.c | 69 +- block/vdi.c | 211 +- block/vhdx-endian.c | 11 +- block/vhdx-log.c | 57 +- block/vhdx.c | 230 +- block/vhdx.h | 2 + block/vmdk.c | 481 +- block/vpc.c | 206 +- block/vvfat.c | 68 +- block/win32-aio.c | 55 +- blockdev-nbd.c | 2 +- blockdev.c | 796 ++- blockjob.c | 172 +- bootdevice.c | 258 + bsd-user/freebsd/strace.list | 76 +- bsd-user/freebsd/syscall_nr.h | 813 ++- bsd-user/main.c | 6 +- bsd-user/mmap.c | 60 - bsd-user/qemu.h | 27 + bsd-user/strace.c | 167 +- configure | 528 +- coroutine-gthread.c | 36 +- coroutine-sigaltstack.c | 2 +- cpu-exec.c | 466 +- cpus.c | 180 +- cputlb.c | 58 +- default-configs/i386-softmmu.mak | 1 + default-configs/mips-softmmu.mak | 1 - default-configs/mips64-softmmu.mak | 1 - default-configs/mipsel-softmmu.mak | 1 - default-configs/ppc-linux-user.mak | 1 + default-configs/ppc-softmmu.mak | 3 +- default-configs/ppc64-linux-user.mak | 1 + default-configs/ppc64-softmmu.mak | 2 + default-configs/ppc64abi32-linux-user.mak | 1 + default-configs/ppc64le-linux-user.mak | 2 + default-configs/ppcemb-softmmu.mak | 1 + default-configs/s390x-softmmu.mak | 3 +- default-configs/usb.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + device-hotplug.c | 5 +- device_tree.c | 55 +- disas.c | 21 +- disas/Makefile.objs | 2 +- disas/arm-a64.cc | 2 +- disas/libvixl/README | 2 +- disas/libvixl/a64/assembler-a64.h | 1133 ++- disas/libvixl/a64/constants-a64.h | 104 +- disas/libvixl/a64/cpu-a64.h | 27 + disas/libvixl/a64/decoder-a64.cc | 85 +- disas/libvixl/a64/decoder-a64.h | 103 +- disas/libvixl/a64/disasm-a64.cc | 486 +- disas/libvixl/a64/disasm-a64.h | 85 +- disas/libvixl/a64/instructions-a64.cc | 73 +- disas/libvixl/a64/instructions-a64.h | 102 +- disas/libvixl/code-buffer.h | 113 + disas/libvixl/globals.h | 42 +- disas/libvixl/platform.h | 10 +- disas/libvixl/utils.cc | 48 +- disas/libvixl/utils.h | 111 +- disas/mips.c | 929 +++- disas/sparc.c | 34 +- dma-helpers.c | 89 +- docs/aio_notify.promela | 104 + docs/blkdebug.txt | 161 + docs/ccid.txt | 80 +- docs/image-fuzzer.txt | 239 + docs/memory.txt | 25 +- docs/migration.txt | 18 +- docs/multiple-iothreads.txt | 134 + docs/multiseat.txt | 102 + docs/qapi-code-gen.txt | 345 +- docs/qmp/qmp-events.txt | 130 +- docs/rdma.txt | 6 +- docs/specs/acpi_mem_hotplug.txt | 44 + docs/specs/qcow2.txt | 20 +- docs/specs/standard-vga.txt | 22 +- docs/specs/vhost-user.txt | 266 + docs/tracing.txt | 50 +- docs/virtio-balloon-stats.txt | 5 +- docs/writing-qmp-commands.txt | 30 +- dump.c | 779 +-- exec.c | 464 +- fpu/softfloat.c | 37 +- fsdev/virtfs-proxy-helper.c | 1 + gdb-xml/s390-acr.xml | 26 + gdb-xml/s390-fpr.xml | 27 + gdb-xml/s390x-core64.xml | 28 + gdbstub.c | 39 +- hmp-commands.hx | 64 +- hmp.c | 273 +- hmp.h | 24 + hw/9pfs/virtio-9p-device.c | 3 +- hw/9pfs/virtio-9p-local.c | 50 +- hw/9pfs/virtio-9p-proxy.c | 11 +- hw/9pfs/virtio-9p-synth.c | 2 +- hw/9pfs/virtio-9p.c | 9 +- hw/Makefile.objs | 1 + hw/acpi/Makefile.objs | 2 + hw/acpi/acpi_interface.c | 15 + hw/acpi/core.c | 11 +- hw/acpi/cpu_hotplug.c | 34 +- hw/acpi/ich9.c | 91 +- hw/acpi/memory_hotplug.c | 223 + hw/acpi/pcihp.c | 23 +- hw/acpi/piix4.c | 111 +- hw/alpha/dp264.c | 14 +- hw/alpha/typhoon.c | 6 +- hw/arm/armv7m.c | 15 +- hw/arm/boot.c | 97 +- hw/arm/collie.c | 20 +- hw/arm/cubieboard.c | 24 +- hw/arm/digic_boards.c | 4 +- hw/arm/exynos4210.c | 9 +- hw/arm/exynos4_boards.c | 22 +- hw/arm/gumstix.c | 12 +- hw/arm/highbank.c | 32 +- hw/arm/integratorcp.c | 17 +- hw/arm/kzm.c | 16 +- hw/arm/mainstone.c | 25 +- hw/arm/musicpal.c | 37 +- hw/arm/nseries.c | 345 +- hw/arm/omap1.c | 14 +- hw/arm/omap2.c | 10 +- hw/arm/omap_sx1.c | 37 +- hw/arm/palm.c | 13 +- hw/arm/pxa2xx.c | 37 +- hw/arm/pxa2xx_gpio.c | 20 +- hw/arm/pxa2xx_pic.c | 1 - hw/arm/realview.c | 55 +- hw/arm/spitz.c | 154 +- hw/arm/stellaris.c | 47 +- hw/arm/strongarm.c | 27 +- hw/arm/tosa.c | 15 +- hw/arm/versatilepb.c | 32 +- hw/arm/vexpress.c | 64 +- hw/arm/virt.c | 306 +- hw/arm/xilinx_zynq.c | 25 +- hw/arm/z2.c | 20 +- hw/audio/ac97.c | 23 +- hw/audio/adlib.c | 10 +- hw/audio/cs4231.c | 3 +- hw/audio/cs4231a.c | 3 +- hw/audio/es1370.c | 14 +- hw/audio/gus.c | 5 +- hw/audio/hda-codec.c | 10 +- hw/audio/intel-hda.c | 16 +- hw/audio/lm4549.c | 5 +- hw/audio/marvell_88w8618.c | 1 - hw/audio/milkymist-ac97.c | 3 +- hw/audio/pl041.c | 9 +- hw/audio/sb16.c | 9 +- hw/audio/wm8750.c | 3 +- hw/block/Makefile.objs | 2 +- hw/block/block.c | 41 +- hw/block/dataplane/Makefile.objs | 2 +- hw/block/dataplane/ioq.c | 117 - hw/block/dataplane/ioq.h | 57 - hw/block/dataplane/virtio-blk.c | 410 +- hw/block/dataplane/virtio-blk.h | 2 +- hw/block/ecc.c | 3 +- hw/block/fdc.c | 182 +- hw/block/hd-geometry.c | 24 +- hw/block/m25p80.c | 48 +- hw/block/nand.c | 53 +- hw/block/nvme.c | 75 +- hw/block/nvme.h | 2 +- hw/block/onenand.c | 74 +- hw/block/pflash_cfi01.c | 71 +- hw/block/pflash_cfi02.c | 33 +- hw/block/virtio-blk.c | 462 +- hw/block/xen_disk.c | 95 +- hw/bt/l2cap.c | 2 +- hw/char/cadence_uart.c | 1 - hw/char/digic-uart.c | 1 - hw/char/escc.c | 239 +- hw/char/exynos4210_uart.c | 2 - hw/char/imx_serial.c | 1 - hw/char/ipoctal232.c | 9 +- hw/char/lm32_juart.c | 3 +- hw/char/lm32_uart.c | 3 +- hw/char/milkymist-uart.c | 3 +- hw/char/parallel.c | 18 + hw/char/pl011.c | 3 +- hw/char/sclpconsole-lm.c | 15 +- hw/char/sclpconsole.c | 15 +- hw/char/serial-pci.c | 17 +- hw/char/serial.c | 292 +- hw/char/spapr_vty.c | 3 +- hw/char/virtio-console.c | 12 +- hw/char/virtio-serial-bus.c | 152 +- hw/char/xilinx_uartlite.c | 32 +- hw/core/Makefile.objs | 2 + hw/core/hotplug.c | 11 + hw/core/irq.c | 44 +- hw/core/loader.c | 111 +- hw/core/machine.c | 343 + hw/core/nmi.c | 84 + hw/core/null-machine.c | 2 +- hw/core/platform-bus.c | 253 + hw/core/ptimer.c | 3 +- hw/core/qdev-properties-system.c | 96 +- hw/core/qdev-properties.c | 70 +- hw/core/qdev.c | 410 +- hw/core/sysbus.c | 104 +- hw/cpu/icc_bus.c | 12 +- hw/cris/axis_dev88.c | 20 +- hw/display/ads7846.c | 3 +- hw/display/blizzard.c | 8 - hw/display/cg3.c | 33 +- hw/display/cirrus_vga.c | 178 +- hw/display/cirrus_vga_rop.h | 3 +- hw/display/cirrus_vga_template.h | 102 - hw/display/exynos4210_fimd.c | 4 +- hw/display/g364fb.c | 1 - hw/display/jazz_led.c | 2 +- hw/display/milkymist-tmu2.c | 3 +- hw/display/milkymist-vgafb.c | 3 +- hw/display/omap_lcd_template.h | 10 +- hw/display/pxa2xx_lcd.c | 30 +- hw/display/qxl-render.c | 15 +- hw/display/qxl.c | 76 +- hw/display/qxl.h | 1 + hw/display/sm501.c | 2 +- hw/display/sm501_template.h | 6 +- hw/display/ssd0303.c | 3 +- hw/display/tc6393xb.c | 7 +- hw/display/tcx.c | 721 ++- hw/display/vga-helpers.h | 439 ++ hw/display/vga-isa-mm.c | 2 +- hw/display/vga-isa.c | 2 +- hw/display/vga-pci.c | 136 +- hw/display/vga.c | 627 +- hw/display/vga_int.h | 13 +- hw/display/vga_template.h | 461 -- hw/display/vmware_vga.c | 135 +- hw/display/xenfb.c | 8 +- hw/dma/i82374.c | 7 +- hw/dma/i8257.c | 10 +- hw/dma/omap_dma.c | 12 +- hw/dma/pl330.c | 5 - hw/dma/pxa2xx_dma.c | 2 - hw/dma/sparc32_dma.c | 3 +- hw/dma/sun4m_iommu.c | 3 +- hw/dma/xilinx_axidma.c | 31 +- hw/gpio/Makefile.objs | 1 + hw/gpio/max7310.c | 3 +- hw/gpio/mpc8xxx.c | 217 + hw/gpio/pl061.c | 61 +- hw/gpio/zaurus.c | 3 +- hw/i2c/core.c | 6 +- hw/i2c/pm_smbus.c | 68 +- hw/i2c/smbus.c | 68 +- hw/i2c/smbus_eeprom.c | 2 +- hw/i2c/smbus_ich9.c | 1 - hw/i386/Makefile.objs | 7 +- hw/i386/acpi-build.c | 313 +- hw/i386/acpi-defs.h | 51 + hw/i386/acpi-dsdt-mem-hotplug.dsl | 176 + hw/i386/acpi-dsdt.dsl | 98 +- hw/i386/acpi-dsdt.hex.generated | 3918 ++++------ hw/i386/intel_iommu.c | 1963 +++++ hw/i386/intel_iommu_internal.h | 389 + hw/i386/kvm/apic.c | 3 + hw/i386/kvm/clock.c | 68 +- hw/i386/kvm/i8254.c | 3 +- hw/i386/kvm/pci-assign.c | 299 +- hw/i386/kvmvapic.c | 79 +- hw/i386/pc.c | 563 ++- hw/i386/pc_piix.c | 304 +- hw/i386/pc_q35.c | 200 +- hw/i386/pc_sysfw.c | 15 +- hw/i386/q35-acpi-dsdt.dsl | 8 +- hw/i386/q35-acpi-dsdt.hex.generated | 876 ++- hw/i386/smbios.c | 803 ++- hw/i386/ssdt-mem.dsl | 77 + hw/i386/ssdt-mem.hex.generated | 213 + hw/i386/ssdt-misc.dsl | 3 + hw/i386/ssdt-misc.hex.generated | 31 +- hw/i386/ssdt-pcihp.hex.generated | 6 +- hw/i386/ssdt-proc.hex.generated | 6 +- hw/i386/ssdt-tpm.dsl | 43 + hw/i386/ssdt-tpm.hex.generated | 95 + hw/i386/xen/xen_platform.c | 8 +- hw/ide/ahci.c | 603 +- hw/ide/ahci.h | 38 +- hw/ide/atapi.c | 53 +- hw/ide/cmd646.c | 101 +- hw/ide/core.c | 515 +- hw/ide/ich.c | 11 +- hw/ide/internal.h | 67 +- hw/ide/isa.c | 5 +- hw/ide/macio.c | 125 +- hw/ide/microdrive.c | 10 +- hw/ide/mmio.c | 9 +- hw/ide/pci.c | 90 +- hw/ide/pci.h | 9 +- hw/ide/piix.c | 19 +- hw/ide/qdev.c | 73 +- hw/ide/via.c | 5 +- hw/input/adb.c | 6 +- hw/input/hid.c | 220 +- hw/input/lm832x.c | 3 +- hw/input/milkymist-softusb.c | 32 +- hw/input/pckbd.c | 61 +- hw/input/ps2.c | 178 +- hw/input/pxa2xx_keypad.c | 3 +- hw/input/stellaris_input.c | 6 +- hw/input/tsc210x.c | 30 - hw/input/vmmouse.c | 3 +- hw/intc/Makefile.objs | 1 + hw/intc/allwinner-a10-pic.c | 24 +- hw/intc/apic.c | 28 +- hw/intc/apic_common.c | 41 +- hw/intc/arm_gic.c | 27 +- hw/intc/arm_gic_common.c | 2 +- hw/intc/arm_gic_kvm.c | 6 +- hw/intc/armv7m_nvic.c | 18 +- hw/intc/exynos4210_combiner.c | 2 - hw/intc/exynos4210_gic.c | 1 - hw/intc/gic_internal.h | 2 +- hw/intc/heathrow_pic.c | 6 +- hw/intc/i8259.c | 7 +- hw/intc/i8259_common.c | 1 - hw/intc/imx_avic.c | 10 - hw/intc/ioapic_common.c | 1 - hw/intc/lm32_pic.c | 3 +- hw/intc/openpic.c | 106 +- hw/intc/openpic_kvm.c | 42 +- hw/intc/s390_flic.c | 325 +- hw/intc/s390_flic_kvm.c | 432 + hw/intc/slavio_intctl.c | 6 +- hw/intc/xics.c | 191 +- hw/intc/xics_kvm.c | 42 +- hw/intc/xilinx_intc.c | 20 +- hw/ipack/ipack.c | 5 +- hw/ipack/tpci200.c | 16 +- hw/isa/apm.c | 6 +- hw/isa/isa-bus.c | 13 +- hw/isa/lpc_ich9.c | 41 +- hw/isa/pc87312.c | 12 +- hw/isa/piix4.c | 3 +- hw/isa/vt82c686.c | 6 +- hw/lm32/lm32_boards.c | 36 +- hw/lm32/milkymist.c | 21 +- hw/m68k/an5206.c | 15 +- hw/m68k/dummy_m68k.c | 13 +- hw/m68k/mcf5208.c | 15 +- hw/mem/Makefile.objs | 1 + hw/mem/pc-dimm.c | 308 + hw/microblaze/boot.c | 17 +- hw/microblaze/petalogix_ml605_mmu.c | 24 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 20 +- hw/mips/addr.c | 7 +- hw/mips/cputimer.c | 18 +- hw/mips/gt64xxx_pci.c | 25 +- hw/mips/mips_fulong2e.c | 51 +- hw/mips/mips_int.c | 11 + hw/mips/mips_jazz.c | 22 +- hw/mips/mips_malta.c | 271 +- hw/mips/mips_mipssim.c | 20 +- hw/mips/mips_r4k.c | 25 +- hw/misc/Makefile.objs | 1 - hw/misc/eccmemctl.c | 3 +- hw/misc/exynos4210_pmu.c | 2 +- hw/misc/imx_ccm.c | 1 - hw/misc/ivshmem.c | 129 +- hw/misc/lm32_sys.c | 180 - hw/misc/macio/cuda.c | 29 +- hw/misc/macio/mac_dbdma.c | 12 +- hw/misc/macio/macio.c | 21 +- hw/misc/max111x.c | 3 +- hw/misc/milkymist-hpdmc.c | 3 +- hw/misc/milkymist-pfpu.c | 3 +- hw/misc/mst_fpga.c | 11 +- hw/misc/omap_gpmc.c | 8 +- hw/misc/pci-testdev.c | 2 - hw/misc/pvpanic.c | 13 +- hw/misc/slavio_misc.c | 3 +- hw/misc/tmp105.c | 9 +- hw/misc/vfio.c | 831 ++- hw/misc/zynq_slcr.c | 698 +- hw/moxie/moxiesim.c | 29 +- hw/net/allwinner_emac.c | 6 +- hw/net/cadence_gem.c | 50 +- hw/net/dp8393x.c | 3 - hw/net/e1000.c | 245 +- hw/net/e1000_regs.h | 9 + hw/net/eepro100.c | 23 +- hw/net/fsl_etsec/rings.c | 2 +- hw/net/lance.c | 15 +- hw/net/mcf_fec.c | 3 - hw/net/milkymist-minimac2.c | 8 +- hw/net/mipsnet.c | 3 +- hw/net/ne2000-isa.c | 48 +- hw/net/ne2000.c | 21 +- hw/net/pcnet-pci.c | 17 +- hw/net/pcnet.c | 61 +- hw/net/pcnet.h | 1 - hw/net/rtl8139.c | 27 +- hw/net/smc91c111.c | 2 +- hw/net/spapr_llan.c | 28 +- hw/net/stellaris_enet.c | 339 +- hw/net/vhost_net.c | 295 +- hw/net/virtio-net.c | 202 +- hw/net/vmxnet3.c | 52 +- hw/net/xgmac.c | 4 +- hw/net/xilinx_axienet.c | 21 +- hw/net/xilinx_ethlite.c | 37 +- hw/nvram/ds1225y.c | 1 - hw/nvram/eeprom93xx.c | 3 +- hw/nvram/fw_cfg.c | 61 +- hw/nvram/mac_nvram.c | 73 +- hw/nvram/spapr_nvram.c | 98 +- hw/openrisc/openrisc_sim.c | 12 +- hw/pci-bridge/ioh3420.c | 33 +- hw/pci-bridge/ioh3420.h | 4 - hw/pci-bridge/pci_bridge_dev.c | 4 +- hw/pci-bridge/xio3130_downstream.c | 12 +- hw/pci-bridge/xio3130_upstream.c | 1 - hw/pci-host/apb.c | 312 +- hw/pci-host/bonito.c | 3 +- hw/pci-host/pam.c | 4 +- hw/pci-host/piix.c | 37 +- hw/pci-host/ppce500.c | 50 +- hw/pci-host/prep.c | 7 +- hw/pci-host/q35.c | 67 +- hw/pci-host/uninorth.c | 2 +- hw/pci/msi.c | 2 +- hw/pci/msix.c | 6 +- hw/pci/pci-hotplug-old.c | 18 +- hw/pci/pci.c | 76 +- hw/pci/pci_bridge.c | 14 +- hw/pci/pcie.c | 85 +- hw/pci/pcie_aer.c | 6 +- hw/pci/pcie_host.c | 8 +- hw/pci/pcie_port.c | 2 +- hw/pci/shpc.c | 9 +- hw/pcmcia/pxa2xx.c | 21 - hw/ppc/Makefile.objs | 5 +- hw/ppc/e500.c | 401 +- hw/ppc/e500.h | 8 +- hw/ppc/e500plat.c | 11 +- hw/ppc/mac.h | 6 +- hw/ppc/mac_newworld.c | 80 +- hw/ppc/mac_oldworld.c | 51 +- hw/ppc/mpc8544ds.c | 4 +- hw/ppc/ppc.c | 79 + hw/ppc/ppc405_boards.c | 76 +- hw/ppc/ppc405_uc.c | 4 +- hw/ppc/ppc440_bamboo.c | 15 +- hw/ppc/ppc4xx_devs.c | 41 +- hw/ppc/ppc4xx_pci.c | 33 +- hw/ppc/prep.c | 40 +- hw/ppc/spapr.c | 633 ++- hw/ppc/spapr_events.c | 5 +- hw/ppc/spapr_hcall.c | 233 +- hw/ppc/spapr_iommu.c | 194 +- hw/ppc/spapr_pci.c | 419 +- hw/ppc/spapr_pci_vfio.c | 102 + hw/ppc/spapr_rtas.c | 115 +- hw/ppc/spapr_vio.c | 16 +- hw/ppc/virtex_ml507.c | 25 +- hw/s390x/css.c | 246 +- hw/s390x/css.h | 9 +- hw/s390x/event-facility.c | 7 +- hw/s390x/ipl.c | 2 +- hw/s390x/s390-virtio-bus.c | 87 +- hw/s390x/s390-virtio-bus.h | 1 - hw/s390x/s390-virtio-ccw.c | 107 +- hw/s390x/s390-virtio.c | 120 +- hw/s390x/s390-virtio.h | 3 + hw/s390x/sclp.c | 289 +- hw/s390x/sclpquiesce.c | 3 +- hw/s390x/virtio-ccw.c | 422 +- hw/s390x/virtio-ccw.h | 17 +- hw/scsi/Makefile.objs | 2 +- hw/scsi/esp-pci.c | 5 +- hw/scsi/esp.c | 15 +- hw/scsi/lsi53c895a.c | 14 +- hw/scsi/megasas.c | 659 ++- hw/scsi/mfi.h | 16 +- hw/scsi/scsi-bus.c | 302 +- hw/scsi/scsi-disk.c | 413 +- hw/scsi/scsi-generic.c | 126 +- hw/scsi/spapr_vscsi.c | 24 +- hw/scsi/vhost-scsi.c | 53 +- hw/scsi/virtio-scsi-dataplane.c | 312 + hw/scsi/virtio-scsi.c | 669 ++- hw/scsi/vmw_pvscsi.c | 32 +- hw/sd/milkymist-memcard.c | 10 +- hw/sd/omap_mmc.c | 8 +- hw/sd/pl181.c | 3 +- hw/sd/pxa2xx_mmci.c | 4 +- hw/sd/sd.c | 71 +- hw/sd/sdhci.c | 8 +- hw/sd/ssi-sd.c | 3 +- hw/sh4/r2d.c | 18 +- hw/sh4/shix.c | 12 +- hw/sparc/leon3.c | 12 +- hw/sparc/sun4m.c | 136 +- hw/sparc64/sun4u.c | 50 +- hw/ssi/pl022.c | 3 +- hw/ssi/ssi.c | 7 +- hw/ssi/xilinx_spi.c | 3 +- hw/ssi/xilinx_spips.c | 1 - hw/timer/allwinner-a10-pit.c | 67 +- hw/timer/arm_timer.c | 6 +- hw/timer/cadence_ttc.c | 19 +- hw/timer/digic-timer.c | 1 - hw/timer/ds1338.c | 1 - hw/timer/exynos4210_mct.c | 10 +- hw/timer/exynos4210_pwm.c | 2 - hw/timer/exynos4210_rtc.c | 1 - hw/timer/hpet.c | 9 +- hw/timer/i8254_common.c | 1 - hw/timer/imx_epit.c | 19 +- hw/timer/imx_gpt.c | 35 +- hw/timer/lm32_timer.c | 3 +- hw/timer/m48t59.c | 3 +- hw/timer/mc146818rtc.c | 101 +- hw/timer/milkymist-sysctl.c | 3 +- hw/timer/pxa2xx_timer.c | 3 - hw/timer/slavio_timer.c | 6 +- hw/timer/tusb6010.c | 3 - hw/timer/twl92230.c | 6 +- hw/timer/xilinx_timer.c | 22 +- hw/tpm/tpm_tis.c | 11 +- hw/tpm/tpm_tis.h | 8 +- hw/tricore/Makefile.objs | 1 + hw/tricore/tricore_testboard.c | 124 + hw/unicore32/puv3.c | 13 +- hw/usb/Makefile.objs | 5 + hw/usb/bus.c | 117 +- hw/usb/ccid-card-emulated.c | 29 +- hw/usb/core.c | 21 + hw/usb/desc-msos.c | 6 +- hw/usb/desc.c | 12 - hw/usb/desc.h | 1 + hw/usb/dev-audio.c | 7 +- hw/usb/dev-bluetooth.c | 6 +- hw/usb/dev-hid.c | 204 +- hw/usb/dev-hub.c | 13 +- hw/usb/dev-mtp.c | 1127 +++ hw/usb/dev-network.c | 20 +- hw/usb/dev-serial.c | 24 +- hw/usb/dev-smartcard-reader.c | 13 +- hw/usb/dev-storage.c | 127 +- hw/usb/dev-uas.c | 17 +- hw/usb/dev-wacom.c | 5 +- hw/usb/hcd-ehci-pci.c | 28 +- hw/usb/hcd-ehci-sysbus.c | 2 +- hw/usb/hcd-ehci.c | 120 +- hw/usb/hcd-ehci.h | 3 + hw/usb/hcd-musb.c | 8 +- hw/usb/hcd-ohci.c | 384 +- hw/usb/hcd-uhci.c | 79 +- hw/usb/hcd-xhci.c | 149 +- hw/usb/host-libusb.c | 198 +- hw/usb/redirect.c | 171 +- hw/virtio/Makefile.objs | 4 +- hw/virtio/dataplane/vring.c | 33 +- hw/virtio/vhost-backend.c | 69 + hw/virtio/vhost-user.c | 351 + hw/virtio/vhost.c | 111 +- hw/virtio/virtio-balloon.c | 90 +- hw/virtio/virtio-mmio.c | 23 +- hw/virtio/virtio-pci.c | 132 +- hw/virtio/virtio-pci.h | 6 +- hw/virtio/virtio-rng.c | 32 +- hw/virtio/virtio.c | 247 +- hw/watchdog/watchdog.c | 31 +- hw/watchdog/wdt_i6300esb.c | 22 +- hw/watchdog/wdt_ib700.c | 10 +- hw/xen/xen_backend.c | 1 - hw/xen/xen_devconfig.c | 1 + hw/xen/xen_pt.c | 20 - hw/xen/xen_pt_msi.c | 2 - hw/xenpv/xen_machine_pv.c | 10 +- hw/xtensa/Makefile.objs | 4 +- hw/xtensa/bootparam.h | 49 + hw/xtensa/pic_cpu.c | 4 +- hw/xtensa/sim.c | 120 + hw/xtensa/xtensa_bootparam.h | 25 - hw/xtensa/xtensa_lx60.c | 360 - hw/xtensa/xtensa_sim.c | 118 - hw/xtensa/xtfpga.c | 448 ++ include/block/accounting.h | 57 + include/block/aio.h | 76 +- include/block/block.h | 227 +- include/block/block_int.h | 176 +- include/block/blockjob.h | 67 +- include/block/coroutine.h | 21 +- include/block/nbd.h | 12 + include/block/qapi.h | 4 - include/block/scsi.h | 2 + include/block/thread-pool.h | 10 +- include/elf.h | 45 +- include/exec/cpu-all.h | 141 +- include/exec/cpu-common.h | 9 + include/exec/cpu-defs.h | 9 +- include/exec/cpu_ldst.h | 400 + include/exec/cpu_ldst_template.h | 193 + include/exec/def-helper.h | 274 - include/exec/exec-all.h | 46 +- include/exec/helper-gen.h | 72 + include/exec/helper-head.h | 134 + include/exec/helper-proto.h | 40 + include/exec/helper-tcg.h | 49 + include/exec/memory.h | 114 +- include/exec/ram_addr.h | 47 +- include/exec/softmmu_exec.h | 164 - include/exec/softmmu_header.h | 213 - include/exec/softmmu_template.h | 525 -- include/fpu/softfloat.h | 4 + include/glib-compat.h | 174 + include/hw/acpi/acpi.h | 5 + include/hw/acpi/acpi_dev_interface.h | 43 + include/hw/acpi/cpu_hotplug.h | 9 +- include/hw/acpi/cpu_hotplug_defs.h | 32 - include/hw/acpi/ich9.h | 8 +- include/hw/acpi/memory_hotplug.h | 38 + include/hw/acpi/pc-hotplug.h | 56 + include/hw/acpi/tpm.h | 29 + include/hw/arm/arm.h | 2 +- include/hw/arm/omap.h | 4 +- include/hw/arm/pxa.h | 2 +- include/hw/block/block.h | 13 +- include/hw/block/flash.h | 6 +- include/hw/boards.h | 81 +- include/hw/compat.h | 35 + include/hw/elf_ops.h | 15 +- include/hw/hotplug.h | 16 +- include/hw/i2c/smbus.h | 18 +- include/hw/i386/apic_internal.h | 1 + include/hw/i386/ich9.h | 2 +- include/hw/i386/intel_iommu.h | 120 + include/hw/i386/pc.h | 158 +- include/hw/i386/smbios.h | 112 +- include/hw/input/hid.h | 4 +- include/hw/irq.h | 5 +- include/hw/isa/pc87312.h | 3 - include/hw/loader.h | 8 +- include/hw/mem/pc-dimm.h | 81 + include/hw/mips/cpudevs.h | 2 + include/hw/misc/vfio.h | 9 + include/hw/net/allwinner_emac.h | 1 + include/hw/nmi.h | 49 + include/hw/nvram/fw_cfg.h | 2 + include/hw/pci-host/pam.h | 2 +- include/hw/pci-host/q35.h | 2 + include/hw/pci-host/spapr.h | 56 +- include/hw/pci/pci.h | 7 + include/hw/pci/pci_ids.h | 1 + include/hw/pci/pcie.h | 13 +- include/hw/pci/pcie_host.h | 1 - include/hw/pci/pcie_regs.h | 2 + include/hw/pci/shpc.h | 4 +- include/hw/pcmcia.h | 6 - include/hw/platform-bus.h | 57 + include/hw/ppc/mac_dbdma.h | 5 + include/hw/ppc/ppc.h | 2 + include/hw/ppc/spapr.h | 106 +- include/hw/ppc/xics.h | 11 +- include/hw/qdev-core.h | 59 +- include/hw/qdev-properties.h | 14 +- include/hw/s390x/adapter.h | 23 + include/hw/s390x/s390_flic.h | 65 +- include/hw/s390x/sclp.h | 22 +- include/hw/scsi/esp.h | 1 + include/hw/scsi/scsi.h | 51 +- include/hw/sd.h | 2 +- include/hw/ssi.h | 2 + include/hw/sysbus.h | 19 +- include/hw/timer/allwinner-a10-pit.h | 13 +- include/hw/tricore/tricore.h | 11 + include/hw/usb.h | 20 +- include/hw/usb/ehci-regs.h | 82 + include/hw/usb/uhci-regs.h | 40 + include/hw/virtio/dataplane/vring.h | 5 +- include/hw/virtio/vhost-backend.h | 40 + include/hw/virtio/vhost.h | 14 +- include/hw/virtio/virtio-access.h | 170 + include/hw/virtio/virtio-blk.h | 57 +- include/hw/virtio/virtio-net.h | 18 +- include/hw/virtio/virtio-scsi.h | 98 +- include/hw/virtio/virtio-serial.h | 2 + include/hw/virtio/virtio.h | 20 +- include/hw/virtio/virtio_ring.h | 167 + include/hw/xen/xen.h | 1 - include/hw/xen/xen_common.h | 15 + include/libdecnumber/dconfig.h | 40 + include/libdecnumber/decContext.h | 257 + include/libdecnumber/decDPD.h | 1214 +++ include/libdecnumber/decNumber.h | 202 + include/libdecnumber/decNumberLocal.h | 665 ++ include/libdecnumber/dpd/decimal128.h | 100 + include/libdecnumber/dpd/decimal128Local.h | 47 + include/libdecnumber/dpd/decimal32.h | 98 + include/libdecnumber/dpd/decimal64.h | 100 + include/migration/migration.h | 4 +- include/migration/qemu-file.h | 32 + include/migration/vmstate.h | 36 +- include/monitor/monitor.h | 48 +- include/net/net.h | 6 +- include/net/vhost-user.h | 17 + include/net/vhost_net.h | 11 +- include/qapi/error.h | 31 +- include/qapi/qmp-event.h | 27 + include/qapi/qmp/dispatch.h | 2 +- include/qapi/qmp/qdict.h | 3 + include/qapi/qmp/qerror.h | 91 - include/qapi/util.h | 17 + include/qapi/visitor-impl.h | 10 +- include/qapi/visitor.h | 7 +- include/qemu-common.h | 34 +- include/qemu/aes.h | 23 + include/qemu/bitmap.h | 19 +- include/qemu/bitops.h | 16 +- include/qemu/bswap.h | 45 +- include/qemu/cache-utils.h | 44 - include/qemu/compiler.h | 6 + include/qemu/config-file.h | 2 + include/qemu/error-report.h | 2 +- include/qemu/int128.h | 9 +- include/qemu/main-loop.h | 2 +- include/qemu/option.h | 53 +- include/qemu/option_int.h | 4 +- include/qemu/osdep.h | 42 +- include/qemu/range.h | 72 + include/qemu/sockets.h | 5 +- include/qemu/throttle.h | 10 + include/qemu/timer.h | 2 + include/qemu/typedefs.h | 5 + include/qom/cpu.h | 36 +- include/qom/object.h | 96 +- include/sysemu/accel.h | 62 + include/sysemu/arch_init.h | 35 +- include/sysemu/balloon.h | 2 - include/sysemu/block-backend.h | 142 + include/sysemu/blockdev.h | 22 +- include/sysemu/char.h | 77 +- include/sysemu/cpus.h | 2 +- include/sysemu/dma.h | 31 +- include/sysemu/dump-arch.h | 28 + include/sysemu/dump.h | 53 +- include/sysemu/hostmem.h | 68 + include/sysemu/kvm.h | 80 +- include/sysemu/os-posix.h | 2 + include/sysemu/os-win32.h | 2 + include/sysemu/qtest.h | 1 - include/sysemu/sysemu.h | 38 +- include/sysemu/tpm.h | 7 + include/trace-tcg.h | 7 + include/trace.h | 1 + include/ui/console.h | 36 +- include/ui/input.h | 10 + include/ui/qemu-pixman.h | 4 + include/ui/spice-display.h | 14 + iohandler.c | 1 + ioport.c | 11 +- iothread.c | 16 +- kvm-all.c | 222 +- kvm-stub.c | 16 +- libcacard/Makefile | 11 +- libcacard/cac.c | 62 +- libcacard/card_7816.c | 28 +- libcacard/event.c | 25 +- libcacard/vcard.c | 43 +- libcacard/vcard_emul.h | 1 + libcacard/vcard_emul_nss.c | 66 +- libcacard/vreader.c | 59 +- libcacard/vscclient.c | 90 +- libdecnumber/decContext.c | 433 ++ libdecnumber/decNumber.c | 8195 ++++++++++++++++++++ libdecnumber/dpd/decimal128.c | 564 ++ libdecnumber/dpd/decimal128Local.h | 42 + libdecnumber/dpd/decimal32.c | 489 ++ libdecnumber/dpd/decimal64.c | 850 ++ linux-headers/asm-arm/kvm.h | 12 +- linux-headers/asm-arm64/kvm.h | 15 +- linux-headers/asm-mips/kvm.h | 35 + linux-headers/asm-mips/kvm_para.h | 6 +- linux-headers/asm-powerpc/kvm.h | 10 +- linux-headers/asm-powerpc/kvm_para.h | 6 + linux-headers/asm-s390/kvm.h | 62 + linux-headers/asm-x86/kvm.h | 3 + linux-headers/linux/kvm.h | 75 +- linux-headers/linux/kvm_para.h | 3 + linux-headers/linux/psci.h | 90 + linux-headers/linux/vfio.h | 43 + linux-user/Makefile.objs | 2 +- linux-user/aarch64/syscall.h | 3 + linux-user/alpha/syscall.h | 3 + linux-user/arm/syscall.h | 5 + linux-user/arm/syscall_nr.h | 2 +- linux-user/cpu-uname.c | 72 - linux-user/cpu-uname.h | 1 - linux-user/cris/syscall.h | 3 + linux-user/elfload.c | 126 +- linux-user/i386/syscall.h | 3 + linux-user/ioctls.h | 5 +- linux-user/m68k/syscall.h | 4 + linux-user/main.c | 113 +- linux-user/microblaze/syscall.h | 3 + linux-user/mips/syscall.h | 3 + linux-user/mips/target_cpu.h | 2 +- linux-user/mips64/syscall.h | 3 + linux-user/openrisc/syscall.h | 4 + linux-user/ppc/syscall.h | 8 + linux-user/ppc/target_cpu.h | 10 + linux-user/qemu.h | 13 +- linux-user/s390x/syscall.h | 3 + linux-user/sh4/syscall.h | 4 + linux-user/signal.c | 1421 ++-- linux-user/socket.h | 5 + linux-user/sparc/syscall.h | 3 + linux-user/sparc64/syscall.h | 3 + linux-user/strace.list | 15 + linux-user/syscall.c | 819 ++- linux-user/syscall_defs.h | 38 +- linux-user/syscall_types.h | 2 +- linux-user/uname.c | 169 + linux-user/uname.h | 10 + linux-user/unicore32/syscall.h | 4 + linux-user/x86_64/syscall.h | 3 + main-loop.c | 35 +- memory.c | 414 +- memory_mapping.c | 3 +- migration-rdma.c | 5 +- migration-tcp.c | 21 +- migration-unix.c | 21 +- migration.c | 16 +- monitor.c | 798 ++- nbd.c | 323 +- net/Makefile.objs | 3 +- net/clients.h | 5 + net/hub.c | 1 + net/l2tpv3.c | 756 ++ net/net.c | 107 +- net/queue.c | 3 + net/slirp.c | 22 +- net/socket.c | 13 +- net/tap.c | 36 +- net/tap_int.h | 3 - net/vhost-user.c | 258 + numa.c | 436 ++ os-posix.c | 107 +- os-win32.c | 5 - page_cache.c | 1 + pc-bios/QEMU,tcx.bin | Bin 1410 -> 1402 bytes pc-bios/README | 7 +- pc-bios/bios-256k.bin | Bin 262144 -> 262144 bytes pc-bios/bios.bin | Bin 131072 -> 131072 bytes pc-bios/efi-e1000.rom | Bin 173568 -> 194560 bytes pc-bios/efi-eepro100.rom | Bin 174592 -> 196096 bytes pc-bios/efi-ne2k_pci.rom | Bin 173056 -> 194560 bytes pc-bios/efi-pcnet.rom | Bin 173056 -> 194560 bytes pc-bios/efi-rtl8139.rom | Bin 176640 -> 198144 bytes pc-bios/efi-virtio.rom | Bin 171008 -> 192000 bytes pc-bios/linuxboot.bin | Bin 1024 -> 1024 bytes pc-bios/openbios-ppc | Bin 734008 -> 746588 bytes pc-bios/openbios-sparc32 | Bin 381512 -> 381512 bytes pc-bios/openbios-sparc64 | Bin 1598376 -> 1616768 bytes pc-bios/optionrom/linuxboot.S | 47 +- pc-bios/optionrom/optionrom.h | 21 +- pc-bios/petalogix-s3adsp1800.dtb | Bin 8259 -> 8259 bytes pc-bios/ppc_rom.bin | Bin 1048576 -> 1048576 bytes pc-bios/qemu_logo.svg | 1010 +++ pc-bios/s390-ccw.img | Bin 9336 -> 17752 bytes pc-bios/s390-ccw/bootmap.c | 536 +- pc-bios/s390-ccw/bootmap.h | 344 + pc-bios/s390-ccw/main.c | 30 +- pc-bios/s390-ccw/s390-ccw.h | 39 +- pc-bios/s390-ccw/sclp-ascii.c | 4 +- pc-bios/s390-ccw/virtio.c | 148 +- pc-bios/s390-ccw/virtio.h | 50 +- pc-bios/slof.bin | Bin 921720 -> 923896 bytes pc-bios/u-boot.e500 | Bin 0 -> 330260 bytes pc-bios/vgabios-cirrus.bin | Bin 37376 -> 37376 bytes pc-bios/vgabios-qxl.bin | Bin 37376 -> 37376 bytes pc-bios/vgabios-stdvga.bin | Bin 37376 -> 37376 bytes pc-bios/vgabios-vmware.bin | Bin 37376 -> 37376 bytes pc-bios/vgabios.bin | Bin 37376 -> 37376 bytes pixman | 2 +- po/Makefile | 13 +- po/de_DE.po | 55 +- po/fr_FR.po | 56 +- po/hu.po | 2 +- po/it.po | 65 +- po/tr.po | 2 +- po/zh_CN.po | 86 + qapi-schema.json | 2127 ++---- qapi/Makefile.objs | 3 +- qapi/block-core.json | 1828 +++++ qapi/block.json | 180 + qapi/common.json | 104 + qapi/event.json | 332 + qapi/opts-visitor.c | 26 +- qapi/qapi-dealloc-visitor.c | 26 + qapi/qapi-util.c | 34 + qapi/qapi-visit-core.c | 266 +- qapi/qmp-dispatch.c | 27 +- qapi/qmp-event.c | 74 + qapi/qmp-input-visitor.c | 8 +- qapi/qmp-output-visitor.c | 6 + qapi/string-input-visitor.c | 207 +- qapi/string-output-visitor.c | 235 +- qapi/trace.json | 65 + qdev-monitor.c | 165 +- qemu-bridge-helper.c | 9 +- qemu-char.c | 1166 ++- qemu-coroutine-io.c | 4 +- qemu-coroutine-sleep.c | 12 - qemu-coroutine.c | 26 +- qemu-doc.texi | 61 +- qemu-file-stdio.c | 194 + qemu-file-unix.c | 223 + qemu-file.c | 896 ++- qemu-img-cmds.hx | 24 +- qemu-img.c | 786 ++- qemu-img.texi | 93 +- qemu-io-cmds.c | 30 +- qemu-io.c | 70 +- qemu-nbd.c | 127 +- qemu-nbd.texi | 2 +- qemu-options.hx | 308 +- qemu-seccomp.c | 12 +- qemu-timer.c | 14 +- qga/channel-posix.c | 2 +- qga/commands-posix.c | 724 ++- qga/commands-win32.c | 170 +- qga/commands.c | 4 +- qga/guest-agent-core.h | 1 + qga/main.c | 8 +- qga/qapi-schema.json | 110 +- qga/vss-win32.c | 6 +- qga/vss-win32.h | 2 +- qmp-commands.hx | 331 +- qmp.c | 220 +- qobject/json-lexer.c | 4 +- qobject/json-parser.c | 17 +- qobject/qdict.c | 32 + qom/cpu.c | 29 +- qom/object.c | 290 +- qtest.c | 79 +- roms/Makefile | 9 + roms/SLOF | 2 +- roms/config.ipxe.general.h | 4 +- roms/ipxe | 2 +- roms/openbios | 2 +- roms/openhackware | 2 +- roms/seabios | 2 +- roms/u-boot | 1 + rules.mak | 293 +- savevm.c | 166 +- scripts/acpi_extract.py | 23 +- scripts/checkpatch.pl | 8 +- scripts/cleanup-trace-events.pl | 2 +- scripts/coverity-model.c | 183 + scripts/get_maintainer.pl | 28 +- scripts/kvm/kvm_stat | 210 +- scripts/kvm/vmxcap | 10 +- scripts/qapi-commands.py | 108 +- scripts/qapi-event.py | 368 + scripts/qapi-types.py | 11 +- scripts/qapi-visit.py | 270 +- scripts/qapi.py | 114 +- scripts/qtest | 5 - scripts/simpletrace.py | 64 +- scripts/tracetool.py | 43 +- scripts/tracetool/__init__.py | 176 +- scripts/tracetool/backend/__init__.py | 76 +- scripts/tracetool/backend/dtrace.py | 81 +- scripts/tracetool/backend/events.py | 23 - scripts/tracetool/backend/ftrace.py | 56 +- scripts/tracetool/backend/simple.py | 132 +- scripts/tracetool/backend/stderr.py | 43 +- scripts/tracetool/backend/ust.py | 65 +- scripts/tracetool/format/__init__.py | 50 +- scripts/tracetool/format/c.py | 16 +- scripts/tracetool/format/d.py | 30 +- scripts/tracetool/format/events_c.py | 15 +- scripts/tracetool/format/events_h.py | 20 +- scripts/tracetool/format/h.py | 30 +- scripts/tracetool/format/simpletrace_stap.py | 71 + scripts/tracetool/format/stap.py | 47 +- scripts/tracetool/format/tcg_h.py | 57 + scripts/tracetool/format/tcg_helper_c.py | 50 + scripts/tracetool/format/tcg_helper_h.py | 50 + scripts/tracetool/format/tcg_helper_wrapper_h.py | 70 + scripts/tracetool/format/ust_events_c.py | 7 +- scripts/tracetool/format/ust_events_h.py | 49 +- scripts/tracetool/transform.py | 166 + scripts/update-linux-headers.sh | 3 +- scripts/vmstate-static-checker.py | 422 + slirp/arp_table.c | 10 +- slirp/misc.c | 33 +- slirp/misc.h | 4 - slirp/slirp.c | 15 +- slirp/slirp.h | 2 - slirp/slirp_config.h | 3 - slirp/tftp.h | 2 +- slirp/udp.c | 2 +- softmmu_template.h | 574 ++ spice-qemu-char.c | 10 +- stubs/Makefile.objs | 14 +- stubs/arch-query-cpu-def.c | 2 +- stubs/bdrv-commit-all.c | 7 + stubs/chr-baum-init.c | 7 + stubs/chr-msmouse.c | 7 + stubs/chr-testdev.c | 7 + stubs/dump.c | 2 +- stubs/fdset-remove-fd.c | 3 +- stubs/get-next-serial.c | 3 + stubs/is-daemonized.c | 9 + stubs/machine-init-done.c | 6 + stubs/mon-print-filename.c | 6 - stubs/mon-protocol-event.c | 6 - stubs/monitor-init.c | 6 + stubs/notify-event.c | 6 + stubs/qemu-chr-open-spice.c | 14 + stubs/qmp_pc_dimm_device_list.c | 7 + stubs/vc-init.c | 7 + stubs/vm-stop.c | 7 +- target-alpha/cpu-qom.h | 3 + target-alpha/cpu.c | 2 + target-alpha/cpu.h | 1 + target-alpha/fpu_helper.c | 9 +- target-alpha/helper.c | 46 +- target-alpha/helper.h | 5 +- target-alpha/int_helper.c | 2 +- target-alpha/machine.c | 2 - target-alpha/mem_helper.c | 29 +- target-alpha/sys_helper.c | 2 +- target-alpha/translate.c | 2372 +++---- target-arm/Makefile.objs | 1 + target-arm/arm_ldst.h | 48 + target-arm/cpu-qom.h | 32 +- target-arm/cpu.c | 235 +- target-arm/cpu.h | 499 +- target-arm/cpu64.c | 135 +- target-arm/crypto_helper.c | 338 +- target-arm/gdbstub64.c | 2 - target-arm/helper-a64.c | 153 +- target-arm/helper-a64.h | 4 +- target-arm/helper.c | 1991 ++++- target-arm/helper.h | 28 +- target-arm/internals.h | 381 + target-arm/iwmmxt_helper.c | 11 +- target-arm/kvm-consts.h | 89 +- target-arm/kvm.c | 11 + target-arm/kvm32.c | 58 +- target-arm/kvm64.c | 92 +- target-arm/kvm_arm.h | 20 + target-arm/machine.c | 27 +- target-arm/neon_helper.c | 32 +- target-arm/op_helper.c | 461 ++- target-arm/psci.c | 242 + target-arm/translate-a64.c | 817 ++- target-arm/translate.c | 1084 ++- target-arm/translate.h | 46 +- target-cris/cpu-qom.h | 1 + target-cris/cpu.c | 2 + target-cris/helper.c | 32 + target-cris/helper.h | 4 - target-cris/op_helper.c | 19 +- target-cris/translate.c | 57 +- target-cris/translate_v10.c | 2 +- target-i386/cc_helper.c | 2 +- target-i386/cpu-qom.h | 12 +- target-i386/cpu.c | 785 ++- target-i386/cpu.h | 188 +- target-i386/excp_helper.c | 2 +- target-i386/fpu_helper.c | 28 +- target-i386/gdbstub.c | 6 +- target-i386/helper.c | 437 +- target-i386/helper.h | 4 - target-i386/int_helper.c | 2 +- target-i386/kvm.c | 207 +- target-i386/kvm_i386.h | 2 + target-i386/machine.c | 158 +- target-i386/mem_helper.c | 25 +- target-i386/misc_helper.c | 49 +- target-i386/ops_sse.h | 32 +- target-i386/seg_helper.c | 257 +- target-i386/smm_helper.c | 52 +- target-i386/svm_helper.c | 20 +- target-i386/translate.c | 60 +- target-lm32/Makefile.objs | 1 + target-lm32/README | 15 +- target-lm32/cpu-qom.h | 1 + target-lm32/cpu.c | 4 +- target-lm32/cpu.h | 3 +- target-lm32/helper.c | 32 +- target-lm32/helper.h | 4 - target-lm32/lm32-semi.c | 215 + target-lm32/machine.c | 6 +- target-lm32/op_helper.c | 16 +- target-lm32/translate.c | 9 +- target-m68k/cpu-qom.h | 4 + target-m68k/cpu.c | 4 + target-m68k/cpu.h | 1 - target-m68k/helper.c | 22 +- target-m68k/helper.h | 4 - target-m68k/op_helper.c | 41 +- target-m68k/translate.c | 9 +- target-microblaze/cpu-qom.h | 1 + target-microblaze/cpu.c | 3 + target-microblaze/helper.c | 16 + target-microblaze/helper.h | 4 - target-microblaze/op_helper.c | 14 +- target-microblaze/translate.c | 21 +- target-mips/Makefile.objs | 3 +- target-mips/cpu-qom.h | 3 + target-mips/cpu.c | 11 + target-mips/cpu.h | 155 +- target-mips/dsp_helper.c | 28 +- target-mips/gdbstub.c | 7 - target-mips/helper.c | 182 +- target-mips/helper.h | 247 +- target-mips/kvm.c | 690 ++ target-mips/kvm_mips.h | 26 + target-mips/lmi_helper.c | 2 +- target-mips/machine.c | 42 +- target-mips/mips-defs.h | 29 +- target-mips/msa_helper.c | 3436 ++++++++ target-mips/op_helper.c | 564 ++- target-mips/translate.c | 6289 ++++++++++++---- target-mips/translate_init.c | 85 +- target-moxie/helper.c | 18 +- target-moxie/helper.h | 4 - target-moxie/machine.c | 3 +- target-moxie/translate.c | 6 +- target-openrisc/cpu.c | 1 + target-openrisc/cpu.h | 1 + target-openrisc/exception_helper.c | 2 +- target-openrisc/fpu_helper.c | 2 +- target-openrisc/helper.h | 4 - target-openrisc/int_helper.c | 2 +- target-openrisc/interrupt.c | 20 + target-openrisc/interrupt_helper.c | 2 +- target-openrisc/machine.c | 2 - target-openrisc/mmu_helper.c | 15 +- target-openrisc/sys_helper.c | 2 +- target-openrisc/translate.c | 13 +- target-ppc/Makefile.objs | 1 + target-ppc/arch_dump.c | 107 +- target-ppc/cpu-models.c | 55 +- target-ppc/cpu-models.h | 23 +- target-ppc/cpu-qom.h | 28 +- target-ppc/cpu.h | 173 +- target-ppc/dfp_helper.c | 1316 ++++ target-ppc/excp_helper.c | 42 +- target-ppc/fpu_helper.c | 11 +- target-ppc/gdbstub.c | 251 +- target-ppc/helper.h | 64 +- target-ppc/int_helper.c | 341 +- target-ppc/kvm.c | 535 ++- target-ppc/kvm_ppc.h | 42 +- target-ppc/machine.c | 79 +- target-ppc/mem_helper.c | 33 +- target-ppc/misc_helper.c | 41 +- target-ppc/mmu-hash32.c | 2 +- target-ppc/mmu-hash64.c | 2 +- target-ppc/mmu_helper.c | 32 +- target-ppc/timebase_helper.c | 2 +- target-ppc/translate.c | 1629 ++-- target-ppc/translate_init.c | 2203 ++++-- target-s390x/Makefile.objs | 2 +- target-s390x/cc_helper.c | 2 +- target-s390x/cpu-qom.h | 7 + target-s390x/cpu.c | 127 +- target-s390x/cpu.h | 172 +- target-s390x/fpu_helper.c | 7 +- target-s390x/gdbstub.c | 109 +- target-s390x/helper.c | 133 +- target-s390x/helper.h | 4 - target-s390x/insn-data.def | 6 +- target-s390x/int_helper.c | 2 +- target-s390x/interrupt.c | 56 +- target-s390x/ioinst.h | 10 + target-s390x/kvm.c | 610 ++- target-s390x/machine.c | 76 + target-s390x/mem_helper.c | 18 +- target-s390x/misc_helper.c | 55 +- target-s390x/translate.c | 25 +- target-sh4/cpu-qom.h | 1 + target-sh4/cpu.c | 1 + target-sh4/helper.c | 9 + target-sh4/helper.h | 4 - target-sh4/op_helper.c | 18 +- target-sh4/translate.c | 9 +- target-sparc/cc_helper.c | 2 +- target-sparc/cpu-qom.h | 3 + target-sparc/cpu.c | 22 + target-sparc/cpu.h | 2 + target-sparc/fop_helper.c | 2 +- target-sparc/helper.c | 2 +- target-sparc/helper.h | 4 - target-sparc/int64_helper.c | 2 +- target-sparc/ldst_helper.c | 49 +- target-sparc/translate.c | 9 +- target-sparc/vis_helper.c | 2 +- target-sparc/win_helper.c | 2 +- target-tricore/Makefile.objs | 1 + target-tricore/cpu-qom.h | 70 + target-tricore/cpu.c | 191 + target-tricore/cpu.h | 403 + target-tricore/helper.c | 140 + target-tricore/helper.h | 32 + target-tricore/op_helper.c | 468 ++ target-tricore/translate.c | 2568 ++++++ target-tricore/tricore-defs.h | 28 + target-tricore/tricore-opcodes.h | 1408 ++++ target-unicore32/cpu-qom.h | 1 + target-unicore32/cpu.c | 1 + target-unicore32/helper.c | 17 +- target-unicore32/helper.h | 3 - target-unicore32/op_helper.c | 19 +- target-unicore32/translate.c | 37 +- target-unicore32/ucf64_helper.c | 24 +- target-xtensa/core-dc232b.c | 2 +- target-xtensa/core-dc233c.c | 2 +- target-xtensa/core-fsf.c | 2 +- target-xtensa/cpu-qom.h | 3 + target-xtensa/cpu.c | 5 +- target-xtensa/cpu.h | 10 +- target-xtensa/helper.c | 15 +- target-xtensa/helper.h | 4 - target-xtensa/import_core.sh | 53 + target-xtensa/op_helper.c | 36 +- target-xtensa/overlay_tool.h | 32 +- target-xtensa/translate.c | 9 +- target-xtensa/xtensa-semi.c | 2 +- tcg-runtime.c | 40 +- tcg/README | 23 +- tcg/aarch64/tcg-target.c | 1279 ++-- tcg/aarch64/tcg-target.h | 37 +- tcg/arm/tcg-target.c | 204 +- tcg/arm/tcg-target.h | 5 +- tcg/i386/tcg-target.c | 128 +- tcg/i386/tcg-target.h | 5 +- tcg/ia64/tcg-target.c | 721 +- tcg/ia64/tcg-target.h | 9 +- tcg/mips/tcg-target.c | 1950 +++--- tcg/mips/tcg-target.h | 20 +- tcg/optimize.c | 380 +- tcg/ppc/tcg-target.c | 3257 +++++--- tcg/ppc/tcg-target.h | 117 +- tcg/ppc64/tcg-target.c | 2210 ------ tcg/ppc64/tcg-target.h | 132 - tcg/s390/tcg-target.c | 889 ++- tcg/s390/tcg-target.h | 5 +- tcg/sparc/tcg-target.c | 1114 ++-- tcg/sparc/tcg-target.h | 34 +- tcg/tcg-be-ldst.h | 9 +- tcg/tcg-op.h | 283 +- tcg/tcg-opc.h | 124 +- tcg/tcg-runtime.h | 30 +- tcg/tcg.c | 565 +- tcg/tcg.h | 200 +- tcg/tci/tcg-target.c | 131 +- tcg/tci/tcg-target.h | 12 +- tci.c | 343 +- tests/.gitignore | 15 +- tests/Makefile | 136 +- tests/ac97-test.c | 33 + tests/acpi-test-data/pc/DSDT | Bin 4480 -> 3592 bytes tests/acpi-test-data/pc/SSDT | Bin 2269 -> 2279 bytes tests/acpi-test-data/q35/DSDT | Bin 7378 -> 8182 bytes tests/acpi-test-data/q35/SSDT | Bin 550 -> 560 bytes tests/acpi-test-data/rebuild-expected-aml.sh | 6 +- tests/acpi-test.c | 674 -- tests/ahci-test.c | 1561 ++++ tests/bios-tables-test.c | 807 ++ tests/blockdev-test.c | 59 - tests/check-qdict.c | 87 + tests/check-qjson.c | 7 + tests/display-vga-test.c | 52 + tests/drive_del-test.c | 137 + tests/e1000-test.c | 33 +- tests/es1370-test.c | 33 + tests/fdc-test.c | 4 +- tests/ide-test.c | 101 +- tests/image-fuzzer/qcow2/__init__.py | 1 + tests/image-fuzzer/qcow2/fuzz.py | 367 + tests/image-fuzzer/qcow2/layout.py | 612 ++ tests/image-fuzzer/runner.py | 437 ++ tests/intel-hda-test.c | 45 + tests/ioh3420-test.c | 34 + tests/libqos/malloc-pc.c | 283 +- tests/libqos/malloc-pc.h | 9 + tests/libqos/malloc.h | 2 +- tests/libqos/pci-pc.c | 73 +- tests/libqos/pci-pc.h | 1 + tests/libqos/pci.c | 123 +- tests/libqos/pci.h | 17 +- tests/libqos/usb.c | 71 + tests/libqos/usb.h | 17 + tests/libqos/virtio-pci.c | 343 + tests/libqos/virtio-pci.h | 61 + tests/libqos/virtio.c | 281 + tests/libqos/virtio.h | 187 + tests/libqtest.c | 128 +- tests/libqtest.h | 32 + tests/qapi-schema/duplicate-key.err | 2 +- tests/qapi-schema/event-nest-struct.err | 1 + tests/qapi-schema/event-nest-struct.exit | 1 + tests/qapi-schema/event-nest-struct.json | 2 + .../qapi-schema/flat-union-invalid-branch-key.err | 2 +- .../flat-union-invalid-discriminator.err | 2 +- tests/qapi-schema/flat-union-no-base.err | 2 +- .../flat-union-string-discriminator.err | 2 +- tests/qapi-schema/funny-char.err | 2 +- tests/qapi-schema/include-before-err.err | 1 + tests/qapi-schema/include-before-err.exit | 1 + tests/qapi-schema/include-before-err.json | 2 + tests/qapi-schema/include-cycle-b.json | 1 + tests/qapi-schema/include-cycle-c.json | 1 + tests/qapi-schema/include-cycle.err | 3 + tests/qapi-schema/include-cycle.exit | 1 + tests/qapi-schema/include-cycle.json | 1 + tests/qapi-schema/include-format-err.err | 1 + tests/qapi-schema/include-format-err.exit | 1 + tests/qapi-schema/include-format-err.json | 2 + tests/qapi-schema/include-nested-err.err | 2 + tests/qapi-schema/include-nested-err.exit | 1 + tests/qapi-schema/include-nested-err.json | 1 + tests/qapi-schema/include-no-file.err | 1 + tests/qapi-schema/include-no-file.exit | 1 + tests/qapi-schema/include-no-file.json | 1 + tests/qapi-schema/include-non-file.err | 1 + tests/qapi-schema/include-non-file.exit | 1 + tests/qapi-schema/include-non-file.json | 1 + tests/qapi-schema/include-relpath-sub.json | 2 + tests/qapi-schema/include-relpath.exit | 1 + tests/qapi-schema/include-relpath.json | 1 + tests/qapi-schema/include-relpath.out | 3 + tests/qapi-schema/include-repetition-sub.json | 2 + tests/qapi-schema/include-repetition.exit | 1 + tests/qapi-schema/include-repetition.json | 3 + tests/qapi-schema/include-repetition.out | 3 + tests/qapi-schema/include-self-cycle.err | 1 + tests/qapi-schema/include-self-cycle.exit | 1 + tests/qapi-schema/include-self-cycle.json | 1 + tests/qapi-schema/include-simple-sub.json | 2 + tests/qapi-schema/include-simple.exit | 1 + tests/qapi-schema/include-simple.json | 1 + tests/qapi-schema/include-simple.out | 3 + tests/qapi-schema/include/relpath.json | 1 + tests/qapi-schema/missing-colon.err | 2 +- tests/qapi-schema/missing-comma-list.err | 2 +- tests/qapi-schema/missing-comma-object.err | 2 +- tests/qapi-schema/non-objects.err | 2 +- tests/qapi-schema/qapi-schema-test.json | 22 + tests/qapi-schema/qapi-schema-test.out | 13 +- tests/qapi-schema/quoted-structural-chars.err | 2 +- tests/qapi-schema/test-qapi.py | 6 +- tests/qapi-schema/trailing-comma-list.err | 2 +- tests/qapi-schema/trailing-comma-object.err | 2 +- tests/qapi-schema/unclosed-list.err | 2 +- tests/qapi-schema/unclosed-object.err | 2 +- tests/qapi-schema/unclosed-string.err | 2 +- tests/qapi-schema/union-invalid-base.err | 2 +- tests/qdev-monitor-test.c | 77 - tests/qemu-iotests-quick.sh | 14 +- tests/qemu-iotests/019 | 2 +- tests/qemu-iotests/025 | 2 +- tests/qemu-iotests/028 | 30 +- tests/qemu-iotests/028.out | 268 + tests/qemu-iotests/030 | 52 +- tests/qemu-iotests/031 | 8 +- tests/qemu-iotests/036 | 58 +- tests/qemu-iotests/036.out | 35 + tests/qemu-iotests/039 | 38 +- tests/qemu-iotests/039.out | 13 +- tests/qemu-iotests/040 | 4 +- tests/qemu-iotests/041 | 238 +- tests/qemu-iotests/041.out | 4 +- tests/qemu-iotests/049.out | 4 +- tests/qemu-iotests/051 | 33 + tests/qemu-iotests/051.out | 71 +- tests/qemu-iotests/052 | 5 +- tests/qemu-iotests/054 | 2 +- tests/qemu-iotests/056 | 9 +- tests/qemu-iotests/059 | 11 + tests/qemu-iotests/059.out | 210 +- tests/qemu-iotests/060 | 84 +- tests/qemu-iotests/060.out | 86 +- tests/qemu-iotests/061 | 49 +- tests/qemu-iotests/061.out | 50 +- tests/qemu-iotests/065 | 14 +- tests/qemu-iotests/067.out | 10 +- tests/qemu-iotests/069 | 2 +- tests/qemu-iotests/070 | 7 + tests/qemu-iotests/070.out | 6 + tests/qemu-iotests/072 | 2 +- tests/qemu-iotests/075 | 2 +- tests/qemu-iotests/076 | 17 +- tests/qemu-iotests/076.out | 12 +- tests/qemu-iotests/078 | 2 +- tests/qemu-iotests/079 | 2 +- tests/qemu-iotests/080 | 2 +- tests/qemu-iotests/081 | 17 +- tests/qemu-iotests/081.out | 12 +- tests/qemu-iotests/082 | 14 +- tests/qemu-iotests/082.out | 140 +- tests/qemu-iotests/083 | 10 +- tests/qemu-iotests/084 | 32 +- tests/qemu-iotests/084.out | 24 +- tests/qemu-iotests/085 | 73 +- tests/qemu-iotests/086 | 10 +- tests/qemu-iotests/087 | 102 + tests/qemu-iotests/087.out | 31 + tests/qemu-iotests/088 | 2 +- tests/qemu-iotests/089 | 129 + tests/qemu-iotests/089.out | 52 + tests/qemu-iotests/090 | 61 + tests/qemu-iotests/090.out | 12 + tests/qemu-iotests/091 | 107 + tests/qemu-iotests/091.out | 28 + tests/qemu-iotests/092 | 2 +- tests/qemu-iotests/095 | 86 + tests/qemu-iotests/095.out | 23 + tests/qemu-iotests/097 | 122 + tests/qemu-iotests/097.out | 119 + tests/qemu-iotests/098 | 82 + tests/qemu-iotests/098.out | 52 + tests/qemu-iotests/099 | 116 + tests/qemu-iotests/099.out | 20 + tests/qemu-iotests/100 | 134 + tests/qemu-iotests/100.out | 89 + tests/qemu-iotests/101 | 58 + tests/qemu-iotests/101.out | 10 + tests/qemu-iotests/102 | 81 + tests/qemu-iotests/102.out | 21 + tests/qemu-iotests/103 | 99 + tests/qemu-iotests/103.out | 29 + tests/qemu-iotests/104 | 57 + tests/qemu-iotests/104.out | 12 + tests/qemu-iotests/105 | 70 + tests/qemu-iotests/105.out | 21 + tests/qemu-iotests/107 | 61 + tests/qemu-iotests/107.out | 10 + tests/qemu-iotests/108 | 141 + tests/qemu-iotests/108.out | 110 + tests/qemu-iotests/111 | 53 + tests/qemu-iotests/111.out | 3 + tests/qemu-iotests/check | 110 +- tests/qemu-iotests/common | 33 +- tests/qemu-iotests/common.config | 2 +- tests/qemu-iotests/common.filter | 51 + tests/qemu-iotests/common.qemu | 200 + tests/qemu-iotests/common.rc | 36 +- tests/qemu-iotests/group | 70 +- tests/qemu-iotests/iotests.py | 9 +- tests/qemu-iotests/qcow2.py | 15 +- .../qemu-iotests/sample_images/fake.parallels.bz2 | Bin 141 -> 0 bytes .../sample_images/iotest-version3.vmdk.bz2 | Bin 414 -> 4764 bytes tests/qemu-iotests/sample_images/parallels-v1.bz2 | Bin 0 -> 147 bytes tests/qemu-iotests/sample_images/parallels-v2.bz2 | Bin 0 -> 150 bytes .../sample_images/test-disk2vhd.vhdx.bz2 | Bin 0 -> 1424 bytes tests/qemu-iotests/socket_scm_helper.c | 2 +- tests/qom-test.c | 21 +- tests/tcg/Makefile | 2 - tests/tcg/lm32/Makefile | 15 +- tests/tcg/lm32/crt.S | 4 +- tests/tcg/lm32/helper.S | 65 + tests/tcg/lm32/macros.inc | 37 +- tests/tcg/lm32/test_lb.S | 4 + tests/tcg/lm32/test_lbu.S | 4 + tests/tcg/lm32/test_lh.S | 4 + tests/tcg/lm32/test_lhu.S | 4 + tests/tcg/lm32/test_lw.S | 2 + tests/tcg/lm32/test_sb.S | 2 + tests/tcg/lm32/test_scall.S | 4 + tests/tcg/lm32/test_sh.S | 2 + tests/tcg/lm32/test_sw.S | 3 + tests/tcg/test_path.c | 7 - tests/tcg/xtensa/Makefile | 10 +- tests/tcg/xtensa/linker.ld | 112 - tests/tcg/xtensa/linker.ld.S | 130 + tests/tcg/xtensa/test_mmu.S | 246 +- tests/tcg/xtensa/test_windowed.S | 51 + tests/test-aio.c | 98 +- tests/test-bitops.c | 1 + tests/test-coroutine.c | 54 + tests/test-qdev-global-props.c | 157 +- tests/test-qemu-opts.c | 441 ++ tests/test-qmp-event.c | 271 + tests/test-qmp-input-strict.c | 117 +- tests/test-qmp-input-visitor.c | 99 +- tests/test-qmp-output-visitor.c | 111 +- tests/test-string-input-visitor.c | 87 +- tests/test-string-output-visitor.c | 178 +- tests/test-thread-pool.c | 52 +- tests/test-throttle.c | 63 +- tests/test-visitor-serialization.c | 32 +- tests/test-vmstate.c | 372 +- tests/tmp105-test.c | 4 +- tests/usb-hcd-ehci-test.c | 173 + tests/usb-hcd-ohci-test.c | 41 + tests/usb-hcd-uhci-test.c | 96 + tests/usb-hcd-xhci-test.c | 99 + tests/vhost-user-test.c | 421 + tests/virtio-blk-test.c | 664 ++- tests/virtio-net-test.c | 10 + tests/virtio-rng-test.c | 10 + tests/virtio-scsi-test.c | 29 + tests/virtio-serial-test.c | 27 + tests/vmstate-static-checker-data/dump1.json | 1163 +++ tests/vmstate-static-checker-data/dump2.json | 968 +++ tests/wdt_ib700-test.c | 134 + thread-pool.c | 69 +- trace-events | 277 +- trace/Makefile.objs | 89 +- trace/control-internal.h | 4 +- trace/control.c | 73 +- trace/control.h | 34 +- trace/default.c | 40 - trace/ftrace.c | 25 +- trace/ftrace.h | 5 + trace/qmp.c | 75 + trace/simple.c | 77 +- trace/simple.h | 1 + trace/stderr.c | 30 - translate-all.c | 159 +- ui/Makefile.objs | 10 +- ui/cocoa.m | 110 +- ui/console.c | 555 +- ui/curses.c | 10 + ui/gtk.c | 1396 +++-- ui/input-keymap.c | 198 + ui/input-legacy.c | 242 +- ui/input.c | 204 +- ui/qemu-pixman.c | 90 + ui/sdl.c | 5 +- ui/sdl2-keymap.h | 7 +- ui/sdl2.c | 141 +- ui/spice-core.c | 101 +- ui/spice-display.c | 149 +- ui/vnc-enc-tight.c | 20 +- ui/vnc-tls.c | 6 +- ui/vnc.c | 387 +- ui/vnc.h | 19 +- user-exec.c | 28 +- util/Makefile.objs | 4 +- util/acl.c | 10 +- util/aes.c | 343 + util/cache-utils.c | 86 - util/cutils.c | 13 +- util/error.c | 18 +- util/fifo8.c | 3 +- util/getauxval.c | 59 +- util/hbitmap.c | 9 +- util/host-utils.c | 2 - util/id.c | 28 + util/iov.c | 44 +- util/module.c | 9 +- util/osdep.c | 21 +- util/oslib-posix.c | 97 +- util/oslib-win32.c | 240 +- util/path.c | 10 +- util/qemu-config.c | 20 +- util/qemu-error.c | 27 +- util/qemu-openpty.c | 2 + util/qemu-option.c | 646 +- util/qemu-sockets.c | 105 +- util/readline.c | 26 +- util/throttle.c | 27 +- vl.c | 1075 ++-- vmstate.c | 33 +- xbzrle.c | 8 +- xen-common-stub.c | 6 - xen-common.c | 25 +- xen-hvm.c | 142 +- 1657 files changed, 142979 insertions(+), 50916 deletions(-) diff --git a/.gitignore b/.gitignore index de90463..e32a584 100644 --- a/.gitignore +++ b/.gitignore @@ -4,12 +4,17 @@ /config-host.* /config-target.* /config.status +/config-temp /trace/generated-tracers.h /trace/generated-tracers.c /trace/generated-tracers-dtrace.h /trace/generated-tracers.dtrace /trace/generated-events.h /trace/generated-events.c +/trace/generated-helpers-wrappers.h +/trace/generated-helpers.h +/trace/generated-helpers.c +/trace/generated-tcg-tracers.h /trace/generated-ust-provider.h /trace/generated-ust.c /libcacard/trace/generated-tracers.c @@ -18,13 +23,14 @@ /*-darwin-user /*-linux-user /*-bsd-user -libdis* -libuser +/libdis* +/libuser /linux-headers/asm /qga/qapi-generated /qapi-generated /qapi-types.[ch] /qapi-visit.[ch] +/qapi-event.[ch] /qmp-commands.h /qmp-marshal.c /qemu-doc.html @@ -49,19 +55,9 @@ libuser /qemu-monitor.texi /qmp-commands.txt /vscclient -/test-bitops -/test-coroutine -/test-int128 -/test-opts-visitor -/test-qmp-input-visitor -/test-qmp-output-visitor -/test-string-input-visitor -/test-string-output-visitor -/test-visitor-serialization /fsdev/virtfs-proxy-helper /fsdev/virtfs-proxy-helper.1 /fsdev/virtfs-proxy-helper.pod -/.gdbinit *.a *.aux *.cp @@ -90,12 +86,8 @@ libuser *.pc .libs .sdk -*.swp -*.orig -.pc *.gcda *.gcno -patches /pc-bios/bios-pq/status /pc-bios/vgabios-pq/status /pc-bios/optionrom/linuxboot.asm diff --git a/.gitmodules b/.gitmodules index 444c24a..9da9ede 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "dtc"] path =3D dtc url =3D git://git.qemu-project.org/dtc.git +[submodule "roms/u-boot"] + path =3D roms/u-boot + url =3D git://git.qemu-project.org/u-boot.git diff --git a/.travis.yml b/.travis.yml index 04da973..ad66e5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ notifications: on_failure: always env: global: - - TEST_CMD=3D"make check" + - TEST_CMD=3D"" - EXTRA_CONFIG=3D"" # Development packages, EXTRA_PKGS saved for additional builds - CORE_PKGS=3D"libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev" @@ -20,31 +20,51 @@ env: - GUI_PKGS=3D"libgtk-3-dev libvte-2.90-dev libsdl1.2-dev libpng12-dev libpixman-1-dev" - EXTRA_PKGS=3D"" matrix: + # Group major targets together with their linux-user counterparts - TARGETS=3Dalpha-softmmu,alpha-linux-user - - TARGETS=3Darm-softmmu,arm-linux-user - - TARGETS=3Daarch64-softmmu,aarch64-linux-user - - TARGETS=3Dcris-softmmu - - TARGETS=3Di386-softmmu,x86_64-softmmu - - TARGETS=3Dlm32-softmmu - - TARGETS=3Dm68k-softmmu - - TARGETS=3Dmicroblaze-softmmu,microblazeel-softmmu + - TARGETS=3Darm-softmmu,arm-linux-user,armeb-linux-user,aarch64-softmmu,aarch64-linux-user + - TARGETS=3Dcris-softmmu,cris-linux-user + - TARGETS=3Di386-softmmu,i386-linux-user,x86_64-softmmu,x86_64-linux-user + - TARGETS=3Dm68k-softmmu,m68k-linux-user + - TARGETS=3Dmicroblaze-softmmu,microblazeel-softmmu,microblaze-linux-user,microblazeel-linux-user - TARGETS=3Dmips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu - - TARGETS=3Dmoxie-softmmu - - TARGETS=3Dor32-softmmu, - - TARGETS=3Dppc-softmmu,ppc64-softmmu,ppcemb-softmmu - - TARGETS=3Ds390x-softmmu - - TARGETS=3Dsh4-softmmu,sh4eb-softmmu - - TARGETS=3Dsparc-softmmu,sparc64-softmmu - - TARGETS=3Dunicore32-softmmu - - TARGETS=3Dxtensa-softmmu,xtensaeb-softmmu + - TARGETS=3Dmips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,mipsn32-linux-user,mipsn32el-linux-user + - TARGETS=3Dor32-softmmu,or32-linux-user + - TARGETS=3Dppc-softmmu,ppc64-softmmu,ppcemb-softmmu,ppc-linux-user,ppc64-linux-user,ppc64abi32-linux-user,ppc64le-linux-user + - TARGETS=3Ds390x-softmmu,s390x-linux-user + - TARGETS=3Dsh4-softmmu,sh4eb-softmmu,sh4-linux-user sh4eb-linux-user + - TARGETS=3Dsparc-softmmu,sparc64-softmmu,sparc-linux-user,sparc32plus-linux-user,sparc64-linux-user + - TARGETS=3Dunicore32-softmmu,unicore32-linux-user + # Group remaining softmmu only targets into one build + - TARGETS=3Dlm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,xtensaeb-softmmu +git: + # we want to do this ourselves + submodules: false before_install: + - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ - git submodule update --init --recursive - sudo apt-get update -qq - sudo apt-get install -qq ${CORE_PKGS} ${NET_PKGS} ${GUI_PKGS} ${EXTRA_PKGS} -script: "./configure --target-list=3D${TARGETS} ${EXTRA_CONFIG} && make && ${TEST_CMD}" +before_script: + - ./configure --target-list=3D${TARGETS} --enable-debug-tcg ${EXTRA_CONFIG} +script: + - make -j2 && ${TEST_CMD} matrix: # We manually include a number of additional build for non-standard bits include: + # Make check target (we only do this once) + - env: + - TARGETS=3Dalpha-softmmu,arm-softmmu,aarch64-softmmu,cris-softmmu, + i386-softmmu,x86_64-softmmu,m68k-softmmu,microblaze-softmmu, + microblazeel-softmmu,mips-softmmu,mips64-softmmu, + mips64el-softmmu,mipsel-softmmu,or32-softmmu,ppc-softmmu, + ppc64-softmmu,ppcemb-softmmu,s390x-softmmu,sh4-softmmu, + sh4eb-softmmu,sparc-softmmu,sparc64-softmmu, + unicore32-softmmu,unicore32-linux-user, + lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu, + xtensaeb-softmmu + TEST_CMD=3D"make check" + compiler: gcc # Debug related options - env: TARGETS=3Di386-softmmu,x86_64-softmmu EXTRA_CONFIG=3D"--enable-debug" @@ -66,16 +86,15 @@ matrix: compiler: gcc # All the trace backends (apart from dtrace) - env: TARGETS=3Di386-softmmu,x86_64-softmmu - EXTRA_CONFIG=3D"--enable-trace-backend=3Dstderr" + EXTRA_CONFIG=3D"--enable-trace-backends=3Dstderr" compiler: gcc - env: TARGETS=3Di386-softmmu,x86_64-softmmu - EXTRA_CONFIG=3D"--enable-trace-backend=3Dsimple" + EXTRA_CONFIG=3D"--enable-trace-backends=3Dsimple" compiler: gcc - env: TARGETS=3Di386-softmmu,x86_64-softmmu - EXTRA_CONFIG=3D"--enable-trace-backend=3Dftrace" - TEST_CMD=3D"" + EXTRA_CONFIG=3D"--enable-trace-backends=3Dftrace" compiler: gcc - env: TARGETS=3Di386-softmmu,x86_64-softmmu EXTRA_PKGS=3D"liblttng-ust-dev liburcu-dev" - EXTRA_CONFIG=3D"--enable-trace-backend=3Dust" + EXTRA_CONFIG=3D"--enable-trace-backends=3Dust" compiler: gcc diff --git a/CODING_STYLE b/CODING_STYLE index 4280945..d46cfa5 100644 --- a/CODING_STYLE +++ b/CODING_STYLE @@ -91,3 +91,17 @@ Mixed declarations (interleaving statements and declarations within blocks) are not allowed; declarations should be at the beginning of blocks. In other words, the code should not generate warnings if using GCC's -Wdeclaration-after-statement option. + +6. Conditional statements + +When comparing a variable for (in)equality with a constant, list the +constant on the right, as in: + +if (a =3D=3D 1) { + /* Reads like: "If a equals 1" */ + do_something(); +} + +Rationale: Yoda conditions (as in 'if (1 =3D=3D a)') are awkward to read. +Besides, good compilers already warn users when '=3D=3D' is mis-typed as '=3D', +even when the constant is on the right. diff --git a/MAINTAINERS b/MAINTAINERS index c66946f..bcb69e8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -51,14 +51,34 @@ Descriptions of section entries: General Project Administration ------------------------------ M: Anthony Liguori +M: Peter Maydell + +Responsible Disclosure, Reporting Security Issues +------------------------------ +W: http://wiki.qemu.org/SecurityProcess +M: Michael S. Tsirkin +M: Anthony Liguori +L: secalert@redhat.com Guest CPU cores (TCG): ---------------------- +Overall +L: qemu-devel@nongnu.org +S: Odd fixes +F: cpu-exec.c +F: cputlb.c +F: softmmu_template.h +F: translate-all.c +F: include/exec/cpu_ldst.h +F: include/exec/cpu_ldst_template.h +F: include/exec/helper*.h + Alpha M: Richard Henderson S: Maintained F: target-alpha/ F: hw/alpha/ +F: tests/tcg/alpha/ ARM M: Peter Maydell @@ -72,6 +92,7 @@ M: Edgar E. Iglesias S: Maintained F: target-cris/ F: hw/cris/ +F: tests/tcg/cris/ LM32 M: Michael Walle @@ -79,6 +100,7 @@ S: Maintained F: target-lm32/ F: hw/lm32/ F: hw/char/lm32_* +F: tests/tcg/lm32/ M68K S: Orphan @@ -93,9 +115,11 @@ F: hw/microblaze/ MIPS M: Aurelien Jarno -S: Odd Fixes +M: Leon Alrae +S: Maintained F: target-mips/ F: hw/mips/ +F: tests/tcg/mips/ Moxie M: Anthony Green @@ -107,6 +131,7 @@ M: Jia Liu S: Maintained F: target-openrisc/ F: hw/openrisc/ +F: tests/tcg/openrisc/ PowerPC M: Alexander Graf @@ -142,7 +167,8 @@ F: target-unicore32/ F: hw/unicore32/ X86 -M: qemu-devel@nongnu.org +M: Paolo Bonzini +M: Richard Henderson S: Odd Fixes F: target-i386/ F: hw/i386/ @@ -153,6 +179,13 @@ W: http://wiki.osll.spb.ru/doku.php=3Fid=3Detc:users:jcmvbkbc:qemu-target-xtensa S: Maintained F: target-xtensa/ F: hw/xtensa/ +F: tests/tcg/xtensa/ + +TriCore +M: Bastian Koppelmann +S: Maintained +F: target-tricore/ +F: hw/tricore/ Guest CPU Cores (KVM): ---------------------- @@ -169,6 +202,11 @@ M: Peter Maydell S: Maintained F: target-arm/kvm.c +MIPS +M: James Hogan +S: Maintained +F: target-mips/kvm.c + PPC M: Alexander Graf S: Maintained @@ -180,9 +218,12 @@ M: Cornelia Huck M: Alexander Graf S: Maintained F: target-s390x/kvm.c -F: hw/intc/s390_flic.[hc] +F: hw/intc/s390_flic.c +F: hw/intc/s390_flic_kvm.c +F: include/hw/s390x/s390_flic.h X86 +M: Paolo Bonzini M: Marcelo Tosatti L: kvm@vger.kernel.org S: Supported @@ -236,8 +277,8 @@ S: Maintained F: hw/*/exynos* Calxeda Highbank -M: Mark Langsdorf -S: Supported +M: Rob Herring +S: Maintained F: hw/arm/highbank.c F: hw/net/xgmac.c @@ -248,7 +289,7 @@ F: include/hw/arm/digic.h F: hw/*/digic* Gumstix -M: qemu-devel@nongnu.org +L: qemu-devel@nongnu.org S: Orphan F: hw/arm/gumstix.c @@ -264,7 +305,7 @@ S: Maintained F: hw/arm/integratorcp.c Mainstone -M: qemu-devel@nongnu.org +L: qemu-devel@nongnu.org S: Orphan F: hw/arm/mainstone.c @@ -370,7 +411,7 @@ S: Maintained F: hw/mips/mips_malta.c Mipssim -M: qemu-devel@nongnu.org +L: qemu-devel@nongnu.org S: Orphan F: hw/mips/mips_mipssim.c @@ -503,6 +544,8 @@ F: hw/s390x/s390-virtio-ccw.c F: hw/s390x/css.[hc] F: hw/s390x/sclp*.[hc] F: hw/s390x/ipl*.[hc] +F: include/hw/s390x/ +F: pc-bios/s390-ccw/ T: git git://github.com/cohuck/qemu virtio-ccw-upstr UniCore32 Machines @@ -540,17 +583,19 @@ Xtensa Machines sim M: Max Filippov S: Maintained -F: hw/xtensa/xtensa_sim.c +F: hw/xtensa/sim.c -Avnet LX60 +XTFPGA (LX60, LX200, ML605, KC705) M: Max Filippov S: Maintained -F: hw/xtensa/xtensa_lx60.c +F: hw/xtensa/xtfpga.c +F: hw/net/opencores_eth.c Devices ------- IDE M: Kevin Wolf +M: Stefan Hajnoczi S: Odd Fixes F: include/hw/ide.h F: hw/ide/ @@ -601,6 +646,13 @@ USB M: Gerd Hoffmann S: Maintained F: hw/usb/* +F: tests/usb-*-test.c + +USB (serial adapter) +M: Gerd Hoffmann +M: Samuel Thibault +S: Maintained +F: hw/usb/dev-serial.c VFIO M: Alex Williamson @@ -651,6 +703,12 @@ S: Supported F: hw/block/nvme* F: tests/nvme-test.c +megasas +M: Hannes Reinecke +S: Supported +F: hw/scsi/megasas.c +F: hw/scsi/mfi.h + Xilinx EDK M: Peter Crosthwaite M: Edgar E. Iglesias @@ -658,6 +716,12 @@ S: Maintained F: hw/*/xilinx_* F: include/hw/xilinx.h +Vmware +M: Dmitry Fleytman +S: Maintained +F: hw/net/vmxnet* +F: hw/scsi/vmw_pvscsi* + Subsystems ---------- Audio @@ -666,21 +730,38 @@ M: Gerd Hoffmann S: Maintained F: audio/ F: hw/audio/ +F: tests/ac97-test.c +F: tests/es1370-test.c +F: tests/intel-hda-test.c Block M: Kevin Wolf M: Stefan Hajnoczi S: Supported +F: async.c +F: aio-*.c F: block* F: block/ F: hw/block/ +F: qemu-img* +F: qemu-io* +F: tests/image-fuzzer/ +F: tests/qemu-iotests/ T: git git://repo.or.cz/qemu/kevin.git block T: git git://github.com/stefanha/qemu.git block Character Devices M: Anthony Liguori +M: Paolo Bonzini S: Maintained F: qemu-char.c +F: backends/msmouse.c +F: backends/testdev.c + +Character Devices (Braille) +M: Samuel Thibault +S: Maintained +F: backends/baum.c CPU M: Andreas F=C3=A4rber @@ -702,11 +783,21 @@ S: Maintained F: device_tree.[ch] GDB stub -M: qemu-devel@nongnu.org +L: qemu-devel@nongnu.org S: Odd Fixes F: gdbstub* F: gdb-xml/ +Memory API +M: Paolo Bonzini +S: Supported +F: include/exec/ioport.h +F: ioport.c +F: include/exec/memory.h +F: memory.c +F: include/exec/memory-internal.h +F: exec.c + SPICE M: Gerd Hoffmann S: Supported @@ -729,7 +820,11 @@ F: ui/cocoa.m Main loop M: Anthony Liguori -S: Supported +M: Paolo Bonzini +S: Maintained +F: cpus.c +F: main-loop.c +F: qemu-timer.c F: vl.c Human Monitor (HMP) @@ -768,6 +863,7 @@ M: Luiz Capitulino M: Michael Roth S: Maintained F: qapi/ +F: tests/qapi-schema/ T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp QAPI Schema @@ -778,6 +874,29 @@ S: Supported F: qapi-schema.json T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp +QObject +M: Luiz Capitulino +S: Maintained +F: qobject/ +T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp + +QEMU Guest Agent +M: Michael Roth +S: Maintained +F: qga/ +T: git git://github.com/mdroth/qemu.git qga + +QOM +M: Anthony Liguori +M: Andreas F=C3=A4rber +S: Supported +T: git git://github.com/afaerber/qemu-cpu.git qom-next +F: include/qom/ +X: include/qom/cpu.h +F: qom/ +X: qom/cpu.c +F: tests/qom-test.c + QMP M: Luiz Capitulino S: Maintained @@ -807,14 +926,29 @@ M: Blue Swirl S: Odd Fixes F: scripts/checkpatch.pl +Migration +M: Juan Quintela +S: Maintained +F: include/migration/ +F: migration* +F: savevm.c +F: arch_init.c +F: vmstate.c + Seccomp -M: Eduardo Otubo +M: Eduardo Otubo S: Supported F: qemu-seccomp.c F: include/sysemu/seccomp.h Usermode Emulation ------------------ +Overall +M: Riku Voipio +S: Maintained +F: thunk.c +F: user-exec.c + BSD user M: Blue Swirl S: Maintained @@ -828,7 +962,6 @@ F: linux-user/ Tiny Code Generator (TCG) ------------------------- Common code -M: qemu-devel@nongnu.org M: Richard Henderson S: Maintained F: tcg/ @@ -845,7 +978,7 @@ S: Maintained F: tcg/arm/ i386 target -M: qemu-devel@nongnu.org +L: qemu-devel@nongnu.org S: Maintained F: tcg/i386/ @@ -922,7 +1055,7 @@ S: Supported F: block/rbd.c Sheepdog -M: MORITA Kazutaka +M: Hitoshi Mitake M: Liu Yuan L: sheepdog@lists.wpkg.org S: Supported @@ -954,3 +1087,14 @@ SSH M: Richard W.M. Jones S: Supported F: block/ssh.c + +ARCHIPELAGO +M: Chrysostomos Nanakos +M: Chrysostomos Nanakos +S: Maintained +F: block/archipelago.c + +Bootdevice +M: Gonglei +S: Maintained +F: bootdevice.c diff --git a/Makefile b/Makefile index 423e373..f505202 100644 --- a/Makefile +++ b/Makefile @@ -45,19 +45,25 @@ endif endif GENERATED_HEADERS =3D config-host.h qemu-options.def -GENERATED_HEADERS +=3D qmp-commands.h qapi-types.h qapi-visit.h -GENERATED_SOURCES +=3D qmp-marshal.c qapi-types.c qapi-visit.c +GENERATED_HEADERS +=3D qmp-commands.h qapi-types.h qapi-visit.h qapi-event.h +GENERATED_SOURCES +=3D qmp-marshal.c qapi-types.c qapi-visit.c qapi-event.c GENERATED_HEADERS +=3D trace/generated-events.h GENERATED_SOURCES +=3D trace/generated-events.c GENERATED_HEADERS +=3D trace/generated-tracers.h -ifeq ($(TRACE_BACKEND),dtrace) +ifeq ($(findstring dtrace,$(TRACE_BACKENDS)),dtrace) GENERATED_HEADERS +=3D trace/generated-tracers-dtrace.h endif GENERATED_SOURCES +=3D trace/generated-tracers.c -ifeq ($(TRACE_BACKEND),ust) +GENERATED_HEADERS +=3D trace/generated-tcg-tracers.h + +GENERATED_HEADERS +=3D trace/generated-helpers-wrappers.h +GENERATED_HEADERS +=3D trace/generated-helpers.h +GENERATED_SOURCES +=3D trace/generated-helpers.c + +ifeq ($(findstring ust,$(TRACE_BACKENDS)),ust) GENERATED_HEADERS +=3D trace/generated-ust-provider.h GENERATED_SOURCES +=3D trace/generated-ust.c endif @@ -148,10 +154,6 @@ endif all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules -vl.o: QEMU_CFLAGS+=3D$(GPROF_CFLAGS) - -vl.o: QEMU_CFLAGS+=3D$(SDL_CFLAGS) - config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak qemu-options.def: $(SRC_PATH)/qemu-options.hx @@ -195,8 +197,6 @@ ALL_SUBDIRS=3D$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS)) recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) -bt-host.o: QEMU_CFLAGS +=3D $(BLUEZ_CFLAGS) - $(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h | $(BUILD_DIR)/version.lo $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<," RC version.o") $(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h @@ -208,7 +208,7 @@ Makefile: $(version-obj-y) $(version-lobj-y) # Build libraries libqemustub.a: $(stub-obj-y) -libqemuutil.a: $(util-obj-y) qapi-types.o qapi-visit.o +libqemuutil.a: $(util-obj-y) block-modules =3D $(foreach o,$(block-obj-m),"$(basename $(subst /,-,$o))",) NULL util/module.o-cflags =3D -D'CONFIG_BLOCK_MODULES=3D$(block-modules)' @@ -238,23 +238,44 @@ qapi-py =3D $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h :\ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@") + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \ + $(gen-out-type) -o qga/qapi-generated -p "qga-" -i $<, \ + " GEN $@") qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h :\ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@") + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \ + $(gen-out-type) -o qga/qapi-generated -p "qga-" -i $<, \ + " GEN $@") qga/qapi-generated/qga-qmp-commands.h qga/qapi-generated/qga-qmp-marshal.c :\ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@") + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \ + $(gen-out-type) -o qga/qapi-generated -p "qga-" -i $<, \ + " GEN $@") + +qapi-modules =3D $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \ + $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json \ + $(SRC_PATH)/qapi/event.json qapi-types.c qapi-types.h :\ -$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o "." -b < $<, " GEN $@") +$(qapi-modules) $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \ + $(gen-out-type) -o "." -b -i $<, \ + " GEN $@") qapi-visit.c qapi-visit.h :\ -$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o "." -b < $<, " GEN $@") +$(qapi-modules) $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \ + $(gen-out-type) -o "." -b -i $<, \ + " GEN $@") +qapi-event.c qapi-event.h :\ +$(qapi-modules) $(SRC_PATH)/scripts/qapi-event.py $(qapi-py) + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-event.py \ + $(gen-out-type) -o "." -b -i $<, \ + " GEN $@") qmp-commands.h qmp-marshal.c :\ -$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -m -o "." < $<, " GEN $@") +$(qapi-modules) $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \ + $(gen-out-type) -o "." -m -i $<, \ + " GEN $@") QGALIB_GEN=3D$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h) $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) @@ -329,7 +350,8 @@ multiboot.bin linuxboot.bin kvmvapic.bin \ s390-zipl.rom \ s390-ccw.img \ spapr-rtas.bin slof.bin \ -palcode-clipper +palcode-clipper \ +u-boot.e500 else BLOBS=3D endif @@ -370,19 +392,19 @@ install-sysconfig: install-datadir install-confdir install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ install-datadir install-localstatedir - $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ifneq ($(TOOLS),) - $(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)" + $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) endif ifneq ($(CONFIG_MODULES),) $(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)" - for s in $(patsubst %.mo,%$(DSOSUF),$(modules-m)); do \ - $(INSTALL_PROG) $(STRIP_OPT) $$s "$(DESTDIR)$(qemu_moddir)/$$(echo $$s | tr / -)"; \ + for s in $(modules-m:.mo=3D$(DSOSUF)); do \ + t=3D"$(DESTDIR)$(qemu_moddir)/$$(echo $$s | tr / -)"; \ + $(INSTALL_LIB) $$s "$$t"; \ + test -z "$(STRIP)" || $(STRIP) "$$t"; \ done endif ifneq ($(HELPERS-y),) - $(INSTALL_DIR) "$(DESTDIR)$(libexecdir)" - $(INSTALL_PROG) $(STRIP_OPT) $(HELPERS-y) "$(DESTDIR)$(libexecdir)" + $(call install-prog,$(HELPERS-y),$(DESTDIR)$(libexecdir)) endif ifneq ($(BLOBS),) set -e; for x in $(BLOBS); do \ @@ -396,6 +418,7 @@ endif set -e; for x in $(KEYMAPS); do \ $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \ done + $(INSTALL_DATA) $(SRC_PATH)/trace-events "$(DESTDIR)$(qemu_datadir)/trace-events" for d in $(TARGET_DIRS); do \ $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=3D$$d/ -C $$d $@ || exit 1 ; \ done diff --git a/Makefile.objs b/Makefile.objs index a6e0e2a..18fd35c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -1,7 +1,7 @@ ####################################################################### # Common libraries for tools and emulators stub-obj-y =3D stubs/ -util-obj-y =3D util/ qobject/ qapi/ trace/ +util-obj-y =3D util/ qobject/ qapi/ qapi-types.o qapi-visit.o qapi-event.o ####################################################################### # block-obj-y is code used by both qemu system emulation and qemu-img @@ -12,7 +12,6 @@ block-obj-y +=3D main-loop.o iohandler.o qemu-timer.o block-obj-$(CONFIG_POSIX) +=3D aio-posix.o block-obj-$(CONFIG_WIN32) +=3D aio-win32.o block-obj-y +=3D block/ -block-obj-y +=3D qapi-types.o qapi-visit.o block-obj-y +=3D qemu-io-cmds.o block-obj-y +=3D qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o @@ -31,6 +30,8 @@ libcacard-y +=3D libcacard/vcard_emul_nss.o libcacard-y +=3D libcacard/vcard_emul_type.o libcacard-y +=3D libcacard/card_7816.o libcacard-y +=3D libcacard/vcardt.o +libcacard/vcard_emul_nss.o-cflags :=3D $(NSS_CFLAGS) +libcacard/vcard_emul_nss.o-libs :=3D $(NSS_LIBS) ###################################################################### # Target independent part of system emulation. The long term path is to @@ -49,7 +50,7 @@ common-obj-$(CONFIG_LINUX) +=3D fsdev/ common-obj-y +=3D migration.o migration-tcp.o common-obj-y +=3D vmstate.o -common-obj-y +=3D qemu-file.o +common-obj-y +=3D qemu-file.o qemu-file-unix.o qemu-file-stdio.o common-obj-$(CONFIG_RDMA) +=3D migration-rdma.o common-obj-y +=3D qemu-char.o #aio.o common-obj-y +=3D block-migration.o @@ -61,12 +62,15 @@ common-obj-$(CONFIG_SPICE) +=3D spice-qemu-char.o common-obj-y +=3D audio/ common-obj-y +=3D hw/ +common-obj-y +=3D accel.o common-obj-y +=3D ui/ common-obj-y +=3D bt-host.o bt-vhci.o +bt-host.o-cflags :=3D $(BLUEZ_CFLAGS) common-obj-y +=3D dma-helpers.o common-obj-y +=3D vl.o +vl.o-cflags :=3D $(GPROF_CFLAGS) $(SDL_CFLAGS) common-obj-y +=3D tpm.o common-obj-$(CONFIG_SLIRP) +=3D slirp/ @@ -84,11 +88,6 @@ common-obj-y +=3D qmp-marshal.o common-obj-y +=3D qmp.o hmp.o endif -###################################################################### -# some qapi visitors are used by both system and user emulation: - -common-obj-y +=3D qapi-visit.o qapi-types.o - ####################################################################### # Target-independent parts used in system and user emulation common-obj-y +=3D qemu-log.o @@ -103,9 +102,14 @@ version-obj-$(CONFIG_WIN32) +=3D $(BUILD_DIR)/version.o version-lobj-$(CONFIG_WIN32) +=3D $(BUILD_DIR)/version.lo ###################################################################### +# tracing +util-obj-y +=3D trace/ +target-obj-y +=3D trace/ + +###################################################################### # guest agent # FIXME: a few definitions from qapi-types.o/qapi-visit.o are needed # by libqemuutil.a. These should be moved to a separate .json schema. -qga-obj-y =3D qga/ qapi-types.o qapi-visit.o +qga-obj-y =3D qga/ qga-vss-dll-obj-y =3D qga/ diff --git a/Makefile.target b/Makefile.target index 6d8fde8..e9ff1ee 100644 --- a/Makefile.target +++ b/Makefile.target @@ -16,26 +16,29 @@ QEMU_CFLAGS+=3D-I$(SRC_PATH)/include ifdef CONFIG_USER_ONLY # user emulator name QEMU_PROG=3Dqemu-$(TARGET_NAME) +QEMU_PROG_BUILD =3D $(QEMU_PROG) else # system emulator name +QEMU_PROG=3Dqemu-system-$(TARGET_NAME)$(EXESUF) ifneq (,$(findstring -mwindows,$(libs_softmmu))) # Terminate program name with a 'w' because the linker builds a windows executable. QEMU_PROGW=3Dqemu-system-$(TARGET_NAME)w$(EXESUF) -endif # windows executable -QEMU_PROG=3Dqemu-system-$(TARGET_NAME)$(EXESUF) +$(QEMU_PROG): $(QEMU_PROGW) + $(call quiet-command,$(OBJCOPY) --subsystem console $(QEMU_PROGW) $(QEMU_PROG)," GEN $(TARGET_DIR)$(QEMU_PROG)") +QEMU_PROG_BUILD =3D $(QEMU_PROGW) +else +QEMU_PROG_BUILD =3D $(QEMU_PROG) endif - -PROGS=3D$(QEMU_PROG) -ifdef QEMU_PROGW -PROGS+=3D$(QEMU_PROGW) endif + +PROGS=3D$(QEMU_PROG) $(QEMU_PROGW) STPFILES=3D config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak ifdef CONFIG_TRACE_SYSTEMTAP -stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp +stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp $(QEMU_PROG)-simpletrace.stp ifdef CONFIG_USER_ONLY TARGET_TYPE=3Duser @@ -46,7 +49,7 @@ endif $(QEMU_PROG).stp-installed: $(SRC_PATH)/trace-events $(call quiet-command,$(TRACETOOL) \ --format=3Dstap \ - --backend=3D$(TRACE_BACKEND) \ + --backends=3D$(TRACE_BACKENDS) \ --binary=3D$(bindir)/$(QEMU_PROG) \ --target-name=3D$(TARGET_NAME) \ --target-type=3D$(TARGET_TYPE) \ @@ -55,12 +58,19 @@ $(QEMU_PROG).stp-installed: $(SRC_PATH)/trace-events $(QEMU_PROG).stp: $(SRC_PATH)/trace-events $(call quiet-command,$(TRACETOOL) \ --format=3Dstap \ - --backend=3D$(TRACE_BACKEND) \ + --backends=3D$(TRACE_BACKENDS) \ --binary=3D$(realpath .)/$(QEMU_PROG) \ --target-name=3D$(TARGET_NAME) \ --target-type=3D$(TARGET_TYPE) \ < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp") +$(QEMU_PROG)-simpletrace.stp: $(SRC_PATH)/trace-events + $(call quiet-command,$(TRACETOOL) \ + --format=3Dsimpletrace-stap \ + --backends=3D$(TRACE_BACKENDS) \ + --probe-prefix=3Dqemu.$(TARGET_TYPE).$(TARGET_NAME) \ + < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG)-simpletrace.stp") + else stap: endif @@ -82,6 +92,12 @@ obj-y +=3D disas.o obj-$(call notempty,$(TARGET_XML_FILES)) +=3D gdbstub-xml.o obj-$(call lnot,$(CONFIG_KVM)) +=3D kvm-stub.o +obj-$(CONFIG_LIBDECNUMBER) +=3D libdecnumber/decContext.o +obj-$(CONFIG_LIBDECNUMBER) +=3D libdecnumber/decNumber.o +obj-$(CONFIG_LIBDECNUMBER) +=3D libdecnumber/dpd/decimal32.o +obj-$(CONFIG_LIBDECNUMBER) +=3D libdecnumber/dpd/decimal64.o +obj-$(CONFIG_LIBDECNUMBER) +=3D libdecnumber/dpd/decimal128.o + ######################################################### # Linux user emulator target @@ -99,7 +115,8 @@ endif #CONFIG_LINUX_USER ifdef CONFIG_BSD_USER -QEMU_CFLAGS+=3D-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ABI_DIR) +QEMU_CFLAGS+=3D-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ABI_DIR) \ + -I$(SRC_PATH)/bsd-user/$(HOST_VARIANT_DIR) obj-y +=3D bsd-user/ obj-y +=3D gdbstub.o user-exec.o @@ -109,8 +126,8 @@ endif #CONFIG_BSD_USER ######################################################### # System emulator target ifdef CONFIG_SOFTMMU -obj-y +=3D arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o -obj-y +=3D qtest.o +obj-y +=3D arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o +obj-y +=3D qtest.o bootdevice.o obj-y +=3D hw/ obj-$(CONFIG_FDT) +=3D device_tree.o obj-$(CONFIG_KVM) +=3D kvm-all.o @@ -140,40 +157,27 @@ endif # CONFIG_SOFTMMU %/translate.o: QEMU_CFLAGS +=3D $(TRANSLATE_OPT_CFLAGS) dummy :=3D $(call unnest-vars,,obj-y) +all-obj-y :=3D $(obj-y) -# we are making another call to unnest-vars with different vars, protect obj-y, -# it can be overriden in subdir Makefile.objs -obj-y-save :=3D $(obj-y) - +target-obj-y :=3D block-obj-y :=3D common-obj-y :=3D include $(SRC_PATH)/Makefile.objs +dummy :=3D $(call unnest-vars,,target-obj-y) +target-obj-y-save :=3D $(target-obj-y) dummy :=3D $(call unnest-vars,.., \ block-obj-y \ block-obj-m \ common-obj-y \ common-obj-m) - -# Now restore obj-y -obj-y :=3D $(obj-y-save) - -all-obj-y =3D $(obj-y) $(common-obj-y) +target-obj-y :=3D $(target-obj-y-save) +all-obj-y +=3D $(common-obj-y) +all-obj-y +=3D $(target-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(block-obj-y) -ifndef CONFIG_HAIKU -LIBS+=3D-lm -endif - -ifdef QEMU_PROGW -# The linker builds a windows executable. Make also a console executable. -$(QEMU_PROGW): $(all-obj-y) ../libqemuutil.a ../libqemustub.a - $(call LINK,$^) -$(QEMU_PROG): $(QEMU_PROGW) - $(call quiet-command,$(OBJCOPY) --subsystem console $(QEMU_PROGW) $(QEMU_PROG)," GEN $(TARGET_DIR)$(QEMU_PROG)") -else -$(QEMU_PROG): $(all-obj-y) ../libqemuutil.a ../libqemustub.a +# build either PROG or PROGW +$(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a $(call LINK,$^) -endif gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@") @@ -194,14 +198,12 @@ endif install: all ifneq ($(PROGS),) - $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" -ifneq ($(STRIP),) - $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS)) -endif + $(call install-prog,$(PROGS),$(DESTDIR)$(bindir)) endif ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset" $(INSTALL_DATA) $(QEMU_PROG).stp-installed "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG).stp" + $(INSTALL_DATA) $(QEMU_PROG)-simpletrace.stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG)-simpletrace.stp" endif GENERATED_HEADERS +=3D config-target.h diff --git a/VERSION b/VERSION index e9307ca..ccbccc3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.2 +2.2.0 diff --git a/accel.c b/accel.c new file mode 100644 index 0000000..74e41da --- /dev/null +++ b/accel.c @@ -0,0 +1,157 @@ +/* + * QEMU System Emulator, accelerator interfaces + * + * Copyright (c) 2003-2008 Fabrice Bellard + * Copyright (c) 2014 Red Hat 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 "sysemu/accel.h" +#include "hw/boards.h" +#include "qemu-common.h" +#include "sysemu/arch_init.h" +#include "sysemu/sysemu.h" +#include "sysemu/kvm.h" +#include "sysemu/qtest.h" +#include "hw/xen/xen.h" +#include "qom/object.h" +#include "hw/boards.h" + +int tcg_tb_size; +static bool tcg_allowed =3D true; + +static int tcg_init(MachineState *ms) +{ + tcg_exec_init(tcg_tb_size * 1024 * 1024); + return 0; +} + +static const TypeInfo accel_type =3D { + .name =3D TYPE_ACCEL, + .parent =3D TYPE_OBJECT, + .class_size =3D sizeof(AccelClass), + .instance_size =3D sizeof(AccelState), +}; + +/* Lookup AccelClass from opt_name. Returns NULL if not found */ +static AccelClass *accel_find(const char *opt_name) +{ + char *class_name =3D g_strdup_printf(ACCEL_CLASS_NAME("%s"), opt_name); + AccelClass *ac =3D ACCEL_CLASS(object_class_by_name(class_name)); + g_free(class_name); + return ac; +} + +static int accel_init_machine(AccelClass *acc, MachineState *ms) +{ + ObjectClass *oc =3D OBJECT_CLASS(acc); + const char *cname =3D object_class_get_name(oc); + AccelState *accel =3D ACCEL(object_new(cname)); + int ret; + ms->accelerator =3D accel; + *(acc->allowed) =3D true; + ret =3D acc->init_machine(ms); + if (ret < 0) { + ms->accelerator =3D NULL; + *(acc->allowed) =3D false; + object_unref(OBJECT(accel)); + } + return ret; +} + +int configure_accelerator(MachineState *ms) +{ + const char *p; + char buf[10]; + int ret; + bool accel_initialised =3D false; + bool init_failed =3D false; + AccelClass *acc =3D NULL; + + p =3D qemu_opt_get(qemu_get_machine_opts(), "accel"); + if (p =3D=3D NULL) { + /* Use the default "accelerator", tcg */ + p =3D "tcg"; + } + + while (!accel_initialised && *p !=3D '\0') { + if (*p =3D=3D ':') { + p++; + } + p =3D get_opt_name(buf, sizeof(buf), p, ':'); + acc =3D accel_find(buf); + if (!acc) { + fprintf(stderr, "\"%s\" accelerator not found.\n", buf); + continue; + } + if (acc->available && !acc->available()) { + printf("%s not supported for this target\n", + acc->name); + continue; + } + ret =3D accel_init_machine(acc, ms); + if (ret < 0) { + init_failed =3D true; + fprintf(stderr, "failed to initialize %s: %s\n", + acc->name, + strerror(-ret)); + } else { + accel_initialised =3D true; + } + } + + if (!accel_initialised) { + if (!init_failed) { + fprintf(stderr, "No accelerator found!\n"); + } + exit(1); + } + + if (init_failed) { + fprintf(stderr, "Back to %s accelerator.\n", acc->name); + } + + return !accel_initialised; +} + + +static void tcg_accel_class_init(ObjectClass *oc, void *data) +{ + AccelClass *ac =3D ACCEL_CLASS(oc); + ac->name =3D "tcg"; + ac->init_machine =3D tcg_init; + ac->allowed =3D &tcg_allowed; +} + +#define TYPE_TCG_ACCEL ACCEL_CLASS_NAME("tcg") + +static const TypeInfo tcg_accel_type =3D { + .name =3D TYPE_TCG_ACCEL, + .parent =3D TYPE_ACCEL, + .class_init =3D tcg_accel_class_init, +}; + +static void register_accel_types(void) +{ + type_register_static(&accel_type); + type_register_static(&tcg_accel_type); +} + +type_init(register_accel_types); diff --git a/aio-posix.c b/aio-posix.c index f921d4f..d3ac06e 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -100,6 +100,11 @@ void aio_set_event_notifier(AioContext *ctx, (IOHandler *)io_read, NULL, notifier); } +bool aio_prepare(AioContext *ctx) +{ + return false; +} + bool aio_pending(AioContext *ctx) { AioHandler *node; @@ -119,13 +124,22 @@ bool aio_pending(AioContext *ctx) return false; } -static bool aio_dispatch(AioContext *ctx) +bool aio_dispatch(AioContext *ctx) { AioHandler *node; bool progress =3D false; /* - * We have to walk very carefully in case qemu_aio_set_fd_handler is + * If there are callbacks left that have been queued, we need to call them. + * Do not call select in this case, because it is possible that the caller + * does not need a complete flush (as is the case for aio_poll loops). + */ + if (aio_bh_poll(ctx)) { + progress =3D true; + } + + /* + * We have to walk very carefully in case aio_set_fd_handler is * called while we're walking. */ node =3D QLIST_FIRST(&ctx->aio_handlers); @@ -175,28 +189,24 @@ static bool aio_dispatch(AioContext *ctx) bool aio_poll(AioContext *ctx, bool blocking) { AioHandler *node; + bool was_dispatching; int ret; bool progress; + was_dispatching =3D ctx->dispatching; progress =3D false; - /* - * If there are callbacks left that have been queued, we need to call them. - * Do not call select in this case, because it is possible that the caller - * does not need a complete flush (as is the case for qemu_aio_wait loops). + /* aio_notify can avoid the expensive event_notifier_set if + * everything (file descriptors, bottom halves, timers) will + * be re-evaluated before the next blocking poll(). This is + * already true when aio_poll is called with blocking =3D=3D false; + * if blocking =3D=3D true, it is only true after poll() returns. + * + * If we're in a nested event loop, ctx->dispatching might be true. + * In that case we can restore it just before returning, but we + * have to clear it now. */ - if (aio_bh_poll(ctx)) { - blocking =3D false; - progress =3D true; - } - - if (aio_dispatch(ctx)) { - progress =3D true; - } - - if (progress && !blocking) { - return true; - } + aio_set_dispatching(ctx, !blocking); ctx->walking_handlers++; @@ -220,7 +230,7 @@ bool aio_poll(AioContext *ctx, bool blocking) /* wait until next event */ ret =3D qemu_poll_ns((GPollFD *)ctx->pollfds->data, ctx->pollfds->len, - blocking =3F timerlistgroup_deadline_ns(&ctx->tlg) : 0); + blocking =3F aio_compute_timeout(ctx) : 0); /* if we have any readable fds, dispatch event */ if (ret > 0) { @@ -234,9 +244,11 @@ bool aio_poll(AioContext *ctx, bool blocking) } /* Run dispatch even if there were no readable fds to run timers */ + aio_set_dispatching(ctx, true); if (aio_dispatch(ctx)) { progress =3D true; } + aio_set_dispatching(ctx, was_dispatching); return progress; } diff --git a/aio-win32.c b/aio-win32.c index 23f4e5b..d81313b 100644 --- a/aio-win32.c +++ b/aio-win32.c @@ -22,12 +22,80 @@ struct AioHandler { --===============8943858755590866684== 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 --===============8943858755590866684==-- From xen-changelog-bounces@lists.xen.org Sun Jan 18 16:57:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 16:57: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 1YCtAR-00046Y-JC; Sun, 18 Jan 2015 16:57:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCtAP-00046T-8v for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 16:57:37 +0000 Content-Length: 145046 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 4D/60-24859-006EBB45; Sun, 18 Jan 2015 16:57:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1421600242!20372423!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, ML_RADAR_SPEW_LINKS_8,spamassassin: ,async_handler: YXN5bmNfZGVsYXk6IDcwNjQ4NDcgKHRpbWVvdXQp\n X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25804 invoked from network); 18 Jan 2015 16:57: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; 18 Jan 2015 16:57:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCtAA-0006fz-0X for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 16:57:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCtA9-0003Ey-HB for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 16:57:21 +0000 Date: Sun, 18 Jan 2015 16:57:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Merge remote-tracking branch 'xen-staging/master' into temp2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============8943858755590866684==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8943858755590866684== Content-Length: 147587 Content-Transfer-Encoding: quoted-printable =3D=3D=3D This changeset includes merge from high-traffic branch =3D=3D=3D Commits on that branch are not reported individually. commit 0d37748342e29854db7c9f6c47d7f58c6cfba6b2 Merge: 45e1611de8be0eae55967694dd6e627c2dc354f2 1ebb75b1fee779621b63e84fefa7b07354c43a99 Author: Stefano Stabellini AuthorDate: Fri Jan 16 15:20:40 2015 +0000 Commit: Stefano Stabellini CommitDate: Fri Jan 16 15:20:40 2015 +0000 Merge remote-tracking branch 'xen-staging/master' into temp2 .gitignore | 24 +- .gitmodules | 3 + .travis.yml | 63 +- CODING_STYLE | 14 + MAINTAINERS | 178 +- Makefile | 77 +- Makefile.objs | 22 +- Makefile.target | 78 +- VERSION | 2 +- accel.c | 157 + aio-posix.c | 50 +- aio-win32.c | 268 +- arch_init.c | 413 +- async.c | 74 +- audio/Makefile.objs | 2 +- audio/alsaaudio.c | 12 +- audio/audio.c | 3 +- audio/audio_template.h | 15 +- audio/ossaudio.c | 6 +- audio/spiceaudio.c | 2 +- audio/wavcapture.c | 3 +- backends/Makefile.objs | 7 +- backends/baum.c | 4 +- backends/hostmem-file.c | 134 + backends/hostmem-ram.c | 53 + backends/hostmem.c | 365 + backends/msmouse.c | 4 +- backends/rng-egd.c | 1 + backends/rng-random.c | 5 +- backends/rng.c | 11 +- backends/testdev.c | 131 + backends/tpm.c | 11 +- balloon.c | 13 - block-migration.c | 95 +- block.c | 1972 +++-- block/Makefile.objs | 11 +- block/accounting.c | 54 + block/archipelago.c | 1084 +++ block/backup.c | 27 +- block/blkdebug.c | 170 +- block/blkverify.c | 112 +- block/block-backend.c | 631 ++ block/bochs.c | 29 +- block/cloop.c | 35 +- block/commit.c | 79 +- block/cow.c | 432 - block/curl.c | 475 +- block/dmg.c | 27 +- block/gluster.c | 100 +- block/iscsi.c | 732 ++- block/linux-aio.c | 236 +- block/mirror.c | 194 +- block/nbd-client.c | 24 +- block/nbd-client.h | 4 + block/nbd.c | 139 +- block/nfs.c | 142 +- block/null.c | 168 + block/parallels.c | 60 +- block/qapi.c | 70 +- block/qcow.c | 118 +- block/qcow2-cache.c | 22 +- block/qcow2-cluster.c | 264 +- block/qcow2-refcount.c | 1014 ++- block/qcow2-snapshot.c | 31 +- block/qcow2.c | 828 ++- block/qcow2.h | 30 +- block/qed-check.c | 6 +- block/qed-gencb.c | 4 +- block/qed-table.c | 18 +- block/qed.c | 282 +- block/qed.h | 16 +- block/quorum.c | 406 +- block/raw-aio.h | 18 +- block/raw-posix.c | 617 +- block/raw-win32.c | 113 +- block/raw_bsd.c | 36 +- block/rbd.c | 246 +- block/sheepdog.c | 491 +- block/snapshot.c | 4 + block/ssh.c | 228 +- block/stream.c | 69 +- block/vdi.c | 211 +- block/vhdx-endian.c | 11 +- block/vhdx-log.c | 57 +- block/vhdx.c | 230 +- block/vhdx.h | 2 + block/vmdk.c | 481 +- block/vpc.c | 206 +- block/vvfat.c | 68 +- block/win32-aio.c | 55 +- blockdev-nbd.c | 2 +- blockdev.c | 796 ++- blockjob.c | 172 +- bootdevice.c | 258 + bsd-user/freebsd/strace.list | 76 +- bsd-user/freebsd/syscall_nr.h | 813 ++- bsd-user/main.c | 6 +- bsd-user/mmap.c | 60 - bsd-user/qemu.h | 27 + bsd-user/strace.c | 167 +- configure | 528 +- coroutine-gthread.c | 36 +- coroutine-sigaltstack.c | 2 +- cpu-exec.c | 466 +- cpus.c | 180 +- cputlb.c | 58 +- default-configs/i386-softmmu.mak | 1 + default-configs/mips-softmmu.mak | 1 - default-configs/mips64-softmmu.mak | 1 - default-configs/mipsel-softmmu.mak | 1 - default-configs/ppc-linux-user.mak | 1 + default-configs/ppc-softmmu.mak | 3 +- default-configs/ppc64-linux-user.mak | 1 + default-configs/ppc64-softmmu.mak | 2 + default-configs/ppc64abi32-linux-user.mak | 1 + default-configs/ppc64le-linux-user.mak | 2 + default-configs/ppcemb-softmmu.mak | 1 + default-configs/s390x-softmmu.mak | 3 +- default-configs/usb.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + device-hotplug.c | 5 +- device_tree.c | 55 +- disas.c | 21 +- disas/Makefile.objs | 2 +- disas/arm-a64.cc | 2 +- disas/libvixl/README | 2 +- disas/libvixl/a64/assembler-a64.h | 1133 ++- disas/libvixl/a64/constants-a64.h | 104 +- disas/libvixl/a64/cpu-a64.h | 27 + disas/libvixl/a64/decoder-a64.cc | 85 +- disas/libvixl/a64/decoder-a64.h | 103 +- disas/libvixl/a64/disasm-a64.cc | 486 +- disas/libvixl/a64/disasm-a64.h | 85 +- disas/libvixl/a64/instructions-a64.cc | 73 +- disas/libvixl/a64/instructions-a64.h | 102 +- disas/libvixl/code-buffer.h | 113 + disas/libvixl/globals.h | 42 +- disas/libvixl/platform.h | 10 +- disas/libvixl/utils.cc | 48 +- disas/libvixl/utils.h | 111 +- disas/mips.c | 929 +++- disas/sparc.c | 34 +- dma-helpers.c | 89 +- docs/aio_notify.promela | 104 + docs/blkdebug.txt | 161 + docs/ccid.txt | 80 +- docs/image-fuzzer.txt | 239 + docs/memory.txt | 25 +- docs/migration.txt | 18 +- docs/multiple-iothreads.txt | 134 + docs/multiseat.txt | 102 + docs/qapi-code-gen.txt | 345 +- docs/qmp/qmp-events.txt | 130 +- docs/rdma.txt | 6 +- docs/specs/acpi_mem_hotplug.txt | 44 + docs/specs/qcow2.txt | 20 +- docs/specs/standard-vga.txt | 22 +- docs/specs/vhost-user.txt | 266 + docs/tracing.txt | 50 +- docs/virtio-balloon-stats.txt | 5 +- docs/writing-qmp-commands.txt | 30 +- dump.c | 779 +-- exec.c | 464 +- fpu/softfloat.c | 37 +- fsdev/virtfs-proxy-helper.c | 1 + gdb-xml/s390-acr.xml | 26 + gdb-xml/s390-fpr.xml | 27 + gdb-xml/s390x-core64.xml | 28 + gdbstub.c | 39 +- hmp-commands.hx | 64 +- hmp.c | 273 +- hmp.h | 24 + hw/9pfs/virtio-9p-device.c | 3 +- hw/9pfs/virtio-9p-local.c | 50 +- hw/9pfs/virtio-9p-proxy.c | 11 +- hw/9pfs/virtio-9p-synth.c | 2 +- hw/9pfs/virtio-9p.c | 9 +- hw/Makefile.objs | 1 + hw/acpi/Makefile.objs | 2 + hw/acpi/acpi_interface.c | 15 + hw/acpi/core.c | 11 +- hw/acpi/cpu_hotplug.c | 34 +- hw/acpi/ich9.c | 91 +- hw/acpi/memory_hotplug.c | 223 + hw/acpi/pcihp.c | 23 +- hw/acpi/piix4.c | 111 +- hw/alpha/dp264.c | 14 +- hw/alpha/typhoon.c | 6 +- hw/arm/armv7m.c | 15 +- hw/arm/boot.c | 97 +- hw/arm/collie.c | 20 +- hw/arm/cubieboard.c | 24 +- hw/arm/digic_boards.c | 4 +- hw/arm/exynos4210.c | 9 +- hw/arm/exynos4_boards.c | 22 +- hw/arm/gumstix.c | 12 +- hw/arm/highbank.c | 32 +- hw/arm/integratorcp.c | 17 +- hw/arm/kzm.c | 16 +- hw/arm/mainstone.c | 25 +- hw/arm/musicpal.c | 37 +- hw/arm/nseries.c | 345 +- hw/arm/omap1.c | 14 +- hw/arm/omap2.c | 10 +- hw/arm/omap_sx1.c | 37 +- hw/arm/palm.c | 13 +- hw/arm/pxa2xx.c | 37 +- hw/arm/pxa2xx_gpio.c | 20 +- hw/arm/pxa2xx_pic.c | 1 - hw/arm/realview.c | 55 +- hw/arm/spitz.c | 154 +- hw/arm/stellaris.c | 47 +- hw/arm/strongarm.c | 27 +- hw/arm/tosa.c | 15 +- hw/arm/versatilepb.c | 32 +- hw/arm/vexpress.c | 64 +- hw/arm/virt.c | 306 +- hw/arm/xilinx_zynq.c | 25 +- hw/arm/z2.c | 20 +- hw/audio/ac97.c | 23 +- hw/audio/adlib.c | 10 +- hw/audio/cs4231.c | 3 +- hw/audio/cs4231a.c | 3 +- hw/audio/es1370.c | 14 +- hw/audio/gus.c | 5 +- hw/audio/hda-codec.c | 10 +- hw/audio/intel-hda.c | 16 +- hw/audio/lm4549.c | 5 +- hw/audio/marvell_88w8618.c | 1 - hw/audio/milkymist-ac97.c | 3 +- hw/audio/pl041.c | 9 +- hw/audio/sb16.c | 9 +- hw/audio/wm8750.c | 3 +- hw/block/Makefile.objs | 2 +- hw/block/block.c | 41 +- hw/block/dataplane/Makefile.objs | 2 +- hw/block/dataplane/ioq.c | 117 - hw/block/dataplane/ioq.h | 57 - hw/block/dataplane/virtio-blk.c | 410 +- hw/block/dataplane/virtio-blk.h | 2 +- hw/block/ecc.c | 3 +- hw/block/fdc.c | 182 +- hw/block/hd-geometry.c | 24 +- hw/block/m25p80.c | 48 +- hw/block/nand.c | 53 +- hw/block/nvme.c | 75 +- hw/block/nvme.h | 2 +- hw/block/onenand.c | 74 +- hw/block/pflash_cfi01.c | 71 +- hw/block/pflash_cfi02.c | 33 +- hw/block/virtio-blk.c | 462 +- hw/block/xen_disk.c | 95 +- hw/bt/l2cap.c | 2 +- hw/char/cadence_uart.c | 1 - hw/char/digic-uart.c | 1 - hw/char/escc.c | 239 +- hw/char/exynos4210_uart.c | 2 - hw/char/imx_serial.c | 1 - hw/char/ipoctal232.c | 9 +- hw/char/lm32_juart.c | 3 +- hw/char/lm32_uart.c | 3 +- hw/char/milkymist-uart.c | 3 +- hw/char/parallel.c | 18 + hw/char/pl011.c | 3 +- hw/char/sclpconsole-lm.c | 15 +- hw/char/sclpconsole.c | 15 +- hw/char/serial-pci.c | 17 +- hw/char/serial.c | 292 +- hw/char/spapr_vty.c | 3 +- hw/char/virtio-console.c | 12 +- hw/char/virtio-serial-bus.c | 152 +- hw/char/xilinx_uartlite.c | 32 +- hw/core/Makefile.objs | 2 + hw/core/hotplug.c | 11 + hw/core/irq.c | 44 +- hw/core/loader.c | 111 +- hw/core/machine.c | 343 + hw/core/nmi.c | 84 + hw/core/null-machine.c | 2 +- hw/core/platform-bus.c | 253 + hw/core/ptimer.c | 3 +- hw/core/qdev-properties-system.c | 96 +- hw/core/qdev-properties.c | 70 +- hw/core/qdev.c | 410 +- hw/core/sysbus.c | 104 +- hw/cpu/icc_bus.c | 12 +- hw/cris/axis_dev88.c | 20 +- hw/display/ads7846.c | 3 +- hw/display/blizzard.c | 8 - hw/display/cg3.c | 33 +- hw/display/cirrus_vga.c | 178 +- hw/display/cirrus_vga_rop.h | 3 +- hw/display/cirrus_vga_template.h | 102 - hw/display/exynos4210_fimd.c | 4 +- hw/display/g364fb.c | 1 - hw/display/jazz_led.c | 2 +- hw/display/milkymist-tmu2.c | 3 +- hw/display/milkymist-vgafb.c | 3 +- hw/display/omap_lcd_template.h | 10 +- hw/display/pxa2xx_lcd.c | 30 +- hw/display/qxl-render.c | 15 +- hw/display/qxl.c | 76 +- hw/display/qxl.h | 1 + hw/display/sm501.c | 2 +- hw/display/sm501_template.h | 6 +- hw/display/ssd0303.c | 3 +- hw/display/tc6393xb.c | 7 +- hw/display/tcx.c | 721 ++- hw/display/vga-helpers.h | 439 ++ hw/display/vga-isa-mm.c | 2 +- hw/display/vga-isa.c | 2 +- hw/display/vga-pci.c | 136 +- hw/display/vga.c | 627 +- hw/display/vga_int.h | 13 +- hw/display/vga_template.h | 461 -- hw/display/vmware_vga.c | 135 +- hw/display/xenfb.c | 8 +- hw/dma/i82374.c | 7 +- hw/dma/i8257.c | 10 +- hw/dma/omap_dma.c | 12 +- hw/dma/pl330.c | 5 - hw/dma/pxa2xx_dma.c | 2 - hw/dma/sparc32_dma.c | 3 +- hw/dma/sun4m_iommu.c | 3 +- hw/dma/xilinx_axidma.c | 31 +- hw/gpio/Makefile.objs | 1 + hw/gpio/max7310.c | 3 +- hw/gpio/mpc8xxx.c | 217 + hw/gpio/pl061.c | 61 +- hw/gpio/zaurus.c | 3 +- hw/i2c/core.c | 6 +- hw/i2c/pm_smbus.c | 68 +- hw/i2c/smbus.c | 68 +- hw/i2c/smbus_eeprom.c | 2 +- hw/i2c/smbus_ich9.c | 1 - hw/i386/Makefile.objs | 7 +- hw/i386/acpi-build.c | 313 +- hw/i386/acpi-defs.h | 51 + hw/i386/acpi-dsdt-mem-hotplug.dsl | 176 + hw/i386/acpi-dsdt.dsl | 98 +- hw/i386/acpi-dsdt.hex.generated | 3918 ++++------ hw/i386/intel_iommu.c | 1963 +++++ hw/i386/intel_iommu_internal.h | 389 + hw/i386/kvm/apic.c | 3 + hw/i386/kvm/clock.c | 68 +- hw/i386/kvm/i8254.c | 3 +- hw/i386/kvm/pci-assign.c | 299 +- hw/i386/kvmvapic.c | 79 +- hw/i386/pc.c | 563 ++- hw/i386/pc_piix.c | 304 +- hw/i386/pc_q35.c | 200 +- hw/i386/pc_sysfw.c | 15 +- hw/i386/q35-acpi-dsdt.dsl | 8 +- hw/i386/q35-acpi-dsdt.hex.generated | 876 ++- hw/i386/smbios.c | 803 ++- hw/i386/ssdt-mem.dsl | 77 + hw/i386/ssdt-mem.hex.generated | 213 + hw/i386/ssdt-misc.dsl | 3 + hw/i386/ssdt-misc.hex.generated | 31 +- hw/i386/ssdt-pcihp.hex.generated | 6 +- hw/i386/ssdt-proc.hex.generated | 6 +- hw/i386/ssdt-tpm.dsl | 43 + hw/i386/ssdt-tpm.hex.generated | 95 + hw/i386/xen/xen_platform.c | 8 +- hw/ide/ahci.c | 603 +- hw/ide/ahci.h | 38 +- hw/ide/atapi.c | 53 +- hw/ide/cmd646.c | 101 +- hw/ide/core.c | 515 +- hw/ide/ich.c | 11 +- hw/ide/internal.h | 67 +- hw/ide/isa.c | 5 +- hw/ide/macio.c | 125 +- hw/ide/microdrive.c | 10 +- hw/ide/mmio.c | 9 +- hw/ide/pci.c | 90 +- hw/ide/pci.h | 9 +- hw/ide/piix.c | 19 +- hw/ide/qdev.c | 73 +- hw/ide/via.c | 5 +- hw/input/adb.c | 6 +- hw/input/hid.c | 220 +- hw/input/lm832x.c | 3 +- hw/input/milkymist-softusb.c | 32 +- hw/input/pckbd.c | 61 +- hw/input/ps2.c | 178 +- hw/input/pxa2xx_keypad.c | 3 +- hw/input/stellaris_input.c | 6 +- hw/input/tsc210x.c | 30 - hw/input/vmmouse.c | 3 +- hw/intc/Makefile.objs | 1 + hw/intc/allwinner-a10-pic.c | 24 +- hw/intc/apic.c | 28 +- hw/intc/apic_common.c | 41 +- hw/intc/arm_gic.c | 27 +- hw/intc/arm_gic_common.c | 2 +- hw/intc/arm_gic_kvm.c | 6 +- hw/intc/armv7m_nvic.c | 18 +- hw/intc/exynos4210_combiner.c | 2 - hw/intc/exynos4210_gic.c | 1 - hw/intc/gic_internal.h | 2 +- hw/intc/heathrow_pic.c | 6 +- hw/intc/i8259.c | 7 +- hw/intc/i8259_common.c | 1 - hw/intc/imx_avic.c | 10 - hw/intc/ioapic_common.c | 1 - hw/intc/lm32_pic.c | 3 +- hw/intc/openpic.c | 106 +- hw/intc/openpic_kvm.c | 42 +- hw/intc/s390_flic.c | 325 +- hw/intc/s390_flic_kvm.c | 432 + hw/intc/slavio_intctl.c | 6 +- hw/intc/xics.c | 191 +- hw/intc/xics_kvm.c | 42 +- hw/intc/xilinx_intc.c | 20 +- hw/ipack/ipack.c | 5 +- hw/ipack/tpci200.c | 16 +- hw/isa/apm.c | 6 +- hw/isa/isa-bus.c | 13 +- hw/isa/lpc_ich9.c | 41 +- hw/isa/pc87312.c | 12 +- hw/isa/piix4.c | 3 +- hw/isa/vt82c686.c | 6 +- hw/lm32/lm32_boards.c | 36 +- hw/lm32/milkymist.c | 21 +- hw/m68k/an5206.c | 15 +- hw/m68k/dummy_m68k.c | 13 +- hw/m68k/mcf5208.c | 15 +- hw/mem/Makefile.objs | 1 + hw/mem/pc-dimm.c | 308 + hw/microblaze/boot.c | 17 +- hw/microblaze/petalogix_ml605_mmu.c | 24 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 20 +- hw/mips/addr.c | 7 +- hw/mips/cputimer.c | 18 +- hw/mips/gt64xxx_pci.c | 25 +- hw/mips/mips_fulong2e.c | 51 +- hw/mips/mips_int.c | 11 + hw/mips/mips_jazz.c | 22 +- hw/mips/mips_malta.c | 271 +- hw/mips/mips_mipssim.c | 20 +- hw/mips/mips_r4k.c | 25 +- hw/misc/Makefile.objs | 1 - hw/misc/eccmemctl.c | 3 +- hw/misc/exynos4210_pmu.c | 2 +- hw/misc/imx_ccm.c | 1 - hw/misc/ivshmem.c | 129 +- hw/misc/lm32_sys.c | 180 - hw/misc/macio/cuda.c | 29 +- hw/misc/macio/mac_dbdma.c | 12 +- hw/misc/macio/macio.c | 21 +- hw/misc/max111x.c | 3 +- hw/misc/milkymist-hpdmc.c | 3 +- hw/misc/milkymist-pfpu.c | 3 +- hw/misc/mst_fpga.c | 11 +- hw/misc/omap_gpmc.c | 8 +- hw/misc/pci-testdev.c | 2 - hw/misc/pvpanic.c | 13 +- hw/misc/slavio_misc.c | 3 +- hw/misc/tmp105.c | 9 +- hw/misc/vfio.c | 831 ++- hw/misc/zynq_slcr.c | 698 +- hw/moxie/moxiesim.c | 29 +- hw/net/allwinner_emac.c | 6 +- hw/net/cadence_gem.c | 50 +- hw/net/dp8393x.c | 3 - hw/net/e1000.c | 245 +- hw/net/e1000_regs.h | 9 + hw/net/eepro100.c | 23 +- hw/net/fsl_etsec/rings.c | 2 +- hw/net/lance.c | 15 +- hw/net/mcf_fec.c | 3 - hw/net/milkymist-minimac2.c | 8 +- hw/net/mipsnet.c | 3 +- hw/net/ne2000-isa.c | 48 +- hw/net/ne2000.c | 21 +- hw/net/pcnet-pci.c | 17 +- hw/net/pcnet.c | 61 +- hw/net/pcnet.h | 1 - hw/net/rtl8139.c | 27 +- hw/net/smc91c111.c | 2 +- hw/net/spapr_llan.c | 28 +- hw/net/stellaris_enet.c | 339 +- hw/net/vhost_net.c | 295 +- hw/net/virtio-net.c | 202 +- hw/net/vmxnet3.c | 52 +- hw/net/xgmac.c | 4 +- hw/net/xilinx_axienet.c | 21 +- hw/net/xilinx_ethlite.c | 37 +- hw/nvram/ds1225y.c | 1 - hw/nvram/eeprom93xx.c | 3 +- hw/nvram/fw_cfg.c | 61 +- hw/nvram/mac_nvram.c | 73 +- hw/nvram/spapr_nvram.c | 98 +- hw/openrisc/openrisc_sim.c | 12 +- hw/pci-bridge/ioh3420.c | 33 +- hw/pci-bridge/ioh3420.h | 4 - hw/pci-bridge/pci_bridge_dev.c | 4 +- hw/pci-bridge/xio3130_downstream.c | 12 +- hw/pci-bridge/xio3130_upstream.c | 1 - hw/pci-host/apb.c | 312 +- hw/pci-host/bonito.c | 3 +- hw/pci-host/pam.c | 4 +- hw/pci-host/piix.c | 37 +- hw/pci-host/ppce500.c | 50 +- hw/pci-host/prep.c | 7 +- hw/pci-host/q35.c | 67 +- hw/pci-host/uninorth.c | 2 +- hw/pci/msi.c | 2 +- hw/pci/msix.c | 6 +- hw/pci/pci-hotplug-old.c | 18 +- hw/pci/pci.c | 76 +- hw/pci/pci_bridge.c | 14 +- hw/pci/pcie.c | 85 +- hw/pci/pcie_aer.c | 6 +- hw/pci/pcie_host.c | 8 +- hw/pci/pcie_port.c | 2 +- hw/pci/shpc.c | 9 +- hw/pcmcia/pxa2xx.c | 21 - hw/ppc/Makefile.objs | 5 +- hw/ppc/e500.c | 401 +- hw/ppc/e500.h | 8 +- hw/ppc/e500plat.c | 11 +- hw/ppc/mac.h | 6 +- hw/ppc/mac_newworld.c | 80 +- hw/ppc/mac_oldworld.c | 51 +- hw/ppc/mpc8544ds.c | 4 +- hw/ppc/ppc.c | 79 + hw/ppc/ppc405_boards.c | 76 +- hw/ppc/ppc405_uc.c | 4 +- hw/ppc/ppc440_bamboo.c | 15 +- hw/ppc/ppc4xx_devs.c | 41 +- hw/ppc/ppc4xx_pci.c | 33 +- hw/ppc/prep.c | 40 +- hw/ppc/spapr.c | 633 ++- hw/ppc/spapr_events.c | 5 +- hw/ppc/spapr_hcall.c | 233 +- hw/ppc/spapr_iommu.c | 194 +- hw/ppc/spapr_pci.c | 419 +- hw/ppc/spapr_pci_vfio.c | 102 + hw/ppc/spapr_rtas.c | 115 +- hw/ppc/spapr_vio.c | 16 +- hw/ppc/virtex_ml507.c | 25 +- hw/s390x/css.c | 246 +- hw/s390x/css.h | 9 +- hw/s390x/event-facility.c | 7 +- hw/s390x/ipl.c | 2 +- hw/s390x/s390-virtio-bus.c | 87 +- hw/s390x/s390-virtio-bus.h | 1 - hw/s390x/s390-virtio-ccw.c | 107 +- hw/s390x/s390-virtio.c | 120 +- hw/s390x/s390-virtio.h | 3 + hw/s390x/sclp.c | 289 +- hw/s390x/sclpquiesce.c | 3 +- hw/s390x/virtio-ccw.c | 422 +- hw/s390x/virtio-ccw.h | 17 +- hw/scsi/Makefile.objs | 2 +- hw/scsi/esp-pci.c | 5 +- hw/scsi/esp.c | 15 +- hw/scsi/lsi53c895a.c | 14 +- hw/scsi/megasas.c | 659 ++- hw/scsi/mfi.h | 16 +- hw/scsi/scsi-bus.c | 302 +- hw/scsi/scsi-disk.c | 413 +- hw/scsi/scsi-generic.c | 126 +- hw/scsi/spapr_vscsi.c | 24 +- hw/scsi/vhost-scsi.c | 53 +- hw/scsi/virtio-scsi-dataplane.c | 312 + hw/scsi/virtio-scsi.c | 669 ++- hw/scsi/vmw_pvscsi.c | 32 +- hw/sd/milkymist-memcard.c | 10 +- hw/sd/omap_mmc.c | 8 +- hw/sd/pl181.c | 3 +- hw/sd/pxa2xx_mmci.c | 4 +- hw/sd/sd.c | 71 +- hw/sd/sdhci.c | 8 +- hw/sd/ssi-sd.c | 3 +- hw/sh4/r2d.c | 18 +- hw/sh4/shix.c | 12 +- hw/sparc/leon3.c | 12 +- hw/sparc/sun4m.c | 136 +- hw/sparc64/sun4u.c | 50 +- hw/ssi/pl022.c | 3 +- hw/ssi/ssi.c | 7 +- hw/ssi/xilinx_spi.c | 3 +- hw/ssi/xilinx_spips.c | 1 - hw/timer/allwinner-a10-pit.c | 67 +- hw/timer/arm_timer.c | 6 +- hw/timer/cadence_ttc.c | 19 +- hw/timer/digic-timer.c | 1 - hw/timer/ds1338.c | 1 - hw/timer/exynos4210_mct.c | 10 +- hw/timer/exynos4210_pwm.c | 2 - hw/timer/exynos4210_rtc.c | 1 - hw/timer/hpet.c | 9 +- hw/timer/i8254_common.c | 1 - hw/timer/imx_epit.c | 19 +- hw/timer/imx_gpt.c | 35 +- hw/timer/lm32_timer.c | 3 +- hw/timer/m48t59.c | 3 +- hw/timer/mc146818rtc.c | 101 +- hw/timer/milkymist-sysctl.c | 3 +- hw/timer/pxa2xx_timer.c | 3 - hw/timer/slavio_timer.c | 6 +- hw/timer/tusb6010.c | 3 - hw/timer/twl92230.c | 6 +- hw/timer/xilinx_timer.c | 22 +- hw/tpm/tpm_tis.c | 11 +- hw/tpm/tpm_tis.h | 8 +- hw/tricore/Makefile.objs | 1 + hw/tricore/tricore_testboard.c | 124 + hw/unicore32/puv3.c | 13 +- hw/usb/Makefile.objs | 5 + hw/usb/bus.c | 117 +- hw/usb/ccid-card-emulated.c | 29 +- hw/usb/core.c | 21 + hw/usb/desc-msos.c | 6 +- hw/usb/desc.c | 12 - hw/usb/desc.h | 1 + hw/usb/dev-audio.c | 7 +- hw/usb/dev-bluetooth.c | 6 +- hw/usb/dev-hid.c | 204 +- hw/usb/dev-hub.c | 13 +- hw/usb/dev-mtp.c | 1127 +++ hw/usb/dev-network.c | 20 +- hw/usb/dev-serial.c | 24 +- hw/usb/dev-smartcard-reader.c | 13 +- hw/usb/dev-storage.c | 127 +- hw/usb/dev-uas.c | 17 +- hw/usb/dev-wacom.c | 5 +- hw/usb/hcd-ehci-pci.c | 28 +- hw/usb/hcd-ehci-sysbus.c | 2 +- hw/usb/hcd-ehci.c | 120 +- hw/usb/hcd-ehci.h | 3 + hw/usb/hcd-musb.c | 8 +- hw/usb/hcd-ohci.c | 384 +- hw/usb/hcd-uhci.c | 79 +- hw/usb/hcd-xhci.c | 149 +- hw/usb/host-libusb.c | 198 +- hw/usb/redirect.c | 171 +- hw/virtio/Makefile.objs | 4 +- hw/virtio/dataplane/vring.c | 33 +- hw/virtio/vhost-backend.c | 69 + hw/virtio/vhost-user.c | 351 + hw/virtio/vhost.c | 111 +- hw/virtio/virtio-balloon.c | 90 +- hw/virtio/virtio-mmio.c | 23 +- hw/virtio/virtio-pci.c | 132 +- hw/virtio/virtio-pci.h | 6 +- hw/virtio/virtio-rng.c | 32 +- hw/virtio/virtio.c | 247 +- hw/watchdog/watchdog.c | 31 +- hw/watchdog/wdt_i6300esb.c | 22 +- hw/watchdog/wdt_ib700.c | 10 +- hw/xen/xen_backend.c | 1 - hw/xen/xen_devconfig.c | 1 + hw/xen/xen_pt.c | 20 - hw/xen/xen_pt_msi.c | 2 - hw/xenpv/xen_machine_pv.c | 10 +- hw/xtensa/Makefile.objs | 4 +- hw/xtensa/bootparam.h | 49 + hw/xtensa/pic_cpu.c | 4 +- hw/xtensa/sim.c | 120 + hw/xtensa/xtensa_bootparam.h | 25 - hw/xtensa/xtensa_lx60.c | 360 - hw/xtensa/xtensa_sim.c | 118 - hw/xtensa/xtfpga.c | 448 ++ include/block/accounting.h | 57 + include/block/aio.h | 76 +- include/block/block.h | 227 +- include/block/block_int.h | 176 +- include/block/blockjob.h | 67 +- include/block/coroutine.h | 21 +- include/block/nbd.h | 12 + include/block/qapi.h | 4 - include/block/scsi.h | 2 + include/block/thread-pool.h | 10 +- include/elf.h | 45 +- include/exec/cpu-all.h | 141 +- include/exec/cpu-common.h | 9 + include/exec/cpu-defs.h | 9 +- include/exec/cpu_ldst.h | 400 + include/exec/cpu_ldst_template.h | 193 + include/exec/def-helper.h | 274 - include/exec/exec-all.h | 46 +- include/exec/helper-gen.h | 72 + include/exec/helper-head.h | 134 + include/exec/helper-proto.h | 40 + include/exec/helper-tcg.h | 49 + include/exec/memory.h | 114 +- include/exec/ram_addr.h | 47 +- include/exec/softmmu_exec.h | 164 - include/exec/softmmu_header.h | 213 - include/exec/softmmu_template.h | 525 -- include/fpu/softfloat.h | 4 + include/glib-compat.h | 174 + include/hw/acpi/acpi.h | 5 + include/hw/acpi/acpi_dev_interface.h | 43 + include/hw/acpi/cpu_hotplug.h | 9 +- include/hw/acpi/cpu_hotplug_defs.h | 32 - include/hw/acpi/ich9.h | 8 +- include/hw/acpi/memory_hotplug.h | 38 + include/hw/acpi/pc-hotplug.h | 56 + include/hw/acpi/tpm.h | 29 + include/hw/arm/arm.h | 2 +- include/hw/arm/omap.h | 4 +- include/hw/arm/pxa.h | 2 +- include/hw/block/block.h | 13 +- include/hw/block/flash.h | 6 +- include/hw/boards.h | 81 +- include/hw/compat.h | 35 + include/hw/elf_ops.h | 15 +- include/hw/hotplug.h | 16 +- include/hw/i2c/smbus.h | 18 +- include/hw/i386/apic_internal.h | 1 + include/hw/i386/ich9.h | 2 +- include/hw/i386/intel_iommu.h | 120 + include/hw/i386/pc.h | 158 +- include/hw/i386/smbios.h | 112 +- include/hw/input/hid.h | 4 +- include/hw/irq.h | 5 +- include/hw/isa/pc87312.h | 3 - include/hw/loader.h | 8 +- include/hw/mem/pc-dimm.h | 81 + include/hw/mips/cpudevs.h | 2 + include/hw/misc/vfio.h | 9 + include/hw/net/allwinner_emac.h | 1 + include/hw/nmi.h | 49 + include/hw/nvram/fw_cfg.h | 2 + include/hw/pci-host/pam.h | 2 +- include/hw/pci-host/q35.h | 2 + include/hw/pci-host/spapr.h | 56 +- include/hw/pci/pci.h | 7 + include/hw/pci/pci_ids.h | 1 + include/hw/pci/pcie.h | 13 +- include/hw/pci/pcie_host.h | 1 - include/hw/pci/pcie_regs.h | 2 + include/hw/pci/shpc.h | 4 +- include/hw/pcmcia.h | 6 - include/hw/platform-bus.h | 57 + include/hw/ppc/mac_dbdma.h | 5 + include/hw/ppc/ppc.h | 2 + include/hw/ppc/spapr.h | 106 +- include/hw/ppc/xics.h | 11 +- include/hw/qdev-core.h | 59 +- include/hw/qdev-properties.h | 14 +- include/hw/s390x/adapter.h | 23 + include/hw/s390x/s390_flic.h | 65 +- include/hw/s390x/sclp.h | 22 +- include/hw/scsi/esp.h | 1 + include/hw/scsi/scsi.h | 51 +- include/hw/sd.h | 2 +- include/hw/ssi.h | 2 + include/hw/sysbus.h | 19 +- include/hw/timer/allwinner-a10-pit.h | 13 +- include/hw/tricore/tricore.h | 11 + include/hw/usb.h | 20 +- include/hw/usb/ehci-regs.h | 82 + include/hw/usb/uhci-regs.h | 40 + include/hw/virtio/dataplane/vring.h | 5 +- include/hw/virtio/vhost-backend.h | 40 + include/hw/virtio/vhost.h | 14 +- include/hw/virtio/virtio-access.h | 170 + include/hw/virtio/virtio-blk.h | 57 +- include/hw/virtio/virtio-net.h | 18 +- include/hw/virtio/virtio-scsi.h | 98 +- include/hw/virtio/virtio-serial.h | 2 + include/hw/virtio/virtio.h | 20 +- include/hw/virtio/virtio_ring.h | 167 + include/hw/xen/xen.h | 1 - include/hw/xen/xen_common.h | 15 + include/libdecnumber/dconfig.h | 40 + include/libdecnumber/decContext.h | 257 + include/libdecnumber/decDPD.h | 1214 +++ include/libdecnumber/decNumber.h | 202 + include/libdecnumber/decNumberLocal.h | 665 ++ include/libdecnumber/dpd/decimal128.h | 100 + include/libdecnumber/dpd/decimal128Local.h | 47 + include/libdecnumber/dpd/decimal32.h | 98 + include/libdecnumber/dpd/decimal64.h | 100 + include/migration/migration.h | 4 +- include/migration/qemu-file.h | 32 + include/migration/vmstate.h | 36 +- include/monitor/monitor.h | 48 +- include/net/net.h | 6 +- include/net/vhost-user.h | 17 + include/net/vhost_net.h | 11 +- include/qapi/error.h | 31 +- include/qapi/qmp-event.h | 27 + include/qapi/qmp/dispatch.h | 2 +- include/qapi/qmp/qdict.h | 3 + include/qapi/qmp/qerror.h | 91 - include/qapi/util.h | 17 + include/qapi/visitor-impl.h | 10 +- include/qapi/visitor.h | 7 +- include/qemu-common.h | 34 +- include/qemu/aes.h | 23 + include/qemu/bitmap.h | 19 +- include/qemu/bitops.h | 16 +- include/qemu/bswap.h | 45 +- include/qemu/cache-utils.h | 44 - include/qemu/compiler.h | 6 + include/qemu/config-file.h | 2 + include/qemu/error-report.h | 2 +- include/qemu/int128.h | 9 +- include/qemu/main-loop.h | 2 +- include/qemu/option.h | 53 +- include/qemu/option_int.h | 4 +- include/qemu/osdep.h | 42 +- include/qemu/range.h | 72 + include/qemu/sockets.h | 5 +- include/qemu/throttle.h | 10 + include/qemu/timer.h | 2 + include/qemu/typedefs.h | 5 + include/qom/cpu.h | 36 +- include/qom/object.h | 96 +- include/sysemu/accel.h | 62 + include/sysemu/arch_init.h | 35 +- include/sysemu/balloon.h | 2 - include/sysemu/block-backend.h | 142 + include/sysemu/blockdev.h | 22 +- include/sysemu/char.h | 77 +- include/sysemu/cpus.h | 2 +- include/sysemu/dma.h | 31 +- include/sysemu/dump-arch.h | 28 + include/sysemu/dump.h | 53 +- include/sysemu/hostmem.h | 68 + include/sysemu/kvm.h | 80 +- include/sysemu/os-posix.h | 2 + include/sysemu/os-win32.h | 2 + include/sysemu/qtest.h | 1 - include/sysemu/sysemu.h | 38 +- include/sysemu/tpm.h | 7 + include/trace-tcg.h | 7 + include/trace.h | 1 + include/ui/console.h | 36 +- include/ui/input.h | 10 + include/ui/qemu-pixman.h | 4 + include/ui/spice-display.h | 14 + iohandler.c | 1 + ioport.c | 11 +- iothread.c | 16 +- kvm-all.c | 222 +- kvm-stub.c | 16 +- libcacard/Makefile | 11 +- libcacard/cac.c | 62 +- libcacard/card_7816.c | 28 +- libcacard/event.c | 25 +- libcacard/vcard.c | 43 +- libcacard/vcard_emul.h | 1 + libcacard/vcard_emul_nss.c | 66 +- libcacard/vreader.c | 59 +- libcacard/vscclient.c | 90 +- libdecnumber/decContext.c | 433 ++ libdecnumber/decNumber.c | 8195 ++++++++++++++++++++ libdecnumber/dpd/decimal128.c | 564 ++ libdecnumber/dpd/decimal128Local.h | 42 + libdecnumber/dpd/decimal32.c | 489 ++ libdecnumber/dpd/decimal64.c | 850 ++ linux-headers/asm-arm/kvm.h | 12 +- linux-headers/asm-arm64/kvm.h | 15 +- linux-headers/asm-mips/kvm.h | 35 + linux-headers/asm-mips/kvm_para.h | 6 +- linux-headers/asm-powerpc/kvm.h | 10 +- linux-headers/asm-powerpc/kvm_para.h | 6 + linux-headers/asm-s390/kvm.h | 62 + linux-headers/asm-x86/kvm.h | 3 + linux-headers/linux/kvm.h | 75 +- linux-headers/linux/kvm_para.h | 3 + linux-headers/linux/psci.h | 90 + linux-headers/linux/vfio.h | 43 + linux-user/Makefile.objs | 2 +- linux-user/aarch64/syscall.h | 3 + linux-user/alpha/syscall.h | 3 + linux-user/arm/syscall.h | 5 + linux-user/arm/syscall_nr.h | 2 +- linux-user/cpu-uname.c | 72 - linux-user/cpu-uname.h | 1 - linux-user/cris/syscall.h | 3 + linux-user/elfload.c | 126 +- linux-user/i386/syscall.h | 3 + linux-user/ioctls.h | 5 +- linux-user/m68k/syscall.h | 4 + linux-user/main.c | 113 +- linux-user/microblaze/syscall.h | 3 + linux-user/mips/syscall.h | 3 + linux-user/mips/target_cpu.h | 2 +- linux-user/mips64/syscall.h | 3 + linux-user/openrisc/syscall.h | 4 + linux-user/ppc/syscall.h | 8 + linux-user/ppc/target_cpu.h | 10 + linux-user/qemu.h | 13 +- linux-user/s390x/syscall.h | 3 + linux-user/sh4/syscall.h | 4 + linux-user/signal.c | 1421 ++-- linux-user/socket.h | 5 + linux-user/sparc/syscall.h | 3 + linux-user/sparc64/syscall.h | 3 + linux-user/strace.list | 15 + linux-user/syscall.c | 819 ++- linux-user/syscall_defs.h | 38 +- linux-user/syscall_types.h | 2 +- linux-user/uname.c | 169 + linux-user/uname.h | 10 + linux-user/unicore32/syscall.h | 4 + linux-user/x86_64/syscall.h | 3 + main-loop.c | 35 +- memory.c | 414 +- memory_mapping.c | 3 +- migration-rdma.c | 5 +- migration-tcp.c | 21 +- migration-unix.c | 21 +- migration.c | 16 +- monitor.c | 798 ++- nbd.c | 323 +- net/Makefile.objs | 3 +- net/clients.h | 5 + net/hub.c | 1 + net/l2tpv3.c | 756 ++ net/net.c | 107 +- net/queue.c | 3 + net/slirp.c | 22 +- net/socket.c | 13 +- net/tap.c | 36 +- net/tap_int.h | 3 - net/vhost-user.c | 258 + numa.c | 436 ++ os-posix.c | 107 +- os-win32.c | 5 - page_cache.c | 1 + pc-bios/QEMU,tcx.bin | Bin 1410 -> 1402 bytes pc-bios/README | 7 +- pc-bios/bios-256k.bin | Bin 262144 -> 262144 bytes pc-bios/bios.bin | Bin 131072 -> 131072 bytes pc-bios/efi-e1000.rom | Bin 173568 -> 194560 bytes pc-bios/efi-eepro100.rom | Bin 174592 -> 196096 bytes pc-bios/efi-ne2k_pci.rom | Bin 173056 -> 194560 bytes pc-bios/efi-pcnet.rom | Bin 173056 -> 194560 bytes pc-bios/efi-rtl8139.rom | Bin 176640 -> 198144 bytes pc-bios/efi-virtio.rom | Bin 171008 -> 192000 bytes pc-bios/linuxboot.bin | Bin 1024 -> 1024 bytes pc-bios/openbios-ppc | Bin 734008 -> 746588 bytes pc-bios/openbios-sparc32 | Bin 381512 -> 381512 bytes pc-bios/openbios-sparc64 | Bin 1598376 -> 1616768 bytes pc-bios/optionrom/linuxboot.S | 47 +- pc-bios/optionrom/optionrom.h | 21 +- pc-bios/petalogix-s3adsp1800.dtb | Bin 8259 -> 8259 bytes pc-bios/ppc_rom.bin | Bin 1048576 -> 1048576 bytes pc-bios/qemu_logo.svg | 1010 +++ pc-bios/s390-ccw.img | Bin 9336 -> 17752 bytes pc-bios/s390-ccw/bootmap.c | 536 +- pc-bios/s390-ccw/bootmap.h | 344 + pc-bios/s390-ccw/main.c | 30 +- pc-bios/s390-ccw/s390-ccw.h | 39 +- pc-bios/s390-ccw/sclp-ascii.c | 4 +- pc-bios/s390-ccw/virtio.c | 148 +- pc-bios/s390-ccw/virtio.h | 50 +- pc-bios/slof.bin | Bin 921720 -> 923896 bytes pc-bios/u-boot.e500 | Bin 0 -> 330260 bytes pc-bios/vgabios-cirrus.bin | Bin 37376 -> 37376 bytes pc-bios/vgabios-qxl.bin | Bin 37376 -> 37376 bytes pc-bios/vgabios-stdvga.bin | Bin 37376 -> 37376 bytes pc-bios/vgabios-vmware.bin | Bin 37376 -> 37376 bytes pc-bios/vgabios.bin | Bin 37376 -> 37376 bytes pixman | 2 +- po/Makefile | 13 +- po/de_DE.po | 55 +- po/fr_FR.po | 56 +- po/hu.po | 2 +- po/it.po | 65 +- po/tr.po | 2 +- po/zh_CN.po | 86 + qapi-schema.json | 2127 ++---- qapi/Makefile.objs | 3 +- qapi/block-core.json | 1828 +++++ qapi/block.json | 180 + qapi/common.json | 104 + qapi/event.json | 332 + qapi/opts-visitor.c | 26 +- qapi/qapi-dealloc-visitor.c | 26 + qapi/qapi-util.c | 34 + qapi/qapi-visit-core.c | 266 +- qapi/qmp-dispatch.c | 27 +- qapi/qmp-event.c | 74 + qapi/qmp-input-visitor.c | 8 +- qapi/qmp-output-visitor.c | 6 + qapi/string-input-visitor.c | 207 +- qapi/string-output-visitor.c | 235 +- qapi/trace.json | 65 + qdev-monitor.c | 165 +- qemu-bridge-helper.c | 9 +- qemu-char.c | 1166 ++- qemu-coroutine-io.c | 4 +- qemu-coroutine-sleep.c | 12 - qemu-coroutine.c | 26 +- qemu-doc.texi | 61 +- qemu-file-stdio.c | 194 + qemu-file-unix.c | 223 + qemu-file.c | 896 ++- qemu-img-cmds.hx | 24 +- qemu-img.c | 786 ++- qemu-img.texi | 93 +- qemu-io-cmds.c | 30 +- qemu-io.c | 70 +- qemu-nbd.c | 127 +- qemu-nbd.texi | 2 +- qemu-options.hx | 308 +- qemu-seccomp.c | 12 +- qemu-timer.c | 14 +- qga/channel-posix.c | 2 +- qga/commands-posix.c | 724 ++- qga/commands-win32.c | 170 +- qga/commands.c | 4 +- qga/guest-agent-core.h | 1 + qga/main.c | 8 +- qga/qapi-schema.json | 110 +- qga/vss-win32.c | 6 +- qga/vss-win32.h | 2 +- qmp-commands.hx | 331 +- qmp.c | 220 +- qobject/json-lexer.c | 4 +- qobject/json-parser.c | 17 +- qobject/qdict.c | 32 + qom/cpu.c | 29 +- qom/object.c | 290 +- qtest.c | 79 +- roms/Makefile | 9 + roms/SLOF | 2 +- roms/config.ipxe.general.h | 4 +- roms/ipxe | 2 +- roms/openbios | 2 +- roms/openhackware | 2 +- roms/seabios | 2 +- roms/u-boot | 1 + rules.mak | 293 +- savevm.c | 166 +- scripts/acpi_extract.py | 23 +- scripts/checkpatch.pl | 8 +- scripts/cleanup-trace-events.pl | 2 +- scripts/coverity-model.c | 183 + scripts/get_maintainer.pl | 28 +- scripts/kvm/kvm_stat | 210 +- scripts/kvm/vmxcap | 10 +- scripts/qapi-commands.py | 108 +- scripts/qapi-event.py | 368 + scripts/qapi-types.py | 11 +- scripts/qapi-visit.py | 270 +- scripts/qapi.py | 114 +- scripts/qtest | 5 - scripts/simpletrace.py | 64 +- scripts/tracetool.py | 43 +- scripts/tracetool/__init__.py | 176 +- scripts/tracetool/backend/__init__.py | 76 +- scripts/tracetool/backend/dtrace.py | 81 +- scripts/tracetool/backend/events.py | 23 - scripts/tracetool/backend/ftrace.py | 56 +- scripts/tracetool/backend/simple.py | 132 +- scripts/tracetool/backend/stderr.py | 43 +- scripts/tracetool/backend/ust.py | 65 +- scripts/tracetool/format/__init__.py | 50 +- scripts/tracetool/format/c.py | 16 +- scripts/tracetool/format/d.py | 30 +- scripts/tracetool/format/events_c.py | 15 +- scripts/tracetool/format/events_h.py | 20 +- scripts/tracetool/format/h.py | 30 +- scripts/tracetool/format/simpletrace_stap.py | 71 + scripts/tracetool/format/stap.py | 47 +- scripts/tracetool/format/tcg_h.py | 57 + scripts/tracetool/format/tcg_helper_c.py | 50 + scripts/tracetool/format/tcg_helper_h.py | 50 + scripts/tracetool/format/tcg_helper_wrapper_h.py | 70 + scripts/tracetool/format/ust_events_c.py | 7 +- scripts/tracetool/format/ust_events_h.py | 49 +- scripts/tracetool/transform.py | 166 + scripts/update-linux-headers.sh | 3 +- scripts/vmstate-static-checker.py | 422 + slirp/arp_table.c | 10 +- slirp/misc.c | 33 +- slirp/misc.h | 4 - slirp/slirp.c | 15 +- slirp/slirp.h | 2 - slirp/slirp_config.h | 3 - slirp/tftp.h | 2 +- slirp/udp.c | 2 +- softmmu_template.h | 574 ++ spice-qemu-char.c | 10 +- stubs/Makefile.objs | 14 +- stubs/arch-query-cpu-def.c | 2 +- stubs/bdrv-commit-all.c | 7 + stubs/chr-baum-init.c | 7 + stubs/chr-msmouse.c | 7 + stubs/chr-testdev.c | 7 + stubs/dump.c | 2 +- stubs/fdset-remove-fd.c | 3 +- stubs/get-next-serial.c | 3 + stubs/is-daemonized.c | 9 + stubs/machine-init-done.c | 6 + stubs/mon-print-filename.c | 6 - stubs/mon-protocol-event.c | 6 - stubs/monitor-init.c | 6 + stubs/notify-event.c | 6 + stubs/qemu-chr-open-spice.c | 14 + stubs/qmp_pc_dimm_device_list.c | 7 + stubs/vc-init.c | 7 + stubs/vm-stop.c | 7 +- target-alpha/cpu-qom.h | 3 + target-alpha/cpu.c | 2 + target-alpha/cpu.h | 1 + target-alpha/fpu_helper.c | 9 +- target-alpha/helper.c | 46 +- target-alpha/helper.h | 5 +- target-alpha/int_helper.c | 2 +- target-alpha/machine.c | 2 - target-alpha/mem_helper.c | 29 +- target-alpha/sys_helper.c | 2 +- target-alpha/translate.c | 2372 +++---- target-arm/Makefile.objs | 1 + target-arm/arm_ldst.h | 48 + target-arm/cpu-qom.h | 32 +- target-arm/cpu.c | 235 +- target-arm/cpu.h | 499 +- target-arm/cpu64.c | 135 +- target-arm/crypto_helper.c | 338 +- target-arm/gdbstub64.c | 2 - target-arm/helper-a64.c | 153 +- target-arm/helper-a64.h | 4 +- target-arm/helper.c | 1991 ++++- target-arm/helper.h | 28 +- target-arm/internals.h | 381 + target-arm/iwmmxt_helper.c | 11 +- target-arm/kvm-consts.h | 89 +- target-arm/kvm.c | 11 + target-arm/kvm32.c | 58 +- target-arm/kvm64.c | 92 +- target-arm/kvm_arm.h | 20 + target-arm/machine.c | 27 +- target-arm/neon_helper.c | 32 +- target-arm/op_helper.c | 461 ++- target-arm/psci.c | 242 + target-arm/translate-a64.c | 817 ++- target-arm/translate.c | 1084 ++- target-arm/translate.h | 46 +- target-cris/cpu-qom.h | 1 + target-cris/cpu.c | 2 + target-cris/helper.c | 32 + target-cris/helper.h | 4 - target-cris/op_helper.c | 19 +- target-cris/translate.c | 57 +- target-cris/translate_v10.c | 2 +- target-i386/cc_helper.c | 2 +- target-i386/cpu-qom.h | 12 +- target-i386/cpu.c | 785 ++- target-i386/cpu.h | 188 +- target-i386/excp_helper.c | 2 +- target-i386/fpu_helper.c | 28 +- target-i386/gdbstub.c | 6 +- target-i386/helper.c | 437 +- target-i386/helper.h | 4 - target-i386/int_helper.c | 2 +- target-i386/kvm.c | 207 +- target-i386/kvm_i386.h | 2 + target-i386/machine.c | 158 +- target-i386/mem_helper.c | 25 +- target-i386/misc_helper.c | 49 +- target-i386/ops_sse.h | 32 +- target-i386/seg_helper.c | 257 +- target-i386/smm_helper.c | 52 +- target-i386/svm_helper.c | 20 +- target-i386/translate.c | 60 +- target-lm32/Makefile.objs | 1 + target-lm32/README | 15 +- target-lm32/cpu-qom.h | 1 + target-lm32/cpu.c | 4 +- target-lm32/cpu.h | 3 +- target-lm32/helper.c | 32 +- target-lm32/helper.h | 4 - target-lm32/lm32-semi.c | 215 + target-lm32/machine.c | 6 +- target-lm32/op_helper.c | 16 +- target-lm32/translate.c | 9 +- target-m68k/cpu-qom.h | 4 + target-m68k/cpu.c | 4 + target-m68k/cpu.h | 1 - target-m68k/helper.c | 22 +- target-m68k/helper.h | 4 - target-m68k/op_helper.c | 41 +- target-m68k/translate.c | 9 +- target-microblaze/cpu-qom.h | 1 + target-microblaze/cpu.c | 3 + target-microblaze/helper.c | 16 + target-microblaze/helper.h | 4 - target-microblaze/op_helper.c | 14 +- target-microblaze/translate.c | 21 +- target-mips/Makefile.objs | 3 +- target-mips/cpu-qom.h | 3 + target-mips/cpu.c | 11 + target-mips/cpu.h | 155 +- target-mips/dsp_helper.c | 28 +- target-mips/gdbstub.c | 7 - target-mips/helper.c | 182 +- target-mips/helper.h | 247 +- target-mips/kvm.c | 690 ++ target-mips/kvm_mips.h | 26 + target-mips/lmi_helper.c | 2 +- target-mips/machine.c | 42 +- target-mips/mips-defs.h | 29 +- target-mips/msa_helper.c | 3436 ++++++++ target-mips/op_helper.c | 564 ++- target-mips/translate.c | 6289 ++++++++++++---- target-mips/translate_init.c | 85 +- target-moxie/helper.c | 18 +- target-moxie/helper.h | 4 - target-moxie/machine.c | 3 +- target-moxie/translate.c | 6 +- target-openrisc/cpu.c | 1 + target-openrisc/cpu.h | 1 + target-openrisc/exception_helper.c | 2 +- target-openrisc/fpu_helper.c | 2 +- target-openrisc/helper.h | 4 - target-openrisc/int_helper.c | 2 +- target-openrisc/interrupt.c | 20 + target-openrisc/interrupt_helper.c | 2 +- target-openrisc/machine.c | 2 - target-openrisc/mmu_helper.c | 15 +- target-openrisc/sys_helper.c | 2 +- target-openrisc/translate.c | 13 +- target-ppc/Makefile.objs | 1 + target-ppc/arch_dump.c | 107 +- target-ppc/cpu-models.c | 55 +- target-ppc/cpu-models.h | 23 +- target-ppc/cpu-qom.h | 28 +- target-ppc/cpu.h | 173 +- target-ppc/dfp_helper.c | 1316 ++++ target-ppc/excp_helper.c | 42 +- target-ppc/fpu_helper.c | 11 +- target-ppc/gdbstub.c | 251 +- target-ppc/helper.h | 64 +- target-ppc/int_helper.c | 341 +- target-ppc/kvm.c | 535 ++- target-ppc/kvm_ppc.h | 42 +- target-ppc/machine.c | 79 +- target-ppc/mem_helper.c | 33 +- target-ppc/misc_helper.c | 41 +- target-ppc/mmu-hash32.c | 2 +- target-ppc/mmu-hash64.c | 2 +- target-ppc/mmu_helper.c | 32 +- target-ppc/timebase_helper.c | 2 +- target-ppc/translate.c | 1629 ++-- target-ppc/translate_init.c | 2203 ++++-- target-s390x/Makefile.objs | 2 +- target-s390x/cc_helper.c | 2 +- target-s390x/cpu-qom.h | 7 + target-s390x/cpu.c | 127 +- target-s390x/cpu.h | 172 +- target-s390x/fpu_helper.c | 7 +- target-s390x/gdbstub.c | 109 +- target-s390x/helper.c | 133 +- target-s390x/helper.h | 4 - target-s390x/insn-data.def | 6 +- target-s390x/int_helper.c | 2 +- target-s390x/interrupt.c | 56 +- target-s390x/ioinst.h | 10 + target-s390x/kvm.c | 610 ++- target-s390x/machine.c | 76 + target-s390x/mem_helper.c | 18 +- target-s390x/misc_helper.c | 55 +- target-s390x/translate.c | 25 +- target-sh4/cpu-qom.h | 1 + target-sh4/cpu.c | 1 + target-sh4/helper.c | 9 + target-sh4/helper.h | 4 - target-sh4/op_helper.c | 18 +- target-sh4/translate.c | 9 +- target-sparc/cc_helper.c | 2 +- target-sparc/cpu-qom.h | 3 + target-sparc/cpu.c | 22 + target-sparc/cpu.h | 2 + target-sparc/fop_helper.c | 2 +- target-sparc/helper.c | 2 +- target-sparc/helper.h | 4 - target-sparc/int64_helper.c | 2 +- target-sparc/ldst_helper.c | 49 +- target-sparc/translate.c | 9 +- target-sparc/vis_helper.c | 2 +- target-sparc/win_helper.c | 2 +- target-tricore/Makefile.objs | 1 + target-tricore/cpu-qom.h | 70 + target-tricore/cpu.c | 191 + target-tricore/cpu.h | 403 + target-tricore/helper.c | 140 + target-tricore/helper.h | 32 + target-tricore/op_helper.c | 468 ++ target-tricore/translate.c | 2568 ++++++ target-tricore/tricore-defs.h | 28 + target-tricore/tricore-opcodes.h | 1408 ++++ target-unicore32/cpu-qom.h | 1 + target-unicore32/cpu.c | 1 + target-unicore32/helper.c | 17 +- target-unicore32/helper.h | 3 - target-unicore32/op_helper.c | 19 +- target-unicore32/translate.c | 37 +- target-unicore32/ucf64_helper.c | 24 +- target-xtensa/core-dc232b.c | 2 +- target-xtensa/core-dc233c.c | 2 +- target-xtensa/core-fsf.c | 2 +- target-xtensa/cpu-qom.h | 3 + target-xtensa/cpu.c | 5 +- target-xtensa/cpu.h | 10 +- target-xtensa/helper.c | 15 +- target-xtensa/helper.h | 4 - target-xtensa/import_core.sh | 53 + target-xtensa/op_helper.c | 36 +- target-xtensa/overlay_tool.h | 32 +- target-xtensa/translate.c | 9 +- target-xtensa/xtensa-semi.c | 2 +- tcg-runtime.c | 40 +- tcg/README | 23 +- tcg/aarch64/tcg-target.c | 1279 ++-- tcg/aarch64/tcg-target.h | 37 +- tcg/arm/tcg-target.c | 204 +- tcg/arm/tcg-target.h | 5 +- tcg/i386/tcg-target.c | 128 +- tcg/i386/tcg-target.h | 5 +- tcg/ia64/tcg-target.c | 721 +- tcg/ia64/tcg-target.h | 9 +- tcg/mips/tcg-target.c | 1950 +++--- tcg/mips/tcg-target.h | 20 +- tcg/optimize.c | 380 +- tcg/ppc/tcg-target.c | 3257 +++++--- tcg/ppc/tcg-target.h | 117 +- tcg/ppc64/tcg-target.c | 2210 ------ tcg/ppc64/tcg-target.h | 132 - tcg/s390/tcg-target.c | 889 ++- tcg/s390/tcg-target.h | 5 +- tcg/sparc/tcg-target.c | 1114 ++-- tcg/sparc/tcg-target.h | 34 +- tcg/tcg-be-ldst.h | 9 +- tcg/tcg-op.h | 283 +- tcg/tcg-opc.h | 124 +- tcg/tcg-runtime.h | 30 +- tcg/tcg.c | 565 +- tcg/tcg.h | 200 +- tcg/tci/tcg-target.c | 131 +- tcg/tci/tcg-target.h | 12 +- tci.c | 343 +- tests/.gitignore | 15 +- tests/Makefile | 136 +- tests/ac97-test.c | 33 + tests/acpi-test-data/pc/DSDT | Bin 4480 -> 3592 bytes tests/acpi-test-data/pc/SSDT | Bin 2269 -> 2279 bytes tests/acpi-test-data/q35/DSDT | Bin 7378 -> 8182 bytes tests/acpi-test-data/q35/SSDT | Bin 550 -> 560 bytes tests/acpi-test-data/rebuild-expected-aml.sh | 6 +- tests/acpi-test.c | 674 -- tests/ahci-test.c | 1561 ++++ tests/bios-tables-test.c | 807 ++ tests/blockdev-test.c | 59 - tests/check-qdict.c | 87 + tests/check-qjson.c | 7 + tests/display-vga-test.c | 52 + tests/drive_del-test.c | 137 + tests/e1000-test.c | 33 +- tests/es1370-test.c | 33 + tests/fdc-test.c | 4 +- tests/ide-test.c | 101 +- tests/image-fuzzer/qcow2/__init__.py | 1 + tests/image-fuzzer/qcow2/fuzz.py | 367 + tests/image-fuzzer/qcow2/layout.py | 612 ++ tests/image-fuzzer/runner.py | 437 ++ tests/intel-hda-test.c | 45 + tests/ioh3420-test.c | 34 + tests/libqos/malloc-pc.c | 283 +- tests/libqos/malloc-pc.h | 9 + tests/libqos/malloc.h | 2 +- tests/libqos/pci-pc.c | 73 +- tests/libqos/pci-pc.h | 1 + tests/libqos/pci.c | 123 +- tests/libqos/pci.h | 17 +- tests/libqos/usb.c | 71 + tests/libqos/usb.h | 17 + tests/libqos/virtio-pci.c | 343 + tests/libqos/virtio-pci.h | 61 + tests/libqos/virtio.c | 281 + tests/libqos/virtio.h | 187 + tests/libqtest.c | 128 +- tests/libqtest.h | 32 + tests/qapi-schema/duplicate-key.err | 2 +- tests/qapi-schema/event-nest-struct.err | 1 + tests/qapi-schema/event-nest-struct.exit | 1 + tests/qapi-schema/event-nest-struct.json | 2 + .../qapi-schema/flat-union-invalid-branch-key.err | 2 +- .../flat-union-invalid-discriminator.err | 2 +- tests/qapi-schema/flat-union-no-base.err | 2 +- .../flat-union-string-discriminator.err | 2 +- tests/qapi-schema/funny-char.err | 2 +- tests/qapi-schema/include-before-err.err | 1 + tests/qapi-schema/include-before-err.exit | 1 + tests/qapi-schema/include-before-err.json | 2 + tests/qapi-schema/include-cycle-b.json | 1 + tests/qapi-schema/include-cycle-c.json | 1 + tests/qapi-schema/include-cycle.err | 3 + tests/qapi-schema/include-cycle.exit | 1 + tests/qapi-schema/include-cycle.json | 1 + tests/qapi-schema/include-format-err.err | 1 + tests/qapi-schema/include-format-err.exit | 1 + tests/qapi-schema/include-format-err.json | 2 + tests/qapi-schema/include-nested-err.err | 2 + tests/qapi-schema/include-nested-err.exit | 1 + tests/qapi-schema/include-nested-err.json | 1 + tests/qapi-schema/include-no-file.err | 1 + tests/qapi-schema/include-no-file.exit | 1 + tests/qapi-schema/include-no-file.json | 1 + tests/qapi-schema/include-non-file.err | 1 + tests/qapi-schema/include-non-file.exit | 1 + tests/qapi-schema/include-non-file.json | 1 + tests/qapi-schema/include-relpath-sub.json | 2 + tests/qapi-schema/include-relpath.exit | 1 + tests/qapi-schema/include-relpath.json | 1 + tests/qapi-schema/include-relpath.out | 3 + tests/qapi-schema/include-repetition-sub.json | 2 + tests/qapi-schema/include-repetition.exit | 1 + tests/qapi-schema/include-repetition.json | 3 + tests/qapi-schema/include-repetition.out | 3 + tests/qapi-schema/include-self-cycle.err | 1 + tests/qapi-schema/include-self-cycle.exit | 1 + tests/qapi-schema/include-self-cycle.json | 1 + tests/qapi-schema/include-simple-sub.json | 2 + tests/qapi-schema/include-simple.exit | 1 + tests/qapi-schema/include-simple.json | 1 + tests/qapi-schema/include-simple.out | 3 + tests/qapi-schema/include/relpath.json | 1 + tests/qapi-schema/missing-colon.err | 2 +- tests/qapi-schema/missing-comma-list.err | 2 +- tests/qapi-schema/missing-comma-object.err | 2 +- tests/qapi-schema/non-objects.err | 2 +- tests/qapi-schema/qapi-schema-test.json | 22 + tests/qapi-schema/qapi-schema-test.out | 13 +- tests/qapi-schema/quoted-structural-chars.err | 2 +- tests/qapi-schema/test-qapi.py | 6 +- tests/qapi-schema/trailing-comma-list.err | 2 +- tests/qapi-schema/trailing-comma-object.err | 2 +- tests/qapi-schema/unclosed-list.err | 2 +- tests/qapi-schema/unclosed-object.err | 2 +- tests/qapi-schema/unclosed-string.err | 2 +- tests/qapi-schema/union-invalid-base.err | 2 +- tests/qdev-monitor-test.c | 77 - tests/qemu-iotests-quick.sh | 14 +- tests/qemu-iotests/019 | 2 +- tests/qemu-iotests/025 | 2 +- tests/qemu-iotests/028 | 30 +- tests/qemu-iotests/028.out | 268 + tests/qemu-iotests/030 | 52 +- tests/qemu-iotests/031 | 8 +- tests/qemu-iotests/036 | 58 +- tests/qemu-iotests/036.out | 35 + tests/qemu-iotests/039 | 38 +- tests/qemu-iotests/039.out | 13 +- tests/qemu-iotests/040 | 4 +- tests/qemu-iotests/041 | 238 +- tests/qemu-iotests/041.out | 4 +- tests/qemu-iotests/049.out | 4 +- tests/qemu-iotests/051 | 33 + tests/qemu-iotests/051.out | 71 +- tests/qemu-iotests/052 | 5 +- tests/qemu-iotests/054 | 2 +- tests/qemu-iotests/056 | 9 +- tests/qemu-iotests/059 | 11 + tests/qemu-iotests/059.out | 210 +- tests/qemu-iotests/060 | 84 +- tests/qemu-iotests/060.out | 86 +- tests/qemu-iotests/061 | 49 +- tests/qemu-iotests/061.out | 50 +- tests/qemu-iotests/065 | 14 +- tests/qemu-iotests/067.out | 10 +- tests/qemu-iotests/069 | 2 +- tests/qemu-iotests/070 | 7 + tests/qemu-iotests/070.out | 6 + tests/qemu-iotests/072 | 2 +- tests/qemu-iotests/075 | 2 +- tests/qemu-iotests/076 | 17 +- tests/qemu-iotests/076.out | 12 +- tests/qemu-iotests/078 | 2 +- tests/qemu-iotests/079 | 2 +- tests/qemu-iotests/080 | 2 +- tests/qemu-iotests/081 | 17 +- tests/qemu-iotests/081.out | 12 +- tests/qemu-iotests/082 | 14 +- tests/qemu-iotests/082.out | 140 +- tests/qemu-iotests/083 | 10 +- tests/qemu-iotests/084 | 32 +- tests/qemu-iotests/084.out | 24 +- tests/qemu-iotests/085 | 73 +- tests/qemu-iotests/086 | 10 +- tests/qemu-iotests/087 | 102 + tests/qemu-iotests/087.out | 31 + tests/qemu-iotests/088 | 2 +- tests/qemu-iotests/089 | 129 + tests/qemu-iotests/089.out | 52 + tests/qemu-iotests/090 | 61 + tests/qemu-iotests/090.out | 12 + tests/qemu-iotests/091 | 107 + tests/qemu-iotests/091.out | 28 + tests/qemu-iotests/092 | 2 +- tests/qemu-iotests/095 | 86 + tests/qemu-iotests/095.out | 23 + tests/qemu-iotests/097 | 122 + tests/qemu-iotests/097.out | 119 + tests/qemu-iotests/098 | 82 + tests/qemu-iotests/098.out | 52 + tests/qemu-iotests/099 | 116 + tests/qemu-iotests/099.out | 20 + tests/qemu-iotests/100 | 134 + tests/qemu-iotests/100.out | 89 + tests/qemu-iotests/101 | 58 + tests/qemu-iotests/101.out | 10 + tests/qemu-iotests/102 | 81 + tests/qemu-iotests/102.out | 21 + tests/qemu-iotests/103 | 99 + tests/qemu-iotests/103.out | 29 + tests/qemu-iotests/104 | 57 + tests/qemu-iotests/104.out | 12 + tests/qemu-iotests/105 | 70 + tests/qemu-iotests/105.out | 21 + tests/qemu-iotests/107 | 61 + tests/qemu-iotests/107.out | 10 + tests/qemu-iotests/108 | 141 + tests/qemu-iotests/108.out | 110 + tests/qemu-iotests/111 | 53 + tests/qemu-iotests/111.out | 3 + tests/qemu-iotests/check | 110 +- tests/qemu-iotests/common | 33 +- tests/qemu-iotests/common.config | 2 +- tests/qemu-iotests/common.filter | 51 + tests/qemu-iotests/common.qemu | 200 + tests/qemu-iotests/common.rc | 36 +- tests/qemu-iotests/group | 70 +- tests/qemu-iotests/iotests.py | 9 +- tests/qemu-iotests/qcow2.py | 15 +- .../qemu-iotests/sample_images/fake.parallels.bz2 | Bin 141 -> 0 bytes .../sample_images/iotest-version3.vmdk.bz2 | Bin 414 -> 4764 bytes tests/qemu-iotests/sample_images/parallels-v1.bz2 | Bin 0 -> 147 bytes tests/qemu-iotests/sample_images/parallels-v2.bz2 | Bin 0 -> 150 bytes .../sample_images/test-disk2vhd.vhdx.bz2 | Bin 0 -> 1424 bytes tests/qemu-iotests/socket_scm_helper.c | 2 +- tests/qom-test.c | 21 +- tests/tcg/Makefile | 2 - tests/tcg/lm32/Makefile | 15 +- tests/tcg/lm32/crt.S | 4 +- tests/tcg/lm32/helper.S | 65 + tests/tcg/lm32/macros.inc | 37 +- tests/tcg/lm32/test_lb.S | 4 + tests/tcg/lm32/test_lbu.S | 4 + tests/tcg/lm32/test_lh.S | 4 + tests/tcg/lm32/test_lhu.S | 4 + tests/tcg/lm32/test_lw.S | 2 + tests/tcg/lm32/test_sb.S | 2 + tests/tcg/lm32/test_scall.S | 4 + tests/tcg/lm32/test_sh.S | 2 + tests/tcg/lm32/test_sw.S | 3 + tests/tcg/test_path.c | 7 - tests/tcg/xtensa/Makefile | 10 +- tests/tcg/xtensa/linker.ld | 112 - tests/tcg/xtensa/linker.ld.S | 130 + tests/tcg/xtensa/test_mmu.S | 246 +- tests/tcg/xtensa/test_windowed.S | 51 + tests/test-aio.c | 98 +- tests/test-bitops.c | 1 + tests/test-coroutine.c | 54 + tests/test-qdev-global-props.c | 157 +- tests/test-qemu-opts.c | 441 ++ tests/test-qmp-event.c | 271 + tests/test-qmp-input-strict.c | 117 +- tests/test-qmp-input-visitor.c | 99 +- tests/test-qmp-output-visitor.c | 111 +- tests/test-string-input-visitor.c | 87 +- tests/test-string-output-visitor.c | 178 +- tests/test-thread-pool.c | 52 +- tests/test-throttle.c | 63 +- tests/test-visitor-serialization.c | 32 +- tests/test-vmstate.c | 372 +- tests/tmp105-test.c | 4 +- tests/usb-hcd-ehci-test.c | 173 + tests/usb-hcd-ohci-test.c | 41 + tests/usb-hcd-uhci-test.c | 96 + tests/usb-hcd-xhci-test.c | 99 + tests/vhost-user-test.c | 421 + tests/virtio-blk-test.c | 664 ++- tests/virtio-net-test.c | 10 + tests/virtio-rng-test.c | 10 + tests/virtio-scsi-test.c | 29 + tests/virtio-serial-test.c | 27 + tests/vmstate-static-checker-data/dump1.json | 1163 +++ tests/vmstate-static-checker-data/dump2.json | 968 +++ tests/wdt_ib700-test.c | 134 + thread-pool.c | 69 +- trace-events | 277 +- trace/Makefile.objs | 89 +- trace/control-internal.h | 4 +- trace/control.c | 73 +- trace/control.h | 34 +- trace/default.c | 40 - trace/ftrace.c | 25 +- trace/ftrace.h | 5 + trace/qmp.c | 75 + trace/simple.c | 77 +- trace/simple.h | 1 + trace/stderr.c | 30 - translate-all.c | 159 +- ui/Makefile.objs | 10 +- ui/cocoa.m | 110 +- ui/console.c | 555 +- ui/curses.c | 10 + ui/gtk.c | 1396 +++-- ui/input-keymap.c | 198 + ui/input-legacy.c | 242 +- ui/input.c | 204 +- ui/qemu-pixman.c | 90 + ui/sdl.c | 5 +- ui/sdl2-keymap.h | 7 +- ui/sdl2.c | 141 +- ui/spice-core.c | 101 +- ui/spice-display.c | 149 +- ui/vnc-enc-tight.c | 20 +- ui/vnc-tls.c | 6 +- ui/vnc.c | 387 +- ui/vnc.h | 19 +- user-exec.c | 28 +- util/Makefile.objs | 4 +- util/acl.c | 10 +- util/aes.c | 343 + util/cache-utils.c | 86 - util/cutils.c | 13 +- util/error.c | 18 +- util/fifo8.c | 3 +- util/getauxval.c | 59 +- util/hbitmap.c | 9 +- util/host-utils.c | 2 - util/id.c | 28 + util/iov.c | 44 +- util/module.c | 9 +- util/osdep.c | 21 +- util/oslib-posix.c | 97 +- util/oslib-win32.c | 240 +- util/path.c | 10 +- util/qemu-config.c | 20 +- util/qemu-error.c | 27 +- util/qemu-openpty.c | 2 + util/qemu-option.c | 646 +- util/qemu-sockets.c | 105 +- util/readline.c | 26 +- util/throttle.c | 27 +- vl.c | 1075 ++-- vmstate.c | 33 +- xbzrle.c | 8 +- xen-common-stub.c | 6 - xen-common.c | 25 +- xen-hvm.c | 142 +- 1657 files changed, 142979 insertions(+), 50916 deletions(-) diff --git a/.gitignore b/.gitignore index de90463..e32a584 100644 --- a/.gitignore +++ b/.gitignore @@ -4,12 +4,17 @@ /config-host.* /config-target.* /config.status +/config-temp /trace/generated-tracers.h /trace/generated-tracers.c /trace/generated-tracers-dtrace.h /trace/generated-tracers.dtrace /trace/generated-events.h /trace/generated-events.c +/trace/generated-helpers-wrappers.h +/trace/generated-helpers.h +/trace/generated-helpers.c +/trace/generated-tcg-tracers.h /trace/generated-ust-provider.h /trace/generated-ust.c /libcacard/trace/generated-tracers.c @@ -18,13 +23,14 @@ /*-darwin-user /*-linux-user /*-bsd-user -libdis* -libuser +/libdis* +/libuser /linux-headers/asm /qga/qapi-generated /qapi-generated /qapi-types.[ch] /qapi-visit.[ch] +/qapi-event.[ch] /qmp-commands.h /qmp-marshal.c /qemu-doc.html @@ -49,19 +55,9 @@ libuser /qemu-monitor.texi /qmp-commands.txt /vscclient -/test-bitops -/test-coroutine -/test-int128 -/test-opts-visitor -/test-qmp-input-visitor -/test-qmp-output-visitor -/test-string-input-visitor -/test-string-output-visitor -/test-visitor-serialization /fsdev/virtfs-proxy-helper /fsdev/virtfs-proxy-helper.1 /fsdev/virtfs-proxy-helper.pod -/.gdbinit *.a *.aux *.cp @@ -90,12 +86,8 @@ libuser *.pc .libs .sdk -*.swp -*.orig -.pc *.gcda *.gcno -patches /pc-bios/bios-pq/status /pc-bios/vgabios-pq/status /pc-bios/optionrom/linuxboot.asm diff --git a/.gitmodules b/.gitmodules index 444c24a..9da9ede 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "dtc"] path =3D dtc url =3D git://git.qemu-project.org/dtc.git +[submodule "roms/u-boot"] + path =3D roms/u-boot + url =3D git://git.qemu-project.org/u-boot.git diff --git a/.travis.yml b/.travis.yml index 04da973..ad66e5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ notifications: on_failure: always env: global: - - TEST_CMD=3D"make check" + - TEST_CMD=3D"" - EXTRA_CONFIG=3D"" # Development packages, EXTRA_PKGS saved for additional builds - CORE_PKGS=3D"libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev" @@ -20,31 +20,51 @@ env: - GUI_PKGS=3D"libgtk-3-dev libvte-2.90-dev libsdl1.2-dev libpng12-dev libpixman-1-dev" - EXTRA_PKGS=3D"" matrix: + # Group major targets together with their linux-user counterparts - TARGETS=3Dalpha-softmmu,alpha-linux-user - - TARGETS=3Darm-softmmu,arm-linux-user - - TARGETS=3Daarch64-softmmu,aarch64-linux-user - - TARGETS=3Dcris-softmmu - - TARGETS=3Di386-softmmu,x86_64-softmmu - - TARGETS=3Dlm32-softmmu - - TARGETS=3Dm68k-softmmu - - TARGETS=3Dmicroblaze-softmmu,microblazeel-softmmu + - TARGETS=3Darm-softmmu,arm-linux-user,armeb-linux-user,aarch64-softmmu,aarch64-linux-user + - TARGETS=3Dcris-softmmu,cris-linux-user + - TARGETS=3Di386-softmmu,i386-linux-user,x86_64-softmmu,x86_64-linux-user + - TARGETS=3Dm68k-softmmu,m68k-linux-user + - TARGETS=3Dmicroblaze-softmmu,microblazeel-softmmu,microblaze-linux-user,microblazeel-linux-user - TARGETS=3Dmips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu - - TARGETS=3Dmoxie-softmmu - - TARGETS=3Dor32-softmmu, - - TARGETS=3Dppc-softmmu,ppc64-softmmu,ppcemb-softmmu - - TARGETS=3Ds390x-softmmu - - TARGETS=3Dsh4-softmmu,sh4eb-softmmu - - TARGETS=3Dsparc-softmmu,sparc64-softmmu - - TARGETS=3Dunicore32-softmmu - - TARGETS=3Dxtensa-softmmu,xtensaeb-softmmu + - TARGETS=3Dmips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,mipsn32-linux-user,mipsn32el-linux-user + - TARGETS=3Dor32-softmmu,or32-linux-user + - TARGETS=3Dppc-softmmu,ppc64-softmmu,ppcemb-softmmu,ppc-linux-user,ppc64-linux-user,ppc64abi32-linux-user,ppc64le-linux-user + - TARGETS=3Ds390x-softmmu,s390x-linux-user + - TARGETS=3Dsh4-softmmu,sh4eb-softmmu,sh4-linux-user sh4eb-linux-user + - TARGETS=3Dsparc-softmmu,sparc64-softmmu,sparc-linux-user,sparc32plus-linux-user,sparc64-linux-user + - TARGETS=3Dunicore32-softmmu,unicore32-linux-user + # Group remaining softmmu only targets into one build + - TARGETS=3Dlm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,xtensaeb-softmmu +git: + # we want to do this ourselves + submodules: false before_install: + - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ - git submodule update --init --recursive - sudo apt-get update -qq - sudo apt-get install -qq ${CORE_PKGS} ${NET_PKGS} ${GUI_PKGS} ${EXTRA_PKGS} -script: "./configure --target-list=3D${TARGETS} ${EXTRA_CONFIG} && make && ${TEST_CMD}" +before_script: + - ./configure --target-list=3D${TARGETS} --enable-debug-tcg ${EXTRA_CONFIG} +script: + - make -j2 && ${TEST_CMD} matrix: # We manually include a number of additional build for non-standard bits include: + # Make check target (we only do this once) + - env: + - TARGETS=3Dalpha-softmmu,arm-softmmu,aarch64-softmmu,cris-softmmu, + i386-softmmu,x86_64-softmmu,m68k-softmmu,microblaze-softmmu, + microblazeel-softmmu,mips-softmmu,mips64-softmmu, + mips64el-softmmu,mipsel-softmmu,or32-softmmu,ppc-softmmu, + ppc64-softmmu,ppcemb-softmmu,s390x-softmmu,sh4-softmmu, + sh4eb-softmmu,sparc-softmmu,sparc64-softmmu, + unicore32-softmmu,unicore32-linux-user, + lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu, + xtensaeb-softmmu + TEST_CMD=3D"make check" + compiler: gcc # Debug related options - env: TARGETS=3Di386-softmmu,x86_64-softmmu EXTRA_CONFIG=3D"--enable-debug" @@ -66,16 +86,15 @@ matrix: compiler: gcc # All the trace backends (apart from dtrace) - env: TARGETS=3Di386-softmmu,x86_64-softmmu - EXTRA_CONFIG=3D"--enable-trace-backend=3Dstderr" + EXTRA_CONFIG=3D"--enable-trace-backends=3Dstderr" compiler: gcc - env: TARGETS=3Di386-softmmu,x86_64-softmmu - EXTRA_CONFIG=3D"--enable-trace-backend=3Dsimple" + EXTRA_CONFIG=3D"--enable-trace-backends=3Dsimple" compiler: gcc - env: TARGETS=3Di386-softmmu,x86_64-softmmu - EXTRA_CONFIG=3D"--enable-trace-backend=3Dftrace" - TEST_CMD=3D"" + EXTRA_CONFIG=3D"--enable-trace-backends=3Dftrace" compiler: gcc - env: TARGETS=3Di386-softmmu,x86_64-softmmu EXTRA_PKGS=3D"liblttng-ust-dev liburcu-dev" - EXTRA_CONFIG=3D"--enable-trace-backend=3Dust" + EXTRA_CONFIG=3D"--enable-trace-backends=3Dust" compiler: gcc diff --git a/CODING_STYLE b/CODING_STYLE index 4280945..d46cfa5 100644 --- a/CODING_STYLE +++ b/CODING_STYLE @@ -91,3 +91,17 @@ Mixed declarations (interleaving statements and declarations within blocks) are not allowed; declarations should be at the beginning of blocks. In other words, the code should not generate warnings if using GCC's -Wdeclaration-after-statement option. + +6. Conditional statements + +When comparing a variable for (in)equality with a constant, list the +constant on the right, as in: + +if (a =3D=3D 1) { + /* Reads like: "If a equals 1" */ + do_something(); +} + +Rationale: Yoda conditions (as in 'if (1 =3D=3D a)') are awkward to read. +Besides, good compilers already warn users when '=3D=3D' is mis-typed as '=3D', +even when the constant is on the right. diff --git a/MAINTAINERS b/MAINTAINERS index c66946f..bcb69e8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -51,14 +51,34 @@ Descriptions of section entries: General Project Administration ------------------------------ M: Anthony Liguori +M: Peter Maydell + +Responsible Disclosure, Reporting Security Issues +------------------------------ +W: http://wiki.qemu.org/SecurityProcess +M: Michael S. Tsirkin +M: Anthony Liguori +L: secalert@redhat.com Guest CPU cores (TCG): ---------------------- +Overall +L: qemu-devel@nongnu.org +S: Odd fixes +F: cpu-exec.c +F: cputlb.c +F: softmmu_template.h +F: translate-all.c +F: include/exec/cpu_ldst.h +F: include/exec/cpu_ldst_template.h +F: include/exec/helper*.h + Alpha M: Richard Henderson S: Maintained F: target-alpha/ F: hw/alpha/ +F: tests/tcg/alpha/ ARM M: Peter Maydell @@ -72,6 +92,7 @@ M: Edgar E. Iglesias S: Maintained F: target-cris/ F: hw/cris/ +F: tests/tcg/cris/ LM32 M: Michael Walle @@ -79,6 +100,7 @@ S: Maintained F: target-lm32/ F: hw/lm32/ F: hw/char/lm32_* +F: tests/tcg/lm32/ M68K S: Orphan @@ -93,9 +115,11 @@ F: hw/microblaze/ MIPS M: Aurelien Jarno -S: Odd Fixes +M: Leon Alrae +S: Maintained F: target-mips/ F: hw/mips/ +F: tests/tcg/mips/ Moxie M: Anthony Green @@ -107,6 +131,7 @@ M: Jia Liu S: Maintained F: target-openrisc/ F: hw/openrisc/ +F: tests/tcg/openrisc/ PowerPC M: Alexander Graf @@ -142,7 +167,8 @@ F: target-unicore32/ F: hw/unicore32/ X86 -M: qemu-devel@nongnu.org +M: Paolo Bonzini +M: Richard Henderson S: Odd Fixes F: target-i386/ F: hw/i386/ @@ -153,6 +179,13 @@ W: http://wiki.osll.spb.ru/doku.php=3Fid=3Detc:users:jcmvbkbc:qemu-target-xtensa S: Maintained F: target-xtensa/ F: hw/xtensa/ +F: tests/tcg/xtensa/ + +TriCore +M: Bastian Koppelmann +S: Maintained +F: target-tricore/ +F: hw/tricore/ Guest CPU Cores (KVM): ---------------------- @@ -169,6 +202,11 @@ M: Peter Maydell S: Maintained F: target-arm/kvm.c +MIPS +M: James Hogan +S: Maintained +F: target-mips/kvm.c + PPC M: Alexander Graf S: Maintained @@ -180,9 +218,12 @@ M: Cornelia Huck M: Alexander Graf S: Maintained F: target-s390x/kvm.c -F: hw/intc/s390_flic.[hc] +F: hw/intc/s390_flic.c +F: hw/intc/s390_flic_kvm.c +F: include/hw/s390x/s390_flic.h X86 +M: Paolo Bonzini M: Marcelo Tosatti L: kvm@vger.kernel.org S: Supported @@ -236,8 +277,8 @@ S: Maintained F: hw/*/exynos* Calxeda Highbank -M: Mark Langsdorf -S: Supported +M: Rob Herring +S: Maintained F: hw/arm/highbank.c F: hw/net/xgmac.c @@ -248,7 +289,7 @@ F: include/hw/arm/digic.h F: hw/*/digic* Gumstix -M: qemu-devel@nongnu.org +L: qemu-devel@nongnu.org S: Orphan F: hw/arm/gumstix.c @@ -264,7 +305,7 @@ S: Maintained F: hw/arm/integratorcp.c Mainstone -M: qemu-devel@nongnu.org +L: qemu-devel@nongnu.org S: Orphan F: hw/arm/mainstone.c @@ -370,7 +411,7 @@ S: Maintained F: hw/mips/mips_malta.c Mipssim -M: qemu-devel@nongnu.org +L: qemu-devel@nongnu.org S: Orphan F: hw/mips/mips_mipssim.c @@ -503,6 +544,8 @@ F: hw/s390x/s390-virtio-ccw.c F: hw/s390x/css.[hc] F: hw/s390x/sclp*.[hc] F: hw/s390x/ipl*.[hc] +F: include/hw/s390x/ +F: pc-bios/s390-ccw/ T: git git://github.com/cohuck/qemu virtio-ccw-upstr UniCore32 Machines @@ -540,17 +583,19 @@ Xtensa Machines sim M: Max Filippov S: Maintained -F: hw/xtensa/xtensa_sim.c +F: hw/xtensa/sim.c -Avnet LX60 +XTFPGA (LX60, LX200, ML605, KC705) M: Max Filippov S: Maintained -F: hw/xtensa/xtensa_lx60.c +F: hw/xtensa/xtfpga.c +F: hw/net/opencores_eth.c Devices ------- IDE M: Kevin Wolf +M: Stefan Hajnoczi S: Odd Fixes F: include/hw/ide.h F: hw/ide/ @@ -601,6 +646,13 @@ USB M: Gerd Hoffmann S: Maintained F: hw/usb/* +F: tests/usb-*-test.c + +USB (serial adapter) +M: Gerd Hoffmann +M: Samuel Thibault +S: Maintained +F: hw/usb/dev-serial.c VFIO M: Alex Williamson @@ -651,6 +703,12 @@ S: Supported F: hw/block/nvme* F: tests/nvme-test.c +megasas +M: Hannes Reinecke +S: Supported +F: hw/scsi/megasas.c +F: hw/scsi/mfi.h + Xilinx EDK M: Peter Crosthwaite M: Edgar E. Iglesias @@ -658,6 +716,12 @@ S: Maintained F: hw/*/xilinx_* F: include/hw/xilinx.h +Vmware +M: Dmitry Fleytman +S: Maintained +F: hw/net/vmxnet* +F: hw/scsi/vmw_pvscsi* + Subsystems ---------- Audio @@ -666,21 +730,38 @@ M: Gerd Hoffmann S: Maintained F: audio/ F: hw/audio/ +F: tests/ac97-test.c +F: tests/es1370-test.c +F: tests/intel-hda-test.c Block M: Kevin Wolf M: Stefan Hajnoczi S: Supported +F: async.c +F: aio-*.c F: block* F: block/ F: hw/block/ +F: qemu-img* +F: qemu-io* +F: tests/image-fuzzer/ +F: tests/qemu-iotests/ T: git git://repo.or.cz/qemu/kevin.git block T: git git://github.com/stefanha/qemu.git block Character Devices M: Anthony Liguori +M: Paolo Bonzini S: Maintained F: qemu-char.c +F: backends/msmouse.c +F: backends/testdev.c + +Character Devices (Braille) +M: Samuel Thibault +S: Maintained +F: backends/baum.c CPU M: Andreas F=C3=A4rber @@ -702,11 +783,21 @@ S: Maintained F: device_tree.[ch] GDB stub -M: qemu-devel@nongnu.org +L: qemu-devel@nongnu.org S: Odd Fixes F: gdbstub* F: gdb-xml/ +Memory API +M: Paolo Bonzini +S: Supported +F: include/exec/ioport.h +F: ioport.c +F: include/exec/memory.h +F: memory.c +F: include/exec/memory-internal.h +F: exec.c + SPICE M: Gerd Hoffmann S: Supported @@ -729,7 +820,11 @@ F: ui/cocoa.m Main loop M: Anthony Liguori -S: Supported +M: Paolo Bonzini +S: Maintained +F: cpus.c +F: main-loop.c +F: qemu-timer.c F: vl.c Human Monitor (HMP) @@ -768,6 +863,7 @@ M: Luiz Capitulino M: Michael Roth S: Maintained F: qapi/ +F: tests/qapi-schema/ T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp QAPI Schema @@ -778,6 +874,29 @@ S: Supported F: qapi-schema.json T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp +QObject +M: Luiz Capitulino +S: Maintained +F: qobject/ +T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp + +QEMU Guest Agent +M: Michael Roth +S: Maintained +F: qga/ +T: git git://github.com/mdroth/qemu.git qga + +QOM +M: Anthony Liguori +M: Andreas F=C3=A4rber +S: Supported +T: git git://github.com/afaerber/qemu-cpu.git qom-next +F: include/qom/ +X: include/qom/cpu.h +F: qom/ +X: qom/cpu.c +F: tests/qom-test.c + QMP M: Luiz Capitulino S: Maintained @@ -807,14 +926,29 @@ M: Blue Swirl S: Odd Fixes F: scripts/checkpatch.pl +Migration +M: Juan Quintela +S: Maintained +F: include/migration/ +F: migration* +F: savevm.c +F: arch_init.c +F: vmstate.c + Seccomp -M: Eduardo Otubo +M: Eduardo Otubo S: Supported F: qemu-seccomp.c F: include/sysemu/seccomp.h Usermode Emulation ------------------ +Overall +M: Riku Voipio +S: Maintained +F: thunk.c +F: user-exec.c + BSD user M: Blue Swirl S: Maintained @@ -828,7 +962,6 @@ F: linux-user/ Tiny Code Generator (TCG) ------------------------- Common code -M: qemu-devel@nongnu.org M: Richard Henderson S: Maintained F: tcg/ @@ -845,7 +978,7 @@ S: Maintained F: tcg/arm/ i386 target -M: qemu-devel@nongnu.org +L: qemu-devel@nongnu.org S: Maintained F: tcg/i386/ @@ -922,7 +1055,7 @@ S: Supported F: block/rbd.c Sheepdog -M: MORITA Kazutaka +M: Hitoshi Mitake M: Liu Yuan L: sheepdog@lists.wpkg.org S: Supported @@ -954,3 +1087,14 @@ SSH M: Richard W.M. Jones S: Supported F: block/ssh.c + +ARCHIPELAGO +M: Chrysostomos Nanakos +M: Chrysostomos Nanakos +S: Maintained +F: block/archipelago.c + +Bootdevice +M: Gonglei +S: Maintained +F: bootdevice.c diff --git a/Makefile b/Makefile index 423e373..f505202 100644 --- a/Makefile +++ b/Makefile @@ -45,19 +45,25 @@ endif endif GENERATED_HEADERS =3D config-host.h qemu-options.def -GENERATED_HEADERS +=3D qmp-commands.h qapi-types.h qapi-visit.h -GENERATED_SOURCES +=3D qmp-marshal.c qapi-types.c qapi-visit.c +GENERATED_HEADERS +=3D qmp-commands.h qapi-types.h qapi-visit.h qapi-event.h +GENERATED_SOURCES +=3D qmp-marshal.c qapi-types.c qapi-visit.c qapi-event.c GENERATED_HEADERS +=3D trace/generated-events.h GENERATED_SOURCES +=3D trace/generated-events.c GENERATED_HEADERS +=3D trace/generated-tracers.h -ifeq ($(TRACE_BACKEND),dtrace) +ifeq ($(findstring dtrace,$(TRACE_BACKENDS)),dtrace) GENERATED_HEADERS +=3D trace/generated-tracers-dtrace.h endif GENERATED_SOURCES +=3D trace/generated-tracers.c -ifeq ($(TRACE_BACKEND),ust) +GENERATED_HEADERS +=3D trace/generated-tcg-tracers.h + +GENERATED_HEADERS +=3D trace/generated-helpers-wrappers.h +GENERATED_HEADERS +=3D trace/generated-helpers.h +GENERATED_SOURCES +=3D trace/generated-helpers.c + +ifeq ($(findstring ust,$(TRACE_BACKENDS)),ust) GENERATED_HEADERS +=3D trace/generated-ust-provider.h GENERATED_SOURCES +=3D trace/generated-ust.c endif @@ -148,10 +154,6 @@ endif all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules -vl.o: QEMU_CFLAGS+=3D$(GPROF_CFLAGS) - -vl.o: QEMU_CFLAGS+=3D$(SDL_CFLAGS) - config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak qemu-options.def: $(SRC_PATH)/qemu-options.hx @@ -195,8 +197,6 @@ ALL_SUBDIRS=3D$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS)) recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) -bt-host.o: QEMU_CFLAGS +=3D $(BLUEZ_CFLAGS) - $(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h | $(BUILD_DIR)/version.lo $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<," RC version.o") $(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h @@ -208,7 +208,7 @@ Makefile: $(version-obj-y) $(version-lobj-y) # Build libraries libqemustub.a: $(stub-obj-y) -libqemuutil.a: $(util-obj-y) qapi-types.o qapi-visit.o +libqemuutil.a: $(util-obj-y) block-modules =3D $(foreach o,$(block-obj-m),"$(basename $(subst /,-,$o))",) NULL util/module.o-cflags =3D -D'CONFIG_BLOCK_MODULES=3D$(block-modules)' @@ -238,23 +238,44 @@ qapi-py =3D $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h :\ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@") + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \ + $(gen-out-type) -o qga/qapi-generated -p "qga-" -i $<, \ + " GEN $@") qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h :\ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@") + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \ + $(gen-out-type) -o qga/qapi-generated -p "qga-" -i $<, \ + " GEN $@") qga/qapi-generated/qga-qmp-commands.h qga/qapi-generated/qga-qmp-marshal.c :\ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@") + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \ + $(gen-out-type) -o qga/qapi-generated -p "qga-" -i $<, \ + " GEN $@") + +qapi-modules =3D $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \ + $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json \ + $(SRC_PATH)/qapi/event.json qapi-types.c qapi-types.h :\ -$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o "." -b < $<, " GEN $@") +$(qapi-modules) $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \ + $(gen-out-type) -o "." -b -i $<, \ + " GEN $@") qapi-visit.c qapi-visit.h :\ -$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o "." -b < $<, " GEN $@") +$(qapi-modules) $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \ + $(gen-out-type) -o "." -b -i $<, \ + " GEN $@") +qapi-event.c qapi-event.h :\ +$(qapi-modules) $(SRC_PATH)/scripts/qapi-event.py $(qapi-py) + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-event.py \ + $(gen-out-type) -o "." -b -i $<, \ + " GEN $@") qmp-commands.h qmp-marshal.c :\ -$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -m -o "." < $<, " GEN $@") +$(qapi-modules) $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \ + $(gen-out-type) -o "." -m -i $<, \ + " GEN $@") QGALIB_GEN=3D$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h) $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) @@ -329,7 +350,8 @@ multiboot.bin linuxboot.bin kvmvapic.bin \ s390-zipl.rom \ s390-ccw.img \ spapr-rtas.bin slof.bin \ -palcode-clipper +palcode-clipper \ +u-boot.e500 else BLOBS=3D endif @@ -370,19 +392,19 @@ install-sysconfig: install-datadir install-confdir install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ install-datadir install-localstatedir - $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ifneq ($(TOOLS),) - $(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)" + $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) endif ifneq ($(CONFIG_MODULES),) $(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)" - for s in $(patsubst %.mo,%$(DSOSUF),$(modules-m)); do \ - $(INSTALL_PROG) $(STRIP_OPT) $$s "$(DESTDIR)$(qemu_moddir)/$$(echo $$s | tr / -)"; \ + for s in $(modules-m:.mo=3D$(DSOSUF)); do \ + t=3D"$(DESTDIR)$(qemu_moddir)/$$(echo $$s | tr / -)"; \ + $(INSTALL_LIB) $$s "$$t"; \ + test -z "$(STRIP)" || $(STRIP) "$$t"; \ done endif ifneq ($(HELPERS-y),) - $(INSTALL_DIR) "$(DESTDIR)$(libexecdir)" - $(INSTALL_PROG) $(STRIP_OPT) $(HELPERS-y) "$(DESTDIR)$(libexecdir)" + $(call install-prog,$(HELPERS-y),$(DESTDIR)$(libexecdir)) endif ifneq ($(BLOBS),) set -e; for x in $(BLOBS); do \ @@ -396,6 +418,7 @@ endif set -e; for x in $(KEYMAPS); do \ $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \ done + $(INSTALL_DATA) $(SRC_PATH)/trace-events "$(DESTDIR)$(qemu_datadir)/trace-events" for d in $(TARGET_DIRS); do \ $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=3D$$d/ -C $$d $@ || exit 1 ; \ done diff --git a/Makefile.objs b/Makefile.objs index a6e0e2a..18fd35c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -1,7 +1,7 @@ ####################################################################### # Common libraries for tools and emulators stub-obj-y =3D stubs/ -util-obj-y =3D util/ qobject/ qapi/ trace/ +util-obj-y =3D util/ qobject/ qapi/ qapi-types.o qapi-visit.o qapi-event.o ####################################################################### # block-obj-y is code used by both qemu system emulation and qemu-img @@ -12,7 +12,6 @@ block-obj-y +=3D main-loop.o iohandler.o qemu-timer.o block-obj-$(CONFIG_POSIX) +=3D aio-posix.o block-obj-$(CONFIG_WIN32) +=3D aio-win32.o block-obj-y +=3D block/ -block-obj-y +=3D qapi-types.o qapi-visit.o block-obj-y +=3D qemu-io-cmds.o block-obj-y +=3D qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o @@ -31,6 +30,8 @@ libcacard-y +=3D libcacard/vcard_emul_nss.o libcacard-y +=3D libcacard/vcard_emul_type.o libcacard-y +=3D libcacard/card_7816.o libcacard-y +=3D libcacard/vcardt.o +libcacard/vcard_emul_nss.o-cflags :=3D $(NSS_CFLAGS) +libcacard/vcard_emul_nss.o-libs :=3D $(NSS_LIBS) ###################################################################### # Target independent part of system emulation. The long term path is to @@ -49,7 +50,7 @@ common-obj-$(CONFIG_LINUX) +=3D fsdev/ common-obj-y +=3D migration.o migration-tcp.o common-obj-y +=3D vmstate.o -common-obj-y +=3D qemu-file.o +common-obj-y +=3D qemu-file.o qemu-file-unix.o qemu-file-stdio.o common-obj-$(CONFIG_RDMA) +=3D migration-rdma.o common-obj-y +=3D qemu-char.o #aio.o common-obj-y +=3D block-migration.o @@ -61,12 +62,15 @@ common-obj-$(CONFIG_SPICE) +=3D spice-qemu-char.o common-obj-y +=3D audio/ common-obj-y +=3D hw/ +common-obj-y +=3D accel.o common-obj-y +=3D ui/ common-obj-y +=3D bt-host.o bt-vhci.o +bt-host.o-cflags :=3D $(BLUEZ_CFLAGS) common-obj-y +=3D dma-helpers.o common-obj-y +=3D vl.o +vl.o-cflags :=3D $(GPROF_CFLAGS) $(SDL_CFLAGS) common-obj-y +=3D tpm.o common-obj-$(CONFIG_SLIRP) +=3D slirp/ @@ -84,11 +88,6 @@ common-obj-y +=3D qmp-marshal.o common-obj-y +=3D qmp.o hmp.o endif -###################################################################### -# some qapi visitors are used by both system and user emulation: - -common-obj-y +=3D qapi-visit.o qapi-types.o - ####################################################################### # Target-independent parts used in system and user emulation common-obj-y +=3D qemu-log.o @@ -103,9 +102,14 @@ version-obj-$(CONFIG_WIN32) +=3D $(BUILD_DIR)/version.o version-lobj-$(CONFIG_WIN32) +=3D $(BUILD_DIR)/version.lo ###################################################################### +# tracing +util-obj-y +=3D trace/ +target-obj-y +=3D trace/ + +###################################################################### # guest agent # FIXME: a few definitions from qapi-types.o/qapi-visit.o are needed # by libqemuutil.a. These should be moved to a separate .json schema. -qga-obj-y =3D qga/ qapi-types.o qapi-visit.o +qga-obj-y =3D qga/ qga-vss-dll-obj-y =3D qga/ diff --git a/Makefile.target b/Makefile.target index 6d8fde8..e9ff1ee 100644 --- a/Makefile.target +++ b/Makefile.target @@ -16,26 +16,29 @@ QEMU_CFLAGS+=3D-I$(SRC_PATH)/include ifdef CONFIG_USER_ONLY # user emulator name QEMU_PROG=3Dqemu-$(TARGET_NAME) +QEMU_PROG_BUILD =3D $(QEMU_PROG) else # system emulator name +QEMU_PROG=3Dqemu-system-$(TARGET_NAME)$(EXESUF) ifneq (,$(findstring -mwindows,$(libs_softmmu))) # Terminate program name with a 'w' because the linker builds a windows executable. QEMU_PROGW=3Dqemu-system-$(TARGET_NAME)w$(EXESUF) -endif # windows executable -QEMU_PROG=3Dqemu-system-$(TARGET_NAME)$(EXESUF) +$(QEMU_PROG): $(QEMU_PROGW) + $(call quiet-command,$(OBJCOPY) --subsystem console $(QEMU_PROGW) $(QEMU_PROG)," GEN $(TARGET_DIR)$(QEMU_PROG)") +QEMU_PROG_BUILD =3D $(QEMU_PROGW) +else +QEMU_PROG_BUILD =3D $(QEMU_PROG) endif - -PROGS=3D$(QEMU_PROG) -ifdef QEMU_PROGW -PROGS+=3D$(QEMU_PROGW) endif + +PROGS=3D$(QEMU_PROG) $(QEMU_PROGW) STPFILES=3D config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak ifdef CONFIG_TRACE_SYSTEMTAP -stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp +stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp $(QEMU_PROG)-simpletrace.stp ifdef CONFIG_USER_ONLY TARGET_TYPE=3Duser @@ -46,7 +49,7 @@ endif $(QEMU_PROG).stp-installed: $(SRC_PATH)/trace-events $(call quiet-command,$(TRACETOOL) \ --format=3Dstap \ - --backend=3D$(TRACE_BACKEND) \ + --backends=3D$(TRACE_BACKENDS) \ --binary=3D$(bindir)/$(QEMU_PROG) \ --target-name=3D$(TARGET_NAME) \ --target-type=3D$(TARGET_TYPE) \ @@ -55,12 +58,19 @@ $(QEMU_PROG).stp-installed: $(SRC_PATH)/trace-events $(QEMU_PROG).stp: $(SRC_PATH)/trace-events $(call quiet-command,$(TRACETOOL) \ --format=3Dstap \ - --backend=3D$(TRACE_BACKEND) \ + --backends=3D$(TRACE_BACKENDS) \ --binary=3D$(realpath .)/$(QEMU_PROG) \ --target-name=3D$(TARGET_NAME) \ --target-type=3D$(TARGET_TYPE) \ < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp") +$(QEMU_PROG)-simpletrace.stp: $(SRC_PATH)/trace-events + $(call quiet-command,$(TRACETOOL) \ + --format=3Dsimpletrace-stap \ + --backends=3D$(TRACE_BACKENDS) \ + --probe-prefix=3Dqemu.$(TARGET_TYPE).$(TARGET_NAME) \ + < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG)-simpletrace.stp") + else stap: endif @@ -82,6 +92,12 @@ obj-y +=3D disas.o obj-$(call notempty,$(TARGET_XML_FILES)) +=3D gdbstub-xml.o obj-$(call lnot,$(CONFIG_KVM)) +=3D kvm-stub.o +obj-$(CONFIG_LIBDECNUMBER) +=3D libdecnumber/decContext.o +obj-$(CONFIG_LIBDECNUMBER) +=3D libdecnumber/decNumber.o +obj-$(CONFIG_LIBDECNUMBER) +=3D libdecnumber/dpd/decimal32.o +obj-$(CONFIG_LIBDECNUMBER) +=3D libdecnumber/dpd/decimal64.o +obj-$(CONFIG_LIBDECNUMBER) +=3D libdecnumber/dpd/decimal128.o + ######################################################### # Linux user emulator target @@ -99,7 +115,8 @@ endif #CONFIG_LINUX_USER ifdef CONFIG_BSD_USER -QEMU_CFLAGS+=3D-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ABI_DIR) +QEMU_CFLAGS+=3D-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ABI_DIR) \ + -I$(SRC_PATH)/bsd-user/$(HOST_VARIANT_DIR) obj-y +=3D bsd-user/ obj-y +=3D gdbstub.o user-exec.o @@ -109,8 +126,8 @@ endif #CONFIG_BSD_USER ######################################################### # System emulator target ifdef CONFIG_SOFTMMU -obj-y +=3D arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o -obj-y +=3D qtest.o +obj-y +=3D arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o +obj-y +=3D qtest.o bootdevice.o obj-y +=3D hw/ obj-$(CONFIG_FDT) +=3D device_tree.o obj-$(CONFIG_KVM) +=3D kvm-all.o @@ -140,40 +157,27 @@ endif # CONFIG_SOFTMMU %/translate.o: QEMU_CFLAGS +=3D $(TRANSLATE_OPT_CFLAGS) dummy :=3D $(call unnest-vars,,obj-y) +all-obj-y :=3D $(obj-y) -# we are making another call to unnest-vars with different vars, protect obj-y, -# it can be overriden in subdir Makefile.objs -obj-y-save :=3D $(obj-y) - +target-obj-y :=3D block-obj-y :=3D common-obj-y :=3D include $(SRC_PATH)/Makefile.objs +dummy :=3D $(call unnest-vars,,target-obj-y) +target-obj-y-save :=3D $(target-obj-y) dummy :=3D $(call unnest-vars,.., \ block-obj-y \ block-obj-m \ common-obj-y \ common-obj-m) - -# Now restore obj-y -obj-y :=3D $(obj-y-save) - -all-obj-y =3D $(obj-y) $(common-obj-y) +target-obj-y :=3D $(target-obj-y-save) +all-obj-y +=3D $(common-obj-y) +all-obj-y +=3D $(target-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(block-obj-y) -ifndef CONFIG_HAIKU -LIBS+=3D-lm -endif - -ifdef QEMU_PROGW -# The linker builds a windows executable. Make also a console executable. -$(QEMU_PROGW): $(all-obj-y) ../libqemuutil.a ../libqemustub.a - $(call LINK,$^) -$(QEMU_PROG): $(QEMU_PROGW) - $(call quiet-command,$(OBJCOPY) --subsystem console $(QEMU_PROGW) $(QEMU_PROG)," GEN $(TARGET_DIR)$(QEMU_PROG)") -else -$(QEMU_PROG): $(all-obj-y) ../libqemuutil.a ../libqemustub.a +# build either PROG or PROGW +$(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a $(call LINK,$^) -endif gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@") @@ -194,14 +198,12 @@ endif install: all ifneq ($(PROGS),) - $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" -ifneq ($(STRIP),) - $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS)) -endif + $(call install-prog,$(PROGS),$(DESTDIR)$(bindir)) endif ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset" $(INSTALL_DATA) $(QEMU_PROG).stp-installed "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG).stp" + $(INSTALL_DATA) $(QEMU_PROG)-simpletrace.stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG)-simpletrace.stp" endif GENERATED_HEADERS +=3D config-target.h diff --git a/VERSION b/VERSION index e9307ca..ccbccc3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.2 +2.2.0 diff --git a/accel.c b/accel.c new file mode 100644 index 0000000..74e41da --- /dev/null +++ b/accel.c @@ -0,0 +1,157 @@ +/* + * QEMU System Emulator, accelerator interfaces + * + * Copyright (c) 2003-2008 Fabrice Bellard + * Copyright (c) 2014 Red Hat 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 "sysemu/accel.h" +#include "hw/boards.h" +#include "qemu-common.h" +#include "sysemu/arch_init.h" +#include "sysemu/sysemu.h" +#include "sysemu/kvm.h" +#include "sysemu/qtest.h" +#include "hw/xen/xen.h" +#include "qom/object.h" +#include "hw/boards.h" + +int tcg_tb_size; +static bool tcg_allowed =3D true; + +static int tcg_init(MachineState *ms) +{ + tcg_exec_init(tcg_tb_size * 1024 * 1024); + return 0; +} + +static const TypeInfo accel_type =3D { + .name =3D TYPE_ACCEL, + .parent =3D TYPE_OBJECT, + .class_size =3D sizeof(AccelClass), + .instance_size =3D sizeof(AccelState), +}; + +/* Lookup AccelClass from opt_name. Returns NULL if not found */ +static AccelClass *accel_find(const char *opt_name) +{ + char *class_name =3D g_strdup_printf(ACCEL_CLASS_NAME("%s"), opt_name); + AccelClass *ac =3D ACCEL_CLASS(object_class_by_name(class_name)); + g_free(class_name); + return ac; +} + +static int accel_init_machine(AccelClass *acc, MachineState *ms) +{ + ObjectClass *oc =3D OBJECT_CLASS(acc); + const char *cname =3D object_class_get_name(oc); + AccelState *accel =3D ACCEL(object_new(cname)); + int ret; + ms->accelerator =3D accel; + *(acc->allowed) =3D true; + ret =3D acc->init_machine(ms); + if (ret < 0) { + ms->accelerator =3D NULL; + *(acc->allowed) =3D false; + object_unref(OBJECT(accel)); + } + return ret; +} + +int configure_accelerator(MachineState *ms) +{ + const char *p; + char buf[10]; + int ret; + bool accel_initialised =3D false; + bool init_failed =3D false; + AccelClass *acc =3D NULL; + + p =3D qemu_opt_get(qemu_get_machine_opts(), "accel"); + if (p =3D=3D NULL) { + /* Use the default "accelerator", tcg */ + p =3D "tcg"; + } + + while (!accel_initialised && *p !=3D '\0') { + if (*p =3D=3D ':') { + p++; + } + p =3D get_opt_name(buf, sizeof(buf), p, ':'); + acc =3D accel_find(buf); + if (!acc) { + fprintf(stderr, "\"%s\" accelerator not found.\n", buf); + continue; + } + if (acc->available && !acc->available()) { + printf("%s not supported for this target\n", + acc->name); + continue; + } + ret =3D accel_init_machine(acc, ms); + if (ret < 0) { + init_failed =3D true; + fprintf(stderr, "failed to initialize %s: %s\n", + acc->name, + strerror(-ret)); + } else { + accel_initialised =3D true; + } + } + + if (!accel_initialised) { + if (!init_failed) { + fprintf(stderr, "No accelerator found!\n"); + } + exit(1); + } + + if (init_failed) { + fprintf(stderr, "Back to %s accelerator.\n", acc->name); + } + + return !accel_initialised; +} + + +static void tcg_accel_class_init(ObjectClass *oc, void *data) +{ + AccelClass *ac =3D ACCEL_CLASS(oc); + ac->name =3D "tcg"; + ac->init_machine =3D tcg_init; + ac->allowed =3D &tcg_allowed; +} + +#define TYPE_TCG_ACCEL ACCEL_CLASS_NAME("tcg") + +static const TypeInfo tcg_accel_type =3D { + .name =3D TYPE_TCG_ACCEL, + .parent =3D TYPE_ACCEL, + .class_init =3D tcg_accel_class_init, +}; + +static void register_accel_types(void) +{ + type_register_static(&accel_type); + type_register_static(&tcg_accel_type); +} + +type_init(register_accel_types); diff --git a/aio-posix.c b/aio-posix.c index f921d4f..d3ac06e 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -100,6 +100,11 @@ void aio_set_event_notifier(AioContext *ctx, (IOHandler *)io_read, NULL, notifier); } +bool aio_prepare(AioContext *ctx) +{ + return false; +} + bool aio_pending(AioContext *ctx) { AioHandler *node; @@ -119,13 +124,22 @@ bool aio_pending(AioContext *ctx) return false; } -static bool aio_dispatch(AioContext *ctx) +bool aio_dispatch(AioContext *ctx) { AioHandler *node; bool progress =3D false; /* - * We have to walk very carefully in case qemu_aio_set_fd_handler is + * If there are callbacks left that have been queued, we need to call them. + * Do not call select in this case, because it is possible that the caller + * does not need a complete flush (as is the case for aio_poll loops). + */ + if (aio_bh_poll(ctx)) { + progress =3D true; + } + + /* + * We have to walk very carefully in case aio_set_fd_handler is * called while we're walking. */ node =3D QLIST_FIRST(&ctx->aio_handlers); @@ -175,28 +189,24 @@ static bool aio_dispatch(AioContext *ctx) bool aio_poll(AioContext *ctx, bool blocking) { AioHandler *node; + bool was_dispatching; int ret; bool progress; + was_dispatching =3D ctx->dispatching; progress =3D false; - /* - * If there are callbacks left that have been queued, we need to call them. - * Do not call select in this case, because it is possible that the caller - * does not need a complete flush (as is the case for qemu_aio_wait loops). + /* aio_notify can avoid the expensive event_notifier_set if + * everything (file descriptors, bottom halves, timers) will + * be re-evaluated before the next blocking poll(). This is + * already true when aio_poll is called with blocking =3D=3D false; + * if blocking =3D=3D true, it is only true after poll() returns. + * + * If we're in a nested event loop, ctx->dispatching might be true. + * In that case we can restore it just before returning, but we + * have to clear it now. */ - if (aio_bh_poll(ctx)) { - blocking =3D false; - progress =3D true; - } - - if (aio_dispatch(ctx)) { - progress =3D true; - } - - if (progress && !blocking) { - return true; - } + aio_set_dispatching(ctx, !blocking); ctx->walking_handlers++; @@ -220,7 +230,7 @@ bool aio_poll(AioContext *ctx, bool blocking) /* wait until next event */ ret =3D qemu_poll_ns((GPollFD *)ctx->pollfds->data, ctx->pollfds->len, - blocking =3F timerlistgroup_deadline_ns(&ctx->tlg) : 0); + blocking =3F aio_compute_timeout(ctx) : 0); /* if we have any readable fds, dispatch event */ if (ret > 0) { @@ -234,9 +244,11 @@ bool aio_poll(AioContext *ctx, bool blocking) } /* Run dispatch even if there were no readable fds to run timers */ + aio_set_dispatching(ctx, true); if (aio_dispatch(ctx)) { progress =3D true; } + aio_set_dispatching(ctx, was_dispatching); return progress; } diff --git a/aio-win32.c b/aio-win32.c index 23f4e5b..d81313b 100644 --- a/aio-win32.c +++ b/aio-win32.c @@ -22,12 +22,80 @@ struct AioHandler { --===============8943858755590866684== 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 --===============8943858755590866684==-- From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:55:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsM-0007y7-2n; Sun, 18 Jan 2015 20:55:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsL-0007xz-5q for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:13 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 70/CD-25714-0BD1CB45; Sun, 18 Jan 2015 20:55:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1421614510!13284043!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20673 invoked from network); 18 Jan 2015 20:55:11 -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; 18 Jan 2015 20:55:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsI-0000zm-I1 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwsI-0003fd-Fo for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:10 +0000 Date: Sun, 18 Jan 2015 20:55:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't deliver NMI to PVH 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 21c9fce8efbf407dc5d6bcc78bf65a1402623db9 Author: Jan Beulich AuthorDate: Thu Dec 11 10:47:21 2014 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 5 10:13:53 2015 -0500 x86: don't deliver NMI to PVH Dom0 ... for the time being: The mechanism used depends on the domain's use of the IRET hypercall - which PVH is not using. HVM code (which PVH uses) will deliver an NMI if it sees v->nmi_pending however that temporary affinity adjustment gets undone in the HYPERVISOR_iret handler, yet PVH can't call that hypercall. Also drop two bogus code lines spotted while going through the involved code paths: Addresses of per-CPU variables can't possibly be NULL, and the setting of st->vcpu in send_guest_trap()'s MCE case is redundant with an earlier cmpxchgptr(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- xen/arch/x86/traps.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 10fc2ca..3cd8746 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -3168,7 +3168,6 @@ static void nmi_mce_softirq(void) int cpu = smp_processor_id(); struct softirq_trap *st = &per_cpu(softirq_trap, cpu); - BUG_ON(st == NULL); BUG_ON(st->vcpu == NULL); /* Set the tmp value unconditionally, so that @@ -3233,7 +3232,7 @@ static void nmi_hwdom_report(unsigned int reason_idx) { struct domain *d = hardware_domain; - if ( (d == NULL) || (d->vcpu == NULL) || (d->vcpu[0] == NULL) ) + if ( !d || !d->vcpu || !d->vcpu[0] || !is_pv_domain(d) /* PVH fixme */ ) return; set_bit(reason_idx, nmi_reason(d)); @@ -3674,7 +3673,6 @@ int send_guest_trap(struct domain *d, uint16_t vcpuid, unsigned int trap_nr) if ( !test_and_set_bool(v->mce_pending) ) { st->domain = d; - st->vcpu = v; st->processor = v->processor; /* not safe to wake up a vcpu here */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:55:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsM-0007y7-2n; Sun, 18 Jan 2015 20:55:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsL-0007xz-5q for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:13 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 70/CD-25714-0BD1CB45; Sun, 18 Jan 2015 20:55:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1421614510!13284043!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20673 invoked from network); 18 Jan 2015 20:55:11 -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; 18 Jan 2015 20:55:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsI-0000zm-I1 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwsI-0003fd-Fo for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:10 +0000 Date: Sun, 18 Jan 2015 20:55:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't deliver NMI to PVH 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 21c9fce8efbf407dc5d6bcc78bf65a1402623db9 Author: Jan Beulich AuthorDate: Thu Dec 11 10:47:21 2014 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 5 10:13:53 2015 -0500 x86: don't deliver NMI to PVH Dom0 ... for the time being: The mechanism used depends on the domain's use of the IRET hypercall - which PVH is not using. HVM code (which PVH uses) will deliver an NMI if it sees v->nmi_pending however that temporary affinity adjustment gets undone in the HYPERVISOR_iret handler, yet PVH can't call that hypercall. Also drop two bogus code lines spotted while going through the involved code paths: Addresses of per-CPU variables can't possibly be NULL, and the setting of st->vcpu in send_guest_trap()'s MCE case is redundant with an earlier cmpxchgptr(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- xen/arch/x86/traps.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 10fc2ca..3cd8746 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -3168,7 +3168,6 @@ static void nmi_mce_softirq(void) int cpu = smp_processor_id(); struct softirq_trap *st = &per_cpu(softirq_trap, cpu); - BUG_ON(st == NULL); BUG_ON(st->vcpu == NULL); /* Set the tmp value unconditionally, so that @@ -3233,7 +3232,7 @@ static void nmi_hwdom_report(unsigned int reason_idx) { struct domain *d = hardware_domain; - if ( (d == NULL) || (d->vcpu == NULL) || (d->vcpu[0] == NULL) ) + if ( !d || !d->vcpu || !d->vcpu[0] || !is_pv_domain(d) /* PVH fixme */ ) return; set_bit(reason_idx, nmi_reason(d)); @@ -3674,7 +3673,6 @@ int send_guest_trap(struct domain *d, uint16_t vcpuid, unsigned int trap_nr) if ( !test_and_set_bool(v->mce_pending) ) { st->domain = d; - st->vcpu = v; st->processor = v->processor; /* not safe to wake up a vcpu here */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:55:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:55: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 1YCwsX-0007zI-5i; Sun, 18 Jan 2015 20:55:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsW-0007z5-8H for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:24 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 12/86-28296-ABD1CB45; Sun, 18 Jan 2015 20:55:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1421614521!16729693!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12156 invoked from network); 18 Jan 2015 20:55:22 -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 Jan 2015 20:55:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsS-0000zs-Pe for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwsS-0003g1-O6 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:20 +0000 Date: Sun, 18 Jan 2015 20:55:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] domctl: fix IRQ permission granting/revocation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6fb3a07bc0ad656b5f76eb9fc961bcd1d3cace58 Author: Jan Beulich AuthorDate: Fri Dec 12 10:24:13 2014 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 5 10:20:24 2015 -0500 domctl: fix IRQ permission granting/revocation Commit 545607eb3c ("x86: fix various issues with handling guest IRQs") wasn't really consistent in one respect: The granting of access to an IRQ shouldn't assume the pIRQ->IRQ translation to be the same in both domains. In fact it is wrong to assume that a translation is already/ still in place at the time access is being granted/revoked. What is wanted is to translate the incoming pIRQ to an IRQ for the invoking domain (as the pIRQ is the only notion the invoking domain has of the IRQ), and grant the subject domain access to the resulting IRQ. Signed-off-by: Jan Beulich Reported-by: Sander Eikelenboom Acked-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/domctl.c | 15 +++++++++------ xen/include/xen/iocap.h | 17 +++-------------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index f15dcfe..8bca6da 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -981,18 +981,21 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) case XEN_DOMCTL_irq_permission: { - unsigned int pirq = op->u.irq_permission.pirq; + unsigned int pirq = op->u.irq_permission.pirq, irq; int allow = op->u.irq_permission.allow_access; - if ( pirq >= d->nr_pirqs ) + if ( pirq >= current->domain->nr_pirqs ) + { ret = -EINVAL; - else if ( !pirq_access_permitted(current->domain, pirq) || - xsm_irq_permission(XSM_HOOK, d, pirq, allow) ) + break; + } + irq = pirq_access_permitted(current->domain, pirq); + if ( !irq || xsm_irq_permission(XSM_HOOK, d, irq, allow) ) ret = -EPERM; else if ( allow ) - ret = pirq_permit_access(d, pirq); + ret = irq_permit_access(d, irq); else - ret = pirq_deny_access(d, pirq); + ret = irq_deny_access(d, irq); } break; diff --git a/xen/include/xen/iocap.h b/xen/include/xen/iocap.h index b755ecb..1ca3858 100644 --- a/xen/include/xen/iocap.h +++ b/xen/include/xen/iocap.h @@ -28,22 +28,11 @@ #define irq_access_permitted(d, i) \ rangeset_contains_singleton((d)->irq_caps, i) -#define pirq_permit_access(d, i) ({ \ - struct domain *d__ = (d); \ - int i__ = domain_pirq_to_irq(d__, i); \ - i__ > 0 ? rangeset_add_singleton(d__->irq_caps, i__)\ - : -EINVAL; \ -}) -#define pirq_deny_access(d, i) ({ \ - struct domain *d__ = (d); \ - int i__ = domain_pirq_to_irq(d__, i); \ - i__ > 0 ? rangeset_remove_singleton(d__->irq_caps, i__)\ - : -EINVAL; \ -}) #define pirq_access_permitted(d, i) ({ \ struct domain *d__ = (d); \ - rangeset_contains_singleton(d__->irq_caps, \ - domain_pirq_to_irq(d__, i));\ + int irq__ = domain_pirq_to_irq(d__, i); \ + irq__ > 0 && irq_access_permitted(d__, irq__) \ + ? irq__ : 0; \ }) #endif /* __XEN_IOCAP_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 Sun Jan 18 20:55:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:55: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 1YCwsX-0007zI-5i; Sun, 18 Jan 2015 20:55:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsW-0007z5-8H for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:24 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 12/86-28296-ABD1CB45; Sun, 18 Jan 2015 20:55:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1421614521!16729693!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12156 invoked from network); 18 Jan 2015 20:55:22 -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 Jan 2015 20:55:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsS-0000zs-Pe for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwsS-0003g1-O6 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:20 +0000 Date: Sun, 18 Jan 2015 20:55:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] domctl: fix IRQ permission granting/revocation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6fb3a07bc0ad656b5f76eb9fc961bcd1d3cace58 Author: Jan Beulich AuthorDate: Fri Dec 12 10:24:13 2014 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 5 10:20:24 2015 -0500 domctl: fix IRQ permission granting/revocation Commit 545607eb3c ("x86: fix various issues with handling guest IRQs") wasn't really consistent in one respect: The granting of access to an IRQ shouldn't assume the pIRQ->IRQ translation to be the same in both domains. In fact it is wrong to assume that a translation is already/ still in place at the time access is being granted/revoked. What is wanted is to translate the incoming pIRQ to an IRQ for the invoking domain (as the pIRQ is the only notion the invoking domain has of the IRQ), and grant the subject domain access to the resulting IRQ. Signed-off-by: Jan Beulich Reported-by: Sander Eikelenboom Acked-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/domctl.c | 15 +++++++++------ xen/include/xen/iocap.h | 17 +++-------------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index f15dcfe..8bca6da 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -981,18 +981,21 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) case XEN_DOMCTL_irq_permission: { - unsigned int pirq = op->u.irq_permission.pirq; + unsigned int pirq = op->u.irq_permission.pirq, irq; int allow = op->u.irq_permission.allow_access; - if ( pirq >= d->nr_pirqs ) + if ( pirq >= current->domain->nr_pirqs ) + { ret = -EINVAL; - else if ( !pirq_access_permitted(current->domain, pirq) || - xsm_irq_permission(XSM_HOOK, d, pirq, allow) ) + break; + } + irq = pirq_access_permitted(current->domain, pirq); + if ( !irq || xsm_irq_permission(XSM_HOOK, d, irq, allow) ) ret = -EPERM; else if ( allow ) - ret = pirq_permit_access(d, pirq); + ret = irq_permit_access(d, irq); else - ret = pirq_deny_access(d, pirq); + ret = irq_deny_access(d, irq); } break; diff --git a/xen/include/xen/iocap.h b/xen/include/xen/iocap.h index b755ecb..1ca3858 100644 --- a/xen/include/xen/iocap.h +++ b/xen/include/xen/iocap.h @@ -28,22 +28,11 @@ #define irq_access_permitted(d, i) \ rangeset_contains_singleton((d)->irq_caps, i) -#define pirq_permit_access(d, i) ({ \ - struct domain *d__ = (d); \ - int i__ = domain_pirq_to_irq(d__, i); \ - i__ > 0 ? rangeset_add_singleton(d__->irq_caps, i__)\ - : -EINVAL; \ -}) -#define pirq_deny_access(d, i) ({ \ - struct domain *d__ = (d); \ - int i__ = domain_pirq_to_irq(d__, i); \ - i__ > 0 ? rangeset_remove_singleton(d__->irq_caps, i__)\ - : -EINVAL; \ -}) #define pirq_access_permitted(d, i) ({ \ struct domain *d__ = (d); \ - rangeset_contains_singleton(d__->irq_caps, \ - domain_pirq_to_irq(d__, i));\ + int irq__ = domain_pirq_to_irq(d__, i); \ + irq__ > 0 && irq_access_permitted(d__, irq__) \ + ? irq__ : 0; \ }) #endif /* __XEN_IOCAP_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 Sun Jan 18 20:55:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:55: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 1YCwsh-00080v-8r; Sun, 18 Jan 2015 20:55:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsg-00080l-KQ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:34 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id D9/92-17958-5CD1CB45; Sun, 18 Jan 2015 20:55:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1421614531!20482917!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15090 invoked from network); 18 Jan 2015 20:55:33 -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; 18 Jan 2015 20:55:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsd-000100-2D for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwsc-0003gO-Tw for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:30 +0000 Date: Sun, 18 Jan 2015 20:55:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/AMD-ucode: correct multiple container 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 4d9ba7b2188083a09d1b1a1bda7054cc3eb77f67 Author: Jan Beulich AuthorDate: Mon Dec 15 09:16:09 2014 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 5 10:20:31 2015 -0500 x86/AMD-ucode: correct multiple container handling Avoid emitting an error message referring to an incorrect or corrupt container file just because no entry was found for the running CPU. Additionally switch the order of data validation and consumption in cpu_request_microcode()'s first loop, and also check the types of skipped blocks in container_fast_forward(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Aravind Gopalakrishnan Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- xen/arch/x86/microcode_amd.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index b68cf93..f79b397 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -331,12 +331,17 @@ static int container_fast_forward(const void *data, size_t size_left, size_t *of header[1] == UCODE_EQUIV_CPU_TABLE_TYPE ) break; + if ( header[0] != UCODE_UCODE_TYPE ) + return -EINVAL; size = header[1] + SECTION_HDR_SIZE; if ( size < PATCH_HDR_SIZE || size_left < size ) return -EINVAL; size_left -= size; *offset += size; + + if ( !size_left ) + return -ENODATA; } return 0; @@ -386,10 +391,6 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) break; } - if ( find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id, - &equiv_cpu_id) ) - break; - /* * Could happen as we advance 'offset' early * in install_equiv_cpu_table @@ -401,7 +402,16 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) break; } + if ( find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id, + &equiv_cpu_id) ) + break; + error = container_fast_forward(buf, bufsize - offset, &offset); + if ( error == -ENODATA ) + { + ASSERT(offset == bufsize); + break; + } if ( error ) { printk(KERN_ERR "microcode: CPU%d incorrect or corrupt container file\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 Sun Jan 18 20:55:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:55: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 1YCwsh-00080v-8r; Sun, 18 Jan 2015 20:55:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsg-00080l-KQ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:34 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id D9/92-17958-5CD1CB45; Sun, 18 Jan 2015 20:55:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1421614531!20482917!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15090 invoked from network); 18 Jan 2015 20:55:33 -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; 18 Jan 2015 20:55:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsd-000100-2D for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwsc-0003gO-Tw for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:30 +0000 Date: Sun, 18 Jan 2015 20:55:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/AMD-ucode: correct multiple container 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 4d9ba7b2188083a09d1b1a1bda7054cc3eb77f67 Author: Jan Beulich AuthorDate: Mon Dec 15 09:16:09 2014 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Jan 5 10:20:31 2015 -0500 x86/AMD-ucode: correct multiple container handling Avoid emitting an error message referring to an incorrect or corrupt container file just because no entry was found for the running CPU. Additionally switch the order of data validation and consumption in cpu_request_microcode()'s first loop, and also check the types of skipped blocks in container_fast_forward(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Aravind Gopalakrishnan Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- xen/arch/x86/microcode_amd.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index b68cf93..f79b397 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -331,12 +331,17 @@ static int container_fast_forward(const void *data, size_t size_left, size_t *of header[1] == UCODE_EQUIV_CPU_TABLE_TYPE ) break; + if ( header[0] != UCODE_UCODE_TYPE ) + return -EINVAL; size = header[1] + SECTION_HDR_SIZE; if ( size < PATCH_HDR_SIZE || size_left < size ) return -EINVAL; size_left -= size; *offset += size; + + if ( !size_left ) + return -ENODATA; } return 0; @@ -386,10 +391,6 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) break; } - if ( find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id, - &equiv_cpu_id) ) - break; - /* * Could happen as we advance 'offset' early * in install_equiv_cpu_table @@ -401,7 +402,16 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) break; } + if ( find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id, + &equiv_cpu_id) ) + break; + error = container_fast_forward(buf, bufsize - offset, &offset); + if ( error == -ENODATA ) + { + ASSERT(offset == bufsize); + break; + } if ( error ) { printk(KERN_ERR "microcode: CPU%d incorrect or corrupt container file\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 Sun Jan 18 20:55:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:55: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 1YCwsr-00082r-Bd; Sun, 18 Jan 2015 20:55:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsq-00082Y-5M for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:44 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 11/36-17936-FCD1CB45; Sun, 18 Jan 2015 20:55:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1421614541!21355681!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18608 invoked from network); 18 Jan 2015 20:55:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:55:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsn-000106-8J for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwsn-0003go-7W for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:41 +0000 Date: Sun, 18 Jan 2015 20:55:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Initialise CTX->xce in domain suspend, as 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 6b511af68618a86d5a2258e649042a3f0b8ace52 Author: Ian Jackson AuthorDate: Mon Jan 5 14:31:00 2015 +0000 Commit: Ian Jackson CommitDate: Mon Jan 5 16:42:11 2015 +0000 libxl: Initialise CTX->xce in domain suspend, as needed When excuting xl migrate/Remus, the following error can occur: [root@master xen]# xl migrate 5 slaver migration target: Ready to receive domain. Saving to migration stream new xl format (info 0x1/0x0/1225) Loading new save file (new xl fmt info 0x1/0x0/12\ ) Savefile contains xl domain config in JSON format Parsing config from Segmentation fault (core dumped) This is because CTX->xce is used without been initialized. The bug was introduced by commit 2ffeb5d7f5d8 libxl: events: Deregister evtchn fd when not needed which removed the initialization of xce from libxl__ctx_alloc. In this patch we initialise the CTX->xce before using it. Also, we adjust the doc comment for libxl__ev_evtchn_* to mention the need to do so. Signed-off-by: Yang Hongyang Signed-off-by: Ian Jackson Acked-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk Cc: Wei Liu --- tools/libxl/libxl_dom.c | 3 +++ tools/libxl/libxl_internal.h | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 74ea84b..94ae818 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1824,6 +1824,9 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) port = xs_suspend_evtchn_port(dss->domid); if (port >= 0) { + rc = libxl__ctx_evtchn_init(gc); + if (rc) goto out; + dss->guest_evtchn.port = xc_suspend_evtchn_init_exclusive(CTX->xch, CTX->xce, dss->domid, port, &dss->guest_evtchn_lockfd); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 9695f18..6dac0f8 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -800,8 +800,10 @@ static inline int libxl__ev_xswatch_isregistered(const libxl__ev_xswatch *xw) /* * The evtchn facility is one-shot per call to libxl__ev_evtchn_wait. - * You should call some suitable xc bind function on (or to obtain) - * the port, then libxl__ev_evtchn_wait. + * You should: + * Use libxl__ctx_evtchn_init to make sure CTX->xce is valid; + * Call some suitable xc bind function on (or to obtain) the port; + * Then call libxl__ev_evtchn_wait. * * When the event is signaled then the callback will be made, once. * Then you must call libxl__ev_evtchn_wait again, if desired. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:55:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:55: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 1YCwsr-00082r-Bd; Sun, 18 Jan 2015 20:55:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsq-00082Y-5M for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:44 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 11/36-17936-FCD1CB45; Sun, 18 Jan 2015 20:55:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1421614541!21355681!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18608 invoked from network); 18 Jan 2015 20:55:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:55:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsn-000106-8J for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwsn-0003go-7W for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:41 +0000 Date: Sun, 18 Jan 2015 20:55:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Initialise CTX->xce in domain suspend, as 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 6b511af68618a86d5a2258e649042a3f0b8ace52 Author: Ian Jackson AuthorDate: Mon Jan 5 14:31:00 2015 +0000 Commit: Ian Jackson CommitDate: Mon Jan 5 16:42:11 2015 +0000 libxl: Initialise CTX->xce in domain suspend, as needed When excuting xl migrate/Remus, the following error can occur: [root@master xen]# xl migrate 5 slaver migration target: Ready to receive domain. Saving to migration stream new xl format (info 0x1/0x0/1225) Loading new save file (new xl fmt info 0x1/0x0/12\ ) Savefile contains xl domain config in JSON format Parsing config from Segmentation fault (core dumped) This is because CTX->xce is used without been initialized. The bug was introduced by commit 2ffeb5d7f5d8 libxl: events: Deregister evtchn fd when not needed which removed the initialization of xce from libxl__ctx_alloc. In this patch we initialise the CTX->xce before using it. Also, we adjust the doc comment for libxl__ev_evtchn_* to mention the need to do so. Signed-off-by: Yang Hongyang Signed-off-by: Ian Jackson Acked-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk Cc: Wei Liu --- tools/libxl/libxl_dom.c | 3 +++ tools/libxl/libxl_internal.h | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 74ea84b..94ae818 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1824,6 +1824,9 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) port = xs_suspend_evtchn_port(dss->domid); if (port >= 0) { + rc = libxl__ctx_evtchn_init(gc); + if (rc) goto out; + dss->guest_evtchn.port = xc_suspend_evtchn_init_exclusive(CTX->xch, CTX->xce, dss->domid, port, &dss->guest_evtchn_lockfd); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 9695f18..6dac0f8 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -800,8 +800,10 @@ static inline int libxl__ev_xswatch_isregistered(const libxl__ev_xswatch *xw) /* * The evtchn facility is one-shot per call to libxl__ev_evtchn_wait. - * You should call some suitable xc bind function on (or to obtain) - * the port, then libxl__ev_evtchn_wait. + * You should: + * Use libxl__ctx_evtchn_init to make sure CTX->xce is valid; + * Call some suitable xc bind function on (or to obtain) the port; + * Then call libxl__ev_evtchn_wait. * * When the event is signaled then the callback will be made, once. * Then you must call libxl__ev_evtchn_wait again, if desired. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:55:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:55:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwt1-00084u-EK; Sun, 18 Jan 2015 20:55:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsz-00084Y-OJ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:53 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id BB/17-01660-9DD1CB45; Sun, 18 Jan 2015 20:55:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1421614551!18681295!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31438 invoked from network); 18 Jan 2015 20:55:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:55:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsx-00010C-Dw for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwsx-0003hg-DC for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:51 +0000 Date: Sun, 18 Jan 2015 20:55:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix if{} nesting in do_pci_remove X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ca2558c048c7d5d2a6d401e58181a06a00f9eeb Author: Ian Jackson AuthorDate: Fri Nov 14 14:41:38 2014 +0000 Commit: Ian Jackson CommitDate: Mon Jan 5 16:45:13 2015 +0000 libxl: Fix if{} nesting in do_pci_remove do_pci_remove contained this: if (type == LIBXL_DOMAIN_TYPE_HVM) { [stuff] } else if (type != LIBXL_DOMAIN_TYPE_PV) abort(); { This is bizarre, and not correct. The effect is that HVM guests end up running both the proper code and that intended for PV guests. This causes (amongst other things) trouble when PCI devices are hot-unplugged from HVM guests. This bug was introduced in abfb006f "tools/libxl: explicitly grant access to needed I/O-memory ranges". This is clear candidate for Xen 4.5, being a bugfix to an important feature. Reported-by: Boris Ostrovsky Signed-off-by: Ian Jackson Tested-by: Robert Hu Rlease-Acked-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell CC: Sander Eikelenboom CC: George Dunlap --- tools/libxl/libxl_pci.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 316643c..9ae37fa 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1247,9 +1247,9 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, rc = ERROR_FAIL; goto out_fail; } - } else if (type != LIBXL_DOMAIN_TYPE_PV) - abort(); - { + } else { + assert(type == LIBXL_DOMAIN_TYPE_PV); + char *sysfs_path = libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/resource", pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); FILE *f = fopen(sysfs_path, "r"); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:55:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:55:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwt1-00084u-EK; Sun, 18 Jan 2015 20:55:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsz-00084Y-OJ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:53 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id BB/17-01660-9DD1CB45; Sun, 18 Jan 2015 20:55:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1421614551!18681295!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31438 invoked from network); 18 Jan 2015 20:55:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:55:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwsx-00010C-Dw for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwsx-0003hg-DC for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:55:51 +0000 Date: Sun, 18 Jan 2015 20:55:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix if{} nesting in do_pci_remove X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ca2558c048c7d5d2a6d401e58181a06a00f9eeb Author: Ian Jackson AuthorDate: Fri Nov 14 14:41:38 2014 +0000 Commit: Ian Jackson CommitDate: Mon Jan 5 16:45:13 2015 +0000 libxl: Fix if{} nesting in do_pci_remove do_pci_remove contained this: if (type == LIBXL_DOMAIN_TYPE_HVM) { [stuff] } else if (type != LIBXL_DOMAIN_TYPE_PV) abort(); { This is bizarre, and not correct. The effect is that HVM guests end up running both the proper code and that intended for PV guests. This causes (amongst other things) trouble when PCI devices are hot-unplugged from HVM guests. This bug was introduced in abfb006f "tools/libxl: explicitly grant access to needed I/O-memory ranges". This is clear candidate for Xen 4.5, being a bugfix to an important feature. Reported-by: Boris Ostrovsky Signed-off-by: Ian Jackson Tested-by: Robert Hu Rlease-Acked-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell CC: Sander Eikelenboom CC: George Dunlap --- tools/libxl/libxl_pci.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 316643c..9ae37fa 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1247,9 +1247,9 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, rc = ERROR_FAIL; goto out_fail; } - } else if (type != LIBXL_DOMAIN_TYPE_PV) - abort(); - { + } else { + assert(type == LIBXL_DOMAIN_TYPE_PV); + char *sysfs_path = libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/resource", pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); FILE *f = fopen(sysfs_path, "r"); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:56:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:56: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 1YCwtC-00086r-Gz; Sun, 18 Jan 2015 20:56:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwtA-00086a-KK for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:04 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id F7/D9-16982-3ED1CB45; Sun, 18 Jan 2015 20:56:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1421614561!20464658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20141 invoked from network); 18 Jan 2015 20:56:03 -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; 18 Jan 2015 20:56:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwt7-00010o-Ks for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwt7-0003i3-JX for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:01 +0000 Date: Sun, 18 Jan 2015 20:56:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Use of init()/dispose() to avoid leaking libxl_dominfo.ssid_label X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 54eb18cd63ed7243f1ab497e35807bf6f4a436ec Author: Andrew Cooper AuthorDate: Mon Jan 5 14:19:58 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jan 6 11:10:43 2015 +0000 tools/libxl: Use of init()/dispose() to avoid leaking libxl_dominfo.ssid_label libxl_dominfo contains a ssid_label pointer which will have memory allocated for it in libxl_domain_info() if the hypervisor has CONFIG_XSM compiled. However, the lack of appropriate use of libxl_dominfo_{init,dispose}() will cause the label string to be leaked, even in success cases. This was discovered by XenServers Coverity scanning, and are issues not identified by upstream Coverity Scan. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Konrad Rzeszutek Wilk Acked-by: Ian Campbell --- tools/libxl/libxl.c | 26 ++++++++++++++++++++++++-- tools/libxl/libxl_dom.c | 14 ++++++++++---- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 50a8928..372dd3b 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -364,6 +364,8 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, char *uuid; const char *vm_name_path; + libxl_dominfo_init(&info); + dom_path = libxl__xs_get_dompath(gc, domid); if (!dom_path) goto x_nomem; @@ -481,6 +483,7 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, rc = 0; x_rc: if (our_trans) xs_transaction_end(ctx->xsh, our_trans, 1); + libxl_dominfo_dispose(&info); return rc; x_fail: rc = ERROR_FAIL; goto x_rc; @@ -4594,6 +4597,8 @@ static int libxl__fill_dom0_memory_info(libxl__gc *gc, uint32_t *target_memkb, libxl_ctx *ctx = libxl__gc_owner(gc); uint32_t free_mem_slack_kb = 0; + libxl_dominfo_init(&info); + retry_transaction: t = xs_transaction_start(ctx->xsh); @@ -4626,6 +4631,8 @@ retry_transaction: } } + libxl_dominfo_dispose(&info); + libxl_dominfo_init(&info); rc = libxl_domain_info(ctx, &info, 0); if (rc < 0) goto out; @@ -4664,7 +4671,7 @@ out: rc = ERROR_FAIL; } - + libxl_dominfo_dispose(&info); return rc; } @@ -4999,6 +5006,8 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) uint32_t target_memkb = 0; libxl_dominfo info; + libxl_dominfo_init(&info); + do { wait_secs--; sleep(1); @@ -5007,9 +5016,11 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) if (rc < 0) goto out; + libxl_dominfo_dispose(&info); + libxl_dominfo_init(&info); rc = libxl_domain_info(ctx, &info, domid); if (rc < 0) - return rc; + goto out; } while (wait_secs > 0 && (info.current_memkb + info.outstanding_memkb) > target_memkb); if ((info.current_memkb + info.outstanding_memkb) <= target_memkb) @@ -5018,6 +5029,7 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) rc = ERROR_FAIL; out: + libxl_dominfo_dispose(&info); return rc; } @@ -5435,6 +5447,8 @@ static int libxl__set_vcpuonline_xenstore(libxl__gc *gc, uint32_t domid, xs_transaction_t t; int i, rc = ERROR_FAIL; + libxl_dominfo_init(&info); + if (libxl_domain_info(CTX, &info, domid) < 0) { LOGE(ERROR, "getting domain info list"); goto out; @@ -5454,6 +5468,7 @@ retry_transaction: } else rc = 0; out: + libxl_dominfo_dispose(&info); return rc; } @@ -5463,8 +5478,11 @@ static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, libxl_dominfo info; int i; + libxl_dominfo_init(&info); + if (libxl_domain_info(CTX, &info, domid) < 0) { LOGE(ERROR, "getting domain info list"); + libxl_dominfo_dispose(&info); return ERROR_FAIL; } for (i = 0; i <= info.vcpu_max_id; i++) { @@ -5477,6 +5495,7 @@ static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, libxl__qmp_cpu_add(gc, domid, i); } } + libxl_dominfo_dispose(&info); return 0; } @@ -6569,12 +6588,15 @@ int libxl_retrieve_domain_configuration(libxl_ctx *ctx, uint32_t domid, /* Domain UUID */ { libxl_dominfo info; + libxl_dominfo_init(&info); rc = libxl_domain_info(ctx, &info, domid); if (rc) { LOG(ERROR, "fail to get domain info for domain %d", domid); + libxl_dominfo_dispose(&info); goto out; } libxl_uuid_copy(ctx, &d_config->c_info.uuid, &info.uuid); + libxl_dominfo_dispose(&info); } /* Memory limits: diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 94ae818..1d33a18 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -2046,19 +2046,25 @@ const char *libxl__userdata_path(libxl__gc *gc, uint32_t domid, const char *wh) { libxl_ctx *ctx = libxl__gc_owner(gc); - char *uuid_string; + char *uuid_string, *path; libxl_dominfo info; int rc; + libxl_dominfo_init(&info); + rc = libxl_domain_info(ctx, &info, domid); if (rc) { LOGE(ERROR, "unable to find domain info for domain %"PRIu32, domid); - return NULL; + path = NULL; + goto out; } uuid_string = GCSPRINTF(LIBXL_UUID_FMT, LIBXL_UUID_BYTES(info.uuid)); - - return GCSPRINTF("/var/lib/xen/userdata-%s.%u.%s.%s", + path = GCSPRINTF("/var/lib/xen/userdata-%s.%u.%s.%s", wh, domid, uuid_string, userdata_userid); + + out: + libxl_dominfo_dispose(&info); + return path; } static int userdata_delete(libxl__gc *gc, const char *path) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:56:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:56: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 1YCwtC-00086r-Gz; Sun, 18 Jan 2015 20:56:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwtA-00086a-KK for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:04 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id F7/D9-16982-3ED1CB45; Sun, 18 Jan 2015 20:56:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1421614561!20464658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20141 invoked from network); 18 Jan 2015 20:56:03 -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; 18 Jan 2015 20:56:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwt7-00010o-Ks for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwt7-0003i3-JX for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:01 +0000 Date: Sun, 18 Jan 2015 20:56:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Use of init()/dispose() to avoid leaking libxl_dominfo.ssid_label X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 54eb18cd63ed7243f1ab497e35807bf6f4a436ec Author: Andrew Cooper AuthorDate: Mon Jan 5 14:19:58 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jan 6 11:10:43 2015 +0000 tools/libxl: Use of init()/dispose() to avoid leaking libxl_dominfo.ssid_label libxl_dominfo contains a ssid_label pointer which will have memory allocated for it in libxl_domain_info() if the hypervisor has CONFIG_XSM compiled. However, the lack of appropriate use of libxl_dominfo_{init,dispose}() will cause the label string to be leaked, even in success cases. This was discovered by XenServers Coverity scanning, and are issues not identified by upstream Coverity Scan. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Konrad Rzeszutek Wilk Acked-by: Ian Campbell --- tools/libxl/libxl.c | 26 ++++++++++++++++++++++++-- tools/libxl/libxl_dom.c | 14 ++++++++++---- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 50a8928..372dd3b 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -364,6 +364,8 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, char *uuid; const char *vm_name_path; + libxl_dominfo_init(&info); + dom_path = libxl__xs_get_dompath(gc, domid); if (!dom_path) goto x_nomem; @@ -481,6 +483,7 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, rc = 0; x_rc: if (our_trans) xs_transaction_end(ctx->xsh, our_trans, 1); + libxl_dominfo_dispose(&info); return rc; x_fail: rc = ERROR_FAIL; goto x_rc; @@ -4594,6 +4597,8 @@ static int libxl__fill_dom0_memory_info(libxl__gc *gc, uint32_t *target_memkb, libxl_ctx *ctx = libxl__gc_owner(gc); uint32_t free_mem_slack_kb = 0; + libxl_dominfo_init(&info); + retry_transaction: t = xs_transaction_start(ctx->xsh); @@ -4626,6 +4631,8 @@ retry_transaction: } } + libxl_dominfo_dispose(&info); + libxl_dominfo_init(&info); rc = libxl_domain_info(ctx, &info, 0); if (rc < 0) goto out; @@ -4664,7 +4671,7 @@ out: rc = ERROR_FAIL; } - + libxl_dominfo_dispose(&info); return rc; } @@ -4999,6 +5006,8 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) uint32_t target_memkb = 0; libxl_dominfo info; + libxl_dominfo_init(&info); + do { wait_secs--; sleep(1); @@ -5007,9 +5016,11 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) if (rc < 0) goto out; + libxl_dominfo_dispose(&info); + libxl_dominfo_init(&info); rc = libxl_domain_info(ctx, &info, domid); if (rc < 0) - return rc; + goto out; } while (wait_secs > 0 && (info.current_memkb + info.outstanding_memkb) > target_memkb); if ((info.current_memkb + info.outstanding_memkb) <= target_memkb) @@ -5018,6 +5029,7 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs) rc = ERROR_FAIL; out: + libxl_dominfo_dispose(&info); return rc; } @@ -5435,6 +5447,8 @@ static int libxl__set_vcpuonline_xenstore(libxl__gc *gc, uint32_t domid, xs_transaction_t t; int i, rc = ERROR_FAIL; + libxl_dominfo_init(&info); + if (libxl_domain_info(CTX, &info, domid) < 0) { LOGE(ERROR, "getting domain info list"); goto out; @@ -5454,6 +5468,7 @@ retry_transaction: } else rc = 0; out: + libxl_dominfo_dispose(&info); return rc; } @@ -5463,8 +5478,11 @@ static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, libxl_dominfo info; int i; + libxl_dominfo_init(&info); + if (libxl_domain_info(CTX, &info, domid) < 0) { LOGE(ERROR, "getting domain info list"); + libxl_dominfo_dispose(&info); return ERROR_FAIL; } for (i = 0; i <= info.vcpu_max_id; i++) { @@ -5477,6 +5495,7 @@ static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, libxl__qmp_cpu_add(gc, domid, i); } } + libxl_dominfo_dispose(&info); return 0; } @@ -6569,12 +6588,15 @@ int libxl_retrieve_domain_configuration(libxl_ctx *ctx, uint32_t domid, /* Domain UUID */ { libxl_dominfo info; + libxl_dominfo_init(&info); rc = libxl_domain_info(ctx, &info, domid); if (rc) { LOG(ERROR, "fail to get domain info for domain %d", domid); + libxl_dominfo_dispose(&info); goto out; } libxl_uuid_copy(ctx, &d_config->c_info.uuid, &info.uuid); + libxl_dominfo_dispose(&info); } /* Memory limits: diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 94ae818..1d33a18 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -2046,19 +2046,25 @@ const char *libxl__userdata_path(libxl__gc *gc, uint32_t domid, const char *wh) { libxl_ctx *ctx = libxl__gc_owner(gc); - char *uuid_string; + char *uuid_string, *path; libxl_dominfo info; int rc; + libxl_dominfo_init(&info); + rc = libxl_domain_info(ctx, &info, domid); if (rc) { LOGE(ERROR, "unable to find domain info for domain %"PRIu32, domid); - return NULL; + path = NULL; + goto out; } uuid_string = GCSPRINTF(LIBXL_UUID_FMT, LIBXL_UUID_BYTES(info.uuid)); - - return GCSPRINTF("/var/lib/xen/userdata-%s.%u.%s.%s", + path = GCSPRINTF("/var/lib/xen/userdata-%s.%u.%s.%s", wh, domid, uuid_string, userdata_userid); + + out: + libxl_dominfo_dispose(&info); + return path; } static int userdata_delete(libxl__gc *gc, const char *path) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:56:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:56: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 1YCwtL-00088l-ME; Sun, 18 Jan 2015 20:56:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwtK-00088X-Mt for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:14 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 9B/2A-28865-DED1CB45; Sun, 18 Jan 2015 20:56:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1421614572!18688888!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16378 invoked from network); 18 Jan 2015 20:56:13 -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; 18 Jan 2015 20:56:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwtH-00010u-Qz for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwtH-0003ic-Pk for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:11 +0000 Date: Sun, 18 Jan 2015 20:56:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correct off-by-one error in consider_modules X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dea3ff6ed2af2fe3ab084733d3e71daf4dcfb8a0 Author: Ian Campbell AuthorDate: Sun Dec 21 11:18:53 2014 +0000 Commit: Ian Campbell CommitDate: Tue Jan 6 11:12:19 2015 +0000 xen: arm: correct off-by-one error in consider_modules By iterating up to <= mi->nr_mods we are running off the end of the boot modules, but more importantly it causes us to then skip the first FDT reserved region, meaning we might clobber it. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/setup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 3991d64..f49569d 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -286,7 +286,7 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, return 0; /* First check the boot modules */ - for ( i = first_mod; i <= mi->nr_mods; i++ ) + for ( i = first_mod; i < mi->nr_mods; i++ ) { paddr_t mod_s = mi->module[i].start; paddr_t mod_e = mod_s + mi->module[i].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 Sun Jan 18 20:56:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:56: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 1YCwtL-00088l-ME; Sun, 18 Jan 2015 20:56:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwtK-00088X-Mt for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:14 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 9B/2A-28865-DED1CB45; Sun, 18 Jan 2015 20:56:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1421614572!18688888!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16378 invoked from network); 18 Jan 2015 20:56:13 -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; 18 Jan 2015 20:56:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwtH-00010u-Qz for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwtH-0003ic-Pk for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:11 +0000 Date: Sun, 18 Jan 2015 20:56:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correct off-by-one error in consider_modules X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dea3ff6ed2af2fe3ab084733d3e71daf4dcfb8a0 Author: Ian Campbell AuthorDate: Sun Dec 21 11:18:53 2014 +0000 Commit: Ian Campbell CommitDate: Tue Jan 6 11:12:19 2015 +0000 xen: arm: correct off-by-one error in consider_modules By iterating up to <= mi->nr_mods we are running off the end of the boot modules, but more importantly it causes us to then skip the first FDT reserved region, meaning we might clobber it. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/setup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 3991d64..f49569d 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -286,7 +286,7 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, return 0; /* First check the boot modules */ - for ( i = first_mod; i <= mi->nr_mods; i++ ) + for ( i = first_mod; i < mi->nr_mods; i++ ) { paddr_t mod_s = mi->module[i].start; paddr_t mod_e = mod_s + mi->module[i].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 Sun Jan 18 20:56:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:56: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 1YCwtV-0008AS-Ov; Sun, 18 Jan 2015 20:56:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwtU-0008A8-Dl for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:24 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 65/E0-14727-7FD1CB45; Sun, 18 Jan 2015 20:56:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1421614582!18695671!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14453 invoked from network); 18 Jan 2015 20:56:23 -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; 18 Jan 2015 20:56:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwtR-00010y-Vl for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwtR-0003iz-UW for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:21 +0000 Date: Sun, 18 Jan 2015 20:56:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: link libxlu against libxl. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ec4e3336d413cc489813669e58c47e9156e03d8 Author: Ian Campbell AuthorDate: Mon Aug 4 10:58:25 2014 +0100 Commit: Ian Campbell CommitDate: Tue Jan 6 11:13:44 2015 +0000 tools: libxl: link libxlu against libxl. It uses libxl_defbool_set and must therefore be linked against the right library. Spotted by dpkg-shlibdeps and pointed out by Bastian Blank: dpkg-shlibdeps: warning: symbol libxl_defbool_set used by debian/libxen-4.4/usr/lib/libxlutil-4.4.so found in none of the libraries This required switching the make rule from $^ to an explicit LIBXLU_OBJS since the former now includes libxenlight.so. Signed-off-by: Ian Campbell Acked-by: Wei Liu Cc: Bastian Blank --- tools/libxl/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index df08c8a..b417372 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -41,7 +41,7 @@ LDFLAGS += $(PTHREAD_LDFLAGS) LIBXL_LIBS += $(PTHREAD_LIBS) LIBXL_LIBS += $(LIBXL_LIBS-y) -LIBXLU_LIBS = +LIBXLU_LIBS = libxenlight.so LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o flexarray.o ifeq ($(LIBXL_BLKTAP),y) @@ -227,8 +227,8 @@ libxlutil.so: libxlutil.so.$(XLUMAJOR) libxlutil.so.$(XLUMAJOR): libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(SYMLINK_SHLIB) $< $@ -libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS) - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXLU_LIBS) $(APPEND_LDFLAGS) +libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS) libxenlight.so + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $(LIBXLU_OBJS) $(LIBXLU_LIBS) $(APPEND_LDFLAGS) libxlutil.a: $(LIBXLU_OBJS) $(AR) rcs libxlutil.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 Sun Jan 18 20:56:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:56: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 1YCwtV-0008AS-Ov; Sun, 18 Jan 2015 20:56:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwtU-0008A8-Dl for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:24 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 65/E0-14727-7FD1CB45; Sun, 18 Jan 2015 20:56:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1421614582!18695671!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14453 invoked from network); 18 Jan 2015 20:56:23 -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; 18 Jan 2015 20:56:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwtR-00010y-Vl for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwtR-0003iz-UW for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:21 +0000 Date: Sun, 18 Jan 2015 20:56:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: link libxlu against libxl. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ec4e3336d413cc489813669e58c47e9156e03d8 Author: Ian Campbell AuthorDate: Mon Aug 4 10:58:25 2014 +0100 Commit: Ian Campbell CommitDate: Tue Jan 6 11:13:44 2015 +0000 tools: libxl: link libxlu against libxl. It uses libxl_defbool_set and must therefore be linked against the right library. Spotted by dpkg-shlibdeps and pointed out by Bastian Blank: dpkg-shlibdeps: warning: symbol libxl_defbool_set used by debian/libxen-4.4/usr/lib/libxlutil-4.4.so found in none of the libraries This required switching the make rule from $^ to an explicit LIBXLU_OBJS since the former now includes libxenlight.so. Signed-off-by: Ian Campbell Acked-by: Wei Liu Cc: Bastian Blank --- tools/libxl/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index df08c8a..b417372 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -41,7 +41,7 @@ LDFLAGS += $(PTHREAD_LDFLAGS) LIBXL_LIBS += $(PTHREAD_LIBS) LIBXL_LIBS += $(LIBXL_LIBS-y) -LIBXLU_LIBS = +LIBXLU_LIBS = libxenlight.so LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o flexarray.o ifeq ($(LIBXL_BLKTAP),y) @@ -227,8 +227,8 @@ libxlutil.so: libxlutil.so.$(XLUMAJOR) libxlutil.so.$(XLUMAJOR): libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(SYMLINK_SHLIB) $< $@ -libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS) - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXLU_LIBS) $(APPEND_LDFLAGS) +libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS) libxenlight.so + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $(LIBXLU_OBJS) $(LIBXLU_LIBS) $(APPEND_LDFLAGS) libxlutil.a: $(LIBXLU_OBJS) $(AR) rcs libxlutil.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 Sun Jan 18 20:56:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:56: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 1YCwtf-0008CS-Rn; Sun, 18 Jan 2015 20:56:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwte-0008CE-Lj for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:34 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 50/F0-14727-10E1CB45; Sun, 18 Jan 2015 20:56:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1421614592!14760850!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6002 invoked from network); 18 Jan 2015 20:56: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; 18 Jan 2015 20:56:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwtc-000118-5L for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwtc-0003jM-3V for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:32 +0000 Date: Sun, 18 Jan 2015 20:56:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Initialize the domain vgic lock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 876367befa26b12bfdecd6697faa7b8102e4b287 Author: Julien Grall AuthorDate: Wed Dec 17 15:40:15 2014 +0000 Commit: Ian Campbell CommitDate: Tue Jan 6 11:14:48 2015 +0000 xen/arm: Initialize the domain vgic lock The domain vgic lock is used uninitialized. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 97061ce..b8bd38b 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -90,6 +90,8 @@ int domain_vgic_init(struct domain *d) return -ENODEV; } + spin_lock_init(&d->arch.vgic.lock); + d->arch.vgic.shared_irqs = xzalloc_array(struct vgic_irq_rank, DOMAIN_NR_RANKS(d)); if ( d->arch.vgic.shared_irqs == NULL ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:56:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:56: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 1YCwtf-0008CS-Rn; Sun, 18 Jan 2015 20:56:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwte-0008CE-Lj for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:34 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 50/F0-14727-10E1CB45; Sun, 18 Jan 2015 20:56:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1421614592!14760850!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6002 invoked from network); 18 Jan 2015 20:56: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; 18 Jan 2015 20:56:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwtc-000118-5L for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwtc-0003jM-3V for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:32 +0000 Date: Sun, 18 Jan 2015 20:56:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Initialize the domain vgic lock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 876367befa26b12bfdecd6697faa7b8102e4b287 Author: Julien Grall AuthorDate: Wed Dec 17 15:40:15 2014 +0000 Commit: Ian Campbell CommitDate: Tue Jan 6 11:14:48 2015 +0000 xen/arm: Initialize the domain vgic lock The domain vgic lock is used uninitialized. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 97061ce..b8bd38b 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -90,6 +90,8 @@ int domain_vgic_init(struct domain *d) return -ENODEV; } + spin_lock_init(&d->arch.vgic.lock); + d->arch.vgic.shared_irqs = xzalloc_array(struct vgic_irq_rank, DOMAIN_NR_RANKS(d)); if ( d->arch.vgic.shared_irqs == NULL ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:56:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:56: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 1YCwtp-0008EA-UW; Sun, 18 Jan 2015 20:56:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwto-0008Du-Oc for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:44 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 1B/39-15461-C0E1CB45; Sun, 18 Jan 2015 20:56:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1421614602!22193310!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20646 invoked from network); 18 Jan 2015 20:56:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:56:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwtm-00011B-Bf for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwtm-0003jl-Ax for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:42 +0000 Date: Sun, 18 Jan 2015 20:56:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] reset PCI devices on force removal even when QEMU returns 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 8233ca53adf008da54c01d55d3309c4b0999ddb5 Author: Stefano Stabellini AuthorDate: Fri Nov 28 16:53:09 2014 +0000 Commit: Ian Campbell CommitDate: Tue Jan 6 11:15:45 2015 +0000 reset PCI devices on force removal even when QEMU returns error On do_pci_remove when QEMU returns error, we just bail out early without resetting the device. On domain shutdown we are racing with QEMU exiting and most often QEMU closes the QMP connection before executing the requested command. In these cases if force=1, it makes sense to go ahead with rest of the PCI device removal, that includes resetting the device and calling xc_deassign_device. Otherwise we risk not resetting the device properly on domain shutdown. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl_pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 9ae37fa..f3ae132 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1243,7 +1243,7 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, rc = ERROR_INVAL; goto out_fail; } - if (rc) { + if (rc && !force) { rc = ERROR_FAIL; goto out_fail; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:56:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:56: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 1YCwtp-0008EA-UW; Sun, 18 Jan 2015 20:56:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwto-0008Du-Oc for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:44 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 1B/39-15461-C0E1CB45; Sun, 18 Jan 2015 20:56:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1421614602!22193310!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20646 invoked from network); 18 Jan 2015 20:56:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:56:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwtm-00011B-Bf for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwtm-0003jl-Ax for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:42 +0000 Date: Sun, 18 Jan 2015 20:56:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] reset PCI devices on force removal even when QEMU returns 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 8233ca53adf008da54c01d55d3309c4b0999ddb5 Author: Stefano Stabellini AuthorDate: Fri Nov 28 16:53:09 2014 +0000 Commit: Ian Campbell CommitDate: Tue Jan 6 11:15:45 2015 +0000 reset PCI devices on force removal even when QEMU returns error On do_pci_remove when QEMU returns error, we just bail out early without resetting the device. On domain shutdown we are racing with QEMU exiting and most often QEMU closes the QMP connection before executing the requested command. In these cases if force=1, it makes sense to go ahead with rest of the PCI device removal, that includes resetting the device and calling xc_deassign_device. Otherwise we risk not resetting the device properly on domain shutdown. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl_pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 9ae37fa..f3ae132 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1243,7 +1243,7 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, rc = ERROR_INVAL; goto out_fail; } - if (rc) { + if (rc && !force) { rc = ERROR_FAIL; goto out_fail; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:56:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:56: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 1YCwu2-0008GG-1O; Sun, 18 Jan 2015 20:56:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwu0-0008G2-8Y for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:56 +0000 Content-Length: 2058 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 4D/35-17694-71E1CB45; Sun, 18 Jan 2015 20:56:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1421614612!20393083!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11608 invoked from network); 18 Jan 2015 20:56:54 -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 Jan 2015 20:56:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwtw-00011N-HO for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwtw-0003kx-Gf for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:52 +0000 Date: Sun, 18 Jan 2015 20:56:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: prevent use-after-free when destroying 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: multipart/mixed; boundary="===============6555651789868627869==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6555651789868627869== Content-Length: 1654 Content-Transfer-Encoding: quoted-printable commit d3c151fd3a4365fc6107198bfc975807d40d157d Author: Mihai Don=C8=9Bu AuthorDate: Tue Jan 6 12:49:52 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 12:50:44 2015 +0000 x86/HVM: prevent use-after-free when destroying a domain hvm_domain_relinquish_resources() can free certain domain resources which can still be accessed, e.g. by HVMOP_set_param, while the domain is being cleaned up. This is CVE-2015-0361 / XSA-116. Signed-off-by: Mihai Don=C8=9Bu Tested-by: R=C4=83zvan Cojocaru Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index bc414ff..72be5b9 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1487,9 +1487,6 @@ int hvm_domain_initialise(struct domain *d) void hvm_domain_relinquish_resources(struct domain *d) { - xfree(d->arch.hvm_domain.io_handler); - xfree(d->arch.hvm_domain.params); - if ( is_pvh_domain(d) ) return; @@ -1511,6 +1508,9 @@ void hvm_domain_relinquish_resources(struct domain *d) void hvm_domain_destroy(struct domain *d) { + xfree(d->arch.hvm_domain.io_handler); + xfree(d->arch.hvm_domain.params); + hvm_destroy_cacheattr_region_list(d); if ( is_pvh_domain(d) ) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6555651789868627869== 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 --===============6555651789868627869==-- From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:56:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:56: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 1YCwu2-0008GG-1O; Sun, 18 Jan 2015 20:56:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwu0-0008G2-8Y for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:56 +0000 Content-Length: 2058 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 4D/35-17694-71E1CB45; Sun, 18 Jan 2015 20:56:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1421614612!20393083!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11608 invoked from network); 18 Jan 2015 20:56:54 -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 Jan 2015 20:56:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwtw-00011N-HO for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwtw-0003kx-Gf for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:56:52 +0000 Date: Sun, 18 Jan 2015 20:56:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: prevent use-after-free when destroying 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: multipart/mixed; boundary="===============6555651789868627869==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6555651789868627869== Content-Length: 1654 Content-Transfer-Encoding: quoted-printable commit d3c151fd3a4365fc6107198bfc975807d40d157d Author: Mihai Don=C8=9Bu AuthorDate: Tue Jan 6 12:49:52 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 12:50:44 2015 +0000 x86/HVM: prevent use-after-free when destroying a domain hvm_domain_relinquish_resources() can free certain domain resources which can still be accessed, e.g. by HVMOP_set_param, while the domain is being cleaned up. This is CVE-2015-0361 / XSA-116. Signed-off-by: Mihai Don=C8=9Bu Tested-by: R=C4=83zvan Cojocaru Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index bc414ff..72be5b9 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1487,9 +1487,6 @@ int hvm_domain_initialise(struct domain *d) void hvm_domain_relinquish_resources(struct domain *d) { - xfree(d->arch.hvm_domain.io_handler); - xfree(d->arch.hvm_domain.params); - if ( is_pvh_domain(d) ) return; @@ -1511,6 +1508,9 @@ void hvm_domain_relinquish_resources(struct domain *d) void hvm_domain_destroy(struct domain *d) { + xfree(d->arch.hvm_domain.io_handler); + xfree(d->arch.hvm_domain.params); + hvm_destroy_cacheattr_region_list(d); if ( is_pvh_domain(d) ) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6555651789868627869== 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 --===============6555651789868627869==-- From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:57:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:57: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 1YCwuC-0008Hv-4A; Sun, 18 Jan 2015 20:57:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwuA-0008He-MD for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:06 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id D4/CB-22737-12E1CB45; Sun, 18 Jan 2015 20:57:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1421614622!18695701!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15041 invoked from network); 18 Jan 2015 20:57:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:57:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwu6-000123-Mt for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwu6-0003lT-Lg for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:02 +0000 Date: Sun, 18 Jan 2015 20:57:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI: suppress bogus loader 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 commit 926e680aadde774557b92a4a3e9457f63e963e84 Author: Jan Beulich AuthorDate: Fri Dec 19 11:17:02 2014 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:07:34 2015 -0500 EFI: suppress bogus loader warning This was accidentally lost in commit fbc3d9a220 ("EFI: add efi_arch_handle_cmdline() for processing commandline"), leading to the "Unknown command line option" warning being printed whenever options get passed to the core hypervisor or the Dom0 kernel. Signed-off-by: Jan Beulich Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/efi/boot.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index c68efdb..ac6881e 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -311,6 +311,7 @@ static unsigned int __init get_argv(unsigned int argc, CHAR16 **argv, ++argc; else if ( prev && wstrcmp(prev, L"--") == 0 ) { + --argv; if ( options ) *options = cmdline; 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 Sun Jan 18 20:57:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:57: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 1YCwuC-0008Hv-4A; Sun, 18 Jan 2015 20:57:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwuA-0008He-MD for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:06 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id D4/CB-22737-12E1CB45; Sun, 18 Jan 2015 20:57:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1421614622!18695701!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15041 invoked from network); 18 Jan 2015 20:57:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:57:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwu6-000123-Mt for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwu6-0003lT-Lg for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:02 +0000 Date: Sun, 18 Jan 2015 20:57:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI: suppress bogus loader 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 commit 926e680aadde774557b92a4a3e9457f63e963e84 Author: Jan Beulich AuthorDate: Fri Dec 19 11:17:02 2014 +0000 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:07:34 2015 -0500 EFI: suppress bogus loader warning This was accidentally lost in commit fbc3d9a220 ("EFI: add efi_arch_handle_cmdline() for processing commandline"), leading to the "Unknown command line option" warning being printed whenever options get passed to the core hypervisor or the Dom0 kernel. Signed-off-by: Jan Beulich Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/efi/boot.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index c68efdb..ac6881e 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -311,6 +311,7 @@ static unsigned int __init get_argv(unsigned int argc, CHAR16 **argv, ++argc; else if ( prev && wstrcmp(prev, L"--") == 0 ) { + --argv; if ( options ) *options = cmdline; 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 Sun Jan 18 20:57:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:57: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 1YCwuL-0008JR-6j; Sun, 18 Jan 2015 20:57:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwuJ-0008J6-LY for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:16 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 3E/91-09842-A2E1CB45; Sun, 18 Jan 2015 20:57:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1421614633!14204563!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18825 invoked from network); 18 Jan 2015 20:57:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:57:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwuG-000129-Sc for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwuG-0003lz-Rn for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:12 +0000 Date: Sun, 18 Jan 2015 20:57:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Renegerate flex output 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 3bd8559e5e3f406fa4159e12cdd1323c62f4eac8 Author: Ian Jackson AuthorDate: Tue Jan 6 15:15:15 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 15:28:17 2015 +0000 libxl: Renegerate flex output files Regenerate libxl_*_l.* with flex 2.5.35-10.1 as in current Debian wheezy. The differences are trivial: addition of declarations of xlu__cfg_yyget_column and xlu__cfg_yyset_column, but no code body changes. Signed-off-by: Ian Jackson Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxlu_cfg_l.c | 8 ++++++-- tools/libxl/libxlu_cfg_l.h | 6 +++++- tools/libxl/libxlu_disk_l.c | 8 ++++++-- tools/libxl/libxlu_disk_l.h | 6 +++++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxlu_cfg_l.c b/tools/libxl/libxlu_cfg_l.c index df352aa..450863a 100644 --- a/tools/libxl/libxlu_cfg_l.c +++ b/tools/libxl/libxlu_cfg_l.c @@ -610,6 +610,10 @@ int xlu__cfg_yyget_lineno (yyscan_t yyscanner ); void xlu__cfg_yyset_lineno (int line_number ,yyscan_t yyscanner ); +int xlu__cfg_yyget_column (yyscan_t yyscanner ); + +void xlu__cfg_yyset_column (int column_no ,yyscan_t yyscanner ); + YYSTYPE * xlu__cfg_yyget_lval (yyscan_t yyscanner ); void xlu__cfg_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); @@ -762,7 +766,7 @@ YY_DECL #line 53 "libxlu_cfg_l.l" -#line 766 "libxlu_cfg_l.c" +#line 770 "libxlu_cfg_l.c" yylval = yylval_param; @@ -971,7 +975,7 @@ YY_RULE_SETUP #line 104 "libxlu_cfg_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 975 "libxlu_cfg_l.c" +#line 979 "libxlu_cfg_l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(lexerr): yyterminate(); diff --git a/tools/libxl/libxlu_cfg_l.h b/tools/libxl/libxlu_cfg_l.h index 4078302..151064e 100644 --- a/tools/libxl/libxlu_cfg_l.h +++ b/tools/libxl/libxlu_cfg_l.h @@ -276,6 +276,10 @@ int xlu__cfg_yyget_lineno (yyscan_t yyscanner ); void xlu__cfg_yyset_lineno (int line_number ,yyscan_t yyscanner ); +int xlu__cfg_yyget_column (yyscan_t yyscanner ); + +void xlu__cfg_yyset_column (int column_no ,yyscan_t yyscanner ); + YYSTYPE * xlu__cfg_yyget_lval (yyscan_t yyscanner ); void xlu__cfg_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); @@ -352,6 +356,6 @@ extern int xlu__cfg_yylex \ #line 104 "libxlu_cfg_l.l" -#line 356 "libxlu_cfg_l.h" +#line 360 "libxlu_cfg_l.h" #undef xlu__cfg_yyIN_HEADER #endif /* xlu__cfg_yyHEADER_H */ diff --git a/tools/libxl/libxlu_disk_l.c b/tools/libxl/libxlu_disk_l.c index 2c6e8e3..beea7f9 100644 --- a/tools/libxl/libxlu_disk_l.c +++ b/tools/libxl/libxlu_disk_l.c @@ -1011,6 +1011,10 @@ int xlu__disk_yyget_lineno (yyscan_t yyscanner ); void xlu__disk_yyset_lineno (int line_number ,yyscan_t yyscanner ); +int xlu__disk_yyget_column (yyscan_t yyscanner ); + +void xlu__disk_yyset_column (int column_no ,yyscan_t yyscanner ); + /* Macros after this point can all be overridden by user definitions in * section 1. */ @@ -1155,7 +1159,7 @@ YY_DECL /*----- the scanner rules which do the parsing -----*/ -#line 1159 "libxlu_disk_l.c" +#line 1163 "libxlu_disk_l.c" if ( !yyg->yy_init ) { @@ -1498,7 +1502,7 @@ YY_RULE_SETUP #line 259 "libxlu_disk_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1502 "libxlu_disk_l.c" +#line 1506 "libxlu_disk_l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(LEXERR): yyterminate(); diff --git a/tools/libxl/libxlu_disk_l.h b/tools/libxl/libxlu_disk_l.h index 08f60e5..f615582 100644 --- a/tools/libxl/libxlu_disk_l.h +++ b/tools/libxl/libxlu_disk_l.h @@ -280,6 +280,10 @@ int xlu__disk_yyget_lineno (yyscan_t yyscanner ); void xlu__disk_yyset_lineno (int line_number ,yyscan_t yyscanner ); +int xlu__disk_yyget_column (yyscan_t yyscanner ); + +void xlu__disk_yyset_column (int column_no ,yyscan_t yyscanner ); + /* Macros after this point can all be overridden by user definitions in * section 1. */ @@ -346,6 +350,6 @@ extern int xlu__disk_yylex (yyscan_t yyscanner); #line 259 "libxlu_disk_l.l" -#line 350 "libxlu_disk_l.h" +#line 354 "libxlu_disk_l.h" #undef xlu__disk_yyIN_HEADER #endif /* xlu__disk_yyHEADER_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 Sun Jan 18 20:57:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:57: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 1YCwuL-0008JR-6j; Sun, 18 Jan 2015 20:57:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwuJ-0008J6-LY for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:16 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 3E/91-09842-A2E1CB45; Sun, 18 Jan 2015 20:57:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1421614633!14204563!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18825 invoked from network); 18 Jan 2015 20:57:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:57:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwuG-000129-Sc for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwuG-0003lz-Rn for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:12 +0000 Date: Sun, 18 Jan 2015 20:57:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Renegerate flex output 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 3bd8559e5e3f406fa4159e12cdd1323c62f4eac8 Author: Ian Jackson AuthorDate: Tue Jan 6 15:15:15 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 15:28:17 2015 +0000 libxl: Renegerate flex output files Regenerate libxl_*_l.* with flex 2.5.35-10.1 as in current Debian wheezy. The differences are trivial: addition of declarations of xlu__cfg_yyget_column and xlu__cfg_yyset_column, but no code body changes. Signed-off-by: Ian Jackson Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxlu_cfg_l.c | 8 ++++++-- tools/libxl/libxlu_cfg_l.h | 6 +++++- tools/libxl/libxlu_disk_l.c | 8 ++++++-- tools/libxl/libxlu_disk_l.h | 6 +++++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxlu_cfg_l.c b/tools/libxl/libxlu_cfg_l.c index df352aa..450863a 100644 --- a/tools/libxl/libxlu_cfg_l.c +++ b/tools/libxl/libxlu_cfg_l.c @@ -610,6 +610,10 @@ int xlu__cfg_yyget_lineno (yyscan_t yyscanner ); void xlu__cfg_yyset_lineno (int line_number ,yyscan_t yyscanner ); +int xlu__cfg_yyget_column (yyscan_t yyscanner ); + +void xlu__cfg_yyset_column (int column_no ,yyscan_t yyscanner ); + YYSTYPE * xlu__cfg_yyget_lval (yyscan_t yyscanner ); void xlu__cfg_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); @@ -762,7 +766,7 @@ YY_DECL #line 53 "libxlu_cfg_l.l" -#line 766 "libxlu_cfg_l.c" +#line 770 "libxlu_cfg_l.c" yylval = yylval_param; @@ -971,7 +975,7 @@ YY_RULE_SETUP #line 104 "libxlu_cfg_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 975 "libxlu_cfg_l.c" +#line 979 "libxlu_cfg_l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(lexerr): yyterminate(); diff --git a/tools/libxl/libxlu_cfg_l.h b/tools/libxl/libxlu_cfg_l.h index 4078302..151064e 100644 --- a/tools/libxl/libxlu_cfg_l.h +++ b/tools/libxl/libxlu_cfg_l.h @@ -276,6 +276,10 @@ int xlu__cfg_yyget_lineno (yyscan_t yyscanner ); void xlu__cfg_yyset_lineno (int line_number ,yyscan_t yyscanner ); +int xlu__cfg_yyget_column (yyscan_t yyscanner ); + +void xlu__cfg_yyset_column (int column_no ,yyscan_t yyscanner ); + YYSTYPE * xlu__cfg_yyget_lval (yyscan_t yyscanner ); void xlu__cfg_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); @@ -352,6 +356,6 @@ extern int xlu__cfg_yylex \ #line 104 "libxlu_cfg_l.l" -#line 356 "libxlu_cfg_l.h" +#line 360 "libxlu_cfg_l.h" #undef xlu__cfg_yyIN_HEADER #endif /* xlu__cfg_yyHEADER_H */ diff --git a/tools/libxl/libxlu_disk_l.c b/tools/libxl/libxlu_disk_l.c index 2c6e8e3..beea7f9 100644 --- a/tools/libxl/libxlu_disk_l.c +++ b/tools/libxl/libxlu_disk_l.c @@ -1011,6 +1011,10 @@ int xlu__disk_yyget_lineno (yyscan_t yyscanner ); void xlu__disk_yyset_lineno (int line_number ,yyscan_t yyscanner ); +int xlu__disk_yyget_column (yyscan_t yyscanner ); + +void xlu__disk_yyset_column (int column_no ,yyscan_t yyscanner ); + /* Macros after this point can all be overridden by user definitions in * section 1. */ @@ -1155,7 +1159,7 @@ YY_DECL /*----- the scanner rules which do the parsing -----*/ -#line 1159 "libxlu_disk_l.c" +#line 1163 "libxlu_disk_l.c" if ( !yyg->yy_init ) { @@ -1498,7 +1502,7 @@ YY_RULE_SETUP #line 259 "libxlu_disk_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1502 "libxlu_disk_l.c" +#line 1506 "libxlu_disk_l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(LEXERR): yyterminate(); diff --git a/tools/libxl/libxlu_disk_l.h b/tools/libxl/libxlu_disk_l.h index 08f60e5..f615582 100644 --- a/tools/libxl/libxlu_disk_l.h +++ b/tools/libxl/libxlu_disk_l.h @@ -280,6 +280,10 @@ int xlu__disk_yyget_lineno (yyscan_t yyscanner ); void xlu__disk_yyset_lineno (int line_number ,yyscan_t yyscanner ); +int xlu__disk_yyget_column (yyscan_t yyscanner ); + +void xlu__disk_yyset_column (int column_no ,yyscan_t yyscanner ); + /* Macros after this point can all be overridden by user definitions in * section 1. */ @@ -346,6 +350,6 @@ extern int xlu__disk_yylex (yyscan_t yyscanner); #line 259 "libxlu_disk_l.l" -#line 350 "libxlu_disk_l.h" +#line 354 "libxlu_disk_l.h" #undef xlu__disk_yyIN_HEADER #endif /* xlu__disk_yyHEADER_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 Sun Jan 18 20:57:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:57: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 1YCwuV-0008L6-9N; Sun, 18 Jan 2015 20:57:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwuT-0008Km-VX for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:26 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id C2/69-02743-43E1CB45; Sun, 18 Jan 2015 20:57:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1421614643!21299752!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2106 invoked from network); 18 Jan 2015 20:57:24 -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; 18 Jan 2015 20:57:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwuR-00012F-2a for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwuR-0003mL-19 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:23 +0000 Date: Sun, 18 Jan 2015 20:57:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix building libxlu_cfg_y.y with bison 3.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 7ba4cdfadd4f3c45d65ffe50e621759f458fedc0 Author: Ed Swierk AuthorDate: Tue Jan 6 15:21:07 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 15:28:17 2015 +0000 libxl: Fix building libxlu_cfg_y.y with bison 3.0 - Use %lex-param instead of obsolete YYLEX_PARAM to override lex scanner parameter - Change deprecated %name-prefix= to %name-prefix Tested against bison 2.4.1 and 3.0.2. This is expected to sometimes (depending on timestamps and whether the bison input files are edited) break building on systems with ancient versions of bison. Bison 2.4.1 is known to work and was released in December 2008. Also, consquentially, regenerate bison output files with bison 1:2.5.dfsg-2.1 from Debian wheezy. Signed-off-by: Ed Swierk Acked-by: Ian Jackson Tested-by: Wei Liu Signed-off-by: Ian Jackson Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxlu_cfg_y.c | 4 ++-- tools/libxl/libxlu_cfg_y.y | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxlu_cfg_y.c b/tools/libxl/libxlu_cfg_y.c index 4437e05..07b5a1d 100644 --- a/tools/libxl/libxlu_cfg_y.c +++ b/tools/libxl/libxlu_cfg_y.c @@ -76,7 +76,7 @@ /* Line 268 of yacc.c */ #line 19 "libxlu_cfg_y.y" -#define YYLEX_PARAM ctx->scanner +#define ctx_scanner ctx->scanner #include "libxlu_cfg_i.h" #include "libxlu_cfg_l.h" @@ -656,7 +656,7 @@ while (YYID (0)) #ifdef YYLEX_PARAM # define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) #else -# define YYLEX yylex (&yylval, &yylloc, scanner) +# define YYLEX yylex (&yylval, &yylloc, ctx_scanner) #endif /* Enable debugging if requested. */ diff --git a/tools/libxl/libxlu_cfg_y.y b/tools/libxl/libxlu_cfg_y.y index aa9f787..5acd438 100644 --- a/tools/libxl/libxlu_cfg_y.y +++ b/tools/libxl/libxlu_cfg_y.y @@ -17,7 +17,7 @@ */ %{ -#define YYLEX_PARAM ctx->scanner +#define ctx_scanner ctx->scanner #include "libxlu_cfg_i.h" #include "libxlu_cfg_l.h" %} @@ -31,9 +31,9 @@ %pure-parser %defines %error-verbose -%name-prefix="xlu__cfg_yy" +%name-prefix "xlu__cfg_yy" %parse-param { CfgParseContext *ctx } -%lex-param { void *scanner } +%lex-param { ctx_scanner } %token IDENT STRING NUMBER NEWLINE %type atom -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:57:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:57: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 1YCwuV-0008L6-9N; Sun, 18 Jan 2015 20:57:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwuT-0008Km-VX for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:26 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id C2/69-02743-43E1CB45; Sun, 18 Jan 2015 20:57:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1421614643!21299752!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2106 invoked from network); 18 Jan 2015 20:57:24 -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; 18 Jan 2015 20:57:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwuR-00012F-2a for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwuR-0003mL-19 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:23 +0000 Date: Sun, 18 Jan 2015 20:57:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix building libxlu_cfg_y.y with bison 3.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 7ba4cdfadd4f3c45d65ffe50e621759f458fedc0 Author: Ed Swierk AuthorDate: Tue Jan 6 15:21:07 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 15:28:17 2015 +0000 libxl: Fix building libxlu_cfg_y.y with bison 3.0 - Use %lex-param instead of obsolete YYLEX_PARAM to override lex scanner parameter - Change deprecated %name-prefix= to %name-prefix Tested against bison 2.4.1 and 3.0.2. This is expected to sometimes (depending on timestamps and whether the bison input files are edited) break building on systems with ancient versions of bison. Bison 2.4.1 is known to work and was released in December 2008. Also, consquentially, regenerate bison output files with bison 1:2.5.dfsg-2.1 from Debian wheezy. Signed-off-by: Ed Swierk Acked-by: Ian Jackson Tested-by: Wei Liu Signed-off-by: Ian Jackson Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxlu_cfg_y.c | 4 ++-- tools/libxl/libxlu_cfg_y.y | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxlu_cfg_y.c b/tools/libxl/libxlu_cfg_y.c index 4437e05..07b5a1d 100644 --- a/tools/libxl/libxlu_cfg_y.c +++ b/tools/libxl/libxlu_cfg_y.c @@ -76,7 +76,7 @@ /* Line 268 of yacc.c */ #line 19 "libxlu_cfg_y.y" -#define YYLEX_PARAM ctx->scanner +#define ctx_scanner ctx->scanner #include "libxlu_cfg_i.h" #include "libxlu_cfg_l.h" @@ -656,7 +656,7 @@ while (YYID (0)) #ifdef YYLEX_PARAM # define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) #else -# define YYLEX yylex (&yylval, &yylloc, scanner) +# define YYLEX yylex (&yylval, &yylloc, ctx_scanner) #endif /* Enable debugging if requested. */ diff --git a/tools/libxl/libxlu_cfg_y.y b/tools/libxl/libxlu_cfg_y.y index aa9f787..5acd438 100644 --- a/tools/libxl/libxlu_cfg_y.y +++ b/tools/libxl/libxlu_cfg_y.y @@ -17,7 +17,7 @@ */ %{ -#define YYLEX_PARAM ctx->scanner +#define ctx_scanner ctx->scanner #include "libxlu_cfg_i.h" #include "libxlu_cfg_l.h" %} @@ -31,9 +31,9 @@ %pure-parser %defines %error-verbose -%name-prefix="xlu__cfg_yy" +%name-prefix "xlu__cfg_yy" %parse-param { CfgParseContext *ctx } -%lex-param { void *scanner } +%lex-param { ctx_scanner } %token IDENT STRING NUMBER NEWLINE %type atom -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:57:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:57: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 1YCwue-0008N8-Dz; Sun, 18 Jan 2015 20:57:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwud-0008Mu-QU for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:35 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 82/B1-09842-F3E1CB45; Sun, 18 Jan 2015 20:57:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1421614653!22268528!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24512 invoked from network); 18 Jan 2015 20:57:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:57:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwub-00012N-EO for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwub-0003mi-7J for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:33 +0000 Date: Sun, 18 Jan 2015 20:57:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: remove SELinux options from var-lib-xenstored.mount X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a6b04352b72e38744ddf3395bf15232e5e7e7393 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:27 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: remove SELinux options from var-lib-xenstored.mount Using SELinux mount options per default breaks several systems. Either the context= mount option is not known at all to the kernel, as reported for ArchLinux. Or the default value "none" is unknown to SELinux, as reported for Fedora. In both cases the unit will fail. The proper place to specify mount options is /etc/fstab. Apparently systemd is kind enough to use values from there even if Options= or What= is specified in a .mount file. Remove XENSTORED_MOUNT_CTX, the reference to a non-existent EnvironmentFile and trim default Options= for the mount point. The removed code was first mentioned in the patch referenced below, with the following description: ... * Some systems define the selinux context in the systemd Option for the /var/lib/xenstored tmpfs: Options=mode=755,context="system_u:object_r:xenstored_var_lib_t:s0" For the upstream version we remove that and let systems specify the context on their system /etc/default/xenstored or /etc/sysconfig/xenstored $XENSTORED_MOUNT_CTX variable ... It is nowhere stated (on xen-devel) what "Some systems" means, which is unfortunately common practice in nearly all opensource projects. http://lists.xenproject.org/archives/html/xen-devel/2014-03/msg02462.html Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Cc: Wei Liu Cc: Anthony PERARD Cc: M A Young Cc: Luis R. Rodriguez Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- .../Linux/systemd/var-lib-xenstored.mount.in | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in index d5e04db..11a7d50 100644 --- a/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in +++ b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in @@ -6,9 +6,7 @@ ConditionPathExists=/proc/xen/capabilities RefuseManualStop=true [Mount] -Environment=XENSTORED_MOUNT_CTX=none -EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored What=xenstore Where=@XEN_LIB_STORED@ Type=tmpfs -Options=mode=755,context="$XENSTORED_MOUNT_CTX" +Options=mode=755 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:57:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:57: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 1YCwue-0008N8-Dz; Sun, 18 Jan 2015 20:57:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwud-0008Mu-QU for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:35 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 82/B1-09842-F3E1CB45; Sun, 18 Jan 2015 20:57:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1421614653!22268528!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24512 invoked from network); 18 Jan 2015 20:57:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:57:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwub-00012N-EO for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwub-0003mi-7J for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:33 +0000 Date: Sun, 18 Jan 2015 20:57:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: remove SELinux options from var-lib-xenstored.mount X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a6b04352b72e38744ddf3395bf15232e5e7e7393 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:27 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: remove SELinux options from var-lib-xenstored.mount Using SELinux mount options per default breaks several systems. Either the context= mount option is not known at all to the kernel, as reported for ArchLinux. Or the default value "none" is unknown to SELinux, as reported for Fedora. In both cases the unit will fail. The proper place to specify mount options is /etc/fstab. Apparently systemd is kind enough to use values from there even if Options= or What= is specified in a .mount file. Remove XENSTORED_MOUNT_CTX, the reference to a non-existent EnvironmentFile and trim default Options= for the mount point. The removed code was first mentioned in the patch referenced below, with the following description: ... * Some systems define the selinux context in the systemd Option for the /var/lib/xenstored tmpfs: Options=mode=755,context="system_u:object_r:xenstored_var_lib_t:s0" For the upstream version we remove that and let systems specify the context on their system /etc/default/xenstored or /etc/sysconfig/xenstored $XENSTORED_MOUNT_CTX variable ... It is nowhere stated (on xen-devel) what "Some systems" means, which is unfortunately common practice in nearly all opensource projects. http://lists.xenproject.org/archives/html/xen-devel/2014-03/msg02462.html Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Cc: Wei Liu Cc: Anthony PERARD Cc: M A Young Cc: Luis R. Rodriguez Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- .../Linux/systemd/var-lib-xenstored.mount.in | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in index d5e04db..11a7d50 100644 --- a/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in +++ b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in @@ -6,9 +6,7 @@ ConditionPathExists=/proc/xen/capabilities RefuseManualStop=true [Mount] -Environment=XENSTORED_MOUNT_CTX=none -EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored What=xenstore Where=@XEN_LIB_STORED@ Type=tmpfs -Options=mode=755,context="$XENSTORED_MOUNT_CTX" +Options=mode=755 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:57:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:57: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 1YCwuo-0008P4-Gp; Sun, 18 Jan 2015 20:57:46 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwun-0008Os-W3 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:46 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 20/6A-10925-94E1CB45; Sun, 18 Jan 2015 20:57:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1421614663!22202754!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28228 invoked from network); 18 Jan 2015 20:57:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:57:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwul-00012T-Jm for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwul-0003n7-Ix for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:43 +0000 Date: Sun, 18 Jan 2015 20:57:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: remove XENSTORED_ROOTDIR from xenstored.service X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae978c555877cd97fb8eec96a27c08c4f72b70bb Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:28 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: remove XENSTORED_ROOTDIR from xenstored.service There is no need to export XENSTORED_ROOTDIR. This variable can be enabled in sysconfig/xencommons. If the variable is unset xenstored will automatically use @XEN_LIB_STORED@. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- tools/hotplug/Linux/systemd/xenstored.service.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in index 780bdd6..0f0ac58 100644 --- a/tools/hotplug/Linux/systemd/xenstored.service.in +++ b/tools/hotplug/Linux/systemd/xenstored.service.in @@ -9,7 +9,6 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=notify Environment=XENSTORED_ARGS= -Environment=XENSTORED_ROOTDIR=@XEN_LIB_STORED@ Environment=XENSTORED=@XENSTORED@ EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:57:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:57: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 1YCwuo-0008P4-Gp; Sun, 18 Jan 2015 20:57:46 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwun-0008Os-W3 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:46 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 20/6A-10925-94E1CB45; Sun, 18 Jan 2015 20:57:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1421614663!22202754!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28228 invoked from network); 18 Jan 2015 20:57:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:57:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwul-00012T-Jm for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwul-0003n7-Ix for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:43 +0000 Date: Sun, 18 Jan 2015 20:57:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: remove XENSTORED_ROOTDIR from xenstored.service X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae978c555877cd97fb8eec96a27c08c4f72b70bb Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:28 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: remove XENSTORED_ROOTDIR from xenstored.service There is no need to export XENSTORED_ROOTDIR. This variable can be enabled in sysconfig/xencommons. If the variable is unset xenstored will automatically use @XEN_LIB_STORED@. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- tools/hotplug/Linux/systemd/xenstored.service.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in index 780bdd6..0f0ac58 100644 --- a/tools/hotplug/Linux/systemd/xenstored.service.in +++ b/tools/hotplug/Linux/systemd/xenstored.service.in @@ -9,7 +9,6 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=notify Environment=XENSTORED_ARGS= -Environment=XENSTORED_ROOTDIR=@XEN_LIB_STORED@ Environment=XENSTORED=@XENSTORED@ EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:57:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:57: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 1YCwuy-0008Qg-JN; Sun, 18 Jan 2015 20:57:56 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwuy-0008QX-3M for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:56 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id F7/C1-09842-35E1CB45; Sun, 18 Jan 2015 20:57:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1421614673!22217023!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9760 invoked from network); 18 Jan 2015 20:57:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:57:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwuv-00012f-OX for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwuv-0003nz-Nr for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:53 +0000 Date: Sun, 18 Jan 2015 20:57:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: xendomains.service depends on network X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 37cc9d9a5b344d0c63d93d9d357b8c07aeb351c9 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:29 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: xendomains.service depends on network Starting domains during boot will most likely require network for the local bridge and it may need access to remote filesystems. Add ordering tags to systemd service file. Signed-off-by: Olaf Hering Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- tools/hotplug/Linux/systemd/xendomains.service.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xendomains.service.in b/tools/hotplug/Linux/systemd/xendomains.service.in index 9962671..66e2065 100644 --- a/tools/hotplug/Linux/systemd/xendomains.service.in +++ b/tools/hotplug/Linux/systemd/xendomains.service.in @@ -2,6 +2,8 @@ Description=Xendomains - start and stop guests on boot and shutdown Requires=proc-xen.mount xenstored.service After=proc-xen.mount xenstored.service xenconsoled.service xen-init-dom0.service +After=network-online.target +After=remote-fs.target ConditionPathExists=/proc/xen/capabilities [Service] -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:57:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:57: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 1YCwuy-0008Qg-JN; Sun, 18 Jan 2015 20:57:56 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwuy-0008QX-3M for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:56 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id F7/C1-09842-35E1CB45; Sun, 18 Jan 2015 20:57:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1421614673!22217023!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9760 invoked from network); 18 Jan 2015 20:57:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:57:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwuv-00012f-OX for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwuv-0003nz-Nr for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:57:53 +0000 Date: Sun, 18 Jan 2015 20:57:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: xendomains.service depends on network X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 37cc9d9a5b344d0c63d93d9d357b8c07aeb351c9 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:29 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: xendomains.service depends on network Starting domains during boot will most likely require network for the local bridge and it may need access to remote filesystems. Add ordering tags to systemd service file. Signed-off-by: Olaf Hering Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Release-Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Konrad Rzeszutek Wilk --- tools/hotplug/Linux/systemd/xendomains.service.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xendomains.service.in b/tools/hotplug/Linux/systemd/xendomains.service.in index 9962671..66e2065 100644 --- a/tools/hotplug/Linux/systemd/xendomains.service.in +++ b/tools/hotplug/Linux/systemd/xendomains.service.in @@ -2,6 +2,8 @@ Description=Xendomains - start and stop guests on boot and shutdown Requires=proc-xen.mount xenstored.service After=proc-xen.mount xenstored.service xenconsoled.service xen-init-dom0.service +After=network-online.target +After=remote-fs.target ConditionPathExists=/proc/xen/capabilities [Service] -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:58:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:58: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 1YCwvA-0008SO-MA; Sun, 18 Jan 2015 20:58:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwv9-0008SA-B2 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:07 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id F4/7A-10925-E5E1CB45; Sun, 18 Jan 2015 20:58:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1421614684!22263343!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25646 invoked from network); 18 Jan 2015 20:58:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:58:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwv5-00013E-WD for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwv5-0003oV-U3 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:03 +0000 Date: Sun, 18 Jan 2015 20:58:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: use xencommons as EnvironmentFile in xenconsoled.service X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9fd87d31ce0f4632cce74c29ea62c9c05ac927e4 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:30 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: use xencommons as EnvironmentFile in xenconsoled.service The referenced sysconfig/xenconsoled does not exist. If anything needs to be specified it has to go into the existing sysconfig/xencommons file. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Cc: Wei Liu Signed-off-by: Konrad Rzeszutek Wilk --- tools/hotplug/Linux/systemd/xenconsoled.service.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xenconsoled.service.in b/tools/hotplug/Linux/systemd/xenconsoled.service.in index cb44cd6..9e71444 100644 --- a/tools/hotplug/Linux/systemd/xenconsoled.service.in +++ b/tools/hotplug/Linux/systemd/xenconsoled.service.in @@ -9,7 +9,7 @@ Type=simple Environment=XENCONSOLED_ARGS= Environment=XENCONSOLED_LOG=none Environment=XENCONSOLED_LOG_DIR=@XEN_LOG_DIR@/console -EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenconsoled +EnvironmentFile=@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons PIDFile=@XEN_RUN_DIR@/xenconsoled.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p ${XENCONSOLED_LOG_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 Sun Jan 18 20:58:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:58: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 1YCwvA-0008SO-MA; Sun, 18 Jan 2015 20:58:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwv9-0008SA-B2 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:07 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id F4/7A-10925-E5E1CB45; Sun, 18 Jan 2015 20:58:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1421614684!22263343!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25646 invoked from network); 18 Jan 2015 20:58:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:58:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwv5-00013E-WD for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwv5-0003oV-U3 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:03 +0000 Date: Sun, 18 Jan 2015 20:58:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: use xencommons as EnvironmentFile in xenconsoled.service X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9fd87d31ce0f4632cce74c29ea62c9c05ac927e4 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:30 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: use xencommons as EnvironmentFile in xenconsoled.service The referenced sysconfig/xenconsoled does not exist. If anything needs to be specified it has to go into the existing sysconfig/xencommons file. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Cc: Wei Liu Signed-off-by: Konrad Rzeszutek Wilk --- tools/hotplug/Linux/systemd/xenconsoled.service.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xenconsoled.service.in b/tools/hotplug/Linux/systemd/xenconsoled.service.in index cb44cd6..9e71444 100644 --- a/tools/hotplug/Linux/systemd/xenconsoled.service.in +++ b/tools/hotplug/Linux/systemd/xenconsoled.service.in @@ -9,7 +9,7 @@ Type=simple Environment=XENCONSOLED_ARGS= Environment=XENCONSOLED_LOG=none Environment=XENCONSOLED_LOG_DIR=@XEN_LOG_DIR@/console -EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenconsoled +EnvironmentFile=@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons PIDFile=@XEN_RUN_DIR@/xenconsoled.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p ${XENCONSOLED_LOG_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 Sun Jan 18 20:58:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:58: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 1YCwvJ-0008Ts-P2; Sun, 18 Jan 2015 20:58:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvJ-0008Th-1d for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:17 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id D9/95-17694-86E1CB45; Sun, 18 Jan 2015 20:58:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1421614694!20393174!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14331 invoked from network); 18 Jan 2015 20:58: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; 18 Jan 2015 20:58:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvG-00013K-4h for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwvG-0003ou-3S for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:14 +0000 Date: Sun, 18 Jan 2015 20:58:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: use XENCONSOLED_TRACE in xenconsoled.service X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 098f91390340691c0603f75ab1694e3ccce26c56 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:31 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: use XENCONSOLED_TRACE in xenconsoled.service Instead of inventing a new XENCONSOLED_LOG= variable reuse the existing XENCONSOLED_TRACE= variable in xenconsoled.service. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Cc: Wei Liu Signed-off-by: Konrad Rzeszutek Wilk --- tools/hotplug/Linux/systemd/xenconsoled.service.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xenconsoled.service.in b/tools/hotplug/Linux/systemd/xenconsoled.service.in index 9e71444..cd282bf 100644 --- a/tools/hotplug/Linux/systemd/xenconsoled.service.in +++ b/tools/hotplug/Linux/systemd/xenconsoled.service.in @@ -7,13 +7,13 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=simple Environment=XENCONSOLED_ARGS= -Environment=XENCONSOLED_LOG=none +Environment=XENCONSOLED_TRACE=none Environment=XENCONSOLED_LOG_DIR=@XEN_LOG_DIR@/console EnvironmentFile=@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons PIDFile=@XEN_RUN_DIR@/xenconsoled.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p ${XENCONSOLED_LOG_DIR} -ExecStart=@sbindir@/xenconsoled --pid-file @XEN_RUN_DIR@/xenconsoled.pid --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS +ExecStart=@sbindir@/xenconsoled --pid-file @XEN_RUN_DIR@/xenconsoled.pid --log=${XENCONSOLED_TRACE} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS [Install] WantedBy=multi-user.target -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:58:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:58: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 1YCwvJ-0008Ts-P2; Sun, 18 Jan 2015 20:58:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvJ-0008Th-1d for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:17 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id D9/95-17694-86E1CB45; Sun, 18 Jan 2015 20:58:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1421614694!20393174!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14331 invoked from network); 18 Jan 2015 20:58: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; 18 Jan 2015 20:58:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvG-00013K-4h for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwvG-0003ou-3S for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:14 +0000 Date: Sun, 18 Jan 2015 20:58:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: use XENCONSOLED_TRACE in xenconsoled.service X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 098f91390340691c0603f75ab1694e3ccce26c56 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:31 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: use XENCONSOLED_TRACE in xenconsoled.service Instead of inventing a new XENCONSOLED_LOG= variable reuse the existing XENCONSOLED_TRACE= variable in xenconsoled.service. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Cc: Wei Liu Signed-off-by: Konrad Rzeszutek Wilk --- tools/hotplug/Linux/systemd/xenconsoled.service.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xenconsoled.service.in b/tools/hotplug/Linux/systemd/xenconsoled.service.in index 9e71444..cd282bf 100644 --- a/tools/hotplug/Linux/systemd/xenconsoled.service.in +++ b/tools/hotplug/Linux/systemd/xenconsoled.service.in @@ -7,13 +7,13 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=simple Environment=XENCONSOLED_ARGS= -Environment=XENCONSOLED_LOG=none +Environment=XENCONSOLED_TRACE=none Environment=XENCONSOLED_LOG_DIR=@XEN_LOG_DIR@/console EnvironmentFile=@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons PIDFile=@XEN_RUN_DIR@/xenconsoled.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p ${XENCONSOLED_LOG_DIR} -ExecStart=@sbindir@/xenconsoled --pid-file @XEN_RUN_DIR@/xenconsoled.pid --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS +ExecStart=@sbindir@/xenconsoled --pid-file @XEN_RUN_DIR@/xenconsoled.pid --log=${XENCONSOLED_TRACE} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS [Install] WantedBy=multi-user.target -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:58:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:58: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 1YCwvU-0008VY-Re; Sun, 18 Jan 2015 20:58:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvT-0008VK-Gp for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:27 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id F8/8A-10925-27E1CB45; Sun, 18 Jan 2015 20:58:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1421614704!21890767!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2513 invoked from network); 18 Jan 2015 20:58:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:58:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvQ-00013Q-BA for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwvQ-0003pH-AM for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:24 +0000 Date: Sun, 18 Jan 2015 20:58:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: remove EnvironmentFile from xen-qemu-dom0-disk-backend.service X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 88ef4e4e5265242bd0cc073fcfdeda8e349c1ff5 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:32 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: remove EnvironmentFile from xen-qemu-dom0-disk-backend.service The referenced Environment file does not exist, and the service file does not make use of variables anyway. N.B. If we start honouring env settings for any reason this will have to be changed. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Cc: Wei Liu Signed-off-by: Konrad Rzeszutek Wilk --- .../systemd/xen-qemu-dom0-disk-backend.service.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in index 0a5807a..274cec0 100644 --- a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in +++ b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in @@ -8,7 +8,6 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=simple -EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored PIDFile=@XEN_RUN_DIR@/qemu-dom0.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p @XEN_RUN_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 Sun Jan 18 20:58:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:58: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 1YCwvU-0008VY-Re; Sun, 18 Jan 2015 20:58:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvT-0008VK-Gp for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:27 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id F8/8A-10925-27E1CB45; Sun, 18 Jan 2015 20:58:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1421614704!21890767!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2513 invoked from network); 18 Jan 2015 20:58:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:58:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvQ-00013Q-BA for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwvQ-0003pH-AM for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:24 +0000 Date: Sun, 18 Jan 2015 20:58:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: remove EnvironmentFile from xen-qemu-dom0-disk-backend.service X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 88ef4e4e5265242bd0cc073fcfdeda8e349c1ff5 Author: Olaf Hering AuthorDate: Fri Dec 19 12:25:32 2014 +0100 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Jan 6 10:29:17 2015 -0500 tools/hotplug: remove EnvironmentFile from xen-qemu-dom0-disk-backend.service The referenced Environment file does not exist, and the service file does not make use of variables anyway. N.B. If we start honouring env settings for any reason this will have to be changed. Signed-off-by: Olaf Hering Acked-by: Ian Jackson Cc: Stefano Stabellini Acked-by: Ian Campbell Cc: Wei Liu Signed-off-by: Konrad Rzeszutek Wilk --- .../systemd/xen-qemu-dom0-disk-backend.service.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in index 0a5807a..274cec0 100644 --- a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in +++ b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in @@ -8,7 +8,6 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=simple -EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored PIDFile=@XEN_RUN_DIR@/qemu-dom0.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p @XEN_RUN_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 Sun Jan 18 20:58:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:58: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 1YCwve-00005O-UN; Sun, 18 Jan 2015 20:58:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvd-000058-AZ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:37 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id E0/CA-02760-C7E1CB45; Sun, 18 Jan 2015 20:58:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1421614714!21303181!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9901 invoked from network); 18 Jan 2015 20:58:35 -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; 18 Jan 2015 20:58:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwva-00013Y-Hc for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwva-0003pk-Gu for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:34 +0000 Date: Sun, 18 Jan 2015 20:58:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Open Xen 4.6. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0082626f35af6cfcdd30214d946981a8aec82c08 Author: Ian Jackson AuthorDate: Tue Jan 6 16:18:42 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 16:22:54 2015 +0000 Open Xen 4.6. * Update README's figlet. * Remove obsolete 4.3 features paragraph from README (!) * Update QEMU_UPSTREAM_REVISION to refer simply to `master' * Update QEMU_TRADITIONAL_REVISION to refer to the actual commit hash. * Change version in xen/Makefile to 4.6.0-unstable Signed-off-by: Ian Jackson --- Config.mk | 4 ++-- README | 22 ++++++---------------- xen/Makefile | 4 ++-- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/Config.mk b/Config.mk index 0e22057..6324237 100644 --- a/Config.mk +++ b/Config.mk @@ -252,7 +252,7 @@ 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 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc4 +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. @@ -260,7 +260,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.5.0-rc1 +QEMU_TRADITIONAL_REVISION ?= b0d42741f8e9a00854c3b3faca1da84bfc69bf22 # Mon Oct 6 16:24:46 2014 +0100 # qemu-xen-trad: Switch to $(LIBEXEC_BIN) from $(LIBEXEC) diff --git a/README b/README index 412607a..07c4797 100644 --- a/README +++ b/README @@ -1,10 +1,10 @@ ################################# -__ __ _ _ ____ _ _ _ -\ \/ /___ _ __ | || | | ___| _ _ _ __ ___| |_ __ _| |__ | | ___ - \ // _ \ '_ \ | || |_ |___ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ - / \ __/ | | | |__ _| ___) |_____| |_| | | | \__ \ || (_| | |_) | | __/ -/_/\_\___|_| |_| |_|(_)____/ \__,_|_| |_|___/\__\__,_|_.__/|_|\___| - +__ __ _ _ __ _ _ _ +\ \/ /___ _ __ | || | / /_ _ _ _ __ ___| |_ __ _| |__ | | ___ + \ // _ \ '_ \ | || |_| '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ + / \ __/ | | | |__ _| (_) |_____| |_| | | | \__ \ || (_| | |_) | | __/ +/_/\_\___|_| |_| |_|(_)___/ \__,_|_| |_|___/\__\__,_|_.__/|_|\___| + ################################# http://www.xen.org/ @@ -19,16 +19,6 @@ is freely-distributable Open Source software, released under the GNU GPL. Since its initial public release, Xen has grown a large development community, spearheaded by xen.org (http://www.xen.org). -The 4.3 release offers a number of improvements, including NUMA -scheduling affinity, openvswitch integration, and defaulting to -qemu-xen rather than qemu-traditional for non-stubdom guests. -(qemu-xen is kept very close to the upstream project.) We also have a -number of updates to vTPM, and improvements to XSM and Flask to allow -greater disaggregation. Additionally, 4.3 contains a basic version of -Xen for the new ARM server architecture, both 32- and 64-bit. And as -always, there are a number of performance, stability, and security -improvements under-the hood. - This file contains some quick-start instructions to install Xen on your system. For more information see http:/www.xen.org/ and http://wiki.xen.org/ diff --git a/xen/Makefile b/xen/Makefile index 72c1313..52643e8 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -1,8 +1,8 @@ # This is the correct place to edit the build version. # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 -export XEN_SUBVERSION = 5 -export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION) +export XEN_SUBVERSION = 6 +export XEN_EXTRAVERSION ?= .0-unstable$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:58:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:58: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 1YCwve-00005O-UN; Sun, 18 Jan 2015 20:58:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvd-000058-AZ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:37 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id E0/CA-02760-C7E1CB45; Sun, 18 Jan 2015 20:58:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1421614714!21303181!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9901 invoked from network); 18 Jan 2015 20:58:35 -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; 18 Jan 2015 20:58:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwva-00013Y-Hc for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwva-0003pk-Gu for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:34 +0000 Date: Sun, 18 Jan 2015 20:58:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Open Xen 4.6. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0082626f35af6cfcdd30214d946981a8aec82c08 Author: Ian Jackson AuthorDate: Tue Jan 6 16:18:42 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 16:22:54 2015 +0000 Open Xen 4.6. * Update README's figlet. * Remove obsolete 4.3 features paragraph from README (!) * Update QEMU_UPSTREAM_REVISION to refer simply to `master' * Update QEMU_TRADITIONAL_REVISION to refer to the actual commit hash. * Change version in xen/Makefile to 4.6.0-unstable Signed-off-by: Ian Jackson --- Config.mk | 4 ++-- README | 22 ++++++---------------- xen/Makefile | 4 ++-- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/Config.mk b/Config.mk index 0e22057..6324237 100644 --- a/Config.mk +++ b/Config.mk @@ -252,7 +252,7 @@ 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 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc4 +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. @@ -260,7 +260,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.5.0-rc1 +QEMU_TRADITIONAL_REVISION ?= b0d42741f8e9a00854c3b3faca1da84bfc69bf22 # Mon Oct 6 16:24:46 2014 +0100 # qemu-xen-trad: Switch to $(LIBEXEC_BIN) from $(LIBEXEC) diff --git a/README b/README index 412607a..07c4797 100644 --- a/README +++ b/README @@ -1,10 +1,10 @@ ################################# -__ __ _ _ ____ _ _ _ -\ \/ /___ _ __ | || | | ___| _ _ _ __ ___| |_ __ _| |__ | | ___ - \ // _ \ '_ \ | || |_ |___ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ - / \ __/ | | | |__ _| ___) |_____| |_| | | | \__ \ || (_| | |_) | | __/ -/_/\_\___|_| |_| |_|(_)____/ \__,_|_| |_|___/\__\__,_|_.__/|_|\___| - +__ __ _ _ __ _ _ _ +\ \/ /___ _ __ | || | / /_ _ _ _ __ ___| |_ __ _| |__ | | ___ + \ // _ \ '_ \ | || |_| '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ + / \ __/ | | | |__ _| (_) |_____| |_| | | | \__ \ || (_| | |_) | | __/ +/_/\_\___|_| |_| |_|(_)___/ \__,_|_| |_|___/\__\__,_|_.__/|_|\___| + ################################# http://www.xen.org/ @@ -19,16 +19,6 @@ is freely-distributable Open Source software, released under the GNU GPL. Since its initial public release, Xen has grown a large development community, spearheaded by xen.org (http://www.xen.org). -The 4.3 release offers a number of improvements, including NUMA -scheduling affinity, openvswitch integration, and defaulting to -qemu-xen rather than qemu-traditional for non-stubdom guests. -(qemu-xen is kept very close to the upstream project.) We also have a -number of updates to vTPM, and improvements to XSM and Flask to allow -greater disaggregation. Additionally, 4.3 contains a basic version of -Xen for the new ARM server architecture, both 32- and 64-bit. And as -always, there are a number of performance, stability, and security -improvements under-the hood. - This file contains some quick-start instructions to install Xen on your system. For more information see http:/www.xen.org/ and http://wiki.xen.org/ diff --git a/xen/Makefile b/xen/Makefile index 72c1313..52643e8 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -1,8 +1,8 @@ # This is the correct place to edit the build version. # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 -export XEN_SUBVERSION = 5 -export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION) +export XEN_SUBVERSION = 6 +export XEN_EXTRAVERSION ?= .0-unstable$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:58:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:58: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 1YCwvp-000079-33; Sun, 18 Jan 2015 20:58:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvn-00006y-Vc for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:48 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id CA/89-27584-78E1CB45; Sun, 18 Jan 2015 20:58:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1421614724!18710555!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22997 invoked from network); 18 Jan 2015 20:58:45 -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 Jan 2015 20:58:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvk-00013e-P3 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwvk-0003q6-OA for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:44 +0000 Date: Sun, 18 Jan 2015 20:58:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] configure: Rerun autogen.sh X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1bdc36a3b3e4ccd64702e7250094aa8d982e9412 Author: Ian Jackson AuthorDate: Tue Jan 6 16:21:21 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 16:22:54 2015 +0000 configure: Rerun autogen.sh Various configure scripts have the Xen version built into them by autoconf. Rereun autogen.sh (on Debian wheezy) so that they all say 4.6. There are no changes other than to doc comments, usage messages, and so forth. Signed-off-by: Ian Jackson --- configure | 18 +++++++++--------- docs/configure | 18 +++++++++--------- stubdom/configure | 18 +++++++++--------- tools/configure | 18 +++++++++--------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/configure b/configure index 98a73d4..718e92f 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.5. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.6. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.5' -PACKAGE_STRING='Xen Hypervisor 4.5' +PACKAGE_VERSION='4.6' +PACKAGE_STRING='Xen Hypervisor 4.6' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1208,7 +1208,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor 4.5 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor 4.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1273,7 +1273,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor 4.5:";; + short | recursive ) echo "Configuration of Xen Hypervisor 4.6:";; esac cat <<\_ACEOF @@ -1361,7 +1361,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor configure 4.5 +Xen Hypervisor configure 4.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1378,7 +1378,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor $as_me 4.5, which was +It was created by Xen Hypervisor $as_me 4.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2727,7 +2727,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor $as_me 4.5, which was +This file was extended by Xen Hypervisor $as_me 4.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2781,7 +2781,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor config.status 4.5 +Xen Hypervisor config.status 4.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/docs/configure b/docs/configure index c36e249..fb1d96c 100755 --- a/docs/configure +++ b/docs/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.5. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.6. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Documentation' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.5' -PACKAGE_STRING='Xen Hypervisor Documentation 4.5' +PACKAGE_VERSION='4.6' +PACKAGE_STRING='Xen Hypervisor Documentation 4.6' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1186,7 +1186,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Documentation 4.5 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Documentation 4.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1247,7 +1247,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Documentation 4.5:";; + short | recursive ) echo "Configuration of Xen Hypervisor Documentation 4.6:";; esac cat <<\_ACEOF @@ -1327,7 +1327,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Documentation configure 4.5 +Xen Hypervisor Documentation configure 4.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1344,7 +1344,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Documentation $as_me 4.5, which was +It was created by Xen Hypervisor Documentation $as_me 4.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2628,7 +2628,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Documentation $as_me 4.5, which was +This file was extended by Xen Hypervisor Documentation $as_me 4.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2682,7 +2682,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Documentation config.status 4.5 +Xen Hypervisor Documentation config.status 4.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/stubdom/configure b/stubdom/configure index 9981f5a..74c5d1d 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.5. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.6. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Stub Domains' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.5' -PACKAGE_STRING='Xen Hypervisor Stub Domains 4.5' +PACKAGE_VERSION='4.6' +PACKAGE_STRING='Xen Hypervisor Stub Domains 4.6' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1250,7 +1250,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Stub Domains 4.5 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Stub Domains 4.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1315,7 +1315,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Stub Domains 4.5:";; + short | recursive ) echo "Configuration of Xen Hypervisor Stub Domains 4.6:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Stub Domains configure 4.5 +Xen Hypervisor Stub Domains configure 4.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1480,7 +1480,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Stub Domains $as_me 4.5, which was +It was created by Xen Hypervisor Stub Domains $as_me 4.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4178,7 +4178,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Stub Domains $as_me 4.5, which was +This file was extended by Xen Hypervisor Stub Domains $as_me 4.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4232,7 +4232,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Stub Domains config.status 4.5 +Xen Hypervisor Stub Domains config.status 4.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/tools/configure b/tools/configure index b0aea0a..e971070 100755 --- a/tools/configure +++ b/tools/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.5. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.6. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Tools' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.5' -PACKAGE_STRING='Xen Hypervisor Tools 4.5' +PACKAGE_VERSION='4.6' +PACKAGE_STRING='Xen Hypervisor Tools 4.6' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1378,7 +1378,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Tools 4.5 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Tools 4.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1443,7 +1443,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Tools 4.5:";; + short | recursive ) echo "Configuration of Xen Hypervisor Tools 4.6:";; esac cat <<\_ACEOF @@ -1625,7 +1625,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Tools configure 4.5 +Xen Hypervisor Tools configure 4.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1927,7 +1927,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Tools $as_me 4.5, which was +It was created by Xen Hypervisor Tools $as_me 4.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -9379,7 +9379,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Tools $as_me 4.5, which was +This file was extended by Xen Hypervisor Tools $as_me 4.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9442,7 +9442,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Tools config.status 4.5 +Xen Hypervisor Tools config.status 4.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:58:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:58: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 1YCwvp-000079-33; Sun, 18 Jan 2015 20:58:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvn-00006y-Vc for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:48 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id CA/89-27584-78E1CB45; Sun, 18 Jan 2015 20:58:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1421614724!18710555!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22997 invoked from network); 18 Jan 2015 20:58:45 -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 Jan 2015 20:58:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvk-00013e-P3 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwvk-0003q6-OA for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:44 +0000 Date: Sun, 18 Jan 2015 20:58:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] configure: Rerun autogen.sh X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1bdc36a3b3e4ccd64702e7250094aa8d982e9412 Author: Ian Jackson AuthorDate: Tue Jan 6 16:21:21 2015 +0000 Commit: Ian Jackson CommitDate: Tue Jan 6 16:22:54 2015 +0000 configure: Rerun autogen.sh Various configure scripts have the Xen version built into them by autoconf. Rereun autogen.sh (on Debian wheezy) so that they all say 4.6. There are no changes other than to doc comments, usage messages, and so forth. Signed-off-by: Ian Jackson --- configure | 18 +++++++++--------- docs/configure | 18 +++++++++--------- stubdom/configure | 18 +++++++++--------- tools/configure | 18 +++++++++--------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/configure b/configure index 98a73d4..718e92f 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.5. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.6. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.5' -PACKAGE_STRING='Xen Hypervisor 4.5' +PACKAGE_VERSION='4.6' +PACKAGE_STRING='Xen Hypervisor 4.6' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1208,7 +1208,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor 4.5 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor 4.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1273,7 +1273,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor 4.5:";; + short | recursive ) echo "Configuration of Xen Hypervisor 4.6:";; esac cat <<\_ACEOF @@ -1361,7 +1361,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor configure 4.5 +Xen Hypervisor configure 4.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1378,7 +1378,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor $as_me 4.5, which was +It was created by Xen Hypervisor $as_me 4.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2727,7 +2727,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor $as_me 4.5, which was +This file was extended by Xen Hypervisor $as_me 4.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2781,7 +2781,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor config.status 4.5 +Xen Hypervisor config.status 4.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/docs/configure b/docs/configure index c36e249..fb1d96c 100755 --- a/docs/configure +++ b/docs/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.5. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.6. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Documentation' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.5' -PACKAGE_STRING='Xen Hypervisor Documentation 4.5' +PACKAGE_VERSION='4.6' +PACKAGE_STRING='Xen Hypervisor Documentation 4.6' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1186,7 +1186,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Documentation 4.5 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Documentation 4.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1247,7 +1247,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Documentation 4.5:";; + short | recursive ) echo "Configuration of Xen Hypervisor Documentation 4.6:";; esac cat <<\_ACEOF @@ -1327,7 +1327,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Documentation configure 4.5 +Xen Hypervisor Documentation configure 4.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1344,7 +1344,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Documentation $as_me 4.5, which was +It was created by Xen Hypervisor Documentation $as_me 4.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2628,7 +2628,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Documentation $as_me 4.5, which was +This file was extended by Xen Hypervisor Documentation $as_me 4.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2682,7 +2682,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Documentation config.status 4.5 +Xen Hypervisor Documentation config.status 4.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/stubdom/configure b/stubdom/configure index 9981f5a..74c5d1d 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.5. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.6. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Stub Domains' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.5' -PACKAGE_STRING='Xen Hypervisor Stub Domains 4.5' +PACKAGE_VERSION='4.6' +PACKAGE_STRING='Xen Hypervisor Stub Domains 4.6' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1250,7 +1250,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Stub Domains 4.5 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Stub Domains 4.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1315,7 +1315,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Stub Domains 4.5:";; + short | recursive ) echo "Configuration of Xen Hypervisor Stub Domains 4.6:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Stub Domains configure 4.5 +Xen Hypervisor Stub Domains configure 4.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1480,7 +1480,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Stub Domains $as_me 4.5, which was +It was created by Xen Hypervisor Stub Domains $as_me 4.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4178,7 +4178,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Stub Domains $as_me 4.5, which was +This file was extended by Xen Hypervisor Stub Domains $as_me 4.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4232,7 +4232,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Stub Domains config.status 4.5 +Xen Hypervisor Stub Domains config.status 4.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/tools/configure b/tools/configure index b0aea0a..e971070 100755 --- a/tools/configure +++ b/tools/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.5. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.6. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Tools' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.5' -PACKAGE_STRING='Xen Hypervisor Tools 4.5' +PACKAGE_VERSION='4.6' +PACKAGE_STRING='Xen Hypervisor Tools 4.6' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1378,7 +1378,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Tools 4.5 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Tools 4.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1443,7 +1443,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Tools 4.5:";; + short | recursive ) echo "Configuration of Xen Hypervisor Tools 4.6:";; esac cat <<\_ACEOF @@ -1625,7 +1625,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Tools configure 4.5 +Xen Hypervisor Tools configure 4.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1927,7 +1927,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Tools $as_me 4.5, which was +It was created by Xen Hypervisor Tools $as_me 4.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -9379,7 +9379,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Tools $as_me 4.5, which was +This file was extended by Xen Hypervisor Tools $as_me 4.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9442,7 +9442,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Tools config.status 4.5 +Xen Hypervisor Tools config.status 4.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:59:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:59: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 1YCww0-00008t-64; Sun, 18 Jan 2015 20:59:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvy-00008X-8o for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:58 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id A0/B2-17735-19E1CB45; Sun, 18 Jan 2015 20:58:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1421614735!11572833!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14453 invoked from network); 18 Jan 2015 20:58:56 -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; 18 Jan 2015 20:58:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvu-00013n-VQ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwvu-0003rE-Ue for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:54 +0000 Date: Sun, 18 Jan 2015 20:58:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: extend HVM cpuid leaf with vcpu id X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd9b0922663751cf3484f0e141ba887422ed15ec Author: Paul Durrant AuthorDate: Wed Jan 7 11:08:49 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:08:49 2015 +0100 x86/hvm: extend HVM cpuid leaf with vcpu id To perform certain hypercalls HVM guests need to use Xen's idea of vcpu id, which may well not match the guest OS idea of CPU id. This patch adds vcpu id to the HVM cpuid leaf allowing the guest to build a mapping. Signed-off-by: Paul Durrant Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 4 ++++ xen/include/public/arch-x86/cpuid.h | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 72be5b9..e33cd0a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4188,6 +4188,10 @@ void hvm_hypervisor_cpuid_leaf(uint32_t sub_idx, * foreign pages) has valid IOMMU entries. */ *eax |= XEN_HVM_CPUID_IOMMU_MAPPINGS; + + /* Indicate presence of vcpu id and set it in ebx */ + *eax |= XEN_HVM_CPUID_VCPU_ID_PRESENT; + *ebx = current->vcpu_id; } } diff --git a/xen/include/public/arch-x86/cpuid.h b/xen/include/public/arch-x86/cpuid.h index 6005dfe..d709340 100644 --- a/xen/include/public/arch-x86/cpuid.h +++ b/xen/include/public/arch-x86/cpuid.h @@ -76,13 +76,14 @@ /* * Leaf 5 (0x40000x04) * HVM-specific features + * EAX: Features + * EBX: vcpu id (iff EAX has XEN_HVM_CPUID_VCPU_ID_PRESENT flag) */ - -/* EAX Features */ #define XEN_HVM_CPUID_APIC_ACCESS_VIRT (1u << 0) /* Virtualized APIC registers */ #define XEN_HVM_CPUID_X2APIC_VIRT (1u << 1) /* Virtualized x2APIC accesses */ /* Memory mapped from other domains has valid IOMMU entries */ #define XEN_HVM_CPUID_IOMMU_MAPPINGS (1u << 2) +#define XEN_HVM_CPUID_VCPU_ID_PRESENT (1u << 3) /* vcpu id is present in EBX */ #define XEN_CPUID_MAX_NUM_LEAVES 4 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:59:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:59: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 1YCww0-00008t-64; Sun, 18 Jan 2015 20:59:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvy-00008X-8o for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:58 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id A0/B2-17735-19E1CB45; Sun, 18 Jan 2015 20:58:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1421614735!11572833!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14453 invoked from network); 18 Jan 2015 20:58:56 -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; 18 Jan 2015 20:58:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwvu-00013n-VQ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwvu-0003rE-Ue for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:58:54 +0000 Date: Sun, 18 Jan 2015 20:58:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: extend HVM cpuid leaf with vcpu id X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd9b0922663751cf3484f0e141ba887422ed15ec Author: Paul Durrant AuthorDate: Wed Jan 7 11:08:49 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:08:49 2015 +0100 x86/hvm: extend HVM cpuid leaf with vcpu id To perform certain hypercalls HVM guests need to use Xen's idea of vcpu id, which may well not match the guest OS idea of CPU id. This patch adds vcpu id to the HVM cpuid leaf allowing the guest to build a mapping. Signed-off-by: Paul Durrant Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 4 ++++ xen/include/public/arch-x86/cpuid.h | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 72be5b9..e33cd0a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4188,6 +4188,10 @@ void hvm_hypervisor_cpuid_leaf(uint32_t sub_idx, * foreign pages) has valid IOMMU entries. */ *eax |= XEN_HVM_CPUID_IOMMU_MAPPINGS; + + /* Indicate presence of vcpu id and set it in ebx */ + *eax |= XEN_HVM_CPUID_VCPU_ID_PRESENT; + *ebx = current->vcpu_id; } } diff --git a/xen/include/public/arch-x86/cpuid.h b/xen/include/public/arch-x86/cpuid.h index 6005dfe..d709340 100644 --- a/xen/include/public/arch-x86/cpuid.h +++ b/xen/include/public/arch-x86/cpuid.h @@ -76,13 +76,14 @@ /* * Leaf 5 (0x40000x04) * HVM-specific features + * EAX: Features + * EBX: vcpu id (iff EAX has XEN_HVM_CPUID_VCPU_ID_PRESENT flag) */ - -/* EAX Features */ #define XEN_HVM_CPUID_APIC_ACCESS_VIRT (1u << 0) /* Virtualized APIC registers */ #define XEN_HVM_CPUID_X2APIC_VIRT (1u << 1) /* Virtualized x2APIC accesses */ /* Memory mapped from other domains has valid IOMMU entries */ #define XEN_HVM_CPUID_IOMMU_MAPPINGS (1u << 2) +#define XEN_HVM_CPUID_VCPU_ID_PRESENT (1u << 3) /* vcpu id is present in EBX */ #define XEN_CPUID_MAX_NUM_LEAVES 4 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:59:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:59: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 1YCwwB-0000AY-8j; Sun, 18 Jan 2015 20:59:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwA-0000AP-5Y for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:10 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 62/1D-25727-D9E1CB45; Sun, 18 Jan 2015 20:59:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1421614745!16729954!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18232 invoked from network); 18 Jan 2015 20:59:07 -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 Jan 2015 20:59:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCww5-00014K-4i for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCww5-0003rj-36 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:05 +0000 Date: Sun, 18 Jan 2015 20:59:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] use more fixed strings to build the 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 ac977f542b92790f87edabbb9b16b4c52a85ed98 Author: Olaf Hering AuthorDate: Wed Jan 7 11:09:50 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:09:50 2015 +0100 use more fixed strings to build the hypervisor It should be possible to repeatedly build identical sources and get identical binaries, even on different hosts at different build times. This fails for xen.gz and xen.efi because current time and buildhost get included in the binaries. Provide variables XEN_BUILD_DATE, XEN_BUILD_TIME and XEN_BUILD_HOST which the build environment can set to fixed strings to get a reproducible build. Signed-off-by: Olaf Hering Acked-by: Ian Jackson --- xen/Makefile | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 52643e8..98ae2d0 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -8,6 +8,9 @@ export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) export XEN_WHOAMI ?= $(USER) export XEN_DOMAIN ?= $(shell ([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname || echo [unknown])) +export XEN_BUILD_DATE ?= $(shell LC_ALL=C date) +export XEN_BUILD_TIME ?= $(shell LC_ALL=C date +%T) +export XEN_BUILD_HOST ?= $(shell hostname) export BASEDIR := $(CURDIR) export XEN_ROOT := $(BASEDIR)/.. @@ -126,11 +129,11 @@ delete-unfresh-files: # compile.h contains dynamic build info. Rebuilt on every 'make' invocation. include/xen/compile.h: include/xen/compile.h.in .banner - @sed -e 's/@@date@@/$(shell LC_ALL=C date)/g' \ - -e 's/@@time@@/$(shell LC_ALL=C date +%T)/g' \ + @sed -e 's/@@date@@/$(XEN_BUILD_DATE)/g' \ + -e 's/@@time@@/$(XEN_BUILD_TIME)/g' \ -e 's/@@whoami@@/$(XEN_WHOAMI)/g' \ -e 's/@@domain@@/$(XEN_DOMAIN)/g' \ - -e 's/@@hostname@@/$(shell hostname)/g' \ + -e 's/@@hostname@@/$(XEN_BUILD_HOST)/g' \ -e 's!@@compiler@@!$(shell $(CC) $(CFLAGS) --version 2>&1 | head -1)!g' \ -e 's/@@version@@/$(XEN_VERSION)/g' \ -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:59:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:59: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 1YCwwB-0000AY-8j; Sun, 18 Jan 2015 20:59:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwA-0000AP-5Y for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:10 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 62/1D-25727-D9E1CB45; Sun, 18 Jan 2015 20:59:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1421614745!16729954!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18232 invoked from network); 18 Jan 2015 20:59:07 -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 Jan 2015 20:59:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCww5-00014K-4i for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCww5-0003rj-36 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:05 +0000 Date: Sun, 18 Jan 2015 20:59:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] use more fixed strings to build the 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 ac977f542b92790f87edabbb9b16b4c52a85ed98 Author: Olaf Hering AuthorDate: Wed Jan 7 11:09:50 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:09:50 2015 +0100 use more fixed strings to build the hypervisor It should be possible to repeatedly build identical sources and get identical binaries, even on different hosts at different build times. This fails for xen.gz and xen.efi because current time and buildhost get included in the binaries. Provide variables XEN_BUILD_DATE, XEN_BUILD_TIME and XEN_BUILD_HOST which the build environment can set to fixed strings to get a reproducible build. Signed-off-by: Olaf Hering Acked-by: Ian Jackson --- xen/Makefile | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 52643e8..98ae2d0 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -8,6 +8,9 @@ export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) export XEN_WHOAMI ?= $(USER) export XEN_DOMAIN ?= $(shell ([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname || echo [unknown])) +export XEN_BUILD_DATE ?= $(shell LC_ALL=C date) +export XEN_BUILD_TIME ?= $(shell LC_ALL=C date +%T) +export XEN_BUILD_HOST ?= $(shell hostname) export BASEDIR := $(CURDIR) export XEN_ROOT := $(BASEDIR)/.. @@ -126,11 +129,11 @@ delete-unfresh-files: # compile.h contains dynamic build info. Rebuilt on every 'make' invocation. include/xen/compile.h: include/xen/compile.h.in .banner - @sed -e 's/@@date@@/$(shell LC_ALL=C date)/g' \ - -e 's/@@time@@/$(shell LC_ALL=C date +%T)/g' \ + @sed -e 's/@@date@@/$(XEN_BUILD_DATE)/g' \ + -e 's/@@time@@/$(XEN_BUILD_TIME)/g' \ -e 's/@@whoami@@/$(XEN_WHOAMI)/g' \ -e 's/@@domain@@/$(XEN_DOMAIN)/g' \ - -e 's/@@hostname@@/$(shell hostname)/g' \ + -e 's/@@hostname@@/$(XEN_BUILD_HOST)/g' \ -e 's!@@compiler@@!$(shell $(CC) $(CFLAGS) --version 2>&1 | head -1)!g' \ -e 's/@@version@@/$(XEN_VERSION)/g' \ -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:59:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:59: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 1YCwwK-0000C8-Be; Sun, 18 Jan 2015 20:59:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwI-0000Bl-C7 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:18 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id EF/5B-18267-5AE1CB45; Sun, 18 Jan 2015 20:59:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1421614755!20393266!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16395 invoked from network); 18 Jan 2015 20:59: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; 18 Jan 2015 20:59:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwF-00014S-9o for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwwF-0003s7-95 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:15 +0000 Date: Sun, 18 Jan 2015 20:59:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] expand x86 arch_shared_info to support linear p2m 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dac6d3b1a479f5c33b6a5233944e43b6c5bf2bb7 Author: Juergen Gross AuthorDate: Wed Jan 7 11:10:28 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:10:28 2015 +0100 expand x86 arch_shared_info to support linear p2m list The x86 struct arch_shared_info field pfn_to_mfn_frame_list_list currently contains the mfn of the top level page frame of the 3 level p2m tree, which is used by the Xen tools during saving and restoring (and live migration) of pv domains and for crash dump analysis. With three levels of the p2m tree it is possible to support up to 512 GB of RAM for a 64 bit pv domain. A 32 bit pv domain can support more, as each memory page can hold 1024 instead of 512 entries, leading to a limit of 4 TB. To be able to support more RAM on x86-64 switch to an additional virtual mapped p2m list. This patch expands struct arch_shared_info with a new p2m list virtual address, the root of the page table root and a p2m generation count. The new information is indicated by the domain to be valid by storing a non-zero value into the page table root member. Signed-off-by: Juergen Gross Reviewed-by: Andrew Cooper --- xen/include/public/arch-x86/xen.h | 36 +++++++++++++++++++++++++++++++++--- 1 files changed, 33 insertions(+), 3 deletions(-) diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index f35804b..c5e880b 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -220,11 +220,41 @@ typedef struct vcpu_guest_context vcpu_guest_context_t; DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t); struct arch_shared_info { - unsigned long max_pfn; /* max pfn that appears in table */ - /* Frame containing list of mfns containing list of mfns containing p2m. */ + /* + * Number of valid entries in the p2m table(s) anchored at + * pfn_to_mfn_frame_list_list and/or p2m_vaddr. + */ + unsigned long max_pfn; + /* + * Frame containing list of mfns containing list of mfns containing p2m. + * A value of 0 indicates it has not yet been set up, ~0 indicates it has + * been set to invalid e.g. due to the p2m being too large for the 3-level + * p2m tree. In this case the linear mapper p2m list anchored at p2m_vaddr + * is to be used. + */ xen_pfn_t pfn_to_mfn_frame_list_list; unsigned long nmi_reason; - uint64_t pad[32]; + /* + * Following three fields are valid if p2m_cr3 contains a value different + * from 0. + * p2m_cr3 is the root of the address space where p2m_vaddr is valid. + * p2m_cr3 is in the same format as a cr3 value in the vcpu register state + * and holds the folded machine frame number (via xen_pfn_to_cr3) of a + * L3 or L4 page table. + * p2m_vaddr holds the virtual address of the linear p2m list. All entries + * in the range [0...max_pfn[ are accessible via this pointer. + * p2m_generation will be incremented by the guest before and after each + * change of the mappings of the p2m list. p2m_generation starts at 0 and + * a value with the least significant bit set indicates that a mapping + * update is in progress. This allows guest external software (e.g. in Dom0) + * to verify that read mappings are consistent and whether they have changed + * since the last check. + * Modifying a p2m element in the linear p2m list is allowed via an atomic + * write only. + */ + unsigned long p2m_cr3; /* cr3 value of the p2m address space */ + unsigned long p2m_vaddr; /* virtual address of the p2m list */ + unsigned long p2m_generation; /* generation count of p2m mapping */ }; typedef struct arch_shared_info arch_shared_info_t; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:59:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:59: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 1YCwwK-0000C8-Be; Sun, 18 Jan 2015 20:59:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwI-0000Bl-C7 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:18 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id EF/5B-18267-5AE1CB45; Sun, 18 Jan 2015 20:59:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1421614755!20393266!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16395 invoked from network); 18 Jan 2015 20:59: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; 18 Jan 2015 20:59:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwF-00014S-9o for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwwF-0003s7-95 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:15 +0000 Date: Sun, 18 Jan 2015 20:59:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] expand x86 arch_shared_info to support linear p2m 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dac6d3b1a479f5c33b6a5233944e43b6c5bf2bb7 Author: Juergen Gross AuthorDate: Wed Jan 7 11:10:28 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:10:28 2015 +0100 expand x86 arch_shared_info to support linear p2m list The x86 struct arch_shared_info field pfn_to_mfn_frame_list_list currently contains the mfn of the top level page frame of the 3 level p2m tree, which is used by the Xen tools during saving and restoring (and live migration) of pv domains and for crash dump analysis. With three levels of the p2m tree it is possible to support up to 512 GB of RAM for a 64 bit pv domain. A 32 bit pv domain can support more, as each memory page can hold 1024 instead of 512 entries, leading to a limit of 4 TB. To be able to support more RAM on x86-64 switch to an additional virtual mapped p2m list. This patch expands struct arch_shared_info with a new p2m list virtual address, the root of the page table root and a p2m generation count. The new information is indicated by the domain to be valid by storing a non-zero value into the page table root member. Signed-off-by: Juergen Gross Reviewed-by: Andrew Cooper --- xen/include/public/arch-x86/xen.h | 36 +++++++++++++++++++++++++++++++++--- 1 files changed, 33 insertions(+), 3 deletions(-) diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index f35804b..c5e880b 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -220,11 +220,41 @@ typedef struct vcpu_guest_context vcpu_guest_context_t; DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t); struct arch_shared_info { - unsigned long max_pfn; /* max pfn that appears in table */ - /* Frame containing list of mfns containing list of mfns containing p2m. */ + /* + * Number of valid entries in the p2m table(s) anchored at + * pfn_to_mfn_frame_list_list and/or p2m_vaddr. + */ + unsigned long max_pfn; + /* + * Frame containing list of mfns containing list of mfns containing p2m. + * A value of 0 indicates it has not yet been set up, ~0 indicates it has + * been set to invalid e.g. due to the p2m being too large for the 3-level + * p2m tree. In this case the linear mapper p2m list anchored at p2m_vaddr + * is to be used. + */ xen_pfn_t pfn_to_mfn_frame_list_list; unsigned long nmi_reason; - uint64_t pad[32]; + /* + * Following three fields are valid if p2m_cr3 contains a value different + * from 0. + * p2m_cr3 is the root of the address space where p2m_vaddr is valid. + * p2m_cr3 is in the same format as a cr3 value in the vcpu register state + * and holds the folded machine frame number (via xen_pfn_to_cr3) of a + * L3 or L4 page table. + * p2m_vaddr holds the virtual address of the linear p2m list. All entries + * in the range [0...max_pfn[ are accessible via this pointer. + * p2m_generation will be incremented by the guest before and after each + * change of the mappings of the p2m list. p2m_generation starts at 0 and + * a value with the least significant bit set indicates that a mapping + * update is in progress. This allows guest external software (e.g. in Dom0) + * to verify that read mappings are consistent and whether they have changed + * since the last check. + * Modifying a p2m element in the linear p2m list is allowed via an atomic + * write only. + */ + unsigned long p2m_cr3; /* cr3 value of the p2m address space */ + unsigned long p2m_vaddr; /* virtual address of the p2m list */ + unsigned long p2m_generation; /* generation count of p2m mapping */ }; typedef struct arch_shared_info arch_shared_info_t; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:59:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:59: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 1YCwwT-0000Dv-EJ; Sun, 18 Jan 2015 20:59:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwR-0000Da-Sv for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:28 +0000 Content-Length: 2427 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id FC/28-01660-FAE1CB45; Sun, 18 Jan 2015 20:59:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1421614765!15336001!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29914 invoked from network); 18 Jan 2015 20:59:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:59:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwP-00014Y-FQ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwwP-0003sT-E8 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:25 +0000 Date: Sun, 18 Jan 2015 20:59:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] console: const-ify the arguments for __warn() and __bug() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4816324857990735197==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4816324857990735197== Content-Length: 2033 Content-Transfer-Encoding: quoted-printable commit e293dd6e80bc6e624d6222ae13331958eb47116a Author: Mihai Don=C8=9Bu AuthorDate: Wed Jan 7 11:11:27 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:11:27 2015 +0100 console: const-ify the arguments for __warn() and __bug() Both __warn() and __bug() take as first parameter the file name of the current compilation unit (__FILE__). Mark that parameter as constant to better reflect that. Signed-off-by: Mihai Don=C8=9Bu Reviewed-by: Andrew Cooper --- xen/drivers/char/console.c | 4 ++-- xen/include/xen/lib.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 0b8d3d4..cb0c2d6 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1150,7 +1150,7 @@ void panic(const char *fmt, ...) machine_restart(5000); } -void __bug(char *file, int line) +void __bug(const char *file, int line) { console_start_sync(); printk("Xen BUG at %s:%d\n", file, line); @@ -1158,7 +1158,7 @@ void __bug(char *file, int line) panic("Xen BUG at %s:%d", file, line); } -void __warn(char *file, int line) +void __warn(const char *file, int line) { printk("Xen WARN at %s:%d\n", file, line); dump_execution_state(); diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index f11b49e..8f9cadb 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -8,8 +8,8 @@ #include #include -void noreturn __bug(char *file, int line); -void __warn(char *file, int line); +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) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============4816324857990735197== 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 --===============4816324857990735197==-- From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:59:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:59: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 1YCwwT-0000Dv-EJ; Sun, 18 Jan 2015 20:59:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwR-0000Da-Sv for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:28 +0000 Content-Length: 2427 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id FC/28-01660-FAE1CB45; Sun, 18 Jan 2015 20:59:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1421614765!15336001!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29914 invoked from network); 18 Jan 2015 20:59:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:59:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwP-00014Y-FQ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwwP-0003sT-E8 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:25 +0000 Date: Sun, 18 Jan 2015 20:59:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] console: const-ify the arguments for __warn() and __bug() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4816324857990735197==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4816324857990735197== Content-Length: 2033 Content-Transfer-Encoding: quoted-printable commit e293dd6e80bc6e624d6222ae13331958eb47116a Author: Mihai Don=C8=9Bu AuthorDate: Wed Jan 7 11:11:27 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:11:27 2015 +0100 console: const-ify the arguments for __warn() and __bug() Both __warn() and __bug() take as first parameter the file name of the current compilation unit (__FILE__). Mark that parameter as constant to better reflect that. Signed-off-by: Mihai Don=C8=9Bu Reviewed-by: Andrew Cooper --- xen/drivers/char/console.c | 4 ++-- xen/include/xen/lib.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 0b8d3d4..cb0c2d6 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1150,7 +1150,7 @@ void panic(const char *fmt, ...) machine_restart(5000); } -void __bug(char *file, int line) +void __bug(const char *file, int line) { console_start_sync(); printk("Xen BUG at %s:%d\n", file, line); @@ -1158,7 +1158,7 @@ void __bug(char *file, int line) panic("Xen BUG at %s:%d", file, line); } -void __warn(char *file, int line) +void __warn(const char *file, int line) { printk("Xen WARN at %s:%d\n", file, line); dump_execution_state(); diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index f11b49e..8f9cadb 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -8,8 +8,8 @@ #include #include -void noreturn __bug(char *file, int line); -void __warn(char *file, int line); +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) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============4816324857990735197== 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 --===============4816324857990735197==-- From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:59:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:59: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 1YCwwd-0000Fv-JT; Sun, 18 Jan 2015 20:59:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwc-0000Fe-37 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:38 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 72/DA-10925-9BE1CB45; Sun, 18 Jan 2015 20:59:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1421614775!21890857!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4591 invoked from network); 18 Jan 2015 20:59:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:59:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwZ-00014g-KQ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwwZ-0003ss-JF for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:35 +0000 Date: Sun, 18 Jan 2015 20:59:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/VPMU: Clear last_vcpu when destroying VPMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed8017155607db1bbe1f6ca41eac696b7ef8082b Author: Boris Ostrovsky AuthorDate: Wed Jan 7 11:12:27 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:12:27 2015 +0100 x86/VPMU: Clear last_vcpu when destroying VPMU We need to make sure that last_vcpu is not pointing to VCPU whose VPMU is being destroyed. Otherwise we may try to dereference it in the future, when VCPU is gone. We have to do this via IPI since otherwise there is a (somewheat theoretical) chance that between test and subsequent clearing of last_vcpu the remote processor (i.e. vpmu->last_pcpu) might do both vpmu_load() and then vpmu_save() for another VCPU. The former will clear last_vcpu and the latter will set it to something else. Performing this operation via IPI will guarantee that nothing can happen on the remote processor between testing and clearing of last_vcpu. We should also check for VPMU_CONTEXT_ALLOCATED in vpmu_destroy() to avoid unnecessary percpu tests and arch-specific destroy ops. Thus checks in AMD and Intel routines are no longer needed. Signed-off-by: Boris Ostrovsky Acked-by: Kevin Tian --- xen/arch/x86/hvm/svm/vpmu.c | 3 --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 2 -- xen/arch/x86/hvm/vpmu.c | 20 ++++++++++++++++++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/svm/vpmu.c b/xen/arch/x86/hvm/svm/vpmu.c index 8e07a98..4c448bb 100644 --- a/xen/arch/x86/hvm/svm/vpmu.c +++ b/xen/arch/x86/hvm/svm/vpmu.c @@ -403,9 +403,6 @@ static void amd_vpmu_destroy(struct vcpu *v) { struct vpmu_struct *vpmu = vcpu_vpmu(v); - if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) - return; - if ( ((struct amd_vpmu_context *)vpmu->context)->msr_bitmap_set ) amd_vpmu_unset_msr_bitmap(v); diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 68b6272..590c2a9 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -818,8 +818,6 @@ static void core2_vpmu_destroy(struct vcpu *v) struct vpmu_struct *vpmu = vcpu_vpmu(v); struct core2_vpmu_context *core2_vpmu_cxt = vpmu->context; - if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) - return; xfree(core2_vpmu_cxt->pmu_enable); xfree(vpmu->context); if ( cpu_has_vmx_msr_bitmap ) diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/hvm/vpmu.c index 1df74c2..37f0d9f 100644 --- a/xen/arch/x86/hvm/vpmu.c +++ b/xen/arch/x86/hvm/vpmu.c @@ -247,10 +247,30 @@ void vpmu_initialise(struct vcpu *v) } } +static void vpmu_clear_last(void *arg) +{ + if ( this_cpu(last_vcpu) == arg ) + this_cpu(last_vcpu) = NULL; +} + void vpmu_destroy(struct vcpu *v) { struct vpmu_struct *vpmu = vcpu_vpmu(v); + if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) + return; + + /* + * Need to clear last_vcpu in case it points to v. + * We can check here non-atomically whether it is 'v' since + * last_vcpu can never become 'v' again at this point. + * We will test it again in vpmu_clear_last() with interrupts + * disabled to make sure we don't clear someone else. + */ + if ( per_cpu(last_vcpu, vpmu->last_pcpu) == v ) + on_selected_cpus(cpumask_of(vpmu->last_pcpu), + vpmu_clear_last, v, 1); + if ( vpmu->arch_vpmu_ops && vpmu->arch_vpmu_ops->arch_vpmu_destroy ) vpmu->arch_vpmu_ops->arch_vpmu_destroy(v); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:59:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:59: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 1YCwwd-0000Fv-JT; Sun, 18 Jan 2015 20:59:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwc-0000Fe-37 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:38 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 72/DA-10925-9BE1CB45; Sun, 18 Jan 2015 20:59:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1421614775!21890857!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4591 invoked from network); 18 Jan 2015 20:59:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:59:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwZ-00014g-KQ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwwZ-0003ss-JF for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:35 +0000 Date: Sun, 18 Jan 2015 20:59:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/VPMU: Clear last_vcpu when destroying VPMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed8017155607db1bbe1f6ca41eac696b7ef8082b Author: Boris Ostrovsky AuthorDate: Wed Jan 7 11:12:27 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:12:27 2015 +0100 x86/VPMU: Clear last_vcpu when destroying VPMU We need to make sure that last_vcpu is not pointing to VCPU whose VPMU is being destroyed. Otherwise we may try to dereference it in the future, when VCPU is gone. We have to do this via IPI since otherwise there is a (somewheat theoretical) chance that between test and subsequent clearing of last_vcpu the remote processor (i.e. vpmu->last_pcpu) might do both vpmu_load() and then vpmu_save() for another VCPU. The former will clear last_vcpu and the latter will set it to something else. Performing this operation via IPI will guarantee that nothing can happen on the remote processor between testing and clearing of last_vcpu. We should also check for VPMU_CONTEXT_ALLOCATED in vpmu_destroy() to avoid unnecessary percpu tests and arch-specific destroy ops. Thus checks in AMD and Intel routines are no longer needed. Signed-off-by: Boris Ostrovsky Acked-by: Kevin Tian --- xen/arch/x86/hvm/svm/vpmu.c | 3 --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 2 -- xen/arch/x86/hvm/vpmu.c | 20 ++++++++++++++++++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/svm/vpmu.c b/xen/arch/x86/hvm/svm/vpmu.c index 8e07a98..4c448bb 100644 --- a/xen/arch/x86/hvm/svm/vpmu.c +++ b/xen/arch/x86/hvm/svm/vpmu.c @@ -403,9 +403,6 @@ static void amd_vpmu_destroy(struct vcpu *v) { struct vpmu_struct *vpmu = vcpu_vpmu(v); - if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) - return; - if ( ((struct amd_vpmu_context *)vpmu->context)->msr_bitmap_set ) amd_vpmu_unset_msr_bitmap(v); diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 68b6272..590c2a9 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -818,8 +818,6 @@ static void core2_vpmu_destroy(struct vcpu *v) struct vpmu_struct *vpmu = vcpu_vpmu(v); struct core2_vpmu_context *core2_vpmu_cxt = vpmu->context; - if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) - return; xfree(core2_vpmu_cxt->pmu_enable); xfree(vpmu->context); if ( cpu_has_vmx_msr_bitmap ) diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/hvm/vpmu.c index 1df74c2..37f0d9f 100644 --- a/xen/arch/x86/hvm/vpmu.c +++ b/xen/arch/x86/hvm/vpmu.c @@ -247,10 +247,30 @@ void vpmu_initialise(struct vcpu *v) } } +static void vpmu_clear_last(void *arg) +{ + if ( this_cpu(last_vcpu) == arg ) + this_cpu(last_vcpu) = NULL; +} + void vpmu_destroy(struct vcpu *v) { struct vpmu_struct *vpmu = vcpu_vpmu(v); + if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) + return; + + /* + * Need to clear last_vcpu in case it points to v. + * We can check here non-atomically whether it is 'v' since + * last_vcpu can never become 'v' again at this point. + * We will test it again in vpmu_clear_last() with interrupts + * disabled to make sure we don't clear someone else. + */ + if ( per_cpu(last_vcpu, vpmu->last_pcpu) == v ) + on_selected_cpus(cpumask_of(vpmu->last_pcpu), + vpmu_clear_last, v, 1); + if ( vpmu->arch_vpmu_ops && vpmu->arch_vpmu_ops->arch_vpmu_destroy ) vpmu->arch_vpmu_ops->arch_vpmu_destroy(v); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:59:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:59: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 1YCwwo-0000Hj-MA; Sun, 18 Jan 2015 20:59:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwm-0000HT-UP for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:49 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id FA/D7-02953-3CE1CB45; Sun, 18 Jan 2015 20:59:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1421614785!21336539!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7898 invoked from network); 18 Jan 2015 20:59:46 -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; 18 Jan 2015 20:59:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwj-00014m-QH for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwwj-0003tN-PA for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:45 +0000 Date: Sun, 18 Jan 2015 20:59:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: don't crash when PTE bits 52 and up are non-zero X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 46e0baf59105200d43612cf0c59de216958b008d Author: Jan Beulich AuthorDate: Wed Jan 7 11:13:58 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:13:58 2015 +0100 VT-d: don't crash when PTE bits 52 and up are non-zero This can (and will) be legitimately the case when sharing page tables with EPT (more of a problem before p2m_access_rwx became zero, but still possible even now when other than that is the default for a guest), leading to an unconditional crash (in print_vtd_entries()) when a DMA remapping fault occurs. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.c | 26 ++++++++------------------ xen/drivers/passthrough/vtd/iommu.h | 2 +- xen/drivers/passthrough/vtd/utils.c | 6 +++--- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 19d8165..2e113d7 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -258,8 +258,7 @@ static u64 addr_to_dma_page_maddr(struct domain *domain, u64 addr, int alloc) struct dma_pte *parent, *pte = NULL; int level = agaw_to_level(hd->arch.agaw); int offset; - u64 pte_maddr = 0, maddr; - u64 *vaddr = NULL; + u64 pte_maddr = 0; addr &= (((u64)1) << addr_width) - 1; ASSERT(spin_is_locked(&hd->arch.mapping_lock)); @@ -281,19 +280,19 @@ static u64 addr_to_dma_page_maddr(struct domain *domain, u64 addr, int alloc) offset = address_level_offset(addr, level); pte = &parent[offset]; - if ( dma_pte_addr(*pte) == 0 ) + pte_maddr = dma_pte_addr(*pte); + if ( !pte_maddr ) { if ( !alloc ) break; pdev = pci_get_pdev_by_domain(domain, -1, -1, -1); drhd = acpi_find_matched_drhd_unit(pdev); - maddr = alloc_pgtable_maddr(drhd, 1); - if ( !maddr ) + pte_maddr = alloc_pgtable_maddr(drhd, 1); + if ( !pte_maddr ) break; - dma_set_pte_addr(*pte, maddr); - vaddr = map_vtd_domain_page(maddr); + dma_set_pte_addr(*pte, pte_maddr); /* * high level table always sets r/w, last level @@ -303,21 +302,12 @@ static u64 addr_to_dma_page_maddr(struct domain *domain, u64 addr, int alloc) dma_set_pte_writable(*pte); iommu_flush_cache_entry(pte, sizeof(struct dma_pte)); } - else - { - vaddr = map_vtd_domain_page(pte->val); - } if ( level == 2 ) - { - pte_maddr = pte->val & PAGE_MASK_4K; - unmap_vtd_domain_page(vaddr); break; - } unmap_vtd_domain_page(parent); - parent = (struct dma_pte *)vaddr; - vaddr = NULL; + parent = map_vtd_domain_page(pte_maddr); level--; } @@ -2449,7 +2439,7 @@ static void vtd_dump_p2m_table_level(paddr_t pt_maddr, int level, paddr_t gpa, printk("%*sgfn: %08lx mfn: %08lx\n", indent, "", (unsigned long)(address >> PAGE_SHIFT_4K), - (unsigned long)(pte->val >> PAGE_SHIFT_4K)); + (unsigned long)(dma_pte_addr(*pte) >> PAGE_SHIFT_4K)); } unmap_vtd_domain_page(pt_vaddr); diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index 6b2cf1a..c3e5181 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -276,7 +276,7 @@ struct dma_pte { #define dma_set_pte_snp(p) do {(p).val |= DMA_PTE_SNP;} while(0) #define dma_set_pte_prot(p, prot) \ do {(p).val = ((p).val & ~3) | ((prot) & 3); } while (0) -#define dma_pte_addr(p) ((p).val & PAGE_MASK_4K) +#define dma_pte_addr(p) ((p).val & PADDR_MASK & PAGE_MASK_4K) #define dma_set_pte_addr(p, addr) do {\ (p).val |= ((addr) & PAGE_MASK_4K); } while (0) #define dma_pte_present(p) (((p).val & 3) != 0) diff --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/vtd/utils.c index a33564b..db4c326 100644 --- a/xen/drivers/passthrough/vtd/utils.c +++ b/xen/drivers/passthrough/vtd/utils.c @@ -170,16 +170,16 @@ void print_vtd_entries(struct iommu *iommu, int bus, int devfn, u64 gmfn) l_index = get_level_index(gmfn, level); printk(" l%d_index = %x\n", level, l_index); - pte.val = val = l[l_index]; + pte.val = l[l_index]; unmap_vtd_domain_page(l); - printk(" l%d[%x] = %"PRIx64"\n", level, l_index, val); + printk(" l%d[%x] = %"PRIx64"\n", level, l_index, pte.val); - pte.val = val; if ( !dma_pte_present(pte) ) { printk(" l%d[%x] not present\n", level, l_index); break; } + val = dma_pte_addr(pte); } while ( --level ); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:59:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:59: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 1YCwwo-0000Hj-MA; Sun, 18 Jan 2015 20:59:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwm-0000HT-UP for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:49 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id FA/D7-02953-3CE1CB45; Sun, 18 Jan 2015 20:59:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1421614785!21336539!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7898 invoked from network); 18 Jan 2015 20:59:46 -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; 18 Jan 2015 20:59:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwj-00014m-QH for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwwj-0003tN-PA for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:45 +0000 Date: Sun, 18 Jan 2015 20:59:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: don't crash when PTE bits 52 and up are non-zero X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 46e0baf59105200d43612cf0c59de216958b008d Author: Jan Beulich AuthorDate: Wed Jan 7 11:13:58 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:13:58 2015 +0100 VT-d: don't crash when PTE bits 52 and up are non-zero This can (and will) be legitimately the case when sharing page tables with EPT (more of a problem before p2m_access_rwx became zero, but still possible even now when other than that is the default for a guest), leading to an unconditional crash (in print_vtd_entries()) when a DMA remapping fault occurs. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.c | 26 ++++++++------------------ xen/drivers/passthrough/vtd/iommu.h | 2 +- xen/drivers/passthrough/vtd/utils.c | 6 +++--- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 19d8165..2e113d7 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -258,8 +258,7 @@ static u64 addr_to_dma_page_maddr(struct domain *domain, u64 addr, int alloc) struct dma_pte *parent, *pte = NULL; int level = agaw_to_level(hd->arch.agaw); int offset; - u64 pte_maddr = 0, maddr; - u64 *vaddr = NULL; + u64 pte_maddr = 0; addr &= (((u64)1) << addr_width) - 1; ASSERT(spin_is_locked(&hd->arch.mapping_lock)); @@ -281,19 +280,19 @@ static u64 addr_to_dma_page_maddr(struct domain *domain, u64 addr, int alloc) offset = address_level_offset(addr, level); pte = &parent[offset]; - if ( dma_pte_addr(*pte) == 0 ) + pte_maddr = dma_pte_addr(*pte); + if ( !pte_maddr ) { if ( !alloc ) break; pdev = pci_get_pdev_by_domain(domain, -1, -1, -1); drhd = acpi_find_matched_drhd_unit(pdev); - maddr = alloc_pgtable_maddr(drhd, 1); - if ( !maddr ) + pte_maddr = alloc_pgtable_maddr(drhd, 1); + if ( !pte_maddr ) break; - dma_set_pte_addr(*pte, maddr); - vaddr = map_vtd_domain_page(maddr); + dma_set_pte_addr(*pte, pte_maddr); /* * high level table always sets r/w, last level @@ -303,21 +302,12 @@ static u64 addr_to_dma_page_maddr(struct domain *domain, u64 addr, int alloc) dma_set_pte_writable(*pte); iommu_flush_cache_entry(pte, sizeof(struct dma_pte)); } - else - { - vaddr = map_vtd_domain_page(pte->val); - } if ( level == 2 ) - { - pte_maddr = pte->val & PAGE_MASK_4K; - unmap_vtd_domain_page(vaddr); break; - } unmap_vtd_domain_page(parent); - parent = (struct dma_pte *)vaddr; - vaddr = NULL; + parent = map_vtd_domain_page(pte_maddr); level--; } @@ -2449,7 +2439,7 @@ static void vtd_dump_p2m_table_level(paddr_t pt_maddr, int level, paddr_t gpa, printk("%*sgfn: %08lx mfn: %08lx\n", indent, "", (unsigned long)(address >> PAGE_SHIFT_4K), - (unsigned long)(pte->val >> PAGE_SHIFT_4K)); + (unsigned long)(dma_pte_addr(*pte) >> PAGE_SHIFT_4K)); } unmap_vtd_domain_page(pt_vaddr); diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index 6b2cf1a..c3e5181 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -276,7 +276,7 @@ struct dma_pte { #define dma_set_pte_snp(p) do {(p).val |= DMA_PTE_SNP;} while(0) #define dma_set_pte_prot(p, prot) \ do {(p).val = ((p).val & ~3) | ((prot) & 3); } while (0) -#define dma_pte_addr(p) ((p).val & PAGE_MASK_4K) +#define dma_pte_addr(p) ((p).val & PADDR_MASK & PAGE_MASK_4K) #define dma_set_pte_addr(p, addr) do {\ (p).val |= ((addr) & PAGE_MASK_4K); } while (0) #define dma_pte_present(p) (((p).val & 3) != 0) diff --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/vtd/utils.c index a33564b..db4c326 100644 --- a/xen/drivers/passthrough/vtd/utils.c +++ b/xen/drivers/passthrough/vtd/utils.c @@ -170,16 +170,16 @@ void print_vtd_entries(struct iommu *iommu, int bus, int devfn, u64 gmfn) l_index = get_level_index(gmfn, level); printk(" l%d_index = %x\n", level, l_index); - pte.val = val = l[l_index]; + pte.val = l[l_index]; unmap_vtd_domain_page(l); - printk(" l%d[%x] = %"PRIx64"\n", level, l_index, val); + printk(" l%d[%x] = %"PRIx64"\n", level, l_index, pte.val); - pte.val = val; if ( !dma_pte_present(pte) ) { printk(" l%d[%x] not present\n", level, l_index); break; } + val = dma_pte_addr(pte); } while ( --level ); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:59:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:59: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 1YCwww-0000JD-P3; Sun, 18 Jan 2015 20:59:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwww-0000Iz-CM for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:58 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 37/EA-10925-DCE1CB45; Sun, 18 Jan 2015 20:59:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1421614796!21890889!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5362 invoked from network); 18 Jan 2015 20:59:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:59:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwt-00014v-VX for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwwt-0003uG-Ud for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:55 +0000 Date: Sun, 18 Jan 2015 20:59:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] remove CONFIG_X86_SUPERVISOR_MODE_KERNEL as x86_32 builds are unsupported X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f915632c909856cdd58e7b8849a0bc93838fa769 Author: Andrew Cooper AuthorDate: Wed Jan 7 11:15:49 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:15:49 2015 +0100 remove CONFIG_X86_SUPERVISOR_MODE_KERNEL as x86_32 builds are unsupported supervisor_mode_kernel was an x86_32-only feature which permitted a PV dom0 to run in ring 0, but at the expense of not being able to start any domUs. As the x86_32 Xen build has been removed from tree, removing the remaining supervisor_mode_kernel code. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/Rules.mk | 10 ---------- xen/arch/x86/domain.c | 3 --- xen/arch/x86/domain_build.c | 24 ++++++------------------ xen/common/domctl.c | 3 +-- xen/common/kernel.c | 2 -- xen/include/asm-arm/config.h | 2 -- xen/include/asm-x86/config.h | 6 ------ xen/include/asm-x86/desc.h | 10 ---------- 8 files changed, 7 insertions(+), 53 deletions(-) diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 6775cb5..ef8c222 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -15,12 +15,6 @@ HAS_GDBSX := y HAS_PDX := y xenoprof := y -# -# If you change any of these configuration options then you must -# 'make clean' before rebuilding. -# -supervisor_mode_kernel ?= n - CFLAGS += -I$(BASEDIR)/include CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default @@ -34,10 +28,6 @@ $(call as-insn-check,CFLAGS,CC,"vmcall",-DHAVE_GAS_VMX) $(call as-insn-check,CFLAGS,CC,"invept (%rax)$$(comma)%rax",-DHAVE_GAS_EPT) $(call as-insn-check,CFLAGS,CC,"rdfsbase %rax",-DHAVE_GAS_FSGSBASE) -ifeq ($(supervisor_mode_kernel),y) -CFLAGS += -DCONFIG_X86_SUPERVISOR_MODE_KERNEL=1 -endif - x86 := y x86_32 := n x86_64 := y diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 11c7d9f..b699510 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1726,9 +1726,6 @@ unsigned long hypercall_create_continuation( } else { - if ( supervisor_mode_kernel ) - regs->eip &= ~31; /* re-execute entire hypercall entry stub */ - for ( i = 0; *p != '\0'; i++ ) { arg = next_arg(p, args); diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 7993b17..7a912e9 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -1410,24 +1410,12 @@ int __init construct_dom0( paging_update_paging_modes(v); } - if ( supervisor_mode_kernel ) - { - v->arch.pv_vcpu.kernel_ss &= ~3; - v->arch.user_regs.ss &= ~3; - v->arch.user_regs.es &= ~3; - v->arch.user_regs.ds &= ~3; - v->arch.user_regs.fs &= ~3; - v->arch.user_regs.gs &= ~3; - printk("Dom0 runs in ring 0 (supervisor mode)\n"); - if ( !test_bit(XENFEAT_supervisor_mode_kernel, - parms.f_supported) ) - panic("Dom0 does not support supervisor-mode execution"); - } - else - { - if ( test_bit(XENFEAT_supervisor_mode_kernel, parms.f_required) ) - panic("Dom0 requires supervisor-mode execution"); - } + /* + * PVH Fixme: XENFEAT_supervisor_mode_kernel has been reused in PVH with a + * different meaning. + */ + if ( test_bit(XENFEAT_supervisor_mode_kernel, parms.f_required) ) + panic("Dom0 requires supervisor-mode execution"); rc = 0; diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 8bca6da..ee578c0 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -534,8 +534,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) unsigned int domcr_flags; ret = -EINVAL; - if ( supervisor_mode_kernel || - (op->u.createdomain.flags & + if ( (op->u.createdomain.flags & ~(XEN_DOMCTL_CDF_hvm_guest | XEN_DOMCTL_CDF_pvh_guest | XEN_DOMCTL_CDF_hap diff --git a/xen/common/kernel.c b/xen/common/kernel.c index d23c422..0d9e519 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -308,8 +308,6 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) fi.submap |= (1U << XENFEAT_writable_page_tables) | (1U << XENFEAT_auto_translated_physmap); - if ( supervisor_mode_kernel ) - fi.submap |= 1U << XENFEAT_supervisor_mode_kernel; if ( is_hardware_domain(current->domain) ) fi.submap |= 1U << XENFEAT_dom0; #ifdef CONFIG_X86 diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 264e2c1..9e165db 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -196,8 +196,6 @@ extern unsigned long xenheap_phys_end; extern unsigned long frametable_virt_end; #endif -#define supervisor_mode_kernel (0) - #define watchdog_disable() ((void)0) #define watchdog_enable() ((void)0) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 3802721..ad52d5b 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -70,12 +70,6 @@ /* Maximum we can support with current vLAPIC ID mapping. */ #define MAX_HVM_VCPUS 128 -#ifdef CONFIG_X86_SUPERVISOR_MODE_KERNEL -# define supervisor_mode_kernel (1) -#else -# define supervisor_mode_kernel (0) -#endif - /* Linkage for x86 */ #define __ALIGN .align 16,0x90 #define __ALIGN_STR ".align 16,0x90" diff --git a/xen/include/asm-x86/desc.h b/xen/include/asm-x86/desc.h index 225913a..20c47d2 100644 --- a/xen/include/asm-x86/desc.h +++ b/xen/include/asm-x86/desc.h @@ -47,17 +47,7 @@ (sel) = (((sel) & 3) >= _rpl) ? (sel) : (((sel) & ~3) | _rpl); \ }) -/* Stack selectors don't need fixing up if the kernel runs in ring 0. */ -#ifdef CONFIG_X86_SUPERVISOR_MODE_KERNEL -#define fixup_guest_stack_selector(d, ss) ((void)0) -#else #define fixup_guest_stack_selector(d, ss) __fixup_guest_selector(d, ss) -#endif - -/* - * Code selectors are always fixed up. It allows the Xen exit stub to detect - * return to guest context, even when the guest kernel runs in ring 0. - */ #define fixup_guest_code_selector(d, cs) __fixup_guest_selector(d, cs) /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 20:59:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 20:59: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 1YCwww-0000JD-P3; Sun, 18 Jan 2015 20:59:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwww-0000Iz-CM for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:58 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 37/EA-10925-DCE1CB45; Sun, 18 Jan 2015 20:59:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1421614796!21890889!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5362 invoked from network); 18 Jan 2015 20:59:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 20:59:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwwt-00014v-VX for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwwt-0003uG-Ud for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 20:59:55 +0000 Date: Sun, 18 Jan 2015 20:59:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] remove CONFIG_X86_SUPERVISOR_MODE_KERNEL as x86_32 builds are unsupported X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f915632c909856cdd58e7b8849a0bc93838fa769 Author: Andrew Cooper AuthorDate: Wed Jan 7 11:15:49 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:15:49 2015 +0100 remove CONFIG_X86_SUPERVISOR_MODE_KERNEL as x86_32 builds are unsupported supervisor_mode_kernel was an x86_32-only feature which permitted a PV dom0 to run in ring 0, but at the expense of not being able to start any domUs. As the x86_32 Xen build has been removed from tree, removing the remaining supervisor_mode_kernel code. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/Rules.mk | 10 ---------- xen/arch/x86/domain.c | 3 --- xen/arch/x86/domain_build.c | 24 ++++++------------------ xen/common/domctl.c | 3 +-- xen/common/kernel.c | 2 -- xen/include/asm-arm/config.h | 2 -- xen/include/asm-x86/config.h | 6 ------ xen/include/asm-x86/desc.h | 10 ---------- 8 files changed, 7 insertions(+), 53 deletions(-) diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 6775cb5..ef8c222 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -15,12 +15,6 @@ HAS_GDBSX := y HAS_PDX := y xenoprof := y -# -# If you change any of these configuration options then you must -# 'make clean' before rebuilding. -# -supervisor_mode_kernel ?= n - CFLAGS += -I$(BASEDIR)/include CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default @@ -34,10 +28,6 @@ $(call as-insn-check,CFLAGS,CC,"vmcall",-DHAVE_GAS_VMX) $(call as-insn-check,CFLAGS,CC,"invept (%rax)$$(comma)%rax",-DHAVE_GAS_EPT) $(call as-insn-check,CFLAGS,CC,"rdfsbase %rax",-DHAVE_GAS_FSGSBASE) -ifeq ($(supervisor_mode_kernel),y) -CFLAGS += -DCONFIG_X86_SUPERVISOR_MODE_KERNEL=1 -endif - x86 := y x86_32 := n x86_64 := y diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 11c7d9f..b699510 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1726,9 +1726,6 @@ unsigned long hypercall_create_continuation( } else { - if ( supervisor_mode_kernel ) - regs->eip &= ~31; /* re-execute entire hypercall entry stub */ - for ( i = 0; *p != '\0'; i++ ) { arg = next_arg(p, args); diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 7993b17..7a912e9 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -1410,24 +1410,12 @@ int __init construct_dom0( paging_update_paging_modes(v); } - if ( supervisor_mode_kernel ) - { - v->arch.pv_vcpu.kernel_ss &= ~3; - v->arch.user_regs.ss &= ~3; - v->arch.user_regs.es &= ~3; - v->arch.user_regs.ds &= ~3; - v->arch.user_regs.fs &= ~3; - v->arch.user_regs.gs &= ~3; - printk("Dom0 runs in ring 0 (supervisor mode)\n"); - if ( !test_bit(XENFEAT_supervisor_mode_kernel, - parms.f_supported) ) - panic("Dom0 does not support supervisor-mode execution"); - } - else - { - if ( test_bit(XENFEAT_supervisor_mode_kernel, parms.f_required) ) - panic("Dom0 requires supervisor-mode execution"); - } + /* + * PVH Fixme: XENFEAT_supervisor_mode_kernel has been reused in PVH with a + * different meaning. + */ + if ( test_bit(XENFEAT_supervisor_mode_kernel, parms.f_required) ) + panic("Dom0 requires supervisor-mode execution"); rc = 0; diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 8bca6da..ee578c0 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -534,8 +534,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) unsigned int domcr_flags; ret = -EINVAL; - if ( supervisor_mode_kernel || - (op->u.createdomain.flags & + if ( (op->u.createdomain.flags & ~(XEN_DOMCTL_CDF_hvm_guest | XEN_DOMCTL_CDF_pvh_guest | XEN_DOMCTL_CDF_hap diff --git a/xen/common/kernel.c b/xen/common/kernel.c index d23c422..0d9e519 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -308,8 +308,6 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) fi.submap |= (1U << XENFEAT_writable_page_tables) | (1U << XENFEAT_auto_translated_physmap); - if ( supervisor_mode_kernel ) - fi.submap |= 1U << XENFEAT_supervisor_mode_kernel; if ( is_hardware_domain(current->domain) ) fi.submap |= 1U << XENFEAT_dom0; #ifdef CONFIG_X86 diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 264e2c1..9e165db 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -196,8 +196,6 @@ extern unsigned long xenheap_phys_end; extern unsigned long frametable_virt_end; #endif -#define supervisor_mode_kernel (0) - #define watchdog_disable() ((void)0) #define watchdog_enable() ((void)0) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 3802721..ad52d5b 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -70,12 +70,6 @@ /* Maximum we can support with current vLAPIC ID mapping. */ #define MAX_HVM_VCPUS 128 -#ifdef CONFIG_X86_SUPERVISOR_MODE_KERNEL -# define supervisor_mode_kernel (1) -#else -# define supervisor_mode_kernel (0) -#endif - /* Linkage for x86 */ #define __ALIGN .align 16,0x90 #define __ALIGN_STR ".align 16,0x90" diff --git a/xen/include/asm-x86/desc.h b/xen/include/asm-x86/desc.h index 225913a..20c47d2 100644 --- a/xen/include/asm-x86/desc.h +++ b/xen/include/asm-x86/desc.h @@ -47,17 +47,7 @@ (sel) = (((sel) & 3) >= _rpl) ? (sel) : (((sel) & ~3) | _rpl); \ }) -/* Stack selectors don't need fixing up if the kernel runs in ring 0. */ -#ifdef CONFIG_X86_SUPERVISOR_MODE_KERNEL -#define fixup_guest_stack_selector(d, ss) ((void)0) -#else #define fixup_guest_stack_selector(d, ss) __fixup_guest_selector(d, ss) -#endif - -/* - * Code selectors are always fixed up. It allows the Xen exit stub to detect - * return to guest context, even when the guest kernel runs in ring 0. - */ #define fixup_guest_code_selector(d, cs) __fixup_guest_selector(d, cs) /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:00:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21: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 1YCwx9-0000ND-S9; Sun, 18 Jan 2015 21:00:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwx9-0000N3-3V for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:11 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id CD/52-09842-ADE1CB45; Sun, 18 Jan 2015 21:00:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1421614808!14943913!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26892 invoked from network); 18 Jan 2015 21:00:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:00:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwx4-00017n-66 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwx4-0003vE-4t for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:06 +0000 Date: Sun, 18 Jan 2015 21:00:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: add a new p2m type class - P2M_DISCARD_WRITE_TYPES X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c02cce0edfa53190b58fa4a1451f47be4d0f1c4 Author: Yu Zhang AuthorDate: Wed Jan 7 11:25:55 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:25:55 2015 +0100 x86: add a new p2m type class - P2M_DISCARD_WRITE_TYPES Currently, the P2M_RO_TYPES bears 2 meanings: one is "_PAGE_RW bit is clear in their PTEs", and another is to discard the write operations on these pages. This patch adds a p2m type class, P2M_DISCARD_WRITE_TYPES, to bear the second meaning, so we can use this type class instead of the P2M_RO_TYPES, to decide if a write operation is to be ignored. Signed-off-by: Yu Zhang Reviewed-by: Tim Deegan Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 16 +++------------- xen/arch/x86/mm/shadow/multi.c | 2 +- xen/include/asm-x86/p2m.h | 5 +++++ 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index e33cd0a..5e2e7ce 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2837,7 +2837,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, * to the mmio handler. */ if ( (p2mt == p2m_mmio_dm) || - (npfec.write_access && (p2mt == p2m_ram_ro)) ) + (npfec.write_access && (p2m_is_discard_write(p2mt))) ) { put_gfn(p2m->domain, gfn); @@ -2882,16 +2882,6 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, goto out_put_gfn; } - /* Shouldn't happen: Maybe the guest was writing to a r/o grant mapping? */ - if ( npfec.write_access && (p2mt == p2m_grant_map_ro) ) - { - gdprintk(XENLOG_WARNING, - "trying to write to read-only grant mapping\n"); - hvm_inject_hw_exception(TRAP_gp_fault, 0); - rc = 1; - goto out_put_gfn; - } - /* If we fell through, the vcpu will retry now that access restrictions have * been removed. It may fault again if the p2m entry type still requires so. * Otherwise, this is an error condition. */ @@ -3941,7 +3931,7 @@ static enum hvm_copy_result __hvm_copy( if ( flags & HVMCOPY_to_guest ) { - if ( p2mt == p2m_ram_ro ) + if ( p2m_is_discard_write(p2mt) ) { static unsigned long lastpage; if ( xchg(&lastpage, gfn) != gfn ) @@ -4035,7 +4025,7 @@ static enum hvm_copy_result __hvm_clear(paddr_t addr, int size) p = (char *)__map_domain_page(page) + (addr & ~PAGE_MASK); - if ( p2mt == p2m_ram_ro ) + if ( p2m_is_discard_write(p2mt) ) { static unsigned long lastpage; if ( xchg(&lastpage, gfn) != gfn ) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 225290e..94cf06d 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4575,7 +4575,7 @@ static mfn_t emulate_gva_to_mfn(struct vcpu *v, { return _mfn(BAD_GFN_TO_MFN); } - if ( p2m_is_readonly(p2mt) ) + if ( p2m_is_discard_write(p2mt) ) { put_page(page); return _mfn(READONLY_GFN); diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 5f7fe71..42de75d 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -113,6 +113,10 @@ typedef unsigned int p2m_query_t; | p2m_to_mask(p2m_grant_map_ro) \ | p2m_to_mask(p2m_ram_shared) ) +/* Write-discard types, which should discard the write operations */ +#define P2M_DISCARD_WRITE_TYPES (p2m_to_mask(p2m_ram_ro) \ + | p2m_to_mask(p2m_grant_map_ro)) + /* Types that can be subject to bulk transitions. */ #define P2M_CHANGEABLE_TYPES (p2m_to_mask(p2m_ram_rw) \ | p2m_to_mask(p2m_ram_logdirty) ) @@ -145,6 +149,7 @@ typedef unsigned int p2m_query_t; #define p2m_is_hole(_t) (p2m_to_mask(_t) & P2M_HOLE_TYPES) #define p2m_is_mmio(_t) (p2m_to_mask(_t) & P2M_MMIO_TYPES) #define p2m_is_readonly(_t) (p2m_to_mask(_t) & P2M_RO_TYPES) +#define p2m_is_discard_write(_t) (p2m_to_mask(_t) & P2M_DISCARD_WRITE_TYPES) #define p2m_is_changeable(_t) (p2m_to_mask(_t) & P2M_CHANGEABLE_TYPES) #define p2m_is_pod(_t) (p2m_to_mask(_t) & P2M_POD_TYPES) #define p2m_is_grant(_t) (p2m_to_mask(_t) & P2M_GRANT_TYPES) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:00:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21: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 1YCwx9-0000ND-S9; Sun, 18 Jan 2015 21:00:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwx9-0000N3-3V for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:11 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id CD/52-09842-ADE1CB45; Sun, 18 Jan 2015 21:00:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1421614808!14943913!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26892 invoked from network); 18 Jan 2015 21:00:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:00:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwx4-00017n-66 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwx4-0003vE-4t for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:06 +0000 Date: Sun, 18 Jan 2015 21:00:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: add a new p2m type class - P2M_DISCARD_WRITE_TYPES X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c02cce0edfa53190b58fa4a1451f47be4d0f1c4 Author: Yu Zhang AuthorDate: Wed Jan 7 11:25:55 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:25:55 2015 +0100 x86: add a new p2m type class - P2M_DISCARD_WRITE_TYPES Currently, the P2M_RO_TYPES bears 2 meanings: one is "_PAGE_RW bit is clear in their PTEs", and another is to discard the write operations on these pages. This patch adds a p2m type class, P2M_DISCARD_WRITE_TYPES, to bear the second meaning, so we can use this type class instead of the P2M_RO_TYPES, to decide if a write operation is to be ignored. Signed-off-by: Yu Zhang Reviewed-by: Tim Deegan Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 16 +++------------- xen/arch/x86/mm/shadow/multi.c | 2 +- xen/include/asm-x86/p2m.h | 5 +++++ 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index e33cd0a..5e2e7ce 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2837,7 +2837,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, * to the mmio handler. */ if ( (p2mt == p2m_mmio_dm) || - (npfec.write_access && (p2mt == p2m_ram_ro)) ) + (npfec.write_access && (p2m_is_discard_write(p2mt))) ) { put_gfn(p2m->domain, gfn); @@ -2882,16 +2882,6 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, goto out_put_gfn; } - /* Shouldn't happen: Maybe the guest was writing to a r/o grant mapping? */ - if ( npfec.write_access && (p2mt == p2m_grant_map_ro) ) - { - gdprintk(XENLOG_WARNING, - "trying to write to read-only grant mapping\n"); - hvm_inject_hw_exception(TRAP_gp_fault, 0); - rc = 1; - goto out_put_gfn; - } - /* If we fell through, the vcpu will retry now that access restrictions have * been removed. It may fault again if the p2m entry type still requires so. * Otherwise, this is an error condition. */ @@ -3941,7 +3931,7 @@ static enum hvm_copy_result __hvm_copy( if ( flags & HVMCOPY_to_guest ) { - if ( p2mt == p2m_ram_ro ) + if ( p2m_is_discard_write(p2mt) ) { static unsigned long lastpage; if ( xchg(&lastpage, gfn) != gfn ) @@ -4035,7 +4025,7 @@ static enum hvm_copy_result __hvm_clear(paddr_t addr, int size) p = (char *)__map_domain_page(page) + (addr & ~PAGE_MASK); - if ( p2mt == p2m_ram_ro ) + if ( p2m_is_discard_write(p2mt) ) { static unsigned long lastpage; if ( xchg(&lastpage, gfn) != gfn ) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 225290e..94cf06d 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4575,7 +4575,7 @@ static mfn_t emulate_gva_to_mfn(struct vcpu *v, { return _mfn(BAD_GFN_TO_MFN); } - if ( p2m_is_readonly(p2mt) ) + if ( p2m_is_discard_write(p2mt) ) { put_page(page); return _mfn(READONLY_GFN); diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 5f7fe71..42de75d 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -113,6 +113,10 @@ typedef unsigned int p2m_query_t; | p2m_to_mask(p2m_grant_map_ro) \ | p2m_to_mask(p2m_ram_shared) ) +/* Write-discard types, which should discard the write operations */ +#define P2M_DISCARD_WRITE_TYPES (p2m_to_mask(p2m_ram_ro) \ + | p2m_to_mask(p2m_grant_map_ro)) + /* Types that can be subject to bulk transitions. */ #define P2M_CHANGEABLE_TYPES (p2m_to_mask(p2m_ram_rw) \ | p2m_to_mask(p2m_ram_logdirty) ) @@ -145,6 +149,7 @@ typedef unsigned int p2m_query_t; #define p2m_is_hole(_t) (p2m_to_mask(_t) & P2M_HOLE_TYPES) #define p2m_is_mmio(_t) (p2m_to_mask(_t) & P2M_MMIO_TYPES) #define p2m_is_readonly(_t) (p2m_to_mask(_t) & P2M_RO_TYPES) +#define p2m_is_discard_write(_t) (p2m_to_mask(_t) & P2M_DISCARD_WRITE_TYPES) #define p2m_is_changeable(_t) (p2m_to_mask(_t) & P2M_CHANGEABLE_TYPES) #define p2m_is_pod(_t) (p2m_to_mask(_t) & P2M_POD_TYPES) #define p2m_is_grant(_t) (p2m_to_mask(_t) & P2M_GRANT_TYPES) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:00:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:00:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxK-0000Oo-Um; Sun, 18 Jan 2015 21:00:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxK-0000Oe-CR for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:22 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 3A/CB-03148-5EE1CB45; Sun, 18 Jan 2015 21:00:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1421614819!21324914!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8659 invoked from network); 18 Jan 2015 21:00:20 -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 Jan 2015 21:00:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxH-00017y-FQ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwxH-0003vd-D5 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:19 +0000 Date: Sun, 18 Jan 2015 21:00:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: add a new p2m type - p2m_mmio_write_dm X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b4986813c59a41189886d1e8da05886455e8ad95 Author: Yu Zhang AuthorDate: Wed Jan 7 11:26:44 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:26:44 2015 +0100 x86: add a new p2m type - p2m_mmio_write_dm A new p2m type, p2m_mmio_write_dm, is added to trap and emulate the write operations on GPU's page tables. Handling of this new p2m type are similar with existing p2m_ram_ro in most condition checks, with only difference on final policy of emulation vs. drop. For p2m_ram_ro types, write operations will not trigger the device model, and will be discarded later in __hvm_copy(); while for the p2m_mmio_write_dm type pages, writes will go to the device model via ioreq-server. Signed-off-by: Yu Zhang Signed-off-by: Wei Ye Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 11 ++++++++--- xen/arch/x86/mm/p2m-ept.c | 1 + xen/arch/x86/mm/p2m-pt.c | 1 + xen/arch/x86/mm/shadow/multi.c | 3 ++- xen/include/asm-x86/p2m.h | 4 +++- xen/include/public/hvm/hvm_op.h | 1 + 6 files changed, 16 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 5e2e7ce..6648d61 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2837,7 +2837,8 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, * to the mmio handler. */ if ( (p2mt == p2m_mmio_dm) || - (npfec.write_access && (p2m_is_discard_write(p2mt))) ) + (npfec.write_access && + (p2m_is_discard_write(p2mt) || (p2mt == p2m_mmio_write_dm))) ) { put_gfn(p2m->domain, gfn); @@ -5926,6 +5927,8 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) get_gfn_query_unlocked(d, a.pfn, &t); if ( p2m_is_mmio(t) ) a.mem_type = HVMMEM_mmio_dm; + else if ( t == p2m_mmio_write_dm ) + a.mem_type = HVMMEM_mmio_write_dm; else if ( p2m_is_readonly(t) ) a.mem_type = HVMMEM_ram_ro; else if ( p2m_is_ram(t) ) @@ -5953,7 +5956,8 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) static const p2m_type_t memtype[] = { [HVMMEM_ram_rw] = p2m_ram_rw, [HVMMEM_ram_ro] = p2m_ram_ro, - [HVMMEM_mmio_dm] = p2m_mmio_dm + [HVMMEM_mmio_dm] = p2m_mmio_dm, + [HVMMEM_mmio_write_dm] = p2m_mmio_write_dm }; if ( copy_from_guest(&a, arg, 1) ) @@ -6000,7 +6004,8 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) goto param_fail4; } if ( !p2m_is_ram(t) && - (!p2m_is_hole(t) || a.hvmmem_type != HVMMEM_mmio_dm) ) + (!p2m_is_hole(t) || a.hvmmem_type != HVMMEM_mmio_dm) && + (t != p2m_mmio_write_dm || a.hvmmem_type != HVMMEM_ram_rw) ) { put_gfn(d, pfn); goto param_fail4; diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 15c6e83..e21a92d 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -136,6 +136,7 @@ static void ept_p2m_type_to_flags(ept_entry_t *entry, p2m_type_t type, p2m_acces entry->x = 0; break; case p2m_grant_map_ro: + case p2m_mmio_write_dm: entry->r = 1; entry->w = entry->x = 0; break; diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index e48b63a..26fb18d 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -94,6 +94,7 @@ static unsigned long p2m_type_to_flags(p2m_type_t t, mfn_t mfn) default: return flags | _PAGE_NX_BIT; case p2m_grant_map_ro: + case p2m_mmio_write_dm: return flags | P2M_BASE_FLAGS | _PAGE_NX_BIT; case p2m_ram_ro: case p2m_ram_logdirty: diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 94cf06d..65815bb 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -3181,7 +3181,8 @@ static int sh_page_fault(struct vcpu *v, } /* Need to hand off device-model MMIO to the device model */ - if ( p2mt == p2m_mmio_dm ) + if ( p2mt == p2m_mmio_dm + || (p2mt == p2m_mmio_write_dm && ft == ft_demand_write) ) { gpa = guest_walk_to_gpa(&gw); goto mmio; diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 42de75d..2cf73ca 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -72,6 +72,7 @@ typedef enum { p2m_ram_shared = 12, /* Shared or sharable memory */ p2m_ram_broken = 13, /* Broken page, access cause domain crash */ p2m_map_foreign = 14, /* ram pages from foreign domain */ + p2m_mmio_write_dm = 15, /* Read-only; writes go to the device model */ } p2m_type_t; /* Modifiers to the query */ @@ -111,7 +112,8 @@ typedef unsigned int p2m_query_t; #define P2M_RO_TYPES (p2m_to_mask(p2m_ram_logdirty) \ | p2m_to_mask(p2m_ram_ro) \ | p2m_to_mask(p2m_grant_map_ro) \ - | p2m_to_mask(p2m_ram_shared) ) + | p2m_to_mask(p2m_ram_shared) \ + | p2m_to_mask(p2m_mmio_write_dm)) /* Write-discard types, which should discard the write operations */ #define P2M_DISCARD_WRITE_TYPES (p2m_to_mask(p2m_ram_ro) \ diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h index eeb0a60..a4e5345 100644 --- a/xen/include/public/hvm/hvm_op.h +++ b/xen/include/public/hvm/hvm_op.h @@ -81,6 +81,7 @@ typedef enum { HVMMEM_ram_rw, /* Normal read/write guest RAM */ HVMMEM_ram_ro, /* Read-only; writes are discarded */ HVMMEM_mmio_dm, /* Reads and write go to the device model */ + HVMMEM_mmio_write_dm /* Read-only; writes go to the device model */ } hvmmem_type_t; /* Following tools-only interfaces may change in future. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:00:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:00:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxK-0000Oo-Um; Sun, 18 Jan 2015 21:00:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxK-0000Oe-CR for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:22 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 3A/CB-03148-5EE1CB45; Sun, 18 Jan 2015 21:00:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1421614819!21324914!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8659 invoked from network); 18 Jan 2015 21:00:20 -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 Jan 2015 21:00:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxH-00017y-FQ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwxH-0003vd-D5 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:19 +0000 Date: Sun, 18 Jan 2015 21:00:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: add a new p2m type - p2m_mmio_write_dm X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b4986813c59a41189886d1e8da05886455e8ad95 Author: Yu Zhang AuthorDate: Wed Jan 7 11:26:44 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:26:44 2015 +0100 x86: add a new p2m type - p2m_mmio_write_dm A new p2m type, p2m_mmio_write_dm, is added to trap and emulate the write operations on GPU's page tables. Handling of this new p2m type are similar with existing p2m_ram_ro in most condition checks, with only difference on final policy of emulation vs. drop. For p2m_ram_ro types, write operations will not trigger the device model, and will be discarded later in __hvm_copy(); while for the p2m_mmio_write_dm type pages, writes will go to the device model via ioreq-server. Signed-off-by: Yu Zhang Signed-off-by: Wei Ye Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 11 ++++++++--- xen/arch/x86/mm/p2m-ept.c | 1 + xen/arch/x86/mm/p2m-pt.c | 1 + xen/arch/x86/mm/shadow/multi.c | 3 ++- xen/include/asm-x86/p2m.h | 4 +++- xen/include/public/hvm/hvm_op.h | 1 + 6 files changed, 16 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 5e2e7ce..6648d61 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2837,7 +2837,8 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, * to the mmio handler. */ if ( (p2mt == p2m_mmio_dm) || - (npfec.write_access && (p2m_is_discard_write(p2mt))) ) + (npfec.write_access && + (p2m_is_discard_write(p2mt) || (p2mt == p2m_mmio_write_dm))) ) { put_gfn(p2m->domain, gfn); @@ -5926,6 +5927,8 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) get_gfn_query_unlocked(d, a.pfn, &t); if ( p2m_is_mmio(t) ) a.mem_type = HVMMEM_mmio_dm; + else if ( t == p2m_mmio_write_dm ) + a.mem_type = HVMMEM_mmio_write_dm; else if ( p2m_is_readonly(t) ) a.mem_type = HVMMEM_ram_ro; else if ( p2m_is_ram(t) ) @@ -5953,7 +5956,8 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) static const p2m_type_t memtype[] = { [HVMMEM_ram_rw] = p2m_ram_rw, [HVMMEM_ram_ro] = p2m_ram_ro, - [HVMMEM_mmio_dm] = p2m_mmio_dm + [HVMMEM_mmio_dm] = p2m_mmio_dm, + [HVMMEM_mmio_write_dm] = p2m_mmio_write_dm }; if ( copy_from_guest(&a, arg, 1) ) @@ -6000,7 +6004,8 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) goto param_fail4; } if ( !p2m_is_ram(t) && - (!p2m_is_hole(t) || a.hvmmem_type != HVMMEM_mmio_dm) ) + (!p2m_is_hole(t) || a.hvmmem_type != HVMMEM_mmio_dm) && + (t != p2m_mmio_write_dm || a.hvmmem_type != HVMMEM_ram_rw) ) { put_gfn(d, pfn); goto param_fail4; diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 15c6e83..e21a92d 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -136,6 +136,7 @@ static void ept_p2m_type_to_flags(ept_entry_t *entry, p2m_type_t type, p2m_acces entry->x = 0; break; case p2m_grant_map_ro: + case p2m_mmio_write_dm: entry->r = 1; entry->w = entry->x = 0; break; diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index e48b63a..26fb18d 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -94,6 +94,7 @@ static unsigned long p2m_type_to_flags(p2m_type_t t, mfn_t mfn) default: return flags | _PAGE_NX_BIT; case p2m_grant_map_ro: + case p2m_mmio_write_dm: return flags | P2M_BASE_FLAGS | _PAGE_NX_BIT; case p2m_ram_ro: case p2m_ram_logdirty: diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 94cf06d..65815bb 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -3181,7 +3181,8 @@ static int sh_page_fault(struct vcpu *v, } /* Need to hand off device-model MMIO to the device model */ - if ( p2mt == p2m_mmio_dm ) + if ( p2mt == p2m_mmio_dm + || (p2mt == p2m_mmio_write_dm && ft == ft_demand_write) ) { gpa = guest_walk_to_gpa(&gw); goto mmio; diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 42de75d..2cf73ca 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -72,6 +72,7 @@ typedef enum { p2m_ram_shared = 12, /* Shared or sharable memory */ p2m_ram_broken = 13, /* Broken page, access cause domain crash */ p2m_map_foreign = 14, /* ram pages from foreign domain */ + p2m_mmio_write_dm = 15, /* Read-only; writes go to the device model */ } p2m_type_t; /* Modifiers to the query */ @@ -111,7 +112,8 @@ typedef unsigned int p2m_query_t; #define P2M_RO_TYPES (p2m_to_mask(p2m_ram_logdirty) \ | p2m_to_mask(p2m_ram_ro) \ | p2m_to_mask(p2m_grant_map_ro) \ - | p2m_to_mask(p2m_ram_shared) ) + | p2m_to_mask(p2m_ram_shared) \ + | p2m_to_mask(p2m_mmio_write_dm)) /* Write-discard types, which should discard the write operations */ #define P2M_DISCARD_WRITE_TYPES (p2m_to_mask(p2m_ram_ro) \ diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h index eeb0a60..a4e5345 100644 --- a/xen/include/public/hvm/hvm_op.h +++ b/xen/include/public/hvm/hvm_op.h @@ -81,6 +81,7 @@ typedef enum { HVMMEM_ram_rw, /* Normal read/write guest RAM */ HVMMEM_ram_ro, /* Read-only; writes are discarded */ HVMMEM_mmio_dm, /* Reads and write go to the device model */ + HVMMEM_mmio_write_dm /* Read-only; writes go to the device model */ } hvmmem_type_t; /* Following tools-only interfaces may change in future. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:00:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21: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 1YCwxW-0000Qe-DF; Sun, 18 Jan 2015 21:00:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxV-0000QM-4n for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:33 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 10/51-23865-0FE1CB45; Sun, 18 Jan 2015 21:00:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1421614830!20434964!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16436 invoked from network); 18 Jan 2015 21:00:31 -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; 18 Jan 2015 21:00:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxR-000184-Ph for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwxR-0003wA-Ks for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:29 +0000 Date: Sun, 18 Jan 2015 21:00:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/viridian: add Partition Reference Time enlightenment X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd94caca537212bfa7f976d0a0f286466709347f Author: Paul Durrant AuthorDate: Wed Jan 7 11:28:57 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:28:57 2015 +0100 x86/viridian: add Partition Reference Time enlightenment The presence of the partition reference time enlightenment persuades newer versions of Windows to prefer the TSC as their primary time source. Hence, if rdtsc is not being emulated and is invariant then many vmexits (for alternative time sources such as the HPET or reference counter MSR) can be avoided. The implementation is not yet complete as no attempt is made to prevent emulation of rdtsc if the enlightenment is active and guest and host TSC frequencies differ. To do that requires invasive changes in the core x86 time code and hence a lot more testing. This patch avoids the issue by disabling the enlightenment if rdtsc is being emulated, causing Windows to choose another time source. This is safe, but may cause a big variation in performance of guests migrated between hosts of differing TSC frequency. Thus the enlightenment is not enabled in the default set, but may be enabled to improve guest performance where such migrations are not a concern. See section 15.4 of the Microsoft Hypervisor Top Level Functional Specification v4.0a for details. Signed-off-by: Paul Durrant Acked-by: Ian Campbell Reviewed-by: Christoph Egger --- docs/man/xl.cfg.pod.5 | 6 ++ tools/libxl/libxl_dom.c | 3 + tools/libxl/libxl_types.idl | 1 + xen/arch/x86/hvm/viridian.c | 111 ++++++++++++++++++++++++++++++++ xen/include/asm-x86/hvm/viridian.h | 25 +++++++ xen/include/public/arch-x86/hvm/save.h | 11 +++ xen/include/public/hvm/params.h | 7 ++- 7 files changed, 163 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 622ea53..e2f91fc 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1231,6 +1231,12 @@ This group incorporates Partition Time Reference Counter MSR. This enlightenment can improve performance of Windows 8 and Windows Server 2012 onwards. +=item B + +This set incorporates the Partition Reference TSC MSR. This +enlightenment can improve performance of Windows 7 and Windows +Server 2008 R2 onwards. + =item B This is a special value that enables the default set of groups, which diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 1d33a18..48d661a 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -263,6 +263,9 @@ static int hvm_set_viridian_features(libxl__gc *gc, uint32_t domid, if (libxl_bitmap_test(&enlightenments, LIBXL_VIRIDIAN_ENLIGHTENMENT_TIME_REF_COUNT)) mask |= HVMPV_time_ref_count; + if (libxl_bitmap_test(&enlightenments, LIBXL_VIRIDIAN_ENLIGHTENMENT_REFERENCE_TSC)) + mask |= HVMPV_reference_tsc; + if (mask != 0 && xc_hvm_param_set(CTX->xch, domid, diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index f7fc695..1214d2e 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -192,6 +192,7 @@ libxl_viridian_enlightenment = Enumeration("viridian_enlightenment", [ (0, "base"), (1, "freq"), (2, "time_ref_count"), + (3, "reference_tsc"), ]) # diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index 3197b6b..cb689f6 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -21,6 +21,7 @@ #define VIRIDIAN_MSR_HYPERCALL 0x40000001 #define VIRIDIAN_MSR_VP_INDEX 0x40000002 #define VIRIDIAN_MSR_TIME_REF_COUNT 0x40000020 +#define VIRIDIAN_MSR_REFERENCE_TSC 0x40000021 #define VIRIDIAN_MSR_TSC_FREQUENCY 0x40000022 #define VIRIDIAN_MSR_APIC_FREQUENCY 0x40000023 #define VIRIDIAN_MSR_EOI 0x40000070 @@ -40,6 +41,7 @@ #define CPUID3A_MSR_APIC_ACCESS (1 << 4) #define CPUID3A_MSR_HYPERCALL (1 << 5) #define CPUID3A_MSR_VP_INDEX (1 << 6) +#define CPUID3A_MSR_REFERENCE_TSC (1 << 9) #define CPUID3A_MSR_FREQ (1 << 11) /* Viridian CPUID 4000004, Implementation Recommendations. */ @@ -95,6 +97,8 @@ int cpuid_viridian_leaves(unsigned int leaf, unsigned int *eax, *eax |= CPUID3A_MSR_FREQ; if ( viridian_feature_mask(d) & HVMPV_time_ref_count ) *eax |= CPUID3A_MSR_TIME_REF_COUNT; + if ( viridian_feature_mask(d) & HVMPV_reference_tsc ) + *eax |= CPUID3A_MSR_REFERENCE_TSC; break; case 4: /* Recommended hypercall usage. */ @@ -155,6 +159,17 @@ static void dump_apic_assist(const struct vcpu *v) v, aa->fields.enabled, (unsigned long)aa->fields.pfn); } +static void dump_reference_tsc(const struct domain *d) +{ + const union viridian_reference_tsc *rt; + + rt = &d->arch.hvm_domain.viridian.reference_tsc; + + printk(XENLOG_G_INFO "d%d: VIRIDIAN REFERENCE_TSC: enabled: %x pfn: %lx\n", + d->domain_id, + rt->fields.enabled, (unsigned long)rt->fields.pfn); +} + static void enable_hypercall_page(struct domain *d) { unsigned long gmfn = d->arch.hvm_domain.viridian.hypercall_gpa.fields.pfn; @@ -224,6 +239,78 @@ static void initialize_apic_assist(struct vcpu *v) put_page_and_type(page); } +static void update_reference_tsc(struct domain *d, bool_t initialize) +{ + unsigned long gmfn = d->arch.hvm_domain.viridian.reference_tsc.fields.pfn; + struct page_info *page = get_page_from_gfn(d, gmfn, NULL, P2M_ALLOC); + HV_REFERENCE_TSC_PAGE *p; + + if ( !page || !get_page_type(page, PGT_writable_page) ) + { + if ( page ) + put_page(page); + gdprintk(XENLOG_WARNING, "Bad GMFN %lx (MFN %lx)\n", gmfn, + page ? page_to_mfn(page) : INVALID_MFN); + return; + } + + p = __map_domain_page(page); + + if ( initialize ) + clear_page(p); + + /* + * This enlightenment must be disabled is the host TSC is not invariant. + * However it is also disabled if vtsc is true (which means rdtsc is being + * emulated). This generally happens when guest TSC freq and host TSC freq + * don't match. The TscScale value could be adjusted to cope with this, + * allowing vtsc to be turned off, but support for this is not yet present + * in the hypervisor. Thus is it is possible that migrating a Windows VM + * between hosts of differing TSC frequencies may result in large + * differences in guest performance. + */ + if ( !host_tsc_is_safe() || d->arch.vtsc ) + { + /* + * The specification states that valid values of TscSequence range + * from 0 to 0xFFFFFFFE. The value 0xFFFFFFFF is used to indicate + * this mechanism is no longer a reliable source of time and that + * the VM should fall back to a different source. + * + * Server 2012 (6.2 kernel) and 2012 R2 (6.3 kernel) actually violate + * the spec. and rely on a value of 0 to indicate that this + * enlightenment should no longer be used. These two kernel + * versions are currently the only ones to make use of this + * enlightenment, so just use 0 here. + */ + p->TscSequence = 0; + + printk(XENLOG_G_INFO "d%d: VIRIDIAN REFERENCE_TSC: invalidated\n", + d->domain_id); + return; + } + + /* + * The guest will calculate reference time according to the following + * formula: + * + * ReferenceTime = ((RDTSC() * TscScale) >> 64) + TscOffset + * + * Windows uses a 100ns tick, so we need a scale which is cpu + * ticks per 100ns shifted left by 64. + */ + p->TscScale = ((10000ul << 32) / d->arch.tsc_khz) << 32; + + p->TscSequence++; + if ( p->TscSequence == 0xFFFFFFFF || + p->TscSequence == 0 ) /* Avoid both 'invalid' values */ + p->TscSequence = 1; + + unmap_domain_page(p); + + put_page_and_type(page); +} + int wrmsr_viridian_regs(uint32_t idx, uint64_t val) { struct vcpu *v = current; @@ -282,6 +369,17 @@ int wrmsr_viridian_regs(uint32_t idx, uint64_t val) initialize_apic_assist(v); break; + case VIRIDIAN_MSR_REFERENCE_TSC: + if ( !(viridian_feature_mask(d) & HVMPV_reference_tsc) ) + return 0; + + perfc_incr(mshv_wrmsr_tsc_msr); + d->arch.hvm_domain.viridian.reference_tsc.raw = val; + dump_reference_tsc(d); + if ( d->arch.hvm_domain.viridian.reference_tsc.fields.enabled ) + update_reference_tsc(d, 1); + break; + default: return 0; } @@ -379,6 +477,14 @@ int rdmsr_viridian_regs(uint32_t idx, uint64_t *val) *val = v->arch.hvm_vcpu.viridian.apic_assist.raw; break; + case VIRIDIAN_MSR_REFERENCE_TSC: + if ( !(viridian_feature_mask(d) & HVMPV_reference_tsc) ) + return 0; + + perfc_incr(mshv_rdmsr_tsc_msr); + *val = d->arch.hvm_domain.viridian.reference_tsc.raw; + break; + case VIRIDIAN_MSR_TIME_REF_COUNT: { struct viridian_time_ref_count *trc; @@ -487,6 +593,7 @@ static int viridian_save_domain_ctxt(struct domain *d, hvm_domain_context_t *h) ctxt.time_ref_count = d->arch.hvm_domain.viridian.time_ref_count.val; ctxt.hypercall_gpa = d->arch.hvm_domain.viridian.hypercall_gpa.raw; ctxt.guest_os_id = d->arch.hvm_domain.viridian.guest_os_id.raw; + ctxt.reference_tsc = d->arch.hvm_domain.viridian.reference_tsc.raw; return (hvm_save_entry(VIRIDIAN_DOMAIN, 0, h, &ctxt) != 0); } @@ -501,6 +608,10 @@ static int viridian_load_domain_ctxt(struct domain *d, hvm_domain_context_t *h) d->arch.hvm_domain.viridian.time_ref_count.val = ctxt.time_ref_count; d->arch.hvm_domain.viridian.hypercall_gpa.raw = ctxt.hypercall_gpa; d->arch.hvm_domain.viridian.guest_os_id.raw = ctxt.guest_os_id; + d->arch.hvm_domain.viridian.reference_tsc.raw = ctxt.reference_tsc; + + if ( d->arch.hvm_domain.viridian.reference_tsc.fields.enabled ) + update_reference_tsc(d, 0); return 0; } diff --git a/xen/include/asm-x86/hvm/viridian.h b/xen/include/asm-x86/hvm/viridian.h index 4cab2e8..c4319d7 100644 --- a/xen/include/asm-x86/hvm/viridian.h +++ b/xen/include/asm-x86/hvm/viridian.h @@ -61,11 +61,36 @@ struct viridian_time_ref_count int64_t off; }; +union viridian_reference_tsc +{ + uint64_t raw; + struct + { + uint64_t enabled:1; + uint64_t reserved_preserved:11; + uint64_t pfn:48; + } fields; +}; + +/* + * Type defintion as in Microsoft Hypervisor Top-Level Functional + * Specification v4.0a, section 15.4.2. + */ +typedef struct _HV_REFERENCE_TSC_PAGE +{ + uint32_t TscSequence; + uint32_t Reserved1; + uint64_t TscScale; + int64_t TscOffset; + uint64_t Reserved2[509]; +} HV_REFERENCE_TSC_PAGE, *PHV_REFERENCE_TSC_PAGE; + struct viridian_domain { union viridian_guest_os_id guest_os_id; union viridian_hypercall_gpa hypercall_gpa; struct viridian_time_ref_count time_ref_count; + union viridian_reference_tsc reference_tsc; }; int diff --git a/xen/include/public/arch-x86/hvm/save.h b/xen/include/public/arch-x86/hvm/save.h index 88aab7e..efb0b62 100644 --- a/xen/include/public/arch-x86/hvm/save.h +++ b/xen/include/public/arch-x86/hvm/save.h @@ -569,6 +569,7 @@ struct hvm_viridian_domain_context { uint64_t hypercall_gpa; uint64_t guest_os_id; uint64_t time_ref_count; + uint64_t reference_tsc; }; DECLARE_HVM_SAVE_TYPE(VIRIDIAN_DOMAIN, 15, struct hvm_viridian_domain_context); @@ -617,3 +618,13 @@ struct hvm_msr { #define HVM_SAVE_CODE_MAX 20 #endif /* __XEN_PUBLIC_HVM_SAVE_X86_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/public/hvm/params.h b/xen/include/public/hvm/params.h index 3c51072..a2d43bc 100644 --- a/xen/include/public/hvm/params.h +++ b/xen/include/public/hvm/params.h @@ -92,10 +92,15 @@ #define _HVMPV_time_ref_count 2 #define HVMPV_time_ref_count (1 << _HVMPV_time_ref_count) +/* Enable Reference TSC Page (HV_X64_MSR_REFERENCE_TSC) */ +#define _HVMPV_reference_tsc 3 +#define HVMPV_reference_tsc (1 << _HVMPV_reference_tsc) + #define HVMPV_feature_mask \ (HVMPV_base_freq | \ HVMPV_no_freq | \ - HVMPV_time_ref_count) + HVMPV_time_ref_count | \ + HVMPV_reference_tsc) #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 Sun Jan 18 21:00:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21: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 1YCwxW-0000Qe-DF; Sun, 18 Jan 2015 21:00:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxV-0000QM-4n for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:33 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 10/51-23865-0FE1CB45; Sun, 18 Jan 2015 21:00:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1421614830!20434964!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16436 invoked from network); 18 Jan 2015 21:00:31 -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; 18 Jan 2015 21:00:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxR-000184-Ph for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwxR-0003wA-Ks for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:29 +0000 Date: Sun, 18 Jan 2015 21:00:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/viridian: add Partition Reference Time enlightenment X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd94caca537212bfa7f976d0a0f286466709347f Author: Paul Durrant AuthorDate: Wed Jan 7 11:28:57 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 11:28:57 2015 +0100 x86/viridian: add Partition Reference Time enlightenment The presence of the partition reference time enlightenment persuades newer versions of Windows to prefer the TSC as their primary time source. Hence, if rdtsc is not being emulated and is invariant then many vmexits (for alternative time sources such as the HPET or reference counter MSR) can be avoided. The implementation is not yet complete as no attempt is made to prevent emulation of rdtsc if the enlightenment is active and guest and host TSC frequencies differ. To do that requires invasive changes in the core x86 time code and hence a lot more testing. This patch avoids the issue by disabling the enlightenment if rdtsc is being emulated, causing Windows to choose another time source. This is safe, but may cause a big variation in performance of guests migrated between hosts of differing TSC frequency. Thus the enlightenment is not enabled in the default set, but may be enabled to improve guest performance where such migrations are not a concern. See section 15.4 of the Microsoft Hypervisor Top Level Functional Specification v4.0a for details. Signed-off-by: Paul Durrant Acked-by: Ian Campbell Reviewed-by: Christoph Egger --- docs/man/xl.cfg.pod.5 | 6 ++ tools/libxl/libxl_dom.c | 3 + tools/libxl/libxl_types.idl | 1 + xen/arch/x86/hvm/viridian.c | 111 ++++++++++++++++++++++++++++++++ xen/include/asm-x86/hvm/viridian.h | 25 +++++++ xen/include/public/arch-x86/hvm/save.h | 11 +++ xen/include/public/hvm/params.h | 7 ++- 7 files changed, 163 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 622ea53..e2f91fc 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1231,6 +1231,12 @@ This group incorporates Partition Time Reference Counter MSR. This enlightenment can improve performance of Windows 8 and Windows Server 2012 onwards. +=item B + +This set incorporates the Partition Reference TSC MSR. This +enlightenment can improve performance of Windows 7 and Windows +Server 2008 R2 onwards. + =item B This is a special value that enables the default set of groups, which diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 1d33a18..48d661a 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -263,6 +263,9 @@ static int hvm_set_viridian_features(libxl__gc *gc, uint32_t domid, if (libxl_bitmap_test(&enlightenments, LIBXL_VIRIDIAN_ENLIGHTENMENT_TIME_REF_COUNT)) mask |= HVMPV_time_ref_count; + if (libxl_bitmap_test(&enlightenments, LIBXL_VIRIDIAN_ENLIGHTENMENT_REFERENCE_TSC)) + mask |= HVMPV_reference_tsc; + if (mask != 0 && xc_hvm_param_set(CTX->xch, domid, diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index f7fc695..1214d2e 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -192,6 +192,7 @@ libxl_viridian_enlightenment = Enumeration("viridian_enlightenment", [ (0, "base"), (1, "freq"), (2, "time_ref_count"), + (3, "reference_tsc"), ]) # diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index 3197b6b..cb689f6 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -21,6 +21,7 @@ #define VIRIDIAN_MSR_HYPERCALL 0x40000001 #define VIRIDIAN_MSR_VP_INDEX 0x40000002 #define VIRIDIAN_MSR_TIME_REF_COUNT 0x40000020 +#define VIRIDIAN_MSR_REFERENCE_TSC 0x40000021 #define VIRIDIAN_MSR_TSC_FREQUENCY 0x40000022 #define VIRIDIAN_MSR_APIC_FREQUENCY 0x40000023 #define VIRIDIAN_MSR_EOI 0x40000070 @@ -40,6 +41,7 @@ #define CPUID3A_MSR_APIC_ACCESS (1 << 4) #define CPUID3A_MSR_HYPERCALL (1 << 5) #define CPUID3A_MSR_VP_INDEX (1 << 6) +#define CPUID3A_MSR_REFERENCE_TSC (1 << 9) #define CPUID3A_MSR_FREQ (1 << 11) /* Viridian CPUID 4000004, Implementation Recommendations. */ @@ -95,6 +97,8 @@ int cpuid_viridian_leaves(unsigned int leaf, unsigned int *eax, *eax |= CPUID3A_MSR_FREQ; if ( viridian_feature_mask(d) & HVMPV_time_ref_count ) *eax |= CPUID3A_MSR_TIME_REF_COUNT; + if ( viridian_feature_mask(d) & HVMPV_reference_tsc ) + *eax |= CPUID3A_MSR_REFERENCE_TSC; break; case 4: /* Recommended hypercall usage. */ @@ -155,6 +159,17 @@ static void dump_apic_assist(const struct vcpu *v) v, aa->fields.enabled, (unsigned long)aa->fields.pfn); } +static void dump_reference_tsc(const struct domain *d) +{ + const union viridian_reference_tsc *rt; + + rt = &d->arch.hvm_domain.viridian.reference_tsc; + + printk(XENLOG_G_INFO "d%d: VIRIDIAN REFERENCE_TSC: enabled: %x pfn: %lx\n", + d->domain_id, + rt->fields.enabled, (unsigned long)rt->fields.pfn); +} + static void enable_hypercall_page(struct domain *d) { unsigned long gmfn = d->arch.hvm_domain.viridian.hypercall_gpa.fields.pfn; @@ -224,6 +239,78 @@ static void initialize_apic_assist(struct vcpu *v) put_page_and_type(page); } +static void update_reference_tsc(struct domain *d, bool_t initialize) +{ + unsigned long gmfn = d->arch.hvm_domain.viridian.reference_tsc.fields.pfn; + struct page_info *page = get_page_from_gfn(d, gmfn, NULL, P2M_ALLOC); + HV_REFERENCE_TSC_PAGE *p; + + if ( !page || !get_page_type(page, PGT_writable_page) ) + { + if ( page ) + put_page(page); + gdprintk(XENLOG_WARNING, "Bad GMFN %lx (MFN %lx)\n", gmfn, + page ? page_to_mfn(page) : INVALID_MFN); + return; + } + + p = __map_domain_page(page); + + if ( initialize ) + clear_page(p); + + /* + * This enlightenment must be disabled is the host TSC is not invariant. + * However it is also disabled if vtsc is true (which means rdtsc is being + * emulated). This generally happens when guest TSC freq and host TSC freq + * don't match. The TscScale value could be adjusted to cope with this, + * allowing vtsc to be turned off, but support for this is not yet present + * in the hypervisor. Thus is it is possible that migrating a Windows VM + * between hosts of differing TSC frequencies may result in large + * differences in guest performance. + */ + if ( !host_tsc_is_safe() || d->arch.vtsc ) + { + /* + * The specification states that valid values of TscSequence range + * from 0 to 0xFFFFFFFE. The value 0xFFFFFFFF is used to indicate + * this mechanism is no longer a reliable source of time and that + * the VM should fall back to a different source. + * + * Server 2012 (6.2 kernel) and 2012 R2 (6.3 kernel) actually violate + * the spec. and rely on a value of 0 to indicate that this + * enlightenment should no longer be used. These two kernel + * versions are currently the only ones to make use of this + * enlightenment, so just use 0 here. + */ + p->TscSequence = 0; + + printk(XENLOG_G_INFO "d%d: VIRIDIAN REFERENCE_TSC: invalidated\n", + d->domain_id); + return; + } + + /* + * The guest will calculate reference time according to the following + * formula: + * + * ReferenceTime = ((RDTSC() * TscScale) >> 64) + TscOffset + * + * Windows uses a 100ns tick, so we need a scale which is cpu + * ticks per 100ns shifted left by 64. + */ + p->TscScale = ((10000ul << 32) / d->arch.tsc_khz) << 32; + + p->TscSequence++; + if ( p->TscSequence == 0xFFFFFFFF || + p->TscSequence == 0 ) /* Avoid both 'invalid' values */ + p->TscSequence = 1; + + unmap_domain_page(p); + + put_page_and_type(page); +} + int wrmsr_viridian_regs(uint32_t idx, uint64_t val) { struct vcpu *v = current; @@ -282,6 +369,17 @@ int wrmsr_viridian_regs(uint32_t idx, uint64_t val) initialize_apic_assist(v); break; + case VIRIDIAN_MSR_REFERENCE_TSC: + if ( !(viridian_feature_mask(d) & HVMPV_reference_tsc) ) + return 0; + + perfc_incr(mshv_wrmsr_tsc_msr); + d->arch.hvm_domain.viridian.reference_tsc.raw = val; + dump_reference_tsc(d); + if ( d->arch.hvm_domain.viridian.reference_tsc.fields.enabled ) + update_reference_tsc(d, 1); + break; + default: return 0; } @@ -379,6 +477,14 @@ int rdmsr_viridian_regs(uint32_t idx, uint64_t *val) *val = v->arch.hvm_vcpu.viridian.apic_assist.raw; break; + case VIRIDIAN_MSR_REFERENCE_TSC: + if ( !(viridian_feature_mask(d) & HVMPV_reference_tsc) ) + return 0; + + perfc_incr(mshv_rdmsr_tsc_msr); + *val = d->arch.hvm_domain.viridian.reference_tsc.raw; + break; + case VIRIDIAN_MSR_TIME_REF_COUNT: { struct viridian_time_ref_count *trc; @@ -487,6 +593,7 @@ static int viridian_save_domain_ctxt(struct domain *d, hvm_domain_context_t *h) ctxt.time_ref_count = d->arch.hvm_domain.viridian.time_ref_count.val; ctxt.hypercall_gpa = d->arch.hvm_domain.viridian.hypercall_gpa.raw; ctxt.guest_os_id = d->arch.hvm_domain.viridian.guest_os_id.raw; + ctxt.reference_tsc = d->arch.hvm_domain.viridian.reference_tsc.raw; return (hvm_save_entry(VIRIDIAN_DOMAIN, 0, h, &ctxt) != 0); } @@ -501,6 +608,10 @@ static int viridian_load_domain_ctxt(struct domain *d, hvm_domain_context_t *h) d->arch.hvm_domain.viridian.time_ref_count.val = ctxt.time_ref_count; d->arch.hvm_domain.viridian.hypercall_gpa.raw = ctxt.hypercall_gpa; d->arch.hvm_domain.viridian.guest_os_id.raw = ctxt.guest_os_id; + d->arch.hvm_domain.viridian.reference_tsc.raw = ctxt.reference_tsc; + + if ( d->arch.hvm_domain.viridian.reference_tsc.fields.enabled ) + update_reference_tsc(d, 0); return 0; } diff --git a/xen/include/asm-x86/hvm/viridian.h b/xen/include/asm-x86/hvm/viridian.h index 4cab2e8..c4319d7 100644 --- a/xen/include/asm-x86/hvm/viridian.h +++ b/xen/include/asm-x86/hvm/viridian.h @@ -61,11 +61,36 @@ struct viridian_time_ref_count int64_t off; }; +union viridian_reference_tsc +{ + uint64_t raw; + struct + { + uint64_t enabled:1; + uint64_t reserved_preserved:11; + uint64_t pfn:48; + } fields; +}; + +/* + * Type defintion as in Microsoft Hypervisor Top-Level Functional + * Specification v4.0a, section 15.4.2. + */ +typedef struct _HV_REFERENCE_TSC_PAGE +{ + uint32_t TscSequence; + uint32_t Reserved1; + uint64_t TscScale; + int64_t TscOffset; + uint64_t Reserved2[509]; +} HV_REFERENCE_TSC_PAGE, *PHV_REFERENCE_TSC_PAGE; + struct viridian_domain { union viridian_guest_os_id guest_os_id; union viridian_hypercall_gpa hypercall_gpa; struct viridian_time_ref_count time_ref_count; + union viridian_reference_tsc reference_tsc; }; int diff --git a/xen/include/public/arch-x86/hvm/save.h b/xen/include/public/arch-x86/hvm/save.h index 88aab7e..efb0b62 100644 --- a/xen/include/public/arch-x86/hvm/save.h +++ b/xen/include/public/arch-x86/hvm/save.h @@ -569,6 +569,7 @@ struct hvm_viridian_domain_context { uint64_t hypercall_gpa; uint64_t guest_os_id; uint64_t time_ref_count; + uint64_t reference_tsc; }; DECLARE_HVM_SAVE_TYPE(VIRIDIAN_DOMAIN, 15, struct hvm_viridian_domain_context); @@ -617,3 +618,13 @@ struct hvm_msr { #define HVM_SAVE_CODE_MAX 20 #endif /* __XEN_PUBLIC_HVM_SAVE_X86_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/public/hvm/params.h b/xen/include/public/hvm/params.h index 3c51072..a2d43bc 100644 --- a/xen/include/public/hvm/params.h +++ b/xen/include/public/hvm/params.h @@ -92,10 +92,15 @@ #define _HVMPV_time_ref_count 2 #define HVMPV_time_ref_count (1 << _HVMPV_time_ref_count) +/* Enable Reference TSC Page (HV_X64_MSR_REFERENCE_TSC) */ +#define _HVMPV_reference_tsc 3 +#define HVMPV_reference_tsc (1 << _HVMPV_reference_tsc) + #define HVMPV_feature_mask \ (HVMPV_base_freq | \ HVMPV_no_freq | \ - HVMPV_time_ref_count) + HVMPV_time_ref_count | \ + HVMPV_reference_tsc) #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 Sun Jan 18 21:00:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:00: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 1YCwxg-0000S9-G9; Sun, 18 Jan 2015 21:00:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxe-0000Rp-TX for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:43 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 05/67-17936-9FE1CB45; Sun, 18 Jan 2015 21:00:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1421614840!21300036!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17061 invoked from network); 18 Jan 2015 21:00:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:00:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxb-00018A-V4 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwxb-0003wb-U8 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:39 +0000 Date: Sun, 18 Jan 2015 21:00:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "expand x86 arch_shared_info to support linear p2m 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 283adf9f0bb0f619bc42e8c5573a874496649805 Author: Jan Beulich AuthorDate: Wed Jan 7 14:49:02 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 14:49:02 2015 +0100 Revert "expand x86 arch_shared_info to support linear p2m list" This reverts commit dac6d3b1a479f5c33b6a5233944e43b6c5bf2bb7, breaking the tools part of the build. --- xen/include/public/arch-x86/xen.h | 36 +++--------------------------------- 1 files changed, 3 insertions(+), 33 deletions(-) diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index c5e880b..f35804b 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -220,41 +220,11 @@ typedef struct vcpu_guest_context vcpu_guest_context_t; DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t); struct arch_shared_info { - /* - * Number of valid entries in the p2m table(s) anchored at - * pfn_to_mfn_frame_list_list and/or p2m_vaddr. - */ - unsigned long max_pfn; - /* - * Frame containing list of mfns containing list of mfns containing p2m. - * A value of 0 indicates it has not yet been set up, ~0 indicates it has - * been set to invalid e.g. due to the p2m being too large for the 3-level - * p2m tree. In this case the linear mapper p2m list anchored at p2m_vaddr - * is to be used. - */ + unsigned long max_pfn; /* max pfn that appears in table */ + /* Frame containing list of mfns containing list of mfns containing p2m. */ xen_pfn_t pfn_to_mfn_frame_list_list; unsigned long nmi_reason; - /* - * Following three fields are valid if p2m_cr3 contains a value different - * from 0. - * p2m_cr3 is the root of the address space where p2m_vaddr is valid. - * p2m_cr3 is in the same format as a cr3 value in the vcpu register state - * and holds the folded machine frame number (via xen_pfn_to_cr3) of a - * L3 or L4 page table. - * p2m_vaddr holds the virtual address of the linear p2m list. All entries - * in the range [0...max_pfn[ are accessible via this pointer. - * p2m_generation will be incremented by the guest before and after each - * change of the mappings of the p2m list. p2m_generation starts at 0 and - * a value with the least significant bit set indicates that a mapping - * update is in progress. This allows guest external software (e.g. in Dom0) - * to verify that read mappings are consistent and whether they have changed - * since the last check. - * Modifying a p2m element in the linear p2m list is allowed via an atomic - * write only. - */ - unsigned long p2m_cr3; /* cr3 value of the p2m address space */ - unsigned long p2m_vaddr; /* virtual address of the p2m list */ - unsigned long p2m_generation; /* generation count of p2m mapping */ + uint64_t pad[32]; }; typedef struct arch_shared_info arch_shared_info_t; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:00:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:00: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 1YCwxg-0000S9-G9; Sun, 18 Jan 2015 21:00:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxe-0000Rp-TX for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:43 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 05/67-17936-9FE1CB45; Sun, 18 Jan 2015 21:00:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1421614840!21300036!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17061 invoked from network); 18 Jan 2015 21:00:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:00:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxb-00018A-V4 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwxb-0003wb-U8 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:39 +0000 Date: Sun, 18 Jan 2015 21:00:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "expand x86 arch_shared_info to support linear p2m 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 283adf9f0bb0f619bc42e8c5573a874496649805 Author: Jan Beulich AuthorDate: Wed Jan 7 14:49:02 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 7 14:49:02 2015 +0100 Revert "expand x86 arch_shared_info to support linear p2m list" This reverts commit dac6d3b1a479f5c33b6a5233944e43b6c5bf2bb7, breaking the tools part of the build. --- xen/include/public/arch-x86/xen.h | 36 +++--------------------------------- 1 files changed, 3 insertions(+), 33 deletions(-) diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index c5e880b..f35804b 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -220,41 +220,11 @@ typedef struct vcpu_guest_context vcpu_guest_context_t; DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t); struct arch_shared_info { - /* - * Number of valid entries in the p2m table(s) anchored at - * pfn_to_mfn_frame_list_list and/or p2m_vaddr. - */ - unsigned long max_pfn; - /* - * Frame containing list of mfns containing list of mfns containing p2m. - * A value of 0 indicates it has not yet been set up, ~0 indicates it has - * been set to invalid e.g. due to the p2m being too large for the 3-level - * p2m tree. In this case the linear mapper p2m list anchored at p2m_vaddr - * is to be used. - */ + unsigned long max_pfn; /* max pfn that appears in table */ + /* Frame containing list of mfns containing list of mfns containing p2m. */ xen_pfn_t pfn_to_mfn_frame_list_list; unsigned long nmi_reason; - /* - * Following three fields are valid if p2m_cr3 contains a value different - * from 0. - * p2m_cr3 is the root of the address space where p2m_vaddr is valid. - * p2m_cr3 is in the same format as a cr3 value in the vcpu register state - * and holds the folded machine frame number (via xen_pfn_to_cr3) of a - * L3 or L4 page table. - * p2m_vaddr holds the virtual address of the linear p2m list. All entries - * in the range [0...max_pfn[ are accessible via this pointer. - * p2m_generation will be incremented by the guest before and after each - * change of the mappings of the p2m list. p2m_generation starts at 0 and - * a value with the least significant bit set indicates that a mapping - * update is in progress. This allows guest external software (e.g. in Dom0) - * to verify that read mappings are consistent and whether they have changed - * since the last check. - * Modifying a p2m element in the linear p2m list is allowed via an atomic - * write only. - */ - unsigned long p2m_cr3; /* cr3 value of the p2m address space */ - unsigned long p2m_vaddr; /* virtual address of the p2m list */ - unsigned long p2m_generation; /* generation count of p2m mapping */ + uint64_t pad[32]; }; typedef struct arch_shared_info arch_shared_info_t; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:00:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:00: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 1YCwxr-0000Tx-Iz; Sun, 18 Jan 2015 21:00:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxp-0000Ti-PS for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:54 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 82/8C-02707-40F1CB45; Sun, 18 Jan 2015 21:00:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1421614850!14761095!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23929 invoked from network); 18 Jan 2015 21:00:51 -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; 18 Jan 2015 21:00:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxm-00018F-7m for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwxm-0003xj-45 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:50 +0000 Date: Sun, 18 Jan 2015 21:00:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: remove Xencomm X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c4811839210cebd41d5561456765b81d0b7c3c14 Author: Tim Deegan AuthorDate: Thu Nov 13 15:59:26 2014 +0000 Commit: Tim Deegan CommitDate: Thu Jan 8 10:45:42 2015 +0000 xen: remove Xencomm Being a feature that has only been used by ia64 and/or ppc it doesn't seem like we need to keep it any longer in the tree. So remove it. Signed-off-by: Boris Ostrovsky Signed-off-by: Tim Deegan Acked-by: Jan Beulich --- xen/common/Makefile | 2 - xen/common/xencomm.c | 621 --------------------------------------------- xen/include/Makefile | 1 - xen/include/xen/xencomm.h | 170 ------------ 4 files changed, 0 insertions(+), 794 deletions(-) diff --git a/xen/common/Makefile b/xen/common/Makefile index 8391246..1956091 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -62,8 +62,6 @@ obj-$(perfc) += perfc.o obj-$(crash_debug) += gdbstub.o obj-$(xenoprof) += xenoprof.o -obj-$(CONFIG_XENCOMM) += xencomm.o - subdir-$(CONFIG_COMPAT) += compat subdir-$(x86_64) += hvm diff --git a/xen/common/xencomm.c b/xen/common/xencomm.c deleted file mode 100644 index 2604ac0..0000000 --- a/xen/common/xencomm.c +++ /dev/null @@ -1,621 +0,0 @@ -/****************************************************************************** - * xencomm.c - * - * 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, write to the Free Software - * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * Copyright (C) IBM Corp. 2006 - * - * Authors: Hollis Blanchard - * Tristan Gingold - * Isaku Yamahata multiple page support - */ - -#include -#include -#include -#include -#include -#include - -#undef DEBUG -#ifdef DEBUG -#define xc_dprintk(f, a...) printk("[xencomm]" f , ## a) -#else -#define xc_dprintk(f, a...) ((void)0) -#endif - -static void * -xencomm_vaddr(unsigned long paddr, struct page_info *page) -{ - return (void*)((paddr & ~PAGE_MASK) | (unsigned long)page_to_virt(page)); -} - -/* get_page() to prevent another vcpu freeing the page. */ -static int -xencomm_get_page(unsigned long paddr, struct page_info **page) -{ - unsigned long maddr = paddr_to_maddr(paddr); - if ( maddr == 0 ) - return -EFAULT; - - *page = maddr_to_page(maddr); - if ( !get_page(*page, current->domain) ) - { - /* - * This page might be a page granted by another domain, or this page - * is freed with decrease reservation hypercall at the same time. - */ - gdprintk(XENLOG_WARNING, - "bad page is passed. paddr %#lx maddr %#lx\n", - paddr, maddr); - return -EFAULT; - } - - return 0; -} - -/* check if struct desc doesn't cross page boundry */ -static int -xencomm_desc_cross_page_boundary(unsigned long paddr) -{ - unsigned long offset = paddr & ~PAGE_MASK; - if ( offset > PAGE_SIZE - sizeof(struct xencomm_desc) ) - return 1; - return 0; -} - -struct xencomm_ctxt { - struct xencomm_desc __user *desc_in_paddr; - uint32_t nr_addrs; - - struct page_info *page; - unsigned long *address; -}; - -static uint32_t -xencomm_ctxt_nr_addrs(const struct xencomm_ctxt *ctxt) -{ - return ctxt->nr_addrs; -} - -static unsigned long* -xencomm_ctxt_address(struct xencomm_ctxt *ctxt) -{ - return ctxt->address; -} - -static int -xencomm_ctxt_init(const void *handle, struct xencomm_ctxt *ctxt) -{ - struct page_info *page; - struct xencomm_desc *desc; - int ret; - - /* Avoid unaligned access. */ - if ( ((unsigned long)handle % __alignof__(*desc)) != 0 ) - return -EINVAL; - if ( xencomm_desc_cross_page_boundary((unsigned long)handle) ) - return -EINVAL; - - /* First we need to access the descriptor. */ - ret = xencomm_get_page((unsigned long)handle, &page); - if ( ret ) - return ret; - - desc = xencomm_vaddr((unsigned long)handle, page); - if ( desc->magic != XENCOMM_MAGIC ) - { - printk("%s: error: %p magic was %#x\n", __func__, desc, desc->magic); - put_page(page); - return -EINVAL; - } - - /* Copy before use: It is possible for a guest to modify concurrently. */ - ctxt->nr_addrs = desc->nr_addrs; - ctxt->desc_in_paddr = (struct xencomm_desc*)handle; - ctxt->page = page; - ctxt->address = &desc->address[0]; - return 0; -} - -/* - * Calculate the vaddr of &ctxt->desc_in_paddr->address[i] and get_page(). - * And put the results in ctxt->page and ctxt->address. - * If there is the previous page, put_page(). - * - * A guest domain passes the array, ctxt->desc_in_paddr->address[]. - * It is gpaddr-contiguous, but not maddr-contiguous so that - * we can't obtain the vaddr by simple offsetting. - * We need to convert gpaddr, &ctxt->desc_in_paddr->address[i], - * into maddr and then convert it to the xen virtual address in order - * to access there. - * The conversion can be optimized out by using the last result of - * ctxt->address because we access the array sequentially. - * The conversion, gpaddr -> maddr -> vaddr, is necessary only when - * crossing page boundary. - */ -static int -xencomm_ctxt_next(struct xencomm_ctxt *ctxt, int i) -{ - unsigned long paddr; - struct page_info *page; - int ret; - - BUG_ON(i >= ctxt->nr_addrs); - - /* For i == 0 case we already calculated it in xencomm_ctxt_init(). */ - if ( i != 0 ) - ctxt->address++; - - if ( ((unsigned long)ctxt->address & ~PAGE_MASK) != 0 ) - return 0; - - /* Crossing page boundary: machine address must be calculated. */ - paddr = (unsigned long)&ctxt->desc_in_paddr->address[i]; - ret = xencomm_get_page(paddr, &page); - if ( ret ) - return ret; - - put_page(ctxt->page); - ctxt->page = page; - ctxt->address = xencomm_vaddr(paddr, page); - - return 0; -} - -static void -xencomm_ctxt_done(struct xencomm_ctxt *ctxt) -{ - put_page(ctxt->page); -} - -static int -xencomm_copy_chunk_from( - unsigned long to, unsigned long paddr, unsigned int len) -{ - struct page_info *page; - int res; - - do { - res = xencomm_get_page(paddr, &page); - } while ( res == -EAGAIN ); - - if ( res ) - return res; - - xc_dprintk("%lx[%d] -> %lx\n", - (unsigned long)xencomm_vaddr(paddr, page), len, to); - - memcpy((void *)to, xencomm_vaddr(paddr, page), len); - put_page(page); - - return 0; -} - -static unsigned long -xencomm_inline_from_guest( - void *to, const void *from, unsigned int n, unsigned int skip) -{ - unsigned long src_paddr = xencomm_inline_addr(from) + skip; - - while ( n > 0 ) - { - unsigned int chunksz, bytes; - - chunksz = PAGE_SIZE - (src_paddr % PAGE_SIZE); - bytes = min(chunksz, n); - - if ( xencomm_copy_chunk_from((unsigned long)to, src_paddr, bytes) ) - return n; - src_paddr += bytes; - to += bytes; - n -= bytes; - } - - /* Always successful. */ - return 0; -} - -/** - * xencomm_copy_from_guest: Copy a block of data from domain space. - * @to: Machine address. - * @from: Physical address to a xencomm buffer descriptor. - * @n: Number of bytes to copy. - * @skip: Number of bytes from the start to skip. - * - * Copy data from domain to hypervisor. - * - * Returns number of bytes that could not be copied. - * On success, this will be zero. - */ -unsigned long -xencomm_copy_from_guest( - void *to, const void *from, unsigned int n, unsigned int skip) -{ - struct xencomm_ctxt ctxt; - unsigned int from_pos = 0; - unsigned int to_pos = 0; - unsigned int i = 0; - - if ( xencomm_is_inline(from) ) - return xencomm_inline_from_guest(to, from, n, skip); - - if ( xencomm_ctxt_init(from, &ctxt) ) - return n; - - /* Iterate through the descriptor, copying up to a page at a time */ - while ( (to_pos < n) && (i < xencomm_ctxt_nr_addrs(&ctxt)) ) - { - unsigned long src_paddr; - unsigned int pgoffset, chunksz, chunk_skip; - - if ( xencomm_ctxt_next(&ctxt, i) ) - goto out; - src_paddr = *xencomm_ctxt_address(&ctxt); - if ( src_paddr == XENCOMM_INVALID ) - { - i++; - continue; - } - - pgoffset = src_paddr % PAGE_SIZE; - chunksz = PAGE_SIZE - pgoffset; - - chunk_skip = min(chunksz, skip); - from_pos += chunk_skip; - chunksz -= chunk_skip; - skip -= chunk_skip; - - if ( skip == 0 && chunksz > 0 ) - { - unsigned int bytes = min(chunksz, n - to_pos); - - if ( xencomm_copy_chunk_from((unsigned long)to + to_pos, - src_paddr + chunk_skip, bytes) ) - goto out; - from_pos += bytes; - to_pos += bytes; - } - - i++; - } - -out: - xencomm_ctxt_done(&ctxt); - return n - to_pos; -} - -static int -xencomm_copy_chunk_to( - unsigned long paddr, unsigned long from, unsigned int len) -{ - struct page_info *page; - int res; - - do { - res = xencomm_get_page(paddr, &page); - } while ( res == -EAGAIN ); - - if ( res ) - return res; - - xc_dprintk("%lx[%d] -> %lx\n", from, len, - (unsigned long)xencomm_vaddr(paddr, page)); - - memcpy(xencomm_vaddr(paddr, page), (void *)from, len); - xencomm_mark_dirty((unsigned long)xencomm_vaddr(paddr, page), len); - put_page(page); - - return 0; -} - -static unsigned long -xencomm_inline_to_guest( - void *to, const void *from, unsigned int n, unsigned int skip) -{ - unsigned long dest_paddr = xencomm_inline_addr(to) + skip; - - while ( n > 0 ) - { - unsigned int chunksz, bytes; - - chunksz = PAGE_SIZE - (dest_paddr % PAGE_SIZE); - bytes = min(chunksz, n); - - if ( xencomm_copy_chunk_to(dest_paddr, (unsigned long)from, bytes) ) - return n; - dest_paddr += bytes; - from += bytes; - n -= bytes; - } - - /* Always successful. */ - return 0; -} - -/** - * xencomm_copy_to_guest: Copy a block of data to domain space. - * @to: Physical address to xencomm buffer descriptor. - * @from: Machine address. - * @n: Number of bytes to copy. - * @skip: Number of bytes from the start to skip. - * - * Copy data from hypervisor to domain. - * - * Returns number of bytes that could not be copied. - * On success, this will be zero. - */ -unsigned long -xencomm_copy_to_guest( - void *to, const void *from, unsigned int n, unsigned int skip) -{ - struct xencomm_ctxt ctxt; - unsigned int from_pos = 0; - unsigned int to_pos = 0; - unsigned int i = 0; - - if ( xencomm_is_inline(to) ) - return xencomm_inline_to_guest(to, from, n, skip); - - if ( xencomm_ctxt_init(to, &ctxt) ) - return n; - - /* Iterate through the descriptor, copying up to a page at a time */ - while ( (from_pos < n) && (i < xencomm_ctxt_nr_addrs(&ctxt)) ) - { - unsigned long dest_paddr; - unsigned int pgoffset, chunksz, chunk_skip; - - if ( xencomm_ctxt_next(&ctxt, i) ) - goto out; - dest_paddr = *xencomm_ctxt_address(&ctxt); - if ( dest_paddr == XENCOMM_INVALID ) - { - i++; - continue; - } - - pgoffset = dest_paddr % PAGE_SIZE; - chunksz = PAGE_SIZE - pgoffset; - - chunk_skip = min(chunksz, skip); - to_pos += chunk_skip; - chunksz -= chunk_skip; - skip -= chunk_skip; - - if ( skip == 0 && chunksz > 0 ) - { - unsigned int bytes = min(chunksz, n - from_pos); - - if ( xencomm_copy_chunk_to(dest_paddr + chunk_skip, - (unsigned long)from + from_pos, bytes) ) - goto out; - from_pos += bytes; - to_pos += bytes; - } - - i++; - } - -out: - xencomm_ctxt_done(&ctxt); - return n - from_pos; -} - -static int -xencomm_clear_chunk( - unsigned long paddr, unsigned int len) -{ - struct page_info *page; - int res; - - do { - res = xencomm_get_page(paddr, &page); - } while ( res == -EAGAIN ); - - if ( res ) - return res; - - memset(xencomm_vaddr(paddr, page), 0x00, len); - xencomm_mark_dirty((unsigned long)xencomm_vaddr(paddr, page), len); - put_page(page); - - return 0; -} - -static unsigned long -xencomm_inline_clear_guest( - void *to, unsigned int n, unsigned int skip) -{ - unsigned long dest_paddr = xencomm_inline_addr(to) + skip; - - while ( n > 0 ) - { - unsigned int chunksz, bytes; - - chunksz = PAGE_SIZE - (dest_paddr % PAGE_SIZE); - bytes = min(chunksz, n); - - if ( xencomm_clear_chunk(dest_paddr, bytes) ) - return n; - dest_paddr += bytes; - n -= bytes; - } - - /* Always successful. */ - return 0; -} - -/** - * xencomm_clear_guest: Clear a block of data in domain space. - * @to: Physical address to xencomm buffer descriptor. - * @n: Number of bytes to copy. - * @skip: Number of bytes from the start to skip. - * - * Clear domain data - * - * Returns number of bytes that could not be cleared - * On success, this will be zero. - */ -unsigned long -xencomm_clear_guest( - void *to, unsigned int n, unsigned int skip) -{ - struct xencomm_ctxt ctxt; - unsigned int from_pos = 0; - unsigned int to_pos = 0; - unsigned int i = 0; - - if ( xencomm_is_inline(to) ) - return xencomm_inline_clear_guest(to, n, skip); - - if ( xencomm_ctxt_init(to, &ctxt) ) - return n; - - /* Iterate through the descriptor, copying up to a page at a time */ - while ( (from_pos < n) && (i < xencomm_ctxt_nr_addrs(&ctxt)) ) - { - unsigned long dest_paddr; - unsigned int pgoffset, chunksz, chunk_skip; - - if ( xencomm_ctxt_next(&ctxt, i) ) - goto out; - dest_paddr = *xencomm_ctxt_address(&ctxt); - if ( dest_paddr == XENCOMM_INVALID ) - { - i++; - continue; - } - - pgoffset = dest_paddr % PAGE_SIZE; - chunksz = PAGE_SIZE - pgoffset; - - chunk_skip = min(chunksz, skip); - to_pos += chunk_skip; - chunksz -= chunk_skip; - skip -= chunk_skip; - - if ( skip == 0 && chunksz > 0 ) - { - unsigned int bytes = min(chunksz, n - from_pos); - - if ( xencomm_clear_chunk(dest_paddr + chunk_skip, bytes) ) - goto out; - from_pos += bytes; - to_pos += bytes; - } - - i++; - } - -out: - xencomm_ctxt_done(&ctxt); - return n - from_pos; -} - -static int xencomm_inline_add_offset(void **handle, unsigned int bytes) -{ - *handle += bytes; - return 0; -} - -/* Offset page addresses in 'handle' to skip 'bytes' bytes. Set completely - * exhausted pages to XENCOMM_INVALID. */ -int xencomm_add_offset(void **handle, unsigned int bytes) -{ - struct xencomm_ctxt ctxt; - int i = 0; - int res = 0; - - if ( xencomm_is_inline(*handle) ) - return xencomm_inline_add_offset(handle, bytes); - - res = xencomm_ctxt_init(handle, &ctxt); - if ( res != 0 ) - return res; - - /* Iterate through the descriptor incrementing addresses */ - while ( (bytes > 0) && (i < xencomm_ctxt_nr_addrs(&ctxt)) ) - { - unsigned long *address; - unsigned long dest_paddr; - unsigned int pgoffset, chunksz, chunk_skip; - - res = xencomm_ctxt_next(&ctxt, i); - if ( res ) - goto out; - address = xencomm_ctxt_address(&ctxt); - dest_paddr = *address; - if ( dest_paddr == XENCOMM_INVALID ) - { - i++; - continue; - } - - pgoffset = dest_paddr % PAGE_SIZE; - chunksz = PAGE_SIZE - pgoffset; - - chunk_skip = min(chunksz, bytes); - if ( chunk_skip == chunksz ) - *address = XENCOMM_INVALID; /* exhausted this page */ - else - *address += chunk_skip; - bytes -= chunk_skip; - - i++; - } - -out: - xencomm_ctxt_done(&ctxt); - return res; -} - -int xencomm_handle_is_null(void *handle) -{ - struct xencomm_ctxt ctxt; - int i; - int res = 1; - - if ( xencomm_is_inline(handle) ) - return xencomm_inline_addr(handle) == 0; - - if ( xencomm_ctxt_init(handle, &ctxt) ) - return 1; - - for ( i = 0; i < xencomm_ctxt_nr_addrs(&ctxt); i++ ) - { - if ( xencomm_ctxt_next(&ctxt, i) ) - goto out; - if ( *xencomm_ctxt_address(&ctxt) != XENCOMM_INVALID ) - { - res = 0; - goto out; - } - } - -out: - xencomm_ctxt_done(&ctxt); - return res; -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/Makefile b/xen/include/Makefile index f7ccbc9..94112d1 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -21,7 +21,6 @@ headers-y := \ compat/vcpu.h \ compat/version.h \ compat/xen.h \ - compat/xencomm.h \ compat/xenoprof.h headers-$(CONFIG_X86) += compat/arch-x86/xen-mca.h headers-$(CONFIG_X86) += compat/arch-x86/xen.h diff --git a/xen/include/xen/xencomm.h b/xen/include/xen/xencomm.h deleted file mode 100644 index 3426b8a..0000000 --- a/xen/include/xen/xencomm.h +++ /dev/null @@ -1,170 +0,0 @@ -/* - * 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, write to the Free Software - * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * Copyright (C) IBM Corp. 2006 - * - * Authors: Hollis Blanchard - */ - -#ifndef __XENCOMM_H__ -#define __XENCOMM_H__ - -#include - -unsigned long xencomm_copy_to_guest( - void *to, const void *from, unsigned int len, unsigned int skip); -unsigned long xencomm_copy_from_guest( - void *to, const void *from, unsigned int len, unsigned int skip); -unsigned long xencomm_clear_guest( - void *to, unsigned int n, unsigned int skip); -int xencomm_add_offset(void **handle, unsigned int bytes); -int xencomm_handle_is_null(void *ptr); - -static inline int xencomm_is_inline(const void *handle) -{ - unsigned long addr = (unsigned long)handle; - return (addr & XENCOMM_INLINE_FLAG) == XENCOMM_INLINE_FLAG; -} - -static inline unsigned long xencomm_inline_addr(const void *handle) -{ - return (unsigned long)handle & ~XENCOMM_INLINE_FLAG; -} - -#define raw_copy_to_guest(dst, src, len) \ - xencomm_copy_to_guest(dst, src, len, 0) -#define raw_copy_from_guest(dst, src, len) \ - xencomm_copy_from_guest(dst, src, nr, 0) -#define raw_clear_guest(dst, len) \ - xencomm_clear_guest(dst, len, 0) -#define __raw_copy_to_guest raw_copy_to_guest -#define __raw_copy_from_guest raw_copy_from_guest -#define __raw_clear_guest raw_clear_guest - -/* Is the guest handle a NULL reference? */ -#define guest_handle_is_null(hnd) \ - ((hnd).p == NULL || xencomm_handle_is_null((hnd).p)) - -/* Offset the given guest handle into the array it refers to. */ -#define guest_handle_add_offset(hnd, nr) ({ \ - const typeof((hnd).p) _ptr; \ - xencomm_add_offset((void **)&((hnd).p), nr * sizeof(*_ptr)); \ -}) - -/* Cast a guest handle to the specified type of handle. */ -#define guest_handle_cast(hnd, type) ({ \ - type *_x = (hnd).p; \ - XEN_GUEST_HANDLE_PARAM(type) _y; \ - set_xen_guest_handle(_y, _x); \ - _y; \ -}) - -/* Cast a XEN_GUEST_HANDLE to XEN_GUEST_HANDLE_PARAM */ -#define guest_handle_to_param(hnd, type) ({ \ - /* type checking: make sure that the pointers inside \ - * XEN_GUEST_HANDLE and XEN_GUEST_HANDLE_PARAM are of \ - * the same type, then return hnd */ \ - (void)((typeof(&(hnd).p)) 0 == \ - (typeof(&((XEN_GUEST_HANDLE_PARAM(type)) {}).p)) 0); \ - (hnd); \ -}) - -/* Cast a XEN_GUEST_HANDLE_PARAM to XEN_GUEST_HANDLE */ -#define guest_handle_from_param(hnd, type) ({ \ - /* type checking: make sure that the pointers inside \ - * XEN_GUEST_HANDLE and XEN_GUEST_HANDLE_PARAM are of \ - * the same type, then return hnd */ \ - (void)((typeof(&(hnd).p)) 0 == \ - (typeof(&((XEN_GUEST_HANDLE_PARAM(type)) {}).p)) 0); \ - (hnd); \ -}) - -/* Since we run in real mode, we can safely access all addresses. That also - * means our __routines are identical to our "normal" routines. */ -#define guest_handle_okay(hnd, nr) 1 -#define guest_handle_subrange_okay(hnd, first, last) 1 - -/* - * Copy an array of objects to guest context via a guest handle. - * Optionally specify an offset into the guest array. - */ -#define copy_to_guest_offset(hnd, idx, ptr, nr) \ - __copy_to_guest_offset(hnd, idx, ptr, nr) - -/* Copy sub-field of a structure to guest context via a guest handle. */ -#define copy_field_to_guest(hnd, ptr, field) \ - __copy_field_to_guest(hnd, ptr, field) - -/* - * Copy an array of objects from guest context via a guest handle. - * Optionally specify an offset into the guest array. - */ -#define copy_from_guest_offset(ptr, hnd, idx, nr) \ - __copy_from_guest_offset(ptr, hnd, idx, nr) - -/* - * Clear an array of objects in guest context via a guest handle. - * Optionally specify an offset into the guest array. - */ -#define clear_guest_offset(hnd, idx, nr) \ - __clear_guest_offset(hnd, idx, nr) - -/* Copy sub-field of a structure from guest context via a guest handle. */ -#define copy_field_from_guest(ptr, hnd, field) \ - __copy_field_from_guest(ptr, hnd, field) - -#define __copy_to_guest_offset(hnd, idx, ptr, nr) ({ \ - const typeof(*(ptr)) *_s = (ptr); \ - void *_d = (hnd).p; \ - ((void)((hnd).p == (ptr))); \ - xencomm_copy_to_guest(_d, _s, sizeof(*_s)*(nr), sizeof(*_s)*(idx)); \ -}) - -#define __copy_field_to_guest(hnd, ptr, field) ({ \ - unsigned int _off = offsetof(typeof(*(hnd).p), field); \ - const typeof(&(ptr)->field) _s = &(ptr)->field; \ - void *_d = (hnd).p; \ - ((void)(&(hnd).p->field == &(ptr)->field)); \ - xencomm_copy_to_guest(_d, _s, sizeof(*_s), _off); \ -}) - -#define __copy_from_guest_offset(ptr, hnd, idx, nr) ({ \ - const typeof(*(ptr)) *_s = (hnd).p; \ - typeof(*(ptr)) *_d = (ptr); \ - xencomm_copy_from_guest(_d, _s, sizeof(*_d)*(nr), sizeof(*_d)*(idx)); \ -}) - -#define __copy_field_from_guest(ptr, hnd, field) ({ \ - unsigned int _off = offsetof(typeof(*(hnd).p), field); \ - const void *_s = (hnd).p; \ - typeof(&(ptr)->field) _d = &(ptr)->field; \ - ((void)(&(hnd).p->field == &(ptr)->field)); \ - xencomm_copy_from_guest(_d, _s, sizeof(*_d), _off); \ -}) - -#define __clear_guest_offset(hnd, idx, nr) ({ \ - void *_d = (hnd).p; \ - xencomm_clear_guest(_d, nr, idx); \ -}) - -#ifdef CONFIG_XENCOMM_MARK_DIRTY -extern void xencomm_mark_dirty(unsigned long addr, unsigned int len); -#else -static inline void xencomm_mark_dirty(unsigned long addr, unsigned int len) -{ -} -#endif - -#endif /* __XENCOMM_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 Sun Jan 18 21:00:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:00: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 1YCwxr-0000Tx-Iz; Sun, 18 Jan 2015 21:00:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxp-0000Ti-PS for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:54 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 82/8C-02707-40F1CB45; Sun, 18 Jan 2015 21:00:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1421614850!14761095!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23929 invoked from network); 18 Jan 2015 21:00:51 -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; 18 Jan 2015 21:00:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxm-00018F-7m for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwxm-0003xj-45 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:00:50 +0000 Date: Sun, 18 Jan 2015 21:00:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: remove Xencomm X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c4811839210cebd41d5561456765b81d0b7c3c14 Author: Tim Deegan AuthorDate: Thu Nov 13 15:59:26 2014 +0000 Commit: Tim Deegan CommitDate: Thu Jan 8 10:45:42 2015 +0000 xen: remove Xencomm Being a feature that has only been used by ia64 and/or ppc it doesn't seem like we need to keep it any longer in the tree. So remove it. Signed-off-by: Boris Ostrovsky Signed-off-by: Tim Deegan Acked-by: Jan Beulich --- xen/common/Makefile | 2 - xen/common/xencomm.c | 621 --------------------------------------------- xen/include/Makefile | 1 - xen/include/xen/xencomm.h | 170 ------------ 4 files changed, 0 insertions(+), 794 deletions(-) diff --git a/xen/common/Makefile b/xen/common/Makefile index 8391246..1956091 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -62,8 +62,6 @@ obj-$(perfc) += perfc.o obj-$(crash_debug) += gdbstub.o obj-$(xenoprof) += xenoprof.o -obj-$(CONFIG_XENCOMM) += xencomm.o - subdir-$(CONFIG_COMPAT) += compat subdir-$(x86_64) += hvm diff --git a/xen/common/xencomm.c b/xen/common/xencomm.c deleted file mode 100644 index 2604ac0..0000000 --- a/xen/common/xencomm.c +++ /dev/null @@ -1,621 +0,0 @@ -/****************************************************************************** - * xencomm.c - * - * 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, write to the Free Software - * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * Copyright (C) IBM Corp. 2006 - * - * Authors: Hollis Blanchard - * Tristan Gingold - * Isaku Yamahata multiple page support - */ - -#include -#include -#include -#include -#include -#include - -#undef DEBUG -#ifdef DEBUG -#define xc_dprintk(f, a...) printk("[xencomm]" f , ## a) -#else -#define xc_dprintk(f, a...) ((void)0) -#endif - -static void * -xencomm_vaddr(unsigned long paddr, struct page_info *page) -{ - return (void*)((paddr & ~PAGE_MASK) | (unsigned long)page_to_virt(page)); -} - -/* get_page() to prevent another vcpu freeing the page. */ -static int -xencomm_get_page(unsigned long paddr, struct page_info **page) -{ - unsigned long maddr = paddr_to_maddr(paddr); - if ( maddr == 0 ) - return -EFAULT; - - *page = maddr_to_page(maddr); - if ( !get_page(*page, current->domain) ) - { - /* - * This page might be a page granted by another domain, or this page - * is freed with decrease reservation hypercall at the same time. - */ - gdprintk(XENLOG_WARNING, - "bad page is passed. paddr %#lx maddr %#lx\n", - paddr, maddr); - return -EFAULT; - } - - return 0; -} - -/* check if struct desc doesn't cross page boundry */ -static int -xencomm_desc_cross_page_boundary(unsigned long paddr) -{ - unsigned long offset = paddr & ~PAGE_MASK; - if ( offset > PAGE_SIZE - sizeof(struct xencomm_desc) ) - return 1; - return 0; -} - -struct xencomm_ctxt { - struct xencomm_desc __user *desc_in_paddr; - uint32_t nr_addrs; - - struct page_info *page; - unsigned long *address; -}; - -static uint32_t -xencomm_ctxt_nr_addrs(const struct xencomm_ctxt *ctxt) -{ - return ctxt->nr_addrs; -} - -static unsigned long* -xencomm_ctxt_address(struct xencomm_ctxt *ctxt) -{ - return ctxt->address; -} - -static int -xencomm_ctxt_init(const void *handle, struct xencomm_ctxt *ctxt) -{ - struct page_info *page; - struct xencomm_desc *desc; - int ret; - - /* Avoid unaligned access. */ - if ( ((unsigned long)handle % __alignof__(*desc)) != 0 ) - return -EINVAL; - if ( xencomm_desc_cross_page_boundary((unsigned long)handle) ) - return -EINVAL; - - /* First we need to access the descriptor. */ - ret = xencomm_get_page((unsigned long)handle, &page); - if ( ret ) - return ret; - - desc = xencomm_vaddr((unsigned long)handle, page); - if ( desc->magic != XENCOMM_MAGIC ) - { - printk("%s: error: %p magic was %#x\n", __func__, desc, desc->magic); - put_page(page); - return -EINVAL; - } - - /* Copy before use: It is possible for a guest to modify concurrently. */ - ctxt->nr_addrs = desc->nr_addrs; - ctxt->desc_in_paddr = (struct xencomm_desc*)handle; - ctxt->page = page; - ctxt->address = &desc->address[0]; - return 0; -} - -/* - * Calculate the vaddr of &ctxt->desc_in_paddr->address[i] and get_page(). - * And put the results in ctxt->page and ctxt->address. - * If there is the previous page, put_page(). - * - * A guest domain passes the array, ctxt->desc_in_paddr->address[]. - * It is gpaddr-contiguous, but not maddr-contiguous so that - * we can't obtain the vaddr by simple offsetting. - * We need to convert gpaddr, &ctxt->desc_in_paddr->address[i], - * into maddr and then convert it to the xen virtual address in order - * to access there. - * The conversion can be optimized out by using the last result of - * ctxt->address because we access the array sequentially. - * The conversion, gpaddr -> maddr -> vaddr, is necessary only when - * crossing page boundary. - */ -static int -xencomm_ctxt_next(struct xencomm_ctxt *ctxt, int i) -{ - unsigned long paddr; - struct page_info *page; - int ret; - - BUG_ON(i >= ctxt->nr_addrs); - - /* For i == 0 case we already calculated it in xencomm_ctxt_init(). */ - if ( i != 0 ) - ctxt->address++; - - if ( ((unsigned long)ctxt->address & ~PAGE_MASK) != 0 ) - return 0; - - /* Crossing page boundary: machine address must be calculated. */ - paddr = (unsigned long)&ctxt->desc_in_paddr->address[i]; - ret = xencomm_get_page(paddr, &page); - if ( ret ) - return ret; - - put_page(ctxt->page); - ctxt->page = page; - ctxt->address = xencomm_vaddr(paddr, page); - - return 0; -} - -static void -xencomm_ctxt_done(struct xencomm_ctxt *ctxt) -{ - put_page(ctxt->page); -} - -static int -xencomm_copy_chunk_from( - unsigned long to, unsigned long paddr, unsigned int len) -{ - struct page_info *page; - int res; - - do { - res = xencomm_get_page(paddr, &page); - } while ( res == -EAGAIN ); - - if ( res ) - return res; - - xc_dprintk("%lx[%d] -> %lx\n", - (unsigned long)xencomm_vaddr(paddr, page), len, to); - - memcpy((void *)to, xencomm_vaddr(paddr, page), len); - put_page(page); - - return 0; -} - -static unsigned long -xencomm_inline_from_guest( - void *to, const void *from, unsigned int n, unsigned int skip) -{ - unsigned long src_paddr = xencomm_inline_addr(from) + skip; - - while ( n > 0 ) - { - unsigned int chunksz, bytes; - - chunksz = PAGE_SIZE - (src_paddr % PAGE_SIZE); - bytes = min(chunksz, n); - - if ( xencomm_copy_chunk_from((unsigned long)to, src_paddr, bytes) ) - return n; - src_paddr += bytes; - to += bytes; - n -= bytes; - } - - /* Always successful. */ - return 0; -} - -/** - * xencomm_copy_from_guest: Copy a block of data from domain space. - * @to: Machine address. - * @from: Physical address to a xencomm buffer descriptor. - * @n: Number of bytes to copy. - * @skip: Number of bytes from the start to skip. - * - * Copy data from domain to hypervisor. - * - * Returns number of bytes that could not be copied. - * On success, this will be zero. - */ -unsigned long -xencomm_copy_from_guest( - void *to, const void *from, unsigned int n, unsigned int skip) -{ - struct xencomm_ctxt ctxt; - unsigned int from_pos = 0; - unsigned int to_pos = 0; - unsigned int i = 0; - - if ( xencomm_is_inline(from) ) - return xencomm_inline_from_guest(to, from, n, skip); - - if ( xencomm_ctxt_init(from, &ctxt) ) - return n; - - /* Iterate through the descriptor, copying up to a page at a time */ - while ( (to_pos < n) && (i < xencomm_ctxt_nr_addrs(&ctxt)) ) - { - unsigned long src_paddr; - unsigned int pgoffset, chunksz, chunk_skip; - - if ( xencomm_ctxt_next(&ctxt, i) ) - goto out; - src_paddr = *xencomm_ctxt_address(&ctxt); - if ( src_paddr == XENCOMM_INVALID ) - { - i++; - continue; - } - - pgoffset = src_paddr % PAGE_SIZE; - chunksz = PAGE_SIZE - pgoffset; - - chunk_skip = min(chunksz, skip); - from_pos += chunk_skip; - chunksz -= chunk_skip; - skip -= chunk_skip; - - if ( skip == 0 && chunksz > 0 ) - { - unsigned int bytes = min(chunksz, n - to_pos); - - if ( xencomm_copy_chunk_from((unsigned long)to + to_pos, - src_paddr + chunk_skip, bytes) ) - goto out; - from_pos += bytes; - to_pos += bytes; - } - - i++; - } - -out: - xencomm_ctxt_done(&ctxt); - return n - to_pos; -} - -static int -xencomm_copy_chunk_to( - unsigned long paddr, unsigned long from, unsigned int len) -{ - struct page_info *page; - int res; - - do { - res = xencomm_get_page(paddr, &page); - } while ( res == -EAGAIN ); - - if ( res ) - return res; - - xc_dprintk("%lx[%d] -> %lx\n", from, len, - (unsigned long)xencomm_vaddr(paddr, page)); - - memcpy(xencomm_vaddr(paddr, page), (void *)from, len); - xencomm_mark_dirty((unsigned long)xencomm_vaddr(paddr, page), len); - put_page(page); - - return 0; -} - -static unsigned long -xencomm_inline_to_guest( - void *to, const void *from, unsigned int n, unsigned int skip) -{ - unsigned long dest_paddr = xencomm_inline_addr(to) + skip; - - while ( n > 0 ) - { - unsigned int chunksz, bytes; - - chunksz = PAGE_SIZE - (dest_paddr % PAGE_SIZE); - bytes = min(chunksz, n); - - if ( xencomm_copy_chunk_to(dest_paddr, (unsigned long)from, bytes) ) - return n; - dest_paddr += bytes; - from += bytes; - n -= bytes; - } - - /* Always successful. */ - return 0; -} - -/** - * xencomm_copy_to_guest: Copy a block of data to domain space. - * @to: Physical address to xencomm buffer descriptor. - * @from: Machine address. - * @n: Number of bytes to copy. - * @skip: Number of bytes from the start to skip. - * - * Copy data from hypervisor to domain. - * - * Returns number of bytes that could not be copied. - * On success, this will be zero. - */ -unsigned long -xencomm_copy_to_guest( - void *to, const void *from, unsigned int n, unsigned int skip) -{ - struct xencomm_ctxt ctxt; - unsigned int from_pos = 0; - unsigned int to_pos = 0; - unsigned int i = 0; - - if ( xencomm_is_inline(to) ) - return xencomm_inline_to_guest(to, from, n, skip); - - if ( xencomm_ctxt_init(to, &ctxt) ) - return n; - - /* Iterate through the descriptor, copying up to a page at a time */ - while ( (from_pos < n) && (i < xencomm_ctxt_nr_addrs(&ctxt)) ) - { - unsigned long dest_paddr; - unsigned int pgoffset, chunksz, chunk_skip; - - if ( xencomm_ctxt_next(&ctxt, i) ) - goto out; - dest_paddr = *xencomm_ctxt_address(&ctxt); - if ( dest_paddr == XENCOMM_INVALID ) - { - i++; - continue; - } - - pgoffset = dest_paddr % PAGE_SIZE; - chunksz = PAGE_SIZE - pgoffset; - - chunk_skip = min(chunksz, skip); - to_pos += chunk_skip; - chunksz -= chunk_skip; - skip -= chunk_skip; - - if ( skip == 0 && chunksz > 0 ) - { - unsigned int bytes = min(chunksz, n - from_pos); - - if ( xencomm_copy_chunk_to(dest_paddr + chunk_skip, - (unsigned long)from + from_pos, bytes) ) - goto out; - from_pos += bytes; - to_pos += bytes; - } - - i++; - } - -out: - xencomm_ctxt_done(&ctxt); - return n - from_pos; -} - -static int -xencomm_clear_chunk( - unsigned long paddr, unsigned int len) -{ - struct page_info *page; - int res; - - do { - res = xencomm_get_page(paddr, &page); - } while ( res == -EAGAIN ); - - if ( res ) - return res; - - memset(xencomm_vaddr(paddr, page), 0x00, len); - xencomm_mark_dirty((unsigned long)xencomm_vaddr(paddr, page), len); - put_page(page); - - return 0; -} - -static unsigned long -xencomm_inline_clear_guest( - void *to, unsigned int n, unsigned int skip) -{ - unsigned long dest_paddr = xencomm_inline_addr(to) + skip; - - while ( n > 0 ) - { - unsigned int chunksz, bytes; - - chunksz = PAGE_SIZE - (dest_paddr % PAGE_SIZE); - bytes = min(chunksz, n); - - if ( xencomm_clear_chunk(dest_paddr, bytes) ) - return n; - dest_paddr += bytes; - n -= bytes; - } - - /* Always successful. */ - return 0; -} - -/** - * xencomm_clear_guest: Clear a block of data in domain space. - * @to: Physical address to xencomm buffer descriptor. - * @n: Number of bytes to copy. - * @skip: Number of bytes from the start to skip. - * - * Clear domain data - * - * Returns number of bytes that could not be cleared - * On success, this will be zero. - */ -unsigned long -xencomm_clear_guest( - void *to, unsigned int n, unsigned int skip) -{ - struct xencomm_ctxt ctxt; - unsigned int from_pos = 0; - unsigned int to_pos = 0; - unsigned int i = 0; - - if ( xencomm_is_inline(to) ) - return xencomm_inline_clear_guest(to, n, skip); - - if ( xencomm_ctxt_init(to, &ctxt) ) - return n; - - /* Iterate through the descriptor, copying up to a page at a time */ - while ( (from_pos < n) && (i < xencomm_ctxt_nr_addrs(&ctxt)) ) - { - unsigned long dest_paddr; - unsigned int pgoffset, chunksz, chunk_skip; - - if ( xencomm_ctxt_next(&ctxt, i) ) - goto out; - dest_paddr = *xencomm_ctxt_address(&ctxt); - if ( dest_paddr == XENCOMM_INVALID ) - { - i++; - continue; - } - - pgoffset = dest_paddr % PAGE_SIZE; - chunksz = PAGE_SIZE - pgoffset; - - chunk_skip = min(chunksz, skip); - to_pos += chunk_skip; - chunksz -= chunk_skip; - skip -= chunk_skip; - - if ( skip == 0 && chunksz > 0 ) - { - unsigned int bytes = min(chunksz, n - from_pos); - - if ( xencomm_clear_chunk(dest_paddr + chunk_skip, bytes) ) - goto out; - from_pos += bytes; - to_pos += bytes; - } - - i++; - } - -out: - xencomm_ctxt_done(&ctxt); - return n - from_pos; -} - -static int xencomm_inline_add_offset(void **handle, unsigned int bytes) -{ - *handle += bytes; - return 0; -} - -/* Offset page addresses in 'handle' to skip 'bytes' bytes. Set completely - * exhausted pages to XENCOMM_INVALID. */ -int xencomm_add_offset(void **handle, unsigned int bytes) -{ - struct xencomm_ctxt ctxt; - int i = 0; - int res = 0; - - if ( xencomm_is_inline(*handle) ) - return xencomm_inline_add_offset(handle, bytes); - - res = xencomm_ctxt_init(handle, &ctxt); - if ( res != 0 ) - return res; - - /* Iterate through the descriptor incrementing addresses */ - while ( (bytes > 0) && (i < xencomm_ctxt_nr_addrs(&ctxt)) ) - { - unsigned long *address; - unsigned long dest_paddr; - unsigned int pgoffset, chunksz, chunk_skip; - - res = xencomm_ctxt_next(&ctxt, i); - if ( res ) - goto out; - address = xencomm_ctxt_address(&ctxt); - dest_paddr = *address; - if ( dest_paddr == XENCOMM_INVALID ) - { - i++; - continue; - } - - pgoffset = dest_paddr % PAGE_SIZE; - chunksz = PAGE_SIZE - pgoffset; - - chunk_skip = min(chunksz, bytes); - if ( chunk_skip == chunksz ) - *address = XENCOMM_INVALID; /* exhausted this page */ - else - *address += chunk_skip; - bytes -= chunk_skip; - - i++; - } - -out: - xencomm_ctxt_done(&ctxt); - return res; -} - -int xencomm_handle_is_null(void *handle) -{ - struct xencomm_ctxt ctxt; - int i; - int res = 1; - - if ( xencomm_is_inline(handle) ) - return xencomm_inline_addr(handle) == 0; - - if ( xencomm_ctxt_init(handle, &ctxt) ) - return 1; - - for ( i = 0; i < xencomm_ctxt_nr_addrs(&ctxt); i++ ) - { - if ( xencomm_ctxt_next(&ctxt, i) ) - goto out; - if ( *xencomm_ctxt_address(&ctxt) != XENCOMM_INVALID ) - { - res = 0; - goto out; - } - } - -out: - xencomm_ctxt_done(&ctxt); - return res; -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/Makefile b/xen/include/Makefile index f7ccbc9..94112d1 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -21,7 +21,6 @@ headers-y := \ compat/vcpu.h \ compat/version.h \ compat/xen.h \ - compat/xencomm.h \ compat/xenoprof.h headers-$(CONFIG_X86) += compat/arch-x86/xen-mca.h headers-$(CONFIG_X86) += compat/arch-x86/xen.h diff --git a/xen/include/xen/xencomm.h b/xen/include/xen/xencomm.h deleted file mode 100644 index 3426b8a..0000000 --- a/xen/include/xen/xencomm.h +++ /dev/null @@ -1,170 +0,0 @@ -/* - * 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, write to the Free Software - * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * Copyright (C) IBM Corp. 2006 - * - * Authors: Hollis Blanchard - */ - -#ifndef __XENCOMM_H__ -#define __XENCOMM_H__ - -#include - -unsigned long xencomm_copy_to_guest( - void *to, const void *from, unsigned int len, unsigned int skip); -unsigned long xencomm_copy_from_guest( - void *to, const void *from, unsigned int len, unsigned int skip); -unsigned long xencomm_clear_guest( - void *to, unsigned int n, unsigned int skip); -int xencomm_add_offset(void **handle, unsigned int bytes); -int xencomm_handle_is_null(void *ptr); - -static inline int xencomm_is_inline(const void *handle) -{ - unsigned long addr = (unsigned long)handle; - return (addr & XENCOMM_INLINE_FLAG) == XENCOMM_INLINE_FLAG; -} - -static inline unsigned long xencomm_inline_addr(const void *handle) -{ - return (unsigned long)handle & ~XENCOMM_INLINE_FLAG; -} - -#define raw_copy_to_guest(dst, src, len) \ - xencomm_copy_to_guest(dst, src, len, 0) -#define raw_copy_from_guest(dst, src, len) \ - xencomm_copy_from_guest(dst, src, nr, 0) -#define raw_clear_guest(dst, len) \ - xencomm_clear_guest(dst, len, 0) -#define __raw_copy_to_guest raw_copy_to_guest -#define __raw_copy_from_guest raw_copy_from_guest -#define __raw_clear_guest raw_clear_guest - -/* Is the guest handle a NULL reference? */ -#define guest_handle_is_null(hnd) \ - ((hnd).p == NULL || xencomm_handle_is_null((hnd).p)) - -/* Offset the given guest handle into the array it refers to. */ -#define guest_handle_add_offset(hnd, nr) ({ \ - const typeof((hnd).p) _ptr; \ - xencomm_add_offset((void **)&((hnd).p), nr * sizeof(*_ptr)); \ -}) - -/* Cast a guest handle to the specified type of handle. */ -#define guest_handle_cast(hnd, type) ({ \ - type *_x = (hnd).p; \ - XEN_GUEST_HANDLE_PARAM(type) _y; \ - set_xen_guest_handle(_y, _x); \ - _y; \ -}) - -/* Cast a XEN_GUEST_HANDLE to XEN_GUEST_HANDLE_PARAM */ -#define guest_handle_to_param(hnd, type) ({ \ - /* type checking: make sure that the pointers inside \ - * XEN_GUEST_HANDLE and XEN_GUEST_HANDLE_PARAM are of \ - * the same type, then return hnd */ \ - (void)((typeof(&(hnd).p)) 0 == \ - (typeof(&((XEN_GUEST_HANDLE_PARAM(type)) {}).p)) 0); \ - (hnd); \ -}) - -/* Cast a XEN_GUEST_HANDLE_PARAM to XEN_GUEST_HANDLE */ -#define guest_handle_from_param(hnd, type) ({ \ - /* type checking: make sure that the pointers inside \ - * XEN_GUEST_HANDLE and XEN_GUEST_HANDLE_PARAM are of \ - * the same type, then return hnd */ \ - (void)((typeof(&(hnd).p)) 0 == \ - (typeof(&((XEN_GUEST_HANDLE_PARAM(type)) {}).p)) 0); \ - (hnd); \ -}) - -/* Since we run in real mode, we can safely access all addresses. That also - * means our __routines are identical to our "normal" routines. */ -#define guest_handle_okay(hnd, nr) 1 -#define guest_handle_subrange_okay(hnd, first, last) 1 - -/* - * Copy an array of objects to guest context via a guest handle. - * Optionally specify an offset into the guest array. - */ -#define copy_to_guest_offset(hnd, idx, ptr, nr) \ - __copy_to_guest_offset(hnd, idx, ptr, nr) - -/* Copy sub-field of a structure to guest context via a guest handle. */ -#define copy_field_to_guest(hnd, ptr, field) \ - __copy_field_to_guest(hnd, ptr, field) - -/* - * Copy an array of objects from guest context via a guest handle. - * Optionally specify an offset into the guest array. - */ -#define copy_from_guest_offset(ptr, hnd, idx, nr) \ - __copy_from_guest_offset(ptr, hnd, idx, nr) - -/* - * Clear an array of objects in guest context via a guest handle. - * Optionally specify an offset into the guest array. - */ -#define clear_guest_offset(hnd, idx, nr) \ - __clear_guest_offset(hnd, idx, nr) - -/* Copy sub-field of a structure from guest context via a guest handle. */ -#define copy_field_from_guest(ptr, hnd, field) \ - __copy_field_from_guest(ptr, hnd, field) - -#define __copy_to_guest_offset(hnd, idx, ptr, nr) ({ \ - const typeof(*(ptr)) *_s = (ptr); \ - void *_d = (hnd).p; \ - ((void)((hnd).p == (ptr))); \ - xencomm_copy_to_guest(_d, _s, sizeof(*_s)*(nr), sizeof(*_s)*(idx)); \ -}) - -#define __copy_field_to_guest(hnd, ptr, field) ({ \ - unsigned int _off = offsetof(typeof(*(hnd).p), field); \ - const typeof(&(ptr)->field) _s = &(ptr)->field; \ - void *_d = (hnd).p; \ - ((void)(&(hnd).p->field == &(ptr)->field)); \ - xencomm_copy_to_guest(_d, _s, sizeof(*_s), _off); \ -}) - -#define __copy_from_guest_offset(ptr, hnd, idx, nr) ({ \ - const typeof(*(ptr)) *_s = (hnd).p; \ - typeof(*(ptr)) *_d = (ptr); \ - xencomm_copy_from_guest(_d, _s, sizeof(*_d)*(nr), sizeof(*_d)*(idx)); \ -}) - -#define __copy_field_from_guest(ptr, hnd, field) ({ \ - unsigned int _off = offsetof(typeof(*(hnd).p), field); \ - const void *_s = (hnd).p; \ - typeof(&(ptr)->field) _d = &(ptr)->field; \ - ((void)(&(hnd).p->field == &(ptr)->field)); \ - xencomm_copy_from_guest(_d, _s, sizeof(*_d), _off); \ -}) - -#define __clear_guest_offset(hnd, idx, nr) ({ \ - void *_d = (hnd).p; \ - xencomm_clear_guest(_d, nr, idx); \ -}) - -#ifdef CONFIG_XENCOMM_MARK_DIRTY -extern void xencomm_mark_dirty(unsigned long addr, unsigned int len); -#else -static inline void xencomm_mark_dirty(unsigned long addr, unsigned int len) -{ -} -#endif - -#endif /* __XENCOMM_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 Sun Jan 18 21:01:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:01: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 1YCwy0-0000Vn-Sc; Sun, 18 Jan 2015 21:01:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxz-0000VX-6x for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:03 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 03/9C-02707-E0F1CB45; Sun, 18 Jan 2015 21:01:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1421614860!18710723!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16088 invoked from network); 18 Jan 2015 21:01:01 -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 Jan 2015 21:01:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxw-00018R-ER for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwxw-0003y6-DG for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:00 +0000 Date: Sun, 18 Jan 2015 21:01:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Manage pl011 uart TX interrupt correctly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 20e297f84035da854ceb6a160981f78ed56a408b Author: Vijaya Kumar K AuthorDate: Tue Dec 9 10:09:55 2014 +0530 Commit: Ian Campbell CommitDate: Thu Jan 8 13:44:57 2015 +0000 xen/arm: Manage pl011 uart TX interrupt correctly In pl011.c, when TX interrupt is received serial_tx_interrupt() is called to push next characters. If TX buffer is empty, serial_tx_interrupt() does not disable TX interrupt and hence pl011 UART irq handler pl011_interrupt() always sees TX interrupt status set in MIS register and cpu does not come out of UART irq handler. With this patch, mask TX interrupt by writing 0 to IMSC register when TX buffer is empty and unmask by writing 1 to IMSC register before sending characters. Signed-off-by: Vijaya Kumar K Reviewed-by: Tim Deegan --- xen/drivers/char/pl011.c | 16 ++++++++++++++++ xen/drivers/char/serial.c | 34 ++++++++++++++++++++++++++++++++++ xen/include/xen/serial.h | 4 ++++ 3 files changed, 54 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index dd19ce8..57274d9 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -197,6 +197,20 @@ static const struct vuart_info *pl011_vuart(struct serial_port *port) return &uart->vuart; } +static void pl011_tx_stop(struct serial_port *port) +{ + struct pl011 *uart = port->uart; + + pl011_write(uart, IMSC, pl011_read(uart, IMSC) & ~(TXI)); +} + +static void pl011_tx_start(struct serial_port *port) +{ + struct pl011 *uart = port->uart; + + pl011_write(uart, IMSC, pl011_read(uart, IMSC) | (TXI)); +} + static struct uart_driver __read_mostly pl011_driver = { .init_preirq = pl011_init_preirq, .init_postirq = pl011_init_postirq, @@ -207,6 +221,8 @@ static struct uart_driver __read_mostly pl011_driver = { .putc = pl011_putc, .getc = pl011_getc, .irq = pl011_irq, + .start_tx = pl011_tx_start, + .stop_tx = pl011_tx_stop, .vuart_info = pl011_vuart, }; diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index 44026b1..c583a48 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -31,6 +31,18 @@ static struct serial_port com[SERHND_IDX + 1] = { static bool_t __read_mostly post_irq; +static inline void serial_start_tx(struct serial_port *port) +{ + if ( port->driver->start_tx != NULL ) + port->driver->start_tx(port); +} + +static inline void serial_stop_tx(struct serial_port *port) +{ + if ( port->driver->stop_tx != NULL ) + port->driver->stop_tx(port); +} + void serial_rx_interrupt(struct serial_port *port, struct cpu_user_regs *regs) { char c; @@ -76,6 +88,18 @@ void serial_tx_interrupt(struct serial_port *port, struct cpu_user_regs *regs) cpu_relax(); } + if ( port->txbufc == port->txbufp ) + { + /* Disable TX. nothing to send */ + serial_stop_tx(port); + spin_unlock(&port->tx_lock); + goto out; + } + else + { + if ( port->driver->tx_ready(port) ) + serial_start_tx(port); + } for ( i = 0, n = port->driver->tx_ready(port); i < n; i++ ) { if ( port->txbufc == port->txbufp ) @@ -117,6 +141,8 @@ static void __serial_putc(struct serial_port *port, char c) cpu_relax(); if ( n > 0 ) { + /* Enable TX before sending chars */ + serial_start_tx(port); while ( n-- ) port->driver->putc( port, @@ -135,6 +161,8 @@ static void __serial_putc(struct serial_port *port, char c) if ( ((port->txbufp - port->txbufc) == 0) && port->driver->tx_ready(port) > 0 ) { + /* Enable TX before sending chars */ + serial_start_tx(port); /* Buffer and UART FIFO are both empty, and port is available. */ port->driver->putc(port, c); } @@ -152,11 +180,16 @@ static void __serial_putc(struct serial_port *port, char c) while ( !(n = port->driver->tx_ready(port)) ) cpu_relax(); if ( n > 0 ) + { + /* Enable TX before sending chars */ + serial_start_tx(port); port->driver->putc(port, c); + } } else { /* Simple synchronous transmitter. */ + serial_start_tx(port); port->driver->putc(port, c); } } @@ -404,6 +437,7 @@ void serial_start_sync(int handle) /* port is unavailable and might not come up until reenabled by dom0, we can't really do proper sync */ break; + serial_start_tx(port); port->driver->putc( port, port->txbuf[mask_serial_txbuf_idx(port->txbufc++)]); } diff --git a/xen/include/xen/serial.h b/xen/include/xen/serial.h index 9f4451b..71e6ade 100644 --- a/xen/include/xen/serial.h +++ b/xen/include/xen/serial.h @@ -81,6 +81,10 @@ struct uart_driver { int (*getc)(struct serial_port *, char *); /* Get IRQ number for this port's serial line: returns -1 if none. */ int (*irq)(struct serial_port *); + /* Unmask TX interrupt */ + void (*start_tx)(struct serial_port *); + /* Mask TX interrupt */ + void (*stop_tx)(struct serial_port *); /* Get serial information */ const struct vuart_info *(*vuart_info)(struct serial_port *); }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:01:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:01: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 1YCwy0-0000Vn-Sc; Sun, 18 Jan 2015 21:01:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxz-0000VX-6x for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:03 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 03/9C-02707-E0F1CB45; Sun, 18 Jan 2015 21:01:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1421614860!18710723!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16088 invoked from network); 18 Jan 2015 21:01:01 -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 Jan 2015 21:01:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwxw-00018R-ER for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwxw-0003y6-DG for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:00 +0000 Date: Sun, 18 Jan 2015 21:01:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Manage pl011 uart TX interrupt correctly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 20e297f84035da854ceb6a160981f78ed56a408b Author: Vijaya Kumar K AuthorDate: Tue Dec 9 10:09:55 2014 +0530 Commit: Ian Campbell CommitDate: Thu Jan 8 13:44:57 2015 +0000 xen/arm: Manage pl011 uart TX interrupt correctly In pl011.c, when TX interrupt is received serial_tx_interrupt() is called to push next characters. If TX buffer is empty, serial_tx_interrupt() does not disable TX interrupt and hence pl011 UART irq handler pl011_interrupt() always sees TX interrupt status set in MIS register and cpu does not come out of UART irq handler. With this patch, mask TX interrupt by writing 0 to IMSC register when TX buffer is empty and unmask by writing 1 to IMSC register before sending characters. Signed-off-by: Vijaya Kumar K Reviewed-by: Tim Deegan --- xen/drivers/char/pl011.c | 16 ++++++++++++++++ xen/drivers/char/serial.c | 34 ++++++++++++++++++++++++++++++++++ xen/include/xen/serial.h | 4 ++++ 3 files changed, 54 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index dd19ce8..57274d9 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -197,6 +197,20 @@ static const struct vuart_info *pl011_vuart(struct serial_port *port) return &uart->vuart; } +static void pl011_tx_stop(struct serial_port *port) +{ + struct pl011 *uart = port->uart; + + pl011_write(uart, IMSC, pl011_read(uart, IMSC) & ~(TXI)); +} + +static void pl011_tx_start(struct serial_port *port) +{ + struct pl011 *uart = port->uart; + + pl011_write(uart, IMSC, pl011_read(uart, IMSC) | (TXI)); +} + static struct uart_driver __read_mostly pl011_driver = { .init_preirq = pl011_init_preirq, .init_postirq = pl011_init_postirq, @@ -207,6 +221,8 @@ static struct uart_driver __read_mostly pl011_driver = { .putc = pl011_putc, .getc = pl011_getc, .irq = pl011_irq, + .start_tx = pl011_tx_start, + .stop_tx = pl011_tx_stop, .vuart_info = pl011_vuart, }; diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index 44026b1..c583a48 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -31,6 +31,18 @@ static struct serial_port com[SERHND_IDX + 1] = { static bool_t __read_mostly post_irq; +static inline void serial_start_tx(struct serial_port *port) +{ + if ( port->driver->start_tx != NULL ) + port->driver->start_tx(port); +} + +static inline void serial_stop_tx(struct serial_port *port) +{ + if ( port->driver->stop_tx != NULL ) + port->driver->stop_tx(port); +} + void serial_rx_interrupt(struct serial_port *port, struct cpu_user_regs *regs) { char c; @@ -76,6 +88,18 @@ void serial_tx_interrupt(struct serial_port *port, struct cpu_user_regs *regs) cpu_relax(); } + if ( port->txbufc == port->txbufp ) + { + /* Disable TX. nothing to send */ + serial_stop_tx(port); + spin_unlock(&port->tx_lock); + goto out; + } + else + { + if ( port->driver->tx_ready(port) ) + serial_start_tx(port); + } for ( i = 0, n = port->driver->tx_ready(port); i < n; i++ ) { if ( port->txbufc == port->txbufp ) @@ -117,6 +141,8 @@ static void __serial_putc(struct serial_port *port, char c) cpu_relax(); if ( n > 0 ) { + /* Enable TX before sending chars */ + serial_start_tx(port); while ( n-- ) port->driver->putc( port, @@ -135,6 +161,8 @@ static void __serial_putc(struct serial_port *port, char c) if ( ((port->txbufp - port->txbufc) == 0) && port->driver->tx_ready(port) > 0 ) { + /* Enable TX before sending chars */ + serial_start_tx(port); /* Buffer and UART FIFO are both empty, and port is available. */ port->driver->putc(port, c); } @@ -152,11 +180,16 @@ static void __serial_putc(struct serial_port *port, char c) while ( !(n = port->driver->tx_ready(port)) ) cpu_relax(); if ( n > 0 ) + { + /* Enable TX before sending chars */ + serial_start_tx(port); port->driver->putc(port, c); + } } else { /* Simple synchronous transmitter. */ + serial_start_tx(port); port->driver->putc(port, c); } } @@ -404,6 +437,7 @@ void serial_start_sync(int handle) /* port is unavailable and might not come up until reenabled by dom0, we can't really do proper sync */ break; + serial_start_tx(port); port->driver->putc( port, port->txbuf[mask_serial_txbuf_idx(port->txbufc++)]); } diff --git a/xen/include/xen/serial.h b/xen/include/xen/serial.h index 9f4451b..71e6ade 100644 --- a/xen/include/xen/serial.h +++ b/xen/include/xen/serial.h @@ -81,6 +81,10 @@ struct uart_driver { int (*getc)(struct serial_port *, char *); /* Get IRQ number for this port's serial line: returns -1 if none. */ int (*irq)(struct serial_port *); + /* Unmask TX interrupt */ + void (*start_tx)(struct serial_port *); + /* Mask TX interrupt */ + void (*stop_tx)(struct serial_port *); /* Get serial information */ const struct vuart_info *(*vuart_info)(struct serial_port *); }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:01:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:01: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 1YCwyA-0000XM-VO; Sun, 18 Jan 2015 21:01:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwy9-0000X2-3u for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:13 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id C7/68-02957-81F1CB45; Sun, 18 Jan 2015 21:01:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1421614870!16709945!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9678 invoked from network); 18 Jan 2015 21:01:11 -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; 18 Jan 2015 21:01:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwy6-000190-Jw for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwy6-0003yb-Ij for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:10 +0000 Date: Sun, 18 Jan 2015 21:01:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: Expose the 1GB pages cpuid flag 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 commit ace4e40029167123e706006583ec87c88731081a Author: Liang Li AuthorDate: Fri Nov 28 18:52:05 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jan 8 13:50:06 2015 +0000 libxc: Expose the 1GB pages cpuid flag to guest If hardware support the 1GB pages, expose the feature to guest by default. Users don't have to use a 'cpuid= ' option in config fil e to turn it on. If guest use shadow mode, the 1GB pages feature will be hidden from guest, this is done in the function hvm_cpuid(). So the change is okay for shadow mode case. Signed-off-by: Liang Li Signed-off-by: Yang Zhang Reviewed-by: Jan Beulich Acked-by: Ian Campbell --- tools/libxc/xc_cpuid_x86.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index a18b1ff..c97f91a 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -109,6 +109,7 @@ static void amd_xc_cpuid_policy( regs[3] &= (0x0183f3ff | /* features shared with 0x00000001:EDX */ bitmaskof(X86_FEATURE_NX) | bitmaskof(X86_FEATURE_LM) | + bitmaskof(X86_FEATURE_PAGE1GB) | bitmaskof(X86_FEATURE_SYSCALL) | bitmaskof(X86_FEATURE_MP) | bitmaskof(X86_FEATURE_MMXEXT) | @@ -192,6 +193,7 @@ static void intel_xc_cpuid_policy( bitmaskof(X86_FEATURE_ABM)); regs[3] &= (bitmaskof(X86_FEATURE_NX) | bitmaskof(X86_FEATURE_LM) | + bitmaskof(X86_FEATURE_PAGE1GB) | bitmaskof(X86_FEATURE_SYSCALL) | bitmaskof(X86_FEATURE_RDTSCP)); break; @@ -386,6 +388,7 @@ static void xc_cpuid_hvm_policy( clear_bit(X86_FEATURE_LM, regs[3]); clear_bit(X86_FEATURE_NX, regs[3]); clear_bit(X86_FEATURE_PSE36, regs[3]); + clear_bit(X86_FEATURE_PAGE1GB, regs[3]); } 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 Sun Jan 18 21:01:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:01: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 1YCwyA-0000XM-VO; Sun, 18 Jan 2015 21:01:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwy9-0000X2-3u for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:13 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id C7/68-02957-81F1CB45; Sun, 18 Jan 2015 21:01:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1421614870!16709945!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9678 invoked from network); 18 Jan 2015 21:01:11 -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; 18 Jan 2015 21:01:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwy6-000190-Jw for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwy6-0003yb-Ij for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:10 +0000 Date: Sun, 18 Jan 2015 21:01:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: Expose the 1GB pages cpuid flag 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 commit ace4e40029167123e706006583ec87c88731081a Author: Liang Li AuthorDate: Fri Nov 28 18:52:05 2014 +0800 Commit: Ian Campbell CommitDate: Thu Jan 8 13:50:06 2015 +0000 libxc: Expose the 1GB pages cpuid flag to guest If hardware support the 1GB pages, expose the feature to guest by default. Users don't have to use a 'cpuid= ' option in config fil e to turn it on. If guest use shadow mode, the 1GB pages feature will be hidden from guest, this is done in the function hvm_cpuid(). So the change is okay for shadow mode case. Signed-off-by: Liang Li Signed-off-by: Yang Zhang Reviewed-by: Jan Beulich Acked-by: Ian Campbell --- tools/libxc/xc_cpuid_x86.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index a18b1ff..c97f91a 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -109,6 +109,7 @@ static void amd_xc_cpuid_policy( regs[3] &= (0x0183f3ff | /* features shared with 0x00000001:EDX */ bitmaskof(X86_FEATURE_NX) | bitmaskof(X86_FEATURE_LM) | + bitmaskof(X86_FEATURE_PAGE1GB) | bitmaskof(X86_FEATURE_SYSCALL) | bitmaskof(X86_FEATURE_MP) | bitmaskof(X86_FEATURE_MMXEXT) | @@ -192,6 +193,7 @@ static void intel_xc_cpuid_policy( bitmaskof(X86_FEATURE_ABM)); regs[3] &= (bitmaskof(X86_FEATURE_NX) | bitmaskof(X86_FEATURE_LM) | + bitmaskof(X86_FEATURE_PAGE1GB) | bitmaskof(X86_FEATURE_SYSCALL) | bitmaskof(X86_FEATURE_RDTSCP)); break; @@ -386,6 +388,7 @@ static void xc_cpuid_hvm_policy( clear_bit(X86_FEATURE_LM, regs[3]); clear_bit(X86_FEATURE_NX, regs[3]); clear_bit(X86_FEATURE_PSE36, regs[3]); + clear_bit(X86_FEATURE_PAGE1GB, regs[3]); } 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 Sun Jan 18 21:01:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21: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 1YCwyL-0000Z0-22; Sun, 18 Jan 2015 21:01:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyJ-0000Yg-BD for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:23 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 33/94-02702-22F1CB45; Sun, 18 Jan 2015 21:01:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1421614881!21336698!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15586 invoked from network); 18 Jan 2015 21:01:21 -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; 18 Jan 2015 21:01:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyG-000196-Ql for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwyG-0003yz-Op for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:20 +0000 Date: Sun, 18 Jan 2015 21:01:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: arm: 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 c802edc15a6773d60c60cf88cc293192addbc0fa Author: Thomas Leonard AuthorDate: Fri Oct 3 10:20:48 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jan 8 15:49:44 2015 +0000 mini-os: arm: time Based on an initial patch by Karim Raslan. Signed-off-by: Karim Allah Ahmed Signed-off-by: Thomas Leonard Acked-by: Ian Campbell --- extras/mini-os/arch/arm/time.c | 136 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 136 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/arch/arm/time.c b/extras/mini-os/arch/arm/time.c new file mode 100644 index 0000000..a088981 --- /dev/null +++ b/extras/mini-os/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=vtimer.c, line=%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 = a; + rl = (uint64_t)u.l.low * (uint64_t)b; + rh = (uint64_t)u.l.high * (uint64_t)b; + rh += (rl >> 32); + res.l.high = rh / c; + res.l.low = (((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":"=r"(c_lo), "=r"(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 = monotonic_clock(); + nsec += shadow_ts.tv_nsec; + + tv->tv_sec = shadow_ts.tv_sec; + tv->tv_sec += NSEC_TO_SEC(nsec); + tv->tv_usec = 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 = 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":"=r"(counter_freq)); + cntvct_at_init = read_virtual_count(); + printk("Virtual Count register is %llx, freq = %d Hz\n", cntvct_at_init, counter_freq); +} + +void fini_time(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 Sun Jan 18 21:01:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21: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 1YCwyL-0000Z0-22; Sun, 18 Jan 2015 21:01:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyJ-0000Yg-BD for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:23 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 33/94-02702-22F1CB45; Sun, 18 Jan 2015 21:01:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1421614881!21336698!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15586 invoked from network); 18 Jan 2015 21:01:21 -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; 18 Jan 2015 21:01:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyG-000196-Ql for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwyG-0003yz-Op for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:20 +0000 Date: Sun, 18 Jan 2015 21:01:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: arm: 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 c802edc15a6773d60c60cf88cc293192addbc0fa Author: Thomas Leonard AuthorDate: Fri Oct 3 10:20:48 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jan 8 15:49:44 2015 +0000 mini-os: arm: time Based on an initial patch by Karim Raslan. Signed-off-by: Karim Allah Ahmed Signed-off-by: Thomas Leonard Acked-by: Ian Campbell --- extras/mini-os/arch/arm/time.c | 136 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 136 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/arch/arm/time.c b/extras/mini-os/arch/arm/time.c new file mode 100644 index 0000000..a088981 --- /dev/null +++ b/extras/mini-os/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=vtimer.c, line=%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 = a; + rl = (uint64_t)u.l.low * (uint64_t)b; + rh = (uint64_t)u.l.high * (uint64_t)b; + rh += (rl >> 32); + res.l.high = rh / c; + res.l.low = (((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":"=r"(c_lo), "=r"(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 = monotonic_clock(); + nsec += shadow_ts.tv_nsec; + + tv->tv_sec = shadow_ts.tv_sec; + tv->tv_sec += NSEC_TO_SEC(nsec); + tv->tv_usec = 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 = 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":"=r"(counter_freq)); + cntvct_at_init = read_virtual_count(); + printk("Virtual Count register is %llx, freq = %d Hz\n", cntvct_at_init, counter_freq); +} + +void fini_time(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 Sun Jan 18 21:01:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:01: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 1YCwyW-0000am-4r; Sun, 18 Jan 2015 21:01:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyU-0000aP-3C for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:34 +0000 Content-Length: 7657 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id B9/41-07724-D2F1CB45; Sun, 18 Jan 2015 21:01:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1421614891!11573112!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23063 invoked from network); 18 Jan 2015 21:01: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; 18 Jan 2015 21:01:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyQ-00019E-Vu for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwyQ-0003zQ-VA for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:30 +0000 Date: Sun, 18 Jan 2015 21:01:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: arm: show registers, stack and exception vector on fault X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0829725978601890437==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0829725978601890437== Content-Length: 7423 Content-Transfer-Encoding: quoted-printable commit bc7012b1156dd1345260db4579ec9c0df38a9ddb Author: Thomas Leonard AuthorDate: Fri Oct 3 10:20:51 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jan 8 16:03:11 2015 +0000 mini-os: arm: show registers, stack and exception vector on fault Signed-off-by: Thomas Leonard Acked-by: Ian Campbell [ ijc -- dropped change to extras/mini-os/ARM-TODO.txt, since the patch which creates it hasn't been applied yet. ] --- extras/mini-os/arch/arm/arm32.S | 75 +++++++++++++++++++++++++++--- extras/mini-os/arch/arm/panic.c | 98 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+), 7 deletions(-) diff --git a/extras/mini-os/arch/arm/arm32.S b/extras/mini-os/arch/arm/arm32.S index 73223c8..a08a170 100644 --- a/extras/mini-os/arch/arm/arm32.S +++ b/extras/mini-os/arch/arm/arm32.S @@ -162,8 +162,69 @@ 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 @@ -173,13 +234,13 @@ irqstack_end: @ 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 . @ reset - b . @ undefined instruction - b . @ supervisor call - b . @ prefetch call - b . @ prefetch abort - b . @ data abort - b irq_handler @ irq + 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" diff --git a/extras/mini-os/arch/arm/panic.c b/extras/mini-os/arch/arm/panic.c new file mode 100644 index 0000000..0ac49ad --- /dev/null +++ b/extras/mini-os/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; +} -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0829725978601890437== 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 --===============0829725978601890437==-- From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:01:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:01: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 1YCwyW-0000am-4r; Sun, 18 Jan 2015 21:01:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyU-0000aP-3C for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:34 +0000 Content-Length: 7657 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id B9/41-07724-D2F1CB45; Sun, 18 Jan 2015 21:01:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1421614891!11573112!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23063 invoked from network); 18 Jan 2015 21:01: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; 18 Jan 2015 21:01:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyQ-00019E-Vu for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwyQ-0003zQ-VA for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:30 +0000 Date: Sun, 18 Jan 2015 21:01:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: arm: show registers, stack and exception vector on fault X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0829725978601890437==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0829725978601890437== Content-Length: 7423 Content-Transfer-Encoding: quoted-printable commit bc7012b1156dd1345260db4579ec9c0df38a9ddb Author: Thomas Leonard AuthorDate: Fri Oct 3 10:20:51 2014 +0100 Commit: Ian Campbell CommitDate: Thu Jan 8 16:03:11 2015 +0000 mini-os: arm: show registers, stack and exception vector on fault Signed-off-by: Thomas Leonard Acked-by: Ian Campbell [ ijc -- dropped change to extras/mini-os/ARM-TODO.txt, since the patch which creates it hasn't been applied yet. ] --- extras/mini-os/arch/arm/arm32.S | 75 +++++++++++++++++++++++++++--- extras/mini-os/arch/arm/panic.c | 98 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+), 7 deletions(-) diff --git a/extras/mini-os/arch/arm/arm32.S b/extras/mini-os/arch/arm/arm32.S index 73223c8..a08a170 100644 --- a/extras/mini-os/arch/arm/arm32.S +++ b/extras/mini-os/arch/arm/arm32.S @@ -162,8 +162,69 @@ 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 @@ -173,13 +234,13 @@ irqstack_end: @ 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 . @ reset - b . @ undefined instruction - b . @ supervisor call - b . @ prefetch call - b . @ prefetch abort - b . @ data abort - b irq_handler @ irq + 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" diff --git a/extras/mini-os/arch/arm/panic.c b/extras/mini-os/arch/arm/panic.c new file mode 100644 index 0000000..0ac49ad --- /dev/null +++ b/extras/mini-os/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; +} -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0829725978601890437== 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 --===============0829725978601890437==-- From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:01:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:01: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 1YCwye-0000cG-7s; Sun, 18 Jan 2015 21:01:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyd-0000bz-Ew for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:43 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 70/DA-15461-63F1CB45; Sun, 18 Jan 2015 21:01:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1421614901!14944077!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31203 invoked from network); 18 Jan 2015 21:01:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:01:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyb-00019K-5J for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwyb-0003zp-4Q for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:41 +0000 Date: Sun, 18 Jan 2015 21:01:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/misc: Remove sbdf2devicepath X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d85c099b95b19f86338e701b3375c22172063649 Author: Andrew Cooper AuthorDate: Thu Jan 8 13:45:33 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 8 17:07:26 2015 +0000 tools/misc: Remove sbdf2devicepath This script has become orphaned from the build system, and depends on removed Xend functionality (xen.util.pci) so can't possibly function now. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Campbell --- tools/misc/sbdf2devicepath | 82 -------------------------------------------- 1 files changed, 0 insertions(+), 82 deletions(-) diff --git a/tools/misc/sbdf2devicepath b/tools/misc/sbdf2devicepath deleted file mode 100644 index 690834a..0000000 --- a/tools/misc/sbdf2devicepath +++ /dev/null @@ -1,82 +0,0 @@ -#!/usr/bin/env python -# -*- mode: python; -*- -#============================================================================ -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General Public -# License as published by the Free Software Foundation. -# -# This library 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. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -#============================================================================ -# Copyright (c) 2009, NEC Corporation. -#============================================================================ -# This script converts SBDF into device path. -# 'SBDF' format is "[SEG#:]BUS#:DEV#.FUNC#" -# ex) 0000:0a:1f.3 -# Device path format is "HID[:UID]-DEV#.FUNC#[-DEV#.FUNC#[...]]" -# ex) PNP0A08:0-2.0-0.0 -#============================================================================= - -import sys -import os - -# add fallback path for non-native python path installs if needed -sys.path.append('/usr/lib/python') -sys.path.append('/usr/lib64/python') -from xen.util.pci import * - -SYSFS_ACPI_DEVS_PATH = '/firmware/acpi/namespace/ACPI/_SB' - -def find_hid_uid(dom, b, d, f): - obj_list = os.listdir(sb_path) - for obj in obj_list: - obj_path = sb_path + '/' + obj.strip() + '/' - if os.path.exists(obj_path + 'seg') and \ - os.path.exists(obj_path + 'bbn'): - seg = open(obj_path + 'seg').read() - bbn = open(obj_path + 'bbn').read() - if int(seg) == dom and int(bbn) == b: - hid = open(obj_path + 'hid').read() - if os.path.exists(obj_path + 'uid') is False: - path_str = hid.strip() - else: - uid = open(obj_path + 'uid').read() - path_str = hid.strip() + ':' + uid.strip() - return path_str - return None - -def make_device_path(dom, b, d, f): - dev = PciDevice(dom, b, d, f) - parent = dev.find_parent() - if parent is None: - path_str = find_hid_uid(dom, b, d, f) - path_str = path_str + '-' + hex(d).replace('0x', '') + '.' + \ - hex(f).replace('0x', '') - return path_str - (pdom, pb, pd, pf) = parent - path_str = make_device_path(pdom, pb, pd, pf) - path_str = path_str + '-' + hex(d).replace('0x', '') + '.' + \ - hex(f).replace('0x', '') - return path_str - -# main -if len(sys.argv) <> 2: - print 'Usage: sbdf2devicepath SBDF\n' -else: - sb_path = find_sysfs_mnt() + SYSFS_ACPI_DEVS_PATH - if os.path.exists(sb_path): - path = os.environ['PATH'] - os.environ['PATH'] = path + ':/sbin' + ':/user/sbin' - sbdf = sys.argv[1] - (dom, b, d, f) = parse_pci_name(sbdf) - path_str = make_device_path(dom, b, d, f) - print path_str - else: - print sb_path + ' not found.\n' - print 'This command is only for linux 2.6.18.8 xen kernel.\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 Sun Jan 18 21:01:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:01: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 1YCwye-0000cG-7s; Sun, 18 Jan 2015 21:01:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyd-0000bz-Ew for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:43 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 70/DA-15461-63F1CB45; Sun, 18 Jan 2015 21:01:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1421614901!14944077!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31203 invoked from network); 18 Jan 2015 21:01:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:01:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyb-00019K-5J for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwyb-0003zp-4Q for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:41 +0000 Date: Sun, 18 Jan 2015 21:01:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/misc: Remove sbdf2devicepath X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d85c099b95b19f86338e701b3375c22172063649 Author: Andrew Cooper AuthorDate: Thu Jan 8 13:45:33 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 8 17:07:26 2015 +0000 tools/misc: Remove sbdf2devicepath This script has become orphaned from the build system, and depends on removed Xend functionality (xen.util.pci) so can't possibly function now. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Campbell --- tools/misc/sbdf2devicepath | 82 -------------------------------------------- 1 files changed, 0 insertions(+), 82 deletions(-) diff --git a/tools/misc/sbdf2devicepath b/tools/misc/sbdf2devicepath deleted file mode 100644 index 690834a..0000000 --- a/tools/misc/sbdf2devicepath +++ /dev/null @@ -1,82 +0,0 @@ -#!/usr/bin/env python -# -*- mode: python; -*- -#============================================================================ -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General Public -# License as published by the Free Software Foundation. -# -# This library 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. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -#============================================================================ -# Copyright (c) 2009, NEC Corporation. -#============================================================================ -# This script converts SBDF into device path. -# 'SBDF' format is "[SEG#:]BUS#:DEV#.FUNC#" -# ex) 0000:0a:1f.3 -# Device path format is "HID[:UID]-DEV#.FUNC#[-DEV#.FUNC#[...]]" -# ex) PNP0A08:0-2.0-0.0 -#============================================================================= - -import sys -import os - -# add fallback path for non-native python path installs if needed -sys.path.append('/usr/lib/python') -sys.path.append('/usr/lib64/python') -from xen.util.pci import * - -SYSFS_ACPI_DEVS_PATH = '/firmware/acpi/namespace/ACPI/_SB' - -def find_hid_uid(dom, b, d, f): - obj_list = os.listdir(sb_path) - for obj in obj_list: - obj_path = sb_path + '/' + obj.strip() + '/' - if os.path.exists(obj_path + 'seg') and \ - os.path.exists(obj_path + 'bbn'): - seg = open(obj_path + 'seg').read() - bbn = open(obj_path + 'bbn').read() - if int(seg) == dom and int(bbn) == b: - hid = open(obj_path + 'hid').read() - if os.path.exists(obj_path + 'uid') is False: - path_str = hid.strip() - else: - uid = open(obj_path + 'uid').read() - path_str = hid.strip() + ':' + uid.strip() - return path_str - return None - -def make_device_path(dom, b, d, f): - dev = PciDevice(dom, b, d, f) - parent = dev.find_parent() - if parent is None: - path_str = find_hid_uid(dom, b, d, f) - path_str = path_str + '-' + hex(d).replace('0x', '') + '.' + \ - hex(f).replace('0x', '') - return path_str - (pdom, pb, pd, pf) = parent - path_str = make_device_path(pdom, pb, pd, pf) - path_str = path_str + '-' + hex(d).replace('0x', '') + '.' + \ - hex(f).replace('0x', '') - return path_str - -# main -if len(sys.argv) <> 2: - print 'Usage: sbdf2devicepath SBDF\n' -else: - sb_path = find_sysfs_mnt() + SYSFS_ACPI_DEVS_PATH - if os.path.exists(sb_path): - path = os.environ['PATH'] - os.environ['PATH'] = path + ':/sbin' + ':/user/sbin' - sbdf = sys.argv[1] - (dom, b, d, f) = parse_pci_name(sbdf) - path_str = make_device_path(dom, b, d, f) - print path_str - else: - print sb_path + ' not found.\n' - print 'This command is only for linux 2.6.18.8 xen kernel.\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 Sun Jan 18 21:01:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:01: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 1YCwyo-0000fQ-Dj; Sun, 18 Jan 2015 21:01:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyn-0000dx-HG for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:53 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 26/AD-22737-04F1CB45; Sun, 18 Jan 2015 21:01:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1421614911!13404809!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9824 invoked from network); 18 Jan 2015 21:01:52 -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; 18 Jan 2015 21:01:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyl-00019Q-CB for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwyl-00040n-9z for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:51 +0000 Date: Sun, 18 Jan 2015 21:01:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl_internal: lock_carefd -> carefd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed6d8cb2d0437d74560c82e10e9c88e4319d704c Author: Wei Liu AuthorDate: Wed Jan 7 15:22:59 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 8 17:08:06 2015 +0000 libxl_internal: lock_carefd -> carefd lock_ prefix is redundant. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Jackson --- tools/libxl/libxl_internal.c | 6 +++--- tools/libxl/libxl_internal.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 00c3b1e..9d8025d 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -405,7 +405,7 @@ libxl__domain_userdata_lock *libxl__lock_domain_userdata(libxl__gc *gc, fd = open(lockfile, O_RDWR|O_CREAT, 0666); if (fd < 0) LOGE(ERROR, "cannot open lockfile %s, errno=%d", lockfile, errno); - lock->lock_carefd = libxl__carefd_opened(CTX, fd); + lock->carefd = libxl__carefd_opened(CTX, fd); if (fd < 0) goto out; /* Lock the file in exclusive mode, wait indefinitely to @@ -440,7 +440,7 @@ libxl__domain_userdata_lock *libxl__lock_domain_userdata(libxl__gc *gc, break; } - libxl__carefd_close(lock->lock_carefd); + libxl__carefd_close(lock->carefd); } /* Check the domain is still there, if not we should release the @@ -459,7 +459,7 @@ out: void libxl__unlock_domain_userdata(libxl__domain_userdata_lock *lock) { if (lock->path) unlink(lock->path); - if (lock->lock_carefd) libxl__carefd_close(lock->lock_carefd); + if (lock->carefd) libxl__carefd_close(lock->carefd); free(lock->path); free(lock); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 6dac0f8..934465a 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3524,7 +3524,7 @@ int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl); /* Portability note: a proper flock(2) implementation is required */ typedef struct { - libxl__carefd *lock_carefd; + libxl__carefd *carefd; char *path; /* path of the lock file itself */ } libxl__domain_userdata_lock; libxl__domain_userdata_lock *libxl__lock_domain_userdata(libxl__gc *gc, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:01:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:01: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 1YCwyo-0000fQ-Dj; Sun, 18 Jan 2015 21:01:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyn-0000dx-HG for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:53 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 26/AD-22737-04F1CB45; Sun, 18 Jan 2015 21:01:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1421614911!13404809!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9824 invoked from network); 18 Jan 2015 21:01:52 -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; 18 Jan 2015 21:01:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyl-00019Q-CB for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwyl-00040n-9z for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:01:51 +0000 Date: Sun, 18 Jan 2015 21:01:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl_internal: lock_carefd -> carefd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed6d8cb2d0437d74560c82e10e9c88e4319d704c Author: Wei Liu AuthorDate: Wed Jan 7 15:22:59 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 8 17:08:06 2015 +0000 libxl_internal: lock_carefd -> carefd lock_ prefix is redundant. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Jackson --- tools/libxl/libxl_internal.c | 6 +++--- tools/libxl/libxl_internal.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 00c3b1e..9d8025d 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -405,7 +405,7 @@ libxl__domain_userdata_lock *libxl__lock_domain_userdata(libxl__gc *gc, fd = open(lockfile, O_RDWR|O_CREAT, 0666); if (fd < 0) LOGE(ERROR, "cannot open lockfile %s, errno=%d", lockfile, errno); - lock->lock_carefd = libxl__carefd_opened(CTX, fd); + lock->carefd = libxl__carefd_opened(CTX, fd); if (fd < 0) goto out; /* Lock the file in exclusive mode, wait indefinitely to @@ -440,7 +440,7 @@ libxl__domain_userdata_lock *libxl__lock_domain_userdata(libxl__gc *gc, break; } - libxl__carefd_close(lock->lock_carefd); + libxl__carefd_close(lock->carefd); } /* Check the domain is still there, if not we should release the @@ -459,7 +459,7 @@ out: void libxl__unlock_domain_userdata(libxl__domain_userdata_lock *lock) { if (lock->path) unlink(lock->path); - if (lock->lock_carefd) libxl__carefd_close(lock->lock_carefd); + if (lock->carefd) libxl__carefd_close(lock->carefd); free(lock->path); free(lock); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 6dac0f8..934465a 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3524,7 +3524,7 @@ int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl); /* Portability note: a proper flock(2) implementation is required */ typedef struct { - libxl__carefd *lock_carefd; + libxl__carefd *carefd; char *path; /* path of the lock file itself */ } libxl__domain_userdata_lock; libxl__domain_userdata_lock *libxl__lock_domain_userdata(libxl__gc *gc, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:02:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:02: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 1YCwyz-0000xx-GT; Sun, 18 Jan 2015 21:02:05 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyy-0000ud-7w for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:04 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 26/DB-10925-B4F1CB45; Sun, 18 Jan 2015 21:02:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1421614921!22193784!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 706 invoked from network); 18 Jan 2015 21:02:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:02:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyv-00019Z-Hy for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwyv-00041A-Gl for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:01 +0000 Date: Sun, 18 Jan 2015 21:02:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl_internal: comment on domain userdata unlock 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 ad40b1fbe41b2fc3a0dfddbbe07a9678c8cd1921 Author: Wei Liu AuthorDate: Wed Jan 7 15:23:00 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 8 17:09:10 2015 +0000 libxl_internal: comment on domain userdata unlock function Discuss why we need to unlink file path before closes fd. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Jackson [ ijc -- s/to avoid such/to avoid the following/ as requested by Ian ] --- tools/libxl/libxl_internal.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 9d8025d..ddc68ab 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -458,6 +458,20 @@ out: void libxl__unlock_domain_userdata(libxl__domain_userdata_lock *lock) { + /* It's important to unlink the file before closing fd to avoid + * the following race (if close before unlink): + * + * P1 LOCK P2 UNLOCK + * fd1 = open(lockfile) + * close(fd2) + * flock(fd1) + * fstat and stat check success + * unlink(lockfile) + * return lock + * + * In above case P1 thinks it has got hold of the lock but + * actually lock is released by P2 (lockfile unlinked). + */ if (lock->path) unlink(lock->path); if (lock->carefd) libxl__carefd_close(lock->carefd); free(lock->path); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:02:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:02: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 1YCwyz-0000xx-GT; Sun, 18 Jan 2015 21:02:05 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyy-0000ud-7w for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:04 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 26/DB-10925-B4F1CB45; Sun, 18 Jan 2015 21:02:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1421614921!22193784!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 706 invoked from network); 18 Jan 2015 21:02:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:02:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwyv-00019Z-Hy for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwyv-00041A-Gl for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:01 +0000 Date: Sun, 18 Jan 2015 21:02:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl_internal: comment on domain userdata unlock 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 ad40b1fbe41b2fc3a0dfddbbe07a9678c8cd1921 Author: Wei Liu AuthorDate: Wed Jan 7 15:23:00 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 8 17:09:10 2015 +0000 libxl_internal: comment on domain userdata unlock function Discuss why we need to unlink file path before closes fd. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Jackson [ ijc -- s/to avoid such/to avoid the following/ as requested by Ian ] --- tools/libxl/libxl_internal.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 9d8025d..ddc68ab 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -458,6 +458,20 @@ out: void libxl__unlock_domain_userdata(libxl__domain_userdata_lock *lock) { + /* It's important to unlink the file before closing fd to avoid + * the following race (if close before unlink): + * + * P1 LOCK P2 UNLOCK + * fd1 = open(lockfile) + * close(fd2) + * flock(fd1) + * fstat and stat check success + * unlink(lockfile) + * return lock + * + * In above case P1 thinks it has got hold of the lock but + * actually lock is released by P2 (lockfile unlinked). + */ if (lock->path) unlink(lock->path); if (lock->carefd) libxl__carefd_close(lock->carefd); free(lock->path); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:02:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:02: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 1YCwz9-0001AE-Jk; Sun, 18 Jan 2015 21:02:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwz8-0001A5-VU for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:15 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id A7/B8-02953-65F1CB45; Sun, 18 Jan 2015 21:02:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1421614931!13648351!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13531 invoked from network); 18 Jan 2015 21:02:12 -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; 18 Jan 2015 21:02:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwz5-0001A8-Ns for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwz5-00041h-N3 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:11 +0000 Date: Sun, 18 Jan 2015 21:02:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: expand arch_shared_info to support linear p2m 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50bd1f0825339dfacde471df7664729216fc46e3 Author: Juergen Gross AuthorDate: Fri Jan 9 17:21:26 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:21:26 2015 +0100 x86: expand arch_shared_info to support linear p2m list The x86 struct arch_shared_info field pfn_to_mfn_frame_list_list currently contains the mfn of the top level page frame of the 3 level p2m tree, which is used by the Xen tools during saving and restoring (and live migration) of pv domains and for crash dump analysis. With three levels of the p2m tree it is possible to support up to 512 GB of RAM for a 64 bit pv domain. A 32 bit pv domain can support more, as each memory page can hold 1024 instead of 512 entries, leading to a limit of 4 TB. To be able to support more RAM on x86-64 switch to an additional virtual mapped p2m list. This patch expands struct arch_shared_info with a new p2m list virtual address, the root of the page table root and a p2m generation count. The new information is indicated by the domain to be valid by storing a non-zero value into the page table root member. To avoid build failures in the tools directory the checked structure sizes must be adapted, too. Signed-off-by: Juergen Gross --- tools/include/xen-foreign/reference.size | 4 +- xen/include/public/arch-x86/xen.h | 36 +++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/tools/include/xen-foreign/reference.size b/tools/include/xen-foreign/reference.size index 60ee262..ffe319e 100644 --- a/tools/include/xen-foreign/reference.size +++ b/tools/include/xen-foreign/reference.size @@ -9,6 +9,6 @@ vcpu_guest_context | 344 344 2800 5168 arch_vcpu_info | 0 0 24 16 vcpu_time_info | 32 32 32 32 vcpu_info | 48 48 64 64 -arch_shared_info | 0 0 268 280 -shared_info | 1088 1088 2584 3368 +arch_shared_info | 0 0 24 48 +shared_info | 1088 1088 2340 3136 diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index f35804b..c5e880b 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -220,11 +220,41 @@ typedef struct vcpu_guest_context vcpu_guest_context_t; DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t); struct arch_shared_info { - unsigned long max_pfn; /* max pfn that appears in table */ - /* Frame containing list of mfns containing list of mfns containing p2m. */ + /* + * Number of valid entries in the p2m table(s) anchored at + * pfn_to_mfn_frame_list_list and/or p2m_vaddr. + */ + unsigned long max_pfn; + /* + * Frame containing list of mfns containing list of mfns containing p2m. + * A value of 0 indicates it has not yet been set up, ~0 indicates it has + * been set to invalid e.g. due to the p2m being too large for the 3-level + * p2m tree. In this case the linear mapper p2m list anchored at p2m_vaddr + * is to be used. + */ xen_pfn_t pfn_to_mfn_frame_list_list; unsigned long nmi_reason; - uint64_t pad[32]; + /* + * Following three fields are valid if p2m_cr3 contains a value different + * from 0. + * p2m_cr3 is the root of the address space where p2m_vaddr is valid. + * p2m_cr3 is in the same format as a cr3 value in the vcpu register state + * and holds the folded machine frame number (via xen_pfn_to_cr3) of a + * L3 or L4 page table. + * p2m_vaddr holds the virtual address of the linear p2m list. All entries + * in the range [0...max_pfn[ are accessible via this pointer. + * p2m_generation will be incremented by the guest before and after each + * change of the mappings of the p2m list. p2m_generation starts at 0 and + * a value with the least significant bit set indicates that a mapping + * update is in progress. This allows guest external software (e.g. in Dom0) + * to verify that read mappings are consistent and whether they have changed + * since the last check. + * Modifying a p2m element in the linear p2m list is allowed via an atomic + * write only. + */ + unsigned long p2m_cr3; /* cr3 value of the p2m address space */ + unsigned long p2m_vaddr; /* virtual address of the p2m list */ + unsigned long p2m_generation; /* generation count of p2m mapping */ }; typedef struct arch_shared_info arch_shared_info_t; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:02:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:02: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 1YCwz9-0001AE-Jk; Sun, 18 Jan 2015 21:02:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwz8-0001A5-VU for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:15 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id A7/B8-02953-65F1CB45; Sun, 18 Jan 2015 21:02:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1421614931!13648351!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13531 invoked from network); 18 Jan 2015 21:02:12 -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; 18 Jan 2015 21:02:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwz5-0001A8-Ns for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwz5-00041h-N3 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:11 +0000 Date: Sun, 18 Jan 2015 21:02:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: expand arch_shared_info to support linear p2m 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50bd1f0825339dfacde471df7664729216fc46e3 Author: Juergen Gross AuthorDate: Fri Jan 9 17:21:26 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:21:26 2015 +0100 x86: expand arch_shared_info to support linear p2m list The x86 struct arch_shared_info field pfn_to_mfn_frame_list_list currently contains the mfn of the top level page frame of the 3 level p2m tree, which is used by the Xen tools during saving and restoring (and live migration) of pv domains and for crash dump analysis. With three levels of the p2m tree it is possible to support up to 512 GB of RAM for a 64 bit pv domain. A 32 bit pv domain can support more, as each memory page can hold 1024 instead of 512 entries, leading to a limit of 4 TB. To be able to support more RAM on x86-64 switch to an additional virtual mapped p2m list. This patch expands struct arch_shared_info with a new p2m list virtual address, the root of the page table root and a p2m generation count. The new information is indicated by the domain to be valid by storing a non-zero value into the page table root member. To avoid build failures in the tools directory the checked structure sizes must be adapted, too. Signed-off-by: Juergen Gross --- tools/include/xen-foreign/reference.size | 4 +- xen/include/public/arch-x86/xen.h | 36 +++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/tools/include/xen-foreign/reference.size b/tools/include/xen-foreign/reference.size index 60ee262..ffe319e 100644 --- a/tools/include/xen-foreign/reference.size +++ b/tools/include/xen-foreign/reference.size @@ -9,6 +9,6 @@ vcpu_guest_context | 344 344 2800 5168 arch_vcpu_info | 0 0 24 16 vcpu_time_info | 32 32 32 32 vcpu_info | 48 48 64 64 -arch_shared_info | 0 0 268 280 -shared_info | 1088 1088 2584 3368 +arch_shared_info | 0 0 24 48 +shared_info | 1088 1088 2340 3136 diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index f35804b..c5e880b 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -220,11 +220,41 @@ typedef struct vcpu_guest_context vcpu_guest_context_t; DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t); struct arch_shared_info { - unsigned long max_pfn; /* max pfn that appears in table */ - /* Frame containing list of mfns containing list of mfns containing p2m. */ + /* + * Number of valid entries in the p2m table(s) anchored at + * pfn_to_mfn_frame_list_list and/or p2m_vaddr. + */ + unsigned long max_pfn; + /* + * Frame containing list of mfns containing list of mfns containing p2m. + * A value of 0 indicates it has not yet been set up, ~0 indicates it has + * been set to invalid e.g. due to the p2m being too large for the 3-level + * p2m tree. In this case the linear mapper p2m list anchored at p2m_vaddr + * is to be used. + */ xen_pfn_t pfn_to_mfn_frame_list_list; unsigned long nmi_reason; - uint64_t pad[32]; + /* + * Following three fields are valid if p2m_cr3 contains a value different + * from 0. + * p2m_cr3 is the root of the address space where p2m_vaddr is valid. + * p2m_cr3 is in the same format as a cr3 value in the vcpu register state + * and holds the folded machine frame number (via xen_pfn_to_cr3) of a + * L3 or L4 page table. + * p2m_vaddr holds the virtual address of the linear p2m list. All entries + * in the range [0...max_pfn[ are accessible via this pointer. + * p2m_generation will be incremented by the guest before and after each + * change of the mappings of the p2m list. p2m_generation starts at 0 and + * a value with the least significant bit set indicates that a mapping + * update is in progress. This allows guest external software (e.g. in Dom0) + * to verify that read mappings are consistent and whether they have changed + * since the last check. + * Modifying a p2m element in the linear p2m list is allowed via an atomic + * write only. + */ + unsigned long p2m_cr3; /* cr3 value of the p2m address space */ + unsigned long p2m_vaddr; /* virtual address of the p2m list */ + unsigned long p2m_generation; /* generation count of p2m mapping */ }; typedef struct arch_shared_info arch_shared_info_t; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:02:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:02: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 1YCwzJ-0001Bu-MY; Sun, 18 Jan 2015 21:02:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzI-0001Bd-EL for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:24 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 28/24-17735-F5F1CB45; Sun, 18 Jan 2015 21:02:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1421614942!20328573!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5216 invoked from network); 18 Jan 2015 21:02:23 -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; 18 Jan 2015 21:02:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzF-0001AE-TW for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwzF-000423-Se for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:21 +0000 Date: Sun, 18 Jan 2015 21:02:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/apic: remove redundant LVR read in init_bsp_APIC() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d2ee7b0fca1f8ff045ef66c9ebbc032faaad4a0c Author: Andrew Cooper AuthorDate: Fri Jan 9 17:22:42 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:22:42 2015 +0100 x86/apic: remove redundant LVR read in init_bsp_APIC() 'ver' became unused by c/s 0b964c0c7 "x86/LAPIC: drop support for non-integrated APIC", which in turn makes the LVR read redundant. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/apic.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 1de693f..39cd9e5 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -434,7 +434,7 @@ void __init sync_Arb_IDs(void) */ void __init init_bsp_APIC(void) { - unsigned long value, ver; + unsigned long value; /* * Don't do the setup now if we have a SMP BIOS as the @@ -443,9 +443,6 @@ void __init init_bsp_APIC(void) if (smp_found_config || !cpu_has_apic) return; - value = apic_read(APIC_LVR); - ver = GET_APIC_VERSION(value); - /* * Do not trust the local APIC being empty at bootup. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:02:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:02: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 1YCwzJ-0001Bu-MY; Sun, 18 Jan 2015 21:02:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzI-0001Bd-EL for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:24 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 28/24-17735-F5F1CB45; Sun, 18 Jan 2015 21:02:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1421614942!20328573!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5216 invoked from network); 18 Jan 2015 21:02:23 -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; 18 Jan 2015 21:02:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzF-0001AE-TW for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwzF-000423-Se for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:21 +0000 Date: Sun, 18 Jan 2015 21:02:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/apic: remove redundant LVR read in init_bsp_APIC() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d2ee7b0fca1f8ff045ef66c9ebbc032faaad4a0c Author: Andrew Cooper AuthorDate: Fri Jan 9 17:22:42 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:22:42 2015 +0100 x86/apic: remove redundant LVR read in init_bsp_APIC() 'ver' became unused by c/s 0b964c0c7 "x86/LAPIC: drop support for non-integrated APIC", which in turn makes the LVR read redundant. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/apic.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 1de693f..39cd9e5 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -434,7 +434,7 @@ void __init sync_Arb_IDs(void) */ void __init init_bsp_APIC(void) { - unsigned long value, ver; + unsigned long value; /* * Don't do the setup now if we have a SMP BIOS as the @@ -443,9 +443,6 @@ void __init init_bsp_APIC(void) if (smp_found_config || !cpu_has_apic) return; - value = apic_read(APIC_LVR); - ver = GET_APIC_VERSION(value); - /* * Do not trust the local APIC being empty at bootup. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:02:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:02: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 1YCwzU-0001Da-PM; Sun, 18 Jan 2015 21:02:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzT-0001DM-5a for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:35 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 6A/3E-03145-A6F1CB45; Sun, 18 Jan 2015 21:02:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1421614952!21325139!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12971 invoked from network); 18 Jan 2015 21:02:33 -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 Jan 2015 21:02:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzQ-0001AM-30 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwzQ-00042Q-1n for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:32 +0000 Date: Sun, 18 Jan 2015 21:02:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/stack: avoid peeking into unmapped guard pages when dumping Xens stack X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c9a206331067ace6416692c64c44375d51e25180 Author: Andrew Cooper AuthorDate: Fri Jan 9 17:24:23 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:24:23 2015 +0100 x86/stack: avoid peeking into unmapped guard pages when dumping Xens stack Currently, Xens stack tracing and dumping of its own stacks will always attempt to continue to the top of the primary stack. While this is fine for 99% of cases, it is incorrect when the stack pointer starts on an IST stack. In particular, the stack analysis functions will wander up from the IST stacks, through the syscall trampolines and then onto the primary stack. If MEMORY_GUARD is enabled, this will cause a pagefault when attempting to read from the guard page. Being an unhandled hypervisor fault, the pagefault handler will then attempt to dump the stacks, and fall over the same problem. This change introduces more finegrained knowledge of the cpu stack layouts, and introduces different boundaries for whether the stack pointer is on an IST stack or the primary stack. Stack analysis starting from an IST stack will now never exceed the stack they start on, and specifically not spill over into an adjacent IST stack, or the syscall trampoline area. A sample now looks like: (XEN) '1' pressed -> testing mce stack printing (XEN) ----[ Xen-4.5.0-rc x86_64 debug=n Not tainted ]---- (XEN) CPU: 0 (XEN) RIP: e008:[] check_mce_test+0xb/0x20 (XEN) RFLAGS: 0000000000010002 CONTEXT: hypervisor (XEN) rax: 0000000000000000 rbx: ffff82d0802caf58 rcx: 0000000000000000 (XEN) rdx: ffff82d080235d20 rsi: 000000000000000a rdi: ffff82d0802caf58 (XEN) rbp: 0000000000000031 rsp: ffff82d0802caf40 r8: ffff83007faf4000 (XEN) r9: 0000000000004000 r10: 0000000000000001 r11: 0000000000000006 (XEN) r12: ffff82d0802cfe58 r13: ffff82d0802cfe58 r14: dead0000c0de0000 (XEN) r15: ffff82d080191910 cr0: 000000008005003b cr4: 00000000000026f0 (XEN) cr3: 0000000062565000 cr2: 00007fb98a5e8fe8 (XEN) ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: e010 cs: e008 (XEN) Xen stack trace from rsp=ffff82d0802caf40: (XEN) ffff82d0801ad119 ffff82d080278da0 ffff82d080227907 ffff82d080191910 (XEN) dead0000c0de0000 ffff82d0802cfe58 ffff82d0802cfe58 0000000000000031 (XEN) ffff82d080278da0 0000000000000006 0000000000000001 0000000000004000 (XEN) ffff83007faf4000 ffff82d0803101a0 0000000000000000 ffff82d0802c8000 (XEN) 000000000000000a ffff82d080277620 0000001200000000 ffff82d08018ae6a (XEN) 000000000000e008 0000000000000292 ffff82d0802cfd18 000000000000e010 (XEN) Xen call trace: (XEN) [] check_mce_test+0xb/0x20 (XEN) [] do_machine_check+0x9/0x20 (XEN) [] handle_ist_exception+0x8d/0xf6 (XEN) In this test case, %r15 is deliberately set up with a function pointer in an attempt to fool the naive stack trace algorithm. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/traps.c | 77 +++++++++++++++++++++++++++++++++++++--- xen/include/asm-x86/current.h | 33 ++++++++++++++--- 2 files changed, 98 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 3cd8746..6abf1db 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -193,6 +193,70 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) printk("\n"); } +/* + * Notes for get_stack_trace_bottom() and get_stack_dump_bottom() + * + * Stack pages 0, 1 and 2: + * These are all 1-page IST stacks. Each of these stacks have an exception + * frame and saved register state at the top. The interesting bound for a + * trace is the word adjacent to this, while the bound for a dump is the + * very top, including the exception frame. + * + * Stack pages 3, 4 and 5: + * None of these are particularly interesting. With MEMORY_GUARD, page 5 is + * explicitly not present, so attempting to dump or trace it is + * counterproductive. Without MEMORY_GUARD, it is possible for a call chain + * to use the entire primary stack and wander into page 5. In this case, + * consider these pages an extension of the primary stack to aid debugging + * hopefully rare situations where the primary stack has effective been + * overflown. + * + * Stack pages 6 and 7: + * These form the primary stack, and have a cpu_info at the top. For a + * trace, the interesting bound is adjacent to the cpu_info, while for a + * dump, the entire cpu_info is interesting. + * + * For the cases where the stack should not be inspected, pretend that the + * passed stack pointer is already out of reasonable bounds. + */ +unsigned long get_stack_trace_bottom(unsigned long sp) +{ + switch ( get_stack_page(sp) ) + { + case 0 ... 2: + return ROUNDUP(sp, PAGE_SIZE) - + offsetof(struct cpu_user_regs, es) - sizeof(unsigned long); + +#ifndef MEMORY_GUARD + case 3 ... 5: +#endif + case 6 ... 7: + return ROUNDUP(sp, STACK_SIZE) - + sizeof(struct cpu_info) - sizeof(unsigned long); + + default: + return sp - sizeof(unsigned long); + } +} + +unsigned long get_stack_dump_bottom(unsigned long sp) +{ + switch ( get_stack_page(sp) ) + { + case 0 ... 2: + return ROUNDUP(sp, PAGE_SIZE) - sizeof(unsigned long); + +#ifndef MEMORY_GUARD + case 3 ... 5: +#endif + case 6 ... 7: + return ROUNDUP(sp, STACK_SIZE) - sizeof(unsigned long); + + default: + return sp - sizeof(unsigned long); + } +} + #if !defined(CONFIG_FRAME_POINTER) /* @@ -203,7 +267,7 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) static void _show_trace(unsigned long sp, unsigned long __maybe_unused bp) { unsigned long *stack = (unsigned long *)sp, addr; - unsigned long *bottom = (unsigned long *)get_printable_stack_bottom(sp); + unsigned long *bottom = (unsigned long *)get_stack_trace_bottom(sp); while ( stack <= bottom ) { @@ -221,7 +285,7 @@ static void _show_trace(unsigned long sp, unsigned long bp) unsigned long *frame, next, addr; /* Bounds for range of valid frame pointer. */ - unsigned long low = sp, high = get_printable_stack_bottom(sp); + unsigned long low = sp, high = get_stack_trace_bottom(sp); /* The initial frame pointer. */ next = bp; @@ -292,7 +356,7 @@ static void show_trace(const struct cpu_user_regs *regs) void show_stack(const struct cpu_user_regs *regs) { - unsigned long *stack = ESP_BEFORE_EXCEPTION(regs), addr; + unsigned long *stack = ESP_BEFORE_EXCEPTION(regs), *stack_bottom, addr; int i; if ( guest_mode(regs) ) @@ -300,10 +364,11 @@ void show_stack(const struct cpu_user_regs *regs) printk("Xen stack trace from "__OP"sp=%p:\n ", stack); - for ( i = 0; i < (debug_stack_lines*stack_words_per_line); i++ ) + stack_bottom = _p(get_stack_dump_bottom(regs->rsp)); + + for ( i = 0; i < (debug_stack_lines*stack_words_per_line) && + (stack <= stack_bottom); i++ ) { - if ( ((long)stack & (STACK_SIZE-BYTES_PER_LONG)) == 0 ) - break; if ( (i != 0) && ((i % stack_words_per_line) == 0) ) printk("\n "); addr = *stack++; diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h index b95fd79..f011d2d 100644 --- a/xen/include/asm-x86/current.h +++ b/xen/include/asm-x86/current.h @@ -12,6 +12,28 @@ #include #include +/* + * Xen's cpu stacks are 8 pages (8-page aligned), arranged as: + * + * 7 - Primary stack (with a struct cpu_info at the top) + * 6 - Primary stack + * 5 - Optionally not preset (MEMORY_GUARD) + * 4 - unused + * 3 - Syscall trampolines + * 2 - MCE IST stack + * 1 - NMI IST stack + * 0 - Double Fault IST stack + */ + +/* + * Identify which stack page the stack pointer is on. Returns an index + * as per the comment above. + */ +static inline unsigned int get_stack_page(unsigned long sp) +{ + return (sp & (STACK_SIZE-1)) >> PAGE_SHIFT; +} + struct vcpu; struct cpu_info { @@ -51,13 +73,12 @@ static inline struct cpu_info *get_cpu_info(void) ((unsigned long)&get_cpu_info()->guest_cpu_user_regs.es) /* - * Get the bottom-of-stack, as useful for printing stack traces. This is the - * highest word on the stack which might be part of a stack trace, and is the - * adjacent word to a struct cpu_info on the stack. + * Get the reasonable stack bounds for stack traces and stack dumps. Stack + * dumps have a slightly larger range to include exception frames in the + * printed information. The returned word is inside the interesting range. */ -#define get_printable_stack_bottom(sp) \ - ((sp & (~(STACK_SIZE-1))) + \ - (STACK_SIZE - sizeof(struct cpu_info) - sizeof(unsigned long))) +unsigned long get_stack_trace_bottom(unsigned long sp); +unsigned long get_stack_dump_bottom (unsigned long sp); #define reset_stack_and_jump(__fn) \ ({ \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:02:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:02: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 1YCwzU-0001Da-PM; Sun, 18 Jan 2015 21:02:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzT-0001DM-5a for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:35 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 6A/3E-03145-A6F1CB45; Sun, 18 Jan 2015 21:02:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1421614952!21325139!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12971 invoked from network); 18 Jan 2015 21:02:33 -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 Jan 2015 21:02:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzQ-0001AM-30 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwzQ-00042Q-1n for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:32 +0000 Date: Sun, 18 Jan 2015 21:02:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/stack: avoid peeking into unmapped guard pages when dumping Xens stack X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c9a206331067ace6416692c64c44375d51e25180 Author: Andrew Cooper AuthorDate: Fri Jan 9 17:24:23 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:24:23 2015 +0100 x86/stack: avoid peeking into unmapped guard pages when dumping Xens stack Currently, Xens stack tracing and dumping of its own stacks will always attempt to continue to the top of the primary stack. While this is fine for 99% of cases, it is incorrect when the stack pointer starts on an IST stack. In particular, the stack analysis functions will wander up from the IST stacks, through the syscall trampolines and then onto the primary stack. If MEMORY_GUARD is enabled, this will cause a pagefault when attempting to read from the guard page. Being an unhandled hypervisor fault, the pagefault handler will then attempt to dump the stacks, and fall over the same problem. This change introduces more finegrained knowledge of the cpu stack layouts, and introduces different boundaries for whether the stack pointer is on an IST stack or the primary stack. Stack analysis starting from an IST stack will now never exceed the stack they start on, and specifically not spill over into an adjacent IST stack, or the syscall trampoline area. A sample now looks like: (XEN) '1' pressed -> testing mce stack printing (XEN) ----[ Xen-4.5.0-rc x86_64 debug=n Not tainted ]---- (XEN) CPU: 0 (XEN) RIP: e008:[] check_mce_test+0xb/0x20 (XEN) RFLAGS: 0000000000010002 CONTEXT: hypervisor (XEN) rax: 0000000000000000 rbx: ffff82d0802caf58 rcx: 0000000000000000 (XEN) rdx: ffff82d080235d20 rsi: 000000000000000a rdi: ffff82d0802caf58 (XEN) rbp: 0000000000000031 rsp: ffff82d0802caf40 r8: ffff83007faf4000 (XEN) r9: 0000000000004000 r10: 0000000000000001 r11: 0000000000000006 (XEN) r12: ffff82d0802cfe58 r13: ffff82d0802cfe58 r14: dead0000c0de0000 (XEN) r15: ffff82d080191910 cr0: 000000008005003b cr4: 00000000000026f0 (XEN) cr3: 0000000062565000 cr2: 00007fb98a5e8fe8 (XEN) ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: e010 cs: e008 (XEN) Xen stack trace from rsp=ffff82d0802caf40: (XEN) ffff82d0801ad119 ffff82d080278da0 ffff82d080227907 ffff82d080191910 (XEN) dead0000c0de0000 ffff82d0802cfe58 ffff82d0802cfe58 0000000000000031 (XEN) ffff82d080278da0 0000000000000006 0000000000000001 0000000000004000 (XEN) ffff83007faf4000 ffff82d0803101a0 0000000000000000 ffff82d0802c8000 (XEN) 000000000000000a ffff82d080277620 0000001200000000 ffff82d08018ae6a (XEN) 000000000000e008 0000000000000292 ffff82d0802cfd18 000000000000e010 (XEN) Xen call trace: (XEN) [] check_mce_test+0xb/0x20 (XEN) [] do_machine_check+0x9/0x20 (XEN) [] handle_ist_exception+0x8d/0xf6 (XEN) In this test case, %r15 is deliberately set up with a function pointer in an attempt to fool the naive stack trace algorithm. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/traps.c | 77 +++++++++++++++++++++++++++++++++++++--- xen/include/asm-x86/current.h | 33 ++++++++++++++--- 2 files changed, 98 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 3cd8746..6abf1db 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -193,6 +193,70 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) printk("\n"); } +/* + * Notes for get_stack_trace_bottom() and get_stack_dump_bottom() + * + * Stack pages 0, 1 and 2: + * These are all 1-page IST stacks. Each of these stacks have an exception + * frame and saved register state at the top. The interesting bound for a + * trace is the word adjacent to this, while the bound for a dump is the + * very top, including the exception frame. + * + * Stack pages 3, 4 and 5: + * None of these are particularly interesting. With MEMORY_GUARD, page 5 is + * explicitly not present, so attempting to dump or trace it is + * counterproductive. Without MEMORY_GUARD, it is possible for a call chain + * to use the entire primary stack and wander into page 5. In this case, + * consider these pages an extension of the primary stack to aid debugging + * hopefully rare situations where the primary stack has effective been + * overflown. + * + * Stack pages 6 and 7: + * These form the primary stack, and have a cpu_info at the top. For a + * trace, the interesting bound is adjacent to the cpu_info, while for a + * dump, the entire cpu_info is interesting. + * + * For the cases where the stack should not be inspected, pretend that the + * passed stack pointer is already out of reasonable bounds. + */ +unsigned long get_stack_trace_bottom(unsigned long sp) +{ + switch ( get_stack_page(sp) ) + { + case 0 ... 2: + return ROUNDUP(sp, PAGE_SIZE) - + offsetof(struct cpu_user_regs, es) - sizeof(unsigned long); + +#ifndef MEMORY_GUARD + case 3 ... 5: +#endif + case 6 ... 7: + return ROUNDUP(sp, STACK_SIZE) - + sizeof(struct cpu_info) - sizeof(unsigned long); + + default: + return sp - sizeof(unsigned long); + } +} + +unsigned long get_stack_dump_bottom(unsigned long sp) +{ + switch ( get_stack_page(sp) ) + { + case 0 ... 2: + return ROUNDUP(sp, PAGE_SIZE) - sizeof(unsigned long); + +#ifndef MEMORY_GUARD + case 3 ... 5: +#endif + case 6 ... 7: + return ROUNDUP(sp, STACK_SIZE) - sizeof(unsigned long); + + default: + return sp - sizeof(unsigned long); + } +} + #if !defined(CONFIG_FRAME_POINTER) /* @@ -203,7 +267,7 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) static void _show_trace(unsigned long sp, unsigned long __maybe_unused bp) { unsigned long *stack = (unsigned long *)sp, addr; - unsigned long *bottom = (unsigned long *)get_printable_stack_bottom(sp); + unsigned long *bottom = (unsigned long *)get_stack_trace_bottom(sp); while ( stack <= bottom ) { @@ -221,7 +285,7 @@ static void _show_trace(unsigned long sp, unsigned long bp) unsigned long *frame, next, addr; /* Bounds for range of valid frame pointer. */ - unsigned long low = sp, high = get_printable_stack_bottom(sp); + unsigned long low = sp, high = get_stack_trace_bottom(sp); /* The initial frame pointer. */ next = bp; @@ -292,7 +356,7 @@ static void show_trace(const struct cpu_user_regs *regs) void show_stack(const struct cpu_user_regs *regs) { - unsigned long *stack = ESP_BEFORE_EXCEPTION(regs), addr; + unsigned long *stack = ESP_BEFORE_EXCEPTION(regs), *stack_bottom, addr; int i; if ( guest_mode(regs) ) @@ -300,10 +364,11 @@ void show_stack(const struct cpu_user_regs *regs) printk("Xen stack trace from "__OP"sp=%p:\n ", stack); - for ( i = 0; i < (debug_stack_lines*stack_words_per_line); i++ ) + stack_bottom = _p(get_stack_dump_bottom(regs->rsp)); + + for ( i = 0; i < (debug_stack_lines*stack_words_per_line) && + (stack <= stack_bottom); i++ ) { - if ( ((long)stack & (STACK_SIZE-BYTES_PER_LONG)) == 0 ) - break; if ( (i != 0) && ((i % stack_words_per_line) == 0) ) printk("\n "); addr = *stack++; diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h index b95fd79..f011d2d 100644 --- a/xen/include/asm-x86/current.h +++ b/xen/include/asm-x86/current.h @@ -12,6 +12,28 @@ #include #include +/* + * Xen's cpu stacks are 8 pages (8-page aligned), arranged as: + * + * 7 - Primary stack (with a struct cpu_info at the top) + * 6 - Primary stack + * 5 - Optionally not preset (MEMORY_GUARD) + * 4 - unused + * 3 - Syscall trampolines + * 2 - MCE IST stack + * 1 - NMI IST stack + * 0 - Double Fault IST stack + */ + +/* + * Identify which stack page the stack pointer is on. Returns an index + * as per the comment above. + */ +static inline unsigned int get_stack_page(unsigned long sp) +{ + return (sp & (STACK_SIZE-1)) >> PAGE_SHIFT; +} + struct vcpu; struct cpu_info { @@ -51,13 +73,12 @@ static inline struct cpu_info *get_cpu_info(void) ((unsigned long)&get_cpu_info()->guest_cpu_user_regs.es) /* - * Get the bottom-of-stack, as useful for printing stack traces. This is the - * highest word on the stack which might be part of a stack trace, and is the - * adjacent word to a struct cpu_info on the stack. + * Get the reasonable stack bounds for stack traces and stack dumps. Stack + * dumps have a slightly larger range to include exception frames in the + * printed information. The returned word is inside the interesting range. */ -#define get_printable_stack_bottom(sp) \ - ((sp & (~(STACK_SIZE-1))) + \ - (STACK_SIZE - sizeof(struct cpu_info) - sizeof(unsigned long))) +unsigned long get_stack_trace_bottom(unsigned long sp); +unsigned long get_stack_dump_bottom (unsigned long sp); #define reset_stack_and_jump(__fn) \ ({ \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:02:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:02: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 1YCwzd-0001FL-UN; Sun, 18 Jan 2015 21:02:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzc-0001F0-NN for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:44 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 94/2B-15461-37F1CB45; Sun, 18 Jan 2015 21:02:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1421614962!22263766!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3788 invoked from network); 18 Jan 2015 21:02:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:02:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwza-0001AQ-8c for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwza-00042p-7q for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:42 +0000 Date: Sun, 18 Jan 2015 21:02:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: Andrew Cooper to co-maintain x86 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a3c0d914b7cbf330042671a7220d990d99f1e4a7 Author: Jan Beulich AuthorDate: Fri Jan 9 17:25:26 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:25:26 2015 +0100 MAINTAINERS: Andrew Cooper to co-maintain x86 Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Acked-by: Keir Fraser --- MAINTAINERS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index ee2fe90..3bbac9e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -341,6 +341,7 @@ F: docs/misc/vtpm.txt X86 ARCHITECTURE M: Keir Fraser M: Jan Beulich +M: Andrew Cooper S: Supported L: xen-devel@lists.xen.org F: xen/arch/x86/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:02:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:02: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 1YCwzd-0001FL-UN; Sun, 18 Jan 2015 21:02:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzc-0001F0-NN for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:44 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 94/2B-15461-37F1CB45; Sun, 18 Jan 2015 21:02:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1421614962!22263766!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3788 invoked from network); 18 Jan 2015 21:02:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:02:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwza-0001AQ-8c for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwza-00042p-7q for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:42 +0000 Date: Sun, 18 Jan 2015 21:02:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: Andrew Cooper to co-maintain x86 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a3c0d914b7cbf330042671a7220d990d99f1e4a7 Author: Jan Beulich AuthorDate: Fri Jan 9 17:25:26 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:25:26 2015 +0100 MAINTAINERS: Andrew Cooper to co-maintain x86 Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Acked-by: Keir Fraser --- MAINTAINERS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index ee2fe90..3bbac9e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -341,6 +341,7 @@ F: docs/misc/vtpm.txt X86 ARCHITECTURE M: Keir Fraser M: Jan Beulich +M: Andrew Cooper S: Supported L: xen-devel@lists.xen.org F: xen/arch/x86/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:02:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:02: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 1YCwzp-0001Gq-0i; Sun, 18 Jan 2015 21:02:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzo-0001Gg-50 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:56 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 21/FA-02743-F7F1CB45; Sun, 18 Jan 2015 21:02:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1421614972!16628136!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13643 invoked from network); 18 Jan 2015 21:02:54 -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; 18 Jan 2015 21:02:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzk-0001AY-Ew for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwzk-00043u-DH for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:52 +0000 Date: Sun, 18 Jan 2015 21:02:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: streamline hypercall_create_continuation() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c109909720fa49cc1bb71c729fd5a14e17163306 Author: Jan Beulich AuthorDate: Fri Jan 9 17:25:55 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:25:55 2015 +0100 x86: streamline hypercall_create_continuation() - drop clearing of excessive multicall arguments in compat case (no longer needed now that hypercall_xlat_continuation() only checks the actual arguments) - latch current into a local variable - use the cached value of hvm_guest_x86_mode() instead of re-executing it - scope restrict "regs" - while at it, convert the remaining two argument checking BUG_ON()s in hypercall_xlat_continuation() to ASSERT()s Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index b699510..c8832c6 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1675,7 +1675,6 @@ unsigned long hypercall_create_continuation( unsigned int op, const char *format, ...) { struct mc_state *mcs = ¤t->mc_state; - struct cpu_user_regs *regs; const char *p = format; unsigned long arg; unsigned int i; @@ -1689,26 +1688,23 @@ unsigned long hypercall_create_continuation( for ( i = 0; *p != '\0'; i++ ) mcs->call.args[i] = next_arg(p, args); - if ( is_pv_32on64_domain(current->domain) ) - { - for ( ; i < 6; i++ ) - mcs->call.args[i] = 0; - } } else { - regs = guest_cpu_user_regs(); - regs->eax = op; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + struct vcpu *curr = current; + + regs->eax = op; /* Ensure the hypercall trap instruction is re-executed. */ - if ( is_pv_vcpu(current) ) + if ( is_pv_vcpu(curr) ) regs->eip -= 2; /* re-execute 'syscall' / 'int $xx' */ else - current->arch.hvm_vcpu.hcall_preempted = 1; + curr->arch.hvm_vcpu.hcall_preempted = 1; - if ( is_pv_vcpu(current) ? - !is_pv_32on64_vcpu(current) : - (hvm_guest_x86_mode(current) == 8) ) + if ( is_pv_vcpu(curr) ? + !is_pv_32on64_vcpu(curr) : + curr->arch.hvm_vcpu.hcall_64bit ) { for ( i = 0; *p != '\0'; i++ ) { @@ -1759,9 +1755,8 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, ASSERT(nr <= ARRAY_SIZE(mcs->call.args)); ASSERT(!(mask >> nr)); - - BUG_ON(id && *id >= nr); - BUG_ON(id && (mask & (1U << *id))); + ASSERT(!id || *id < nr); + ASSERT(!id || !(mask & (1U << *id))); va_start(args, 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 Sun Jan 18 21:02:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:02: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 1YCwzp-0001Gq-0i; Sun, 18 Jan 2015 21:02:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzo-0001Gg-50 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:56 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 21/FA-02743-F7F1CB45; Sun, 18 Jan 2015 21:02:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1421614972!16628136!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13643 invoked from network); 18 Jan 2015 21:02:54 -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; 18 Jan 2015 21:02:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzk-0001AY-Ew for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwzk-00043u-DH for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:02:52 +0000 Date: Sun, 18 Jan 2015 21:02:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: streamline hypercall_create_continuation() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c109909720fa49cc1bb71c729fd5a14e17163306 Author: Jan Beulich AuthorDate: Fri Jan 9 17:25:55 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:25:55 2015 +0100 x86: streamline hypercall_create_continuation() - drop clearing of excessive multicall arguments in compat case (no longer needed now that hypercall_xlat_continuation() only checks the actual arguments) - latch current into a local variable - use the cached value of hvm_guest_x86_mode() instead of re-executing it - scope restrict "regs" - while at it, convert the remaining two argument checking BUG_ON()s in hypercall_xlat_continuation() to ASSERT()s Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index b699510..c8832c6 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1675,7 +1675,6 @@ unsigned long hypercall_create_continuation( unsigned int op, const char *format, ...) { struct mc_state *mcs = ¤t->mc_state; - struct cpu_user_regs *regs; const char *p = format; unsigned long arg; unsigned int i; @@ -1689,26 +1688,23 @@ unsigned long hypercall_create_continuation( for ( i = 0; *p != '\0'; i++ ) mcs->call.args[i] = next_arg(p, args); - if ( is_pv_32on64_domain(current->domain) ) - { - for ( ; i < 6; i++ ) - mcs->call.args[i] = 0; - } } else { - regs = guest_cpu_user_regs(); - regs->eax = op; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + struct vcpu *curr = current; + + regs->eax = op; /* Ensure the hypercall trap instruction is re-executed. */ - if ( is_pv_vcpu(current) ) + if ( is_pv_vcpu(curr) ) regs->eip -= 2; /* re-execute 'syscall' / 'int $xx' */ else - current->arch.hvm_vcpu.hcall_preempted = 1; + curr->arch.hvm_vcpu.hcall_preempted = 1; - if ( is_pv_vcpu(current) ? - !is_pv_32on64_vcpu(current) : - (hvm_guest_x86_mode(current) == 8) ) + if ( is_pv_vcpu(curr) ? + !is_pv_32on64_vcpu(curr) : + curr->arch.hvm_vcpu.hcall_64bit ) { for ( i = 0; *p != '\0'; i++ ) { @@ -1759,9 +1755,8 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, ASSERT(nr <= ARRAY_SIZE(mcs->call.args)); ASSERT(!(mask >> nr)); - - BUG_ON(id && *id >= nr); - BUG_ON(id && (mask & (1U << *id))); + ASSERT(!id || *id < nr); + ASSERT(!id || !(mask & (1U << *id))); va_start(args, 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 Sun Jan 18 21:03:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:03: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 1YCwzz-0001IO-3E; Sun, 18 Jan 2015 21:03:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzx-0001I5-6K for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:05 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 41/02-07724-88F1CB45; Sun, 18 Jan 2015 21:03:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1421614982!20483633!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27773 invoked from network); 18 Jan 2015 21:03: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; 18 Jan 2015 21:03:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzu-0001BA-L3 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwzu-00044P-Jh for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:02 +0000 Date: Sun, 18 Jan 2015 21:03:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: clobber hypercall arguments just like for PV X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9281ad48e948d715f17c38049216fcb9933092bc Author: Jan Beulich AuthorDate: Fri Jan 9 17:26:31 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:26:31 2015 +0100 x86/HVM: clobber hypercall arguments just like for PV Unused arguments get clobbered before the call (not affecting caller visible state), while used arguments get clobbered afterwards unless a continuation is needed (affecting caller visible state). Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 101 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 81 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 6648d61..8b06bfd 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4818,6 +4818,8 @@ static hvm_hypercall_t *const pvh_hypercall64_table[NR_hypercalls] = { [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation }; +extern const uint8_t hypercall_args_table[], compat_hypercall_args_table[]; + int hvm_do_hypercall(struct cpu_user_regs *regs) { struct vcpu *curr = current; @@ -4856,36 +4858,95 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) if ( mode == 8 ) { + unsigned long rdi = regs->rdi; + unsigned long rsi = regs->rsi; + unsigned long rdx = regs->rdx; + unsigned long r10 = regs->r10; + unsigned long r8 = regs->r8; + unsigned long r9 = regs->r9; + HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%u(%lx, %lx, %lx, %lx, %lx, %lx)", - eax, regs->rdi, regs->rsi, regs->rdx, - regs->r10, regs->r8, regs->r9); + eax, rdi, rsi, rdx, r10, r8, r9); + +#ifndef NDEBUG + /* Deliberately corrupt parameter regs not used by this hypercall. */ + switch ( hypercall_args_table[eax] ) + { + case 0: rdi = 0xdeadbeefdeadf00dUL; + case 1: rsi = 0xdeadbeefdeadf00dUL; + case 2: rdx = 0xdeadbeefdeadf00dUL; + case 3: r10 = 0xdeadbeefdeadf00dUL; + case 4: r8 = 0xdeadbeefdeadf00dUL; + case 5: r9 = 0xdeadbeefdeadf00dUL; + } +#endif curr->arch.hvm_vcpu.hcall_64bit = 1; - if ( is_pvh_vcpu(curr) ) - regs->rax = pvh_hypercall64_table[eax](regs->rdi, regs->rsi, - regs->rdx, regs->r10, - regs->r8, regs->r9); - else - regs->rax = hvm_hypercall64_table[eax](regs->rdi, regs->rsi, - regs->rdx, regs->r10, - regs->r8, regs->r9); + regs->rax = (is_pvh_vcpu(curr) + ? pvh_hypercall64_table + : hvm_hypercall64_table)[eax](rdi, rsi, rdx, r10, r8, r9); curr->arch.hvm_vcpu.hcall_64bit = 0; + +#ifndef NDEBUG + if ( !curr->arch.hvm_vcpu.hcall_preempted ) + { + /* Deliberately corrupt parameter regs used by this hypercall. */ + switch ( hypercall_args_table[eax] ) + { + case 6: regs->r9 = 0xdeadbeefdeadf00dUL; + case 5: regs->r8 = 0xdeadbeefdeadf00dUL; + case 4: regs->r10 = 0xdeadbeefdeadf00dUL; + case 3: regs->edx = 0xdeadbeefdeadf00dUL; + case 2: regs->esi = 0xdeadbeefdeadf00dUL; + case 1: regs->edi = 0xdeadbeefdeadf00dUL; + } + } +#endif } else if ( unlikely(is_pvh_vcpu(curr)) ) regs->_eax = -ENOSYS; /* PVH 32bitfixme. */ else { + unsigned int ebx = regs->_ebx; + unsigned int ecx = regs->_ecx; + unsigned int edx = regs->_edx; + unsigned int esi = regs->_esi; + unsigned int edi = regs->_edi; + unsigned int ebp = regs->_ebp; + HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%u(%x, %x, %x, %x, %x, %x)", eax, - (uint32_t)regs->ebx, (uint32_t)regs->ecx, - (uint32_t)regs->edx, (uint32_t)regs->esi, - (uint32_t)regs->edi, (uint32_t)regs->ebp); - - regs->eax = hvm_hypercall32_table[eax]((uint32_t)regs->ebx, - (uint32_t)regs->ecx, - (uint32_t)regs->edx, - (uint32_t)regs->esi, - (uint32_t)regs->edi, - (uint32_t)regs->ebp); + ebx, ecx, edx, esi, edi, ebp); + +#ifndef NDEBUG + /* Deliberately corrupt parameter regs not used by this hypercall. */ + switch ( compat_hypercall_args_table[eax] ) + { + case 0: ebx = 0xdeadf00d; + case 1: ecx = 0xdeadf00d; + case 2: edx = 0xdeadf00d; + case 3: esi = 0xdeadf00d; + case 4: edi = 0xdeadf00d; + case 5: ebp = 0xdeadf00d; + } +#endif + + regs->_eax = hvm_hypercall32_table[eax](ebx, ecx, edx, esi, edi, ebp); + +#ifndef NDEBUG + if ( !curr->arch.hvm_vcpu.hcall_preempted ) + { + /* Deliberately corrupt parameter regs used by this hypercall. */ + switch ( compat_hypercall_args_table[eax] ) + { + case 6: regs->ebp = 0xdeadf00d; + case 5: regs->edi = 0xdeadf00d; + case 4: regs->esi = 0xdeadf00d; + case 3: regs->edx = 0xdeadf00d; + case 2: regs->ecx = 0xdeadf00d; + case 1: regs->ebx = 0xdeadf00d; + } + } +#endif } HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%u -> %lx", -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:03:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:03: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 1YCwzz-0001IO-3E; Sun, 18 Jan 2015 21:03:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzx-0001I5-6K for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:05 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 41/02-07724-88F1CB45; Sun, 18 Jan 2015 21:03:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1421614982!20483633!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27773 invoked from network); 18 Jan 2015 21:03: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; 18 Jan 2015 21:03:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCwzu-0001BA-L3 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCwzu-00044P-Jh for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:02 +0000 Date: Sun, 18 Jan 2015 21:03:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: clobber hypercall arguments just like for PV X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9281ad48e948d715f17c38049216fcb9933092bc Author: Jan Beulich AuthorDate: Fri Jan 9 17:26:31 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:26:31 2015 +0100 x86/HVM: clobber hypercall arguments just like for PV Unused arguments get clobbered before the call (not affecting caller visible state), while used arguments get clobbered afterwards unless a continuation is needed (affecting caller visible state). Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 101 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 81 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 6648d61..8b06bfd 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4818,6 +4818,8 @@ static hvm_hypercall_t *const pvh_hypercall64_table[NR_hypercalls] = { [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation }; +extern const uint8_t hypercall_args_table[], compat_hypercall_args_table[]; + int hvm_do_hypercall(struct cpu_user_regs *regs) { struct vcpu *curr = current; @@ -4856,36 +4858,95 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) if ( mode == 8 ) { + unsigned long rdi = regs->rdi; + unsigned long rsi = regs->rsi; + unsigned long rdx = regs->rdx; + unsigned long r10 = regs->r10; + unsigned long r8 = regs->r8; + unsigned long r9 = regs->r9; + HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%u(%lx, %lx, %lx, %lx, %lx, %lx)", - eax, regs->rdi, regs->rsi, regs->rdx, - regs->r10, regs->r8, regs->r9); + eax, rdi, rsi, rdx, r10, r8, r9); + +#ifndef NDEBUG + /* Deliberately corrupt parameter regs not used by this hypercall. */ + switch ( hypercall_args_table[eax] ) + { + case 0: rdi = 0xdeadbeefdeadf00dUL; + case 1: rsi = 0xdeadbeefdeadf00dUL; + case 2: rdx = 0xdeadbeefdeadf00dUL; + case 3: r10 = 0xdeadbeefdeadf00dUL; + case 4: r8 = 0xdeadbeefdeadf00dUL; + case 5: r9 = 0xdeadbeefdeadf00dUL; + } +#endif curr->arch.hvm_vcpu.hcall_64bit = 1; - if ( is_pvh_vcpu(curr) ) - regs->rax = pvh_hypercall64_table[eax](regs->rdi, regs->rsi, - regs->rdx, regs->r10, - regs->r8, regs->r9); - else - regs->rax = hvm_hypercall64_table[eax](regs->rdi, regs->rsi, - regs->rdx, regs->r10, - regs->r8, regs->r9); + regs->rax = (is_pvh_vcpu(curr) + ? pvh_hypercall64_table + : hvm_hypercall64_table)[eax](rdi, rsi, rdx, r10, r8, r9); curr->arch.hvm_vcpu.hcall_64bit = 0; + +#ifndef NDEBUG + if ( !curr->arch.hvm_vcpu.hcall_preempted ) + { + /* Deliberately corrupt parameter regs used by this hypercall. */ + switch ( hypercall_args_table[eax] ) + { + case 6: regs->r9 = 0xdeadbeefdeadf00dUL; + case 5: regs->r8 = 0xdeadbeefdeadf00dUL; + case 4: regs->r10 = 0xdeadbeefdeadf00dUL; + case 3: regs->edx = 0xdeadbeefdeadf00dUL; + case 2: regs->esi = 0xdeadbeefdeadf00dUL; + case 1: regs->edi = 0xdeadbeefdeadf00dUL; + } + } +#endif } else if ( unlikely(is_pvh_vcpu(curr)) ) regs->_eax = -ENOSYS; /* PVH 32bitfixme. */ else { + unsigned int ebx = regs->_ebx; + unsigned int ecx = regs->_ecx; + unsigned int edx = regs->_edx; + unsigned int esi = regs->_esi; + unsigned int edi = regs->_edi; + unsigned int ebp = regs->_ebp; + HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%u(%x, %x, %x, %x, %x, %x)", eax, - (uint32_t)regs->ebx, (uint32_t)regs->ecx, - (uint32_t)regs->edx, (uint32_t)regs->esi, - (uint32_t)regs->edi, (uint32_t)regs->ebp); - - regs->eax = hvm_hypercall32_table[eax]((uint32_t)regs->ebx, - (uint32_t)regs->ecx, - (uint32_t)regs->edx, - (uint32_t)regs->esi, - (uint32_t)regs->edi, - (uint32_t)regs->ebp); + ebx, ecx, edx, esi, edi, ebp); + +#ifndef NDEBUG + /* Deliberately corrupt parameter regs not used by this hypercall. */ + switch ( compat_hypercall_args_table[eax] ) + { + case 0: ebx = 0xdeadf00d; + case 1: ecx = 0xdeadf00d; + case 2: edx = 0xdeadf00d; + case 3: esi = 0xdeadf00d; + case 4: edi = 0xdeadf00d; + case 5: ebp = 0xdeadf00d; + } +#endif + + regs->_eax = hvm_hypercall32_table[eax](ebx, ecx, edx, esi, edi, ebp); + +#ifndef NDEBUG + if ( !curr->arch.hvm_vcpu.hcall_preempted ) + { + /* Deliberately corrupt parameter regs used by this hypercall. */ + switch ( compat_hypercall_args_table[eax] ) + { + case 6: regs->ebp = 0xdeadf00d; + case 5: regs->edi = 0xdeadf00d; + case 4: regs->esi = 0xdeadf00d; + case 3: regs->edx = 0xdeadf00d; + case 2: regs->ecx = 0xdeadf00d; + case 1: regs->ebx = 0xdeadf00d; + } + } +#endif } HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%u -> %lx", -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:03:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:03: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 1YCx09-0001Jz-6A; Sun, 18 Jan 2015 21:03:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx07-0001Je-UZ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:16 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 65/99-26858-29F1CB45; Sun, 18 Jan 2015 21:03:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1421614993!20504293!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9532 invoked from network); 18 Jan 2015 21:03:14 -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; 18 Jan 2015 21:03:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx04-0001BG-QP for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx04-00044n-PX for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:12 +0000 Date: Sun, 18 Jan 2015 21:03:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvm/vmx: WRITE_MSR() macro hygene X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 463a991e51835ced8d440d37959d5bfc1f79417b Author: Andrew Cooper AuthorDate: Fri Jan 9 17:27:04 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:27:04 2015 +0100 hvm/vmx: WRITE_MSR() macro hygene Use the standard "do { } while ( 0 )" semantics, and don't hide the break statement, incase this macro wants to be used anywhere outside of a switch. No functional change, but it is now clear that long_mode_do_msr_write() doesn't have fallthough for the STAR, LSTAR and SYSCALL_MASK cases. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f2554d6..522892f 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -152,12 +152,12 @@ void vmx_save_host_msrs(void) rdmsrl(msr_index[i], host_msr_state->msrs[i]); } -#define WRITE_MSR(address) \ +#define WRITE_MSR(address) do { \ guest_msr_state->msrs[VMX_INDEX_MSR_ ## address] = msr_content; \ set_bit(VMX_INDEX_MSR_ ## address, &guest_msr_state->flags); \ wrmsrl(MSR_ ## address, msr_content); \ set_bit(VMX_INDEX_MSR_ ## address, &host_msr_state->flags); \ - break + } while ( 0 ) static enum handler_return long_mode_do_msr_read(unsigned int msr, uint64_t *msr_content) @@ -232,11 +232,13 @@ long_mode_do_msr_write(unsigned int msr, uint64_t msr_content) case MSR_STAR: WRITE_MSR(STAR); + break; case MSR_LSTAR: if ( !is_canonical_address(msr_content) ) goto uncanonical_address; WRITE_MSR(LSTAR); + break; case MSR_CSTAR: if ( !is_canonical_address(msr_content) ) @@ -246,6 +248,7 @@ long_mode_do_msr_write(unsigned int msr, uint64_t msr_content) case MSR_SYSCALL_MASK: WRITE_MSR(SYSCALL_MASK); + break; default: return HNDL_unhandled; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:03:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:03: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 1YCx09-0001Jz-6A; Sun, 18 Jan 2015 21:03:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx07-0001Je-UZ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:16 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 65/99-26858-29F1CB45; Sun, 18 Jan 2015 21:03:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1421614993!20504293!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9532 invoked from network); 18 Jan 2015 21:03:14 -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; 18 Jan 2015 21:03:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx04-0001BG-QP for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx04-00044n-PX for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:12 +0000 Date: Sun, 18 Jan 2015 21:03:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvm/vmx: WRITE_MSR() macro hygene X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 463a991e51835ced8d440d37959d5bfc1f79417b Author: Andrew Cooper AuthorDate: Fri Jan 9 17:27:04 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:27:04 2015 +0100 hvm/vmx: WRITE_MSR() macro hygene Use the standard "do { } while ( 0 )" semantics, and don't hide the break statement, incase this macro wants to be used anywhere outside of a switch. No functional change, but it is now clear that long_mode_do_msr_write() doesn't have fallthough for the STAR, LSTAR and SYSCALL_MASK cases. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f2554d6..522892f 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -152,12 +152,12 @@ void vmx_save_host_msrs(void) rdmsrl(msr_index[i], host_msr_state->msrs[i]); } -#define WRITE_MSR(address) \ +#define WRITE_MSR(address) do { \ guest_msr_state->msrs[VMX_INDEX_MSR_ ## address] = msr_content; \ set_bit(VMX_INDEX_MSR_ ## address, &guest_msr_state->flags); \ wrmsrl(MSR_ ## address, msr_content); \ set_bit(VMX_INDEX_MSR_ ## address, &host_msr_state->flags); \ - break + } while ( 0 ) static enum handler_return long_mode_do_msr_read(unsigned int msr, uint64_t *msr_content) @@ -232,11 +232,13 @@ long_mode_do_msr_write(unsigned int msr, uint64_t msr_content) case MSR_STAR: WRITE_MSR(STAR); + break; case MSR_LSTAR: if ( !is_canonical_address(msr_content) ) goto uncanonical_address; WRITE_MSR(LSTAR); + break; case MSR_CSTAR: if ( !is_canonical_address(msr_content) ) @@ -246,6 +248,7 @@ long_mode_do_msr_write(unsigned int msr, uint64_t msr_content) case MSR_SYSCALL_MASK: WRITE_MSR(SYSCALL_MASK); + break; default: return HNDL_unhandled; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:03:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:03: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 1YCx0J-0001Lb-8p; Sun, 18 Jan 2015 21:03:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0H-0001LI-Bv for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:25 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 00/43-02696-C9F1CB45; Sun, 18 Jan 2015 21:03:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1421615003!21348658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3846 invoked from network); 18 Jan 2015 21:03:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:03:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0E-0001BM-VG for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx0E-00045A-U3 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:22 +0000 Date: Sun, 18 Jan 2015 21:03:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: drop pointless parameters from vIOAPIC internal routines X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c2fd155200259687cab5ba0a2320e1a5c1f6f7b Author: Jan Beulich AuthorDate: Fri Jan 9 17:29:10 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:29:10 2015 +0100 x86/HVM: drop pointless parameters from vIOAPIC internal routines Also simplify a few other operations (without funtional change). Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/vioapic.c | 31 ++++++++++++------------------- 1 files changed, 12 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index d3c681b..9248adc 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -46,11 +46,9 @@ static void vioapic_deliver(struct hvm_hw_vioapic *vioapic, int irq); -static unsigned long vioapic_read_indirect(struct hvm_hw_vioapic *vioapic, - unsigned long addr, - unsigned long length) +static uint32_t vioapic_read_indirect(const struct hvm_hw_vioapic *vioapic) { - unsigned long result = 0; + uint32_t result = 0; switch ( vioapic->ioregsel ) { @@ -77,9 +75,8 @@ static unsigned long vioapic_read_indirect(struct hvm_hw_vioapic *vioapic, } redir_content = vioapic->redirtbl[redir_index].bits; - result = (vioapic->ioregsel & 0x1)? - (redir_content >> 32) & 0xffffffff : - redir_content & 0xffffffff; + result = (vioapic->ioregsel & 1) ? (redir_content >> 32) + : redir_content; break; } } @@ -91,21 +88,19 @@ static int vioapic_read( struct vcpu *v, unsigned long addr, unsigned long length, unsigned long *pval) { - struct hvm_hw_vioapic *vioapic = domain_vioapic(v->domain); + const struct hvm_hw_vioapic *vioapic = domain_vioapic(v->domain); uint32_t result; HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "addr %lx", addr); - addr &= 0xff; - - switch ( addr ) + switch ( addr & 0xff ) { case VIOAPIC_REG_SELECT: result = vioapic->ioregsel; break; case VIOAPIC_REG_WINDOW: - result = vioapic_read_indirect(vioapic, addr, length); + result = vioapic_read_indirect(vioapic); break; default: @@ -169,7 +164,7 @@ static void vioapic_write_redirent( } static void vioapic_write_indirect( - struct hvm_hw_vioapic *vioapic, unsigned long length, unsigned long val) + struct hvm_hw_vioapic *vioapic, uint32_t val) { switch ( vioapic->ioregsel ) { @@ -188,8 +183,8 @@ static void vioapic_write_indirect( { uint32_t redir_index = (vioapic->ioregsel - 0x10) >> 1; - HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "change redir index %x val %lx", - redir_index, val); + HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "rte[%02x].%s = %08x", + redir_index, vioapic->ioregsel & 1 ? "hi" : "lo", val); if ( redir_index >= VIOAPIC_NUM_PINS ) { @@ -211,16 +206,14 @@ static int vioapic_write( { struct hvm_hw_vioapic *vioapic = domain_vioapic(v->domain); - addr &= 0xff; - - switch ( addr ) + switch ( addr & 0xff ) { case VIOAPIC_REG_SELECT: vioapic->ioregsel = val; break; case VIOAPIC_REG_WINDOW: - vioapic_write_indirect(vioapic, length, val); + vioapic_write_indirect(vioapic, val); break; #if VIOAPIC_VERSION_ID >= 0x20 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:03:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:03: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 1YCx0J-0001Lb-8p; Sun, 18 Jan 2015 21:03:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0H-0001LI-Bv for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:25 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 00/43-02696-C9F1CB45; Sun, 18 Jan 2015 21:03:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1421615003!21348658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3846 invoked from network); 18 Jan 2015 21:03:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:03:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0E-0001BM-VG for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx0E-00045A-U3 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:22 +0000 Date: Sun, 18 Jan 2015 21:03:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: drop pointless parameters from vIOAPIC internal routines X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c2fd155200259687cab5ba0a2320e1a5c1f6f7b Author: Jan Beulich AuthorDate: Fri Jan 9 17:29:10 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:29:10 2015 +0100 x86/HVM: drop pointless parameters from vIOAPIC internal routines Also simplify a few other operations (without funtional change). Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/vioapic.c | 31 ++++++++++++------------------- 1 files changed, 12 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index d3c681b..9248adc 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -46,11 +46,9 @@ static void vioapic_deliver(struct hvm_hw_vioapic *vioapic, int irq); -static unsigned long vioapic_read_indirect(struct hvm_hw_vioapic *vioapic, - unsigned long addr, - unsigned long length) +static uint32_t vioapic_read_indirect(const struct hvm_hw_vioapic *vioapic) { - unsigned long result = 0; + uint32_t result = 0; switch ( vioapic->ioregsel ) { @@ -77,9 +75,8 @@ static unsigned long vioapic_read_indirect(struct hvm_hw_vioapic *vioapic, } redir_content = vioapic->redirtbl[redir_index].bits; - result = (vioapic->ioregsel & 0x1)? - (redir_content >> 32) & 0xffffffff : - redir_content & 0xffffffff; + result = (vioapic->ioregsel & 1) ? (redir_content >> 32) + : redir_content; break; } } @@ -91,21 +88,19 @@ static int vioapic_read( struct vcpu *v, unsigned long addr, unsigned long length, unsigned long *pval) { - struct hvm_hw_vioapic *vioapic = domain_vioapic(v->domain); + const struct hvm_hw_vioapic *vioapic = domain_vioapic(v->domain); uint32_t result; HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "addr %lx", addr); - addr &= 0xff; - - switch ( addr ) + switch ( addr & 0xff ) { case VIOAPIC_REG_SELECT: result = vioapic->ioregsel; break; case VIOAPIC_REG_WINDOW: - result = vioapic_read_indirect(vioapic, addr, length); + result = vioapic_read_indirect(vioapic); break; default: @@ -169,7 +164,7 @@ static void vioapic_write_redirent( } static void vioapic_write_indirect( - struct hvm_hw_vioapic *vioapic, unsigned long length, unsigned long val) + struct hvm_hw_vioapic *vioapic, uint32_t val) { switch ( vioapic->ioregsel ) { @@ -188,8 +183,8 @@ static void vioapic_write_indirect( { uint32_t redir_index = (vioapic->ioregsel - 0x10) >> 1; - HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "change redir index %x val %lx", - redir_index, val); + HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "rte[%02x].%s = %08x", + redir_index, vioapic->ioregsel & 1 ? "hi" : "lo", val); if ( redir_index >= VIOAPIC_NUM_PINS ) { @@ -211,16 +206,14 @@ static int vioapic_write( { struct hvm_hw_vioapic *vioapic = domain_vioapic(v->domain); - addr &= 0xff; - - switch ( addr ) + switch ( addr & 0xff ) { case VIOAPIC_REG_SELECT: vioapic->ioregsel = val; break; case VIOAPIC_REG_WINDOW: - vioapic_write_indirect(vioapic, length, val); + vioapic_write_indirect(vioapic, val); break; #if VIOAPIC_VERSION_ID >= 0x20 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:03:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:03: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 1YCx0T-0001NB-Ba; Sun, 18 Jan 2015 21:03:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0R-0001Mu-Hl for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:35 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 19/F2-24124-6AF1CB45; Sun, 18 Jan 2015 21:03:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1421615013!14574219!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3016 invoked from network); 18 Jan 2015 21:03:34 -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 Jan 2015 21:03:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0P-0001BU-5I for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx0P-00045Y-4G for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:33 +0000 Date: Sun, 18 Jan 2015 21:03:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: vMSI simplification X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb7681bf7065160fee9fcb2778a2433637c4f2a4 Author: Jan Beulich AuthorDate: Fri Jan 9 17:29:44 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:29:44 2015 +0100 x86/HVM: vMSI simplification - struct msixtbl_entry's table_len field can be unsigned int, and by moving it down a little the structure size can be reduced slightly - a disjoint xmalloc()/memset() pair can be converted to xzalloc() - a pointless local variable can be dropped Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/vmsi.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index ab4ac50..a67044d 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -153,9 +153,9 @@ struct msixtbl_entry /* TODO: resolve the potential race by destruction of pdev */ struct pci_dev *pdev; unsigned long gtable; /* gpa of msix table */ - unsigned long table_len; unsigned long table_flags[BITS_TO_LONGS(MAX_MSIX_TABLE_ENTRIES)]; #define MAX_MSIX_ACC_ENTRIES 3 + unsigned int table_len; struct { uint32_t msi_ad[3]; /* Shadow of address low, high and data */ } gentries[MAX_MSIX_ACC_ENTRIES]; @@ -380,16 +380,11 @@ static void add_msixtbl_entry(struct domain *d, uint64_t gtable, struct msixtbl_entry *entry) { - u32 len; - - memset(entry, 0, sizeof(struct msixtbl_entry)); - INIT_LIST_HEAD(&entry->list); INIT_RCU_HEAD(&entry->rcu); atomic_set(&entry->refcnt, 0); - len = pci_msix_get_table_len(pdev); - entry->table_len = len; + entry->table_len = pci_msix_get_table_len(pdev); entry->pdev = pdev; entry->gtable = (unsigned long) gtable; @@ -426,7 +421,7 @@ int msixtbl_pt_register(struct domain *d, struct pirq *pirq, uint64_t gtable) * xmalloc() with irq_disabled causes the failure of check_lock() * for xenpool->lock. So we allocate an entry beforehand. */ - new_entry = xmalloc(struct msixtbl_entry); + new_entry = xzalloc(struct msixtbl_entry); if ( !new_entry ) return -ENOMEM; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:03:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:03: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 1YCx0T-0001NB-Ba; Sun, 18 Jan 2015 21:03:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0R-0001Mu-Hl for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:35 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 19/F2-24124-6AF1CB45; Sun, 18 Jan 2015 21:03:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1421615013!14574219!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3016 invoked from network); 18 Jan 2015 21:03:34 -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 Jan 2015 21:03:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0P-0001BU-5I for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx0P-00045Y-4G for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:33 +0000 Date: Sun, 18 Jan 2015 21:03:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: vMSI simplification X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb7681bf7065160fee9fcb2778a2433637c4f2a4 Author: Jan Beulich AuthorDate: Fri Jan 9 17:29:44 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:29:44 2015 +0100 x86/HVM: vMSI simplification - struct msixtbl_entry's table_len field can be unsigned int, and by moving it down a little the structure size can be reduced slightly - a disjoint xmalloc()/memset() pair can be converted to xzalloc() - a pointless local variable can be dropped Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/vmsi.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index ab4ac50..a67044d 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -153,9 +153,9 @@ struct msixtbl_entry /* TODO: resolve the potential race by destruction of pdev */ struct pci_dev *pdev; unsigned long gtable; /* gpa of msix table */ - unsigned long table_len; unsigned long table_flags[BITS_TO_LONGS(MAX_MSIX_TABLE_ENTRIES)]; #define MAX_MSIX_ACC_ENTRIES 3 + unsigned int table_len; struct { uint32_t msi_ad[3]; /* Shadow of address low, high and data */ } gentries[MAX_MSIX_ACC_ENTRIES]; @@ -380,16 +380,11 @@ static void add_msixtbl_entry(struct domain *d, uint64_t gtable, struct msixtbl_entry *entry) { - u32 len; - - memset(entry, 0, sizeof(struct msixtbl_entry)); - INIT_LIST_HEAD(&entry->list); INIT_RCU_HEAD(&entry->rcu); atomic_set(&entry->refcnt, 0); - len = pci_msix_get_table_len(pdev); - entry->table_len = len; + entry->table_len = pci_msix_get_table_len(pdev); entry->pdev = pdev; entry->gtable = (unsigned long) gtable; @@ -426,7 +421,7 @@ int msixtbl_pt_register(struct domain *d, struct pirq *pirq, uint64_t gtable) * xmalloc() with irq_disabled causes the failure of check_lock() * for xenpool->lock. So we allocate an entry beforehand. */ - new_entry = xmalloc(struct msixtbl_entry); + new_entry = xzalloc(struct msixtbl_entry); if ( !new_entry ) return -ENOMEM; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:03:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:03: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 1YCx0d-0001P3-H4; Sun, 18 Jan 2015 21:03:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0c-0001Op-8W for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:46 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id D6/AC-02954-1BF1CB45; Sun, 18 Jan 2015 21:03:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1421615023!16710179!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22684 invoked from network); 18 Jan 2015 21:03:44 -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; 18 Jan 2015 21:03:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0Z-0001Ba-BL for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx0Z-00045x-91 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:43 +0000 Date: Sun, 18 Jan 2015 21:03:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] spinlock: use local_irq_disable() instead of local_irq_save() where possible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2e9869028ab80f13da79517d4572b5d6044ac228 Author: Jan Beulich AuthorDate: Fri Jan 9 17:30:32 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:30:32 2015 +0100 spinlock: use local_irq_disable() instead of local_irq_save() where possible ... as generally being a cheaper operation. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/common/spinlock.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index f9f19a8..13340a3 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -162,7 +162,7 @@ unsigned long _spin_lock_irqsave(spinlock_t *lock) local_irq_restore(flags); while ( likely(_raw_spin_is_locked(&lock->raw)) ) cpu_relax(); - local_irq_save(flags); + local_irq_disable(); } LOCK_PROFILE_GOT; preempt_disable(); @@ -313,7 +313,7 @@ unsigned long _read_lock_irqsave(rwlock_t *lock) local_irq_restore(flags); while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); - local_irq_save(flags); + local_irq_disable(); } } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); @@ -409,7 +409,7 @@ unsigned long _write_lock_irqsave(rwlock_t *lock) local_irq_restore(flags); while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); - local_irq_save(flags); + local_irq_disable(); } } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); while ( x != 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 Sun Jan 18 21:03:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:03: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 1YCx0d-0001P3-H4; Sun, 18 Jan 2015 21:03:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0c-0001Op-8W for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:46 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id D6/AC-02954-1BF1CB45; Sun, 18 Jan 2015 21:03:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1421615023!16710179!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22684 invoked from network); 18 Jan 2015 21:03:44 -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; 18 Jan 2015 21:03:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0Z-0001Ba-BL for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx0Z-00045x-91 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:43 +0000 Date: Sun, 18 Jan 2015 21:03:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] spinlock: use local_irq_disable() instead of local_irq_save() where possible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2e9869028ab80f13da79517d4572b5d6044ac228 Author: Jan Beulich AuthorDate: Fri Jan 9 17:30:32 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:30:32 2015 +0100 spinlock: use local_irq_disable() instead of local_irq_save() where possible ... as generally being a cheaper operation. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/common/spinlock.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index f9f19a8..13340a3 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -162,7 +162,7 @@ unsigned long _spin_lock_irqsave(spinlock_t *lock) local_irq_restore(flags); while ( likely(_raw_spin_is_locked(&lock->raw)) ) cpu_relax(); - local_irq_save(flags); + local_irq_disable(); } LOCK_PROFILE_GOT; preempt_disable(); @@ -313,7 +313,7 @@ unsigned long _read_lock_irqsave(rwlock_t *lock) local_irq_restore(flags); while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); - local_irq_save(flags); + local_irq_disable(); } } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); @@ -409,7 +409,7 @@ unsigned long _write_lock_irqsave(rwlock_t *lock) local_irq_restore(flags); while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); - local_irq_save(flags); + local_irq_disable(); } } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); while ( x != 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 Sun Jan 18 21:03:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:03: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 1YCx0n-0001Qm-Jd; Sun, 18 Jan 2015 21:03:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0l-0001QU-LI for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:55 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id D7/6C-10925-BBF1CB45; Sun, 18 Jan 2015 21:03:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1421615033!14944267!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4150 invoked from network); 18 Jan 2015 21:03:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:03:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0j-0001Bj-HB for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx0j-00047H-GB for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:53 +0000 Date: Sun, 18 Jan 2015 21:03:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] rwlock: allow arch to override read_unlock() atomic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f5584f5b6e67627d6d721ed7003469263fdeaa9 Author: Jan Beulich AuthorDate: Fri Jan 9 17:31:05 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:31:05 2015 +0100 rwlock: allow arch to override read_unlock() atomic On x86, LOCK DEC is cheaper than LOCK CMPXCHG and doesn't require a retry loop around it. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/common/spinlock.c | 16 ++++++++++------ xen/include/asm-x86/spinlock.h | 3 +++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 13340a3..f6925ec 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -333,14 +333,18 @@ int _read_trylock(rwlock_t *lock) return 1; } -void _read_unlock(rwlock_t *lock) -{ - uint32_t x, y; +#ifndef _raw_read_unlock +# define _raw_read_unlock(l) do { \ + uint32_t x = (l)->lock, y; \ + while ( (y = cmpxchg(&(l)->lock, x, x - 1)) != x ) \ + x = y; \ +} while (0) +#endif +inline void _read_unlock(rwlock_t *lock) +{ preempt_enable(); - x = lock->lock; - while ( (y = cmpxchg(&lock->lock, x, x-1)) != x ) - x = y; + _raw_read_unlock(lock); } void _read_unlock_irq(rwlock_t *lock) diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h index 06d9b04..757e20b 100644 --- a/xen/include/asm-x86/spinlock.h +++ b/xen/include/asm-x86/spinlock.h @@ -31,4 +31,7 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) return (oldval > 0); } +#define _raw_read_unlock(l) \ + asm volatile ( "lock; dec%z0 %0" : "+m" ((l)->lock) :: "memory" ) + #endif /* __ASM_SPINLOCK_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 Sun Jan 18 21:03:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:03: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 1YCx0n-0001Qm-Jd; Sun, 18 Jan 2015 21:03:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0l-0001QU-LI for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:55 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id D7/6C-10925-BBF1CB45; Sun, 18 Jan 2015 21:03:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1421615033!14944267!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4150 invoked from network); 18 Jan 2015 21:03:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:03:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0j-0001Bj-HB for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx0j-00047H-GB for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:03:53 +0000 Date: Sun, 18 Jan 2015 21:03:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] rwlock: allow arch to override read_unlock() atomic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f5584f5b6e67627d6d721ed7003469263fdeaa9 Author: Jan Beulich AuthorDate: Fri Jan 9 17:31:05 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:31:05 2015 +0100 rwlock: allow arch to override read_unlock() atomic On x86, LOCK DEC is cheaper than LOCK CMPXCHG and doesn't require a retry loop around it. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/common/spinlock.c | 16 ++++++++++------ xen/include/asm-x86/spinlock.h | 3 +++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 13340a3..f6925ec 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -333,14 +333,18 @@ int _read_trylock(rwlock_t *lock) return 1; } -void _read_unlock(rwlock_t *lock) -{ - uint32_t x, y; +#ifndef _raw_read_unlock +# define _raw_read_unlock(l) do { \ + uint32_t x = (l)->lock, y; \ + while ( (y = cmpxchg(&(l)->lock, x, x - 1)) != x ) \ + x = y; \ +} while (0) +#endif +inline void _read_unlock(rwlock_t *lock) +{ preempt_enable(); - x = lock->lock; - while ( (y = cmpxchg(&lock->lock, x, x-1)) != x ) - x = y; + _raw_read_unlock(lock); } void _read_unlock_irq(rwlock_t *lock) diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h index 06d9b04..757e20b 100644 --- a/xen/include/asm-x86/spinlock.h +++ b/xen/include/asm-x86/spinlock.h @@ -31,4 +31,7 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) return (oldval > 0); } +#define _raw_read_unlock(l) \ + asm volatile ( "lock; dec%z0 %0" : "+m" ((l)->lock) :: "memory" ) + #endif /* __ASM_SPINLOCK_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 Sun Jan 18 21:04:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:04: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 1YCx0y-0001SM-MN; Sun, 18 Jan 2015 21:04:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0y-0001SA-5q for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:08 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id D4/CC-02954-7CF1CB45; Sun, 18 Jan 2015 21:04:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1421615045!21356414!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18327 invoked from network); 18 Jan 2015 21:04:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:04:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0t-0001CI-Mo for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx0t-00047n-Lf for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:03 +0000 Date: Sun, 18 Jan 2015 21:04:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] rwlock: allow arch to override write_unlock() atomic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3a76bf0ea622e233cad1f871901eb25e4b40ec3f Author: Jan Beulich AuthorDate: Fri Jan 9 17:31:45 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:31:45 2015 +0100 rwlock: allow arch to override write_unlock() atomic ... (for consistency with read_unlock()), and default it to xchg(), being generally cheaper than cmpxchg(). Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/common/spinlock.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index f6925ec..5fd8b1c 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -438,10 +438,14 @@ int _write_trylock(rwlock_t *lock) return 1; } -void _write_unlock(rwlock_t *lock) +#ifndef _raw_write_unlock +# define _raw_write_unlock(l) xchg(&(l)->lock, 0) +#endif + +inline void _write_unlock(rwlock_t *lock) { preempt_enable(); - if ( cmpxchg(&lock->lock, RW_WRITE_FLAG, 0) != RW_WRITE_FLAG ) + if ( _raw_write_unlock(lock) != RW_WRITE_FLAG ) BUG(); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:04:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:04: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 1YCx0y-0001SM-MN; Sun, 18 Jan 2015 21:04:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0y-0001SA-5q for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:08 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id D4/CC-02954-7CF1CB45; Sun, 18 Jan 2015 21:04:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1421615045!21356414!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18327 invoked from network); 18 Jan 2015 21:04:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:04:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx0t-0001CI-Mo for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx0t-00047n-Lf for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:03 +0000 Date: Sun, 18 Jan 2015 21:04:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] rwlock: allow arch to override write_unlock() atomic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3a76bf0ea622e233cad1f871901eb25e4b40ec3f Author: Jan Beulich AuthorDate: Fri Jan 9 17:31:45 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:31:45 2015 +0100 rwlock: allow arch to override write_unlock() atomic ... (for consistency with read_unlock()), and default it to xchg(), being generally cheaper than cmpxchg(). Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/common/spinlock.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index f6925ec..5fd8b1c 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -438,10 +438,14 @@ int _write_trylock(rwlock_t *lock) return 1; } -void _write_unlock(rwlock_t *lock) +#ifndef _raw_write_unlock +# define _raw_write_unlock(l) xchg(&(l)->lock, 0) +#endif + +inline void _write_unlock(rwlock_t *lock) { preempt_enable(); - if ( cmpxchg(&lock->lock, RW_WRITE_FLAG, 0) != RW_WRITE_FLAG ) + if ( _raw_write_unlock(lock) != RW_WRITE_FLAG ) BUG(); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:04:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:04: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 1YCx19-0001UB-Pg; Sun, 18 Jan 2015 21:04:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx18-0001U1-K1 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:18 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id C0/F7-22777-1DF1CB45; Sun, 18 Jan 2015 21:04:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1421615056!14574255!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4862 invoked from network); 18 Jan 2015 21:04:16 -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 Jan 2015 21:04:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx15-0001CO-T3 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx15-00048m-R9 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:15 +0000 Date: Sun, 18 Jan 2015 21:04:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: avoid named helper symbols X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b1b2a3afe0d67a16ca3afc0ed6a04dc5a5128e36 Author: Jan Beulich AuthorDate: Fri Jan 9 17:32:54 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:32:54 2015 +0100 hvmloader: avoid named helper symbols Newer iasl validly complains that such routines would otherwise need to be marked Serialized (in the SSDT case it can't know that explicit serialization is being enforced), which is undesirable. Use Local instead. Reported-by: Ian Campbell Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- tools/firmware/hvmloader/acpi/dsdt.asl | 24 ++++++++++++------------ tools/firmware/hvmloader/acpi/ssdt_pm.asl | 29 ++++++++++++++--------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/dsdt.asl b/tools/firmware/hvmloader/acpi/dsdt.asl index 5610385..fc1f309 100644 --- a/tools/firmware/hvmloader/acpi/dsdt.asl +++ b/tools/firmware/hvmloader/acpi/dsdt.asl @@ -109,7 +109,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "Xen", "HVM", 0) Method (_CRS, 0, NotSerialized) { - Name (PRT0, ResourceTemplate () + Store (ResourceTemplate () { /* bus number is from 0 - 255*/ WordBusNumber( @@ -167,11 +167,11 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "Xen", "HVM", 0) 0x0000000000000010, ,, _Y02) - }) + }, Local1) - CreateDWordField(PRT0, \_SB.PCI0._CRS._Y01._MIN, MMIN) - CreateDWordField(PRT0, \_SB.PCI0._CRS._Y01._MAX, MMAX) - CreateDWordField(PRT0, \_SB.PCI0._CRS._Y01._LEN, MLEN) + CreateDWordField(Local1, \_SB.PCI0._CRS._Y01._MIN, MMIN) + CreateDWordField(Local1, \_SB.PCI0._CRS._Y01._MAX, MMAX) + CreateDWordField(Local1, \_SB.PCI0._CRS._Y01._LEN, MLEN) Store(\_SB.PMIN, MMIN) Store(\_SB.PLEN, MLEN) @@ -192,12 +192,12 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "Xen", "HVM", 0) } Else { Store(\_SB.PCI0._CRS._Y02, Local0) } - CreateDWordField(PRT0, Add(Local0, 14), MINL) - CreateDWordField(PRT0, Add(Local0, 18), MINH) - CreateDWordField(PRT0, Add(Local0, 22), MAXL) - CreateDWordField(PRT0, Add(Local0, 26), MAXH) - CreateDWordField(PRT0, Add(Local0, 38), LENL) - CreateDWordField(PRT0, Add(Local0, 42), LENH) + CreateDWordField(Local1, Add(Local0, 14), MINL) + CreateDWordField(Local1, Add(Local0, 18), MINH) + CreateDWordField(Local1, Add(Local0, 22), MAXL) + CreateDWordField(Local1, Add(Local0, 26), MAXH) + CreateDWordField(Local1, Add(Local0, 38), LENL) + CreateDWordField(Local1, Add(Local0, 42), LENH) Store(\_SB.LMIN, MINL) Store(\_SB.HMIN, MINH) @@ -215,7 +215,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "Xen", "HVM", 0) Subtract(MAXL, One, MAXL) } - Return (PRT0) + Return (Local1) } Device(HPET) { diff --git a/tools/firmware/hvmloader/acpi/ssdt_pm.asl b/tools/firmware/hvmloader/acpi/ssdt_pm.asl index afb78b6..48e6d05 100644 --- a/tools/firmware/hvmloader/acpi/ssdt_pm.asl +++ b/tools/firmware/hvmloader/acpi/ssdt_pm.asl @@ -276,14 +276,13 @@ DefinitionBlock ("SSDT_PM.aml", "SSDT", 2, "Xen", "HVM", 0) HLP8 (Arg0, Local0) Increment (Local0) } + Return (Arg0) } Method (HLPA, 0, NotSerialized) { Store (HLP6 (), Local0) - Name (TMP, Buffer (Local0) {}) - HLP9 (TMP, Local0) - Return (TMP) + Return (HLP9 (Buffer (Local0) {}, Local0)) } Method (REL, 0, NotSerialized) @@ -372,14 +371,14 @@ DefinitionBlock ("SSDT_PM.aml", "SSDT", 2, "Xen", "HVM", 0) INIT (0x02) INIT (0x01) HLP5 () - Name (BST0, Package (0x04) {}) - Store (HLP7 (), Index (BST0, 0x00)) - Store (HLP7 (), Index (BST0, 0x01)) - Store (HLP7 (), Index (BST0, 0x02)) - Store (HLP7 (), Index (BST0, 0x03)) + Store (Package (0x04) {}, Local0) + Store (HLP7 (), Index (Local0, 0x00)) + Store (HLP7 (), Index (Local0, 0x01)) + Store (HLP7 (), Index (Local0, 0x02)) + Store (HLP7 (), Index (Local0, 0x03)) REL () Store (2, \_SB.DBG1) - Return (BST0) + Return (Local0) } } @@ -409,13 +408,13 @@ DefinitionBlock ("SSDT_PM.aml", "SSDT", 2, "Xen", "HVM", 0) INIT (0x02) INIT (0x02) HLP5 () - Name (BST1, Package (0x04) {}) - Store (HLP7 (), Index (BST1, 0x00)) - Store (HLP7 (), Index (BST1, 0x01)) - Store (HLP7 (), Index (BST1, 0x02)) - Store (HLP7 (), Index (BST1, 0x03)) + Store (Package (0x04) {}, Local0) + Store (HLP7 (), Index (Local0, 0x00)) + Store (HLP7 (), Index (Local0, 0x01)) + Store (HLP7 (), Index (Local0, 0x02)) + Store (HLP7 (), Index (Local0, 0x03)) REL () - Return (BST1) + Return (Local0) } } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:04:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:04: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 1YCx19-0001UB-Pg; Sun, 18 Jan 2015 21:04:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx18-0001U1-K1 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:18 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id C0/F7-22777-1DF1CB45; Sun, 18 Jan 2015 21:04:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1421615056!14574255!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4862 invoked from network); 18 Jan 2015 21:04:16 -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 Jan 2015 21:04:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx15-0001CO-T3 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx15-00048m-R9 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:15 +0000 Date: Sun, 18 Jan 2015 21:04:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: avoid named helper symbols X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b1b2a3afe0d67a16ca3afc0ed6a04dc5a5128e36 Author: Jan Beulich AuthorDate: Fri Jan 9 17:32:54 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:32:54 2015 +0100 hvmloader: avoid named helper symbols Newer iasl validly complains that such routines would otherwise need to be marked Serialized (in the SSDT case it can't know that explicit serialization is being enforced), which is undesirable. Use Local instead. Reported-by: Ian Campbell Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- tools/firmware/hvmloader/acpi/dsdt.asl | 24 ++++++++++++------------ tools/firmware/hvmloader/acpi/ssdt_pm.asl | 29 ++++++++++++++--------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/dsdt.asl b/tools/firmware/hvmloader/acpi/dsdt.asl index 5610385..fc1f309 100644 --- a/tools/firmware/hvmloader/acpi/dsdt.asl +++ b/tools/firmware/hvmloader/acpi/dsdt.asl @@ -109,7 +109,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "Xen", "HVM", 0) Method (_CRS, 0, NotSerialized) { - Name (PRT0, ResourceTemplate () + Store (ResourceTemplate () { /* bus number is from 0 - 255*/ WordBusNumber( @@ -167,11 +167,11 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "Xen", "HVM", 0) 0x0000000000000010, ,, _Y02) - }) + }, Local1) - CreateDWordField(PRT0, \_SB.PCI0._CRS._Y01._MIN, MMIN) - CreateDWordField(PRT0, \_SB.PCI0._CRS._Y01._MAX, MMAX) - CreateDWordField(PRT0, \_SB.PCI0._CRS._Y01._LEN, MLEN) + CreateDWordField(Local1, \_SB.PCI0._CRS._Y01._MIN, MMIN) + CreateDWordField(Local1, \_SB.PCI0._CRS._Y01._MAX, MMAX) + CreateDWordField(Local1, \_SB.PCI0._CRS._Y01._LEN, MLEN) Store(\_SB.PMIN, MMIN) Store(\_SB.PLEN, MLEN) @@ -192,12 +192,12 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "Xen", "HVM", 0) } Else { Store(\_SB.PCI0._CRS._Y02, Local0) } - CreateDWordField(PRT0, Add(Local0, 14), MINL) - CreateDWordField(PRT0, Add(Local0, 18), MINH) - CreateDWordField(PRT0, Add(Local0, 22), MAXL) - CreateDWordField(PRT0, Add(Local0, 26), MAXH) - CreateDWordField(PRT0, Add(Local0, 38), LENL) - CreateDWordField(PRT0, Add(Local0, 42), LENH) + CreateDWordField(Local1, Add(Local0, 14), MINL) + CreateDWordField(Local1, Add(Local0, 18), MINH) + CreateDWordField(Local1, Add(Local0, 22), MAXL) + CreateDWordField(Local1, Add(Local0, 26), MAXH) + CreateDWordField(Local1, Add(Local0, 38), LENL) + CreateDWordField(Local1, Add(Local0, 42), LENH) Store(\_SB.LMIN, MINL) Store(\_SB.HMIN, MINH) @@ -215,7 +215,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "Xen", "HVM", 0) Subtract(MAXL, One, MAXL) } - Return (PRT0) + Return (Local1) } Device(HPET) { diff --git a/tools/firmware/hvmloader/acpi/ssdt_pm.asl b/tools/firmware/hvmloader/acpi/ssdt_pm.asl index afb78b6..48e6d05 100644 --- a/tools/firmware/hvmloader/acpi/ssdt_pm.asl +++ b/tools/firmware/hvmloader/acpi/ssdt_pm.asl @@ -276,14 +276,13 @@ DefinitionBlock ("SSDT_PM.aml", "SSDT", 2, "Xen", "HVM", 0) HLP8 (Arg0, Local0) Increment (Local0) } + Return (Arg0) } Method (HLPA, 0, NotSerialized) { Store (HLP6 (), Local0) - Name (TMP, Buffer (Local0) {}) - HLP9 (TMP, Local0) - Return (TMP) + Return (HLP9 (Buffer (Local0) {}, Local0)) } Method (REL, 0, NotSerialized) @@ -372,14 +371,14 @@ DefinitionBlock ("SSDT_PM.aml", "SSDT", 2, "Xen", "HVM", 0) INIT (0x02) INIT (0x01) HLP5 () - Name (BST0, Package (0x04) {}) - Store (HLP7 (), Index (BST0, 0x00)) - Store (HLP7 (), Index (BST0, 0x01)) - Store (HLP7 (), Index (BST0, 0x02)) - Store (HLP7 (), Index (BST0, 0x03)) + Store (Package (0x04) {}, Local0) + Store (HLP7 (), Index (Local0, 0x00)) + Store (HLP7 (), Index (Local0, 0x01)) + Store (HLP7 (), Index (Local0, 0x02)) + Store (HLP7 (), Index (Local0, 0x03)) REL () Store (2, \_SB.DBG1) - Return (BST0) + Return (Local0) } } @@ -409,13 +408,13 @@ DefinitionBlock ("SSDT_PM.aml", "SSDT", 2, "Xen", "HVM", 0) INIT (0x02) INIT (0x02) HLP5 () - Name (BST1, Package (0x04) {}) - Store (HLP7 (), Index (BST1, 0x00)) - Store (HLP7 (), Index (BST1, 0x01)) - Store (HLP7 (), Index (BST1, 0x02)) - Store (HLP7 (), Index (BST1, 0x03)) + Store (Package (0x04) {}, Local0) + Store (HLP7 (), Index (Local0, 0x00)) + Store (HLP7 (), Index (Local0, 0x01)) + Store (HLP7 (), Index (Local0, 0x02)) + Store (HLP7 (), Index (Local0, 0x03)) REL () - Return (BST1) + Return (Local0) } } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:04:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:04: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 1YCx1I-0001Vb-SI; Sun, 18 Jan 2015 21:04:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1I-0001VS-Et for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:28 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id C0/3C-11581-BDF1CB45; Sun, 18 Jan 2015 21:04:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1421615066!15815339!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21116 invoked from network); 18 Jan 2015 21:04:27 -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; 18 Jan 2015 21:04:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1G-0001CU-25 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx1G-00049Q-1M for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:26 +0000 Date: Sun, 18 Jan 2015 21:04:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: certain methods are not supposed to have a 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 64ce4209cd79d414a1fbef2ede63e5c584b08b40 Author: Jan Beulich AuthorDate: Fri Jan 9 17:33:11 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:33:11 2015 +0100 hvmloader: certain methods are not supposed to have a return value Newer iasl complains about this being violated. Also convert a ShiftLeft(, ) to a plain constant. Reported-by: Ian Campbell Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- tools/firmware/hvmloader/acpi/mk_dsdt.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/mk_dsdt.c b/tools/firmware/hvmloader/acpi/mk_dsdt.c index a4b693b..1392525 100644 --- a/tools/firmware/hvmloader/acpi/mk_dsdt.c +++ b/tools/firmware/hvmloader/acpi/mk_dsdt.c @@ -222,12 +222,9 @@ int main(int argc, char **argv) /* Define GPE control method. */ push_block("Scope", "\\_GPE"); - if (dm_version == QEMU_XEN_TRADITIONAL) { - push_block("Method", "_L02"); - } else { - push_block("Method", "_E02"); - } - stmt("Return", "\\_SB.PRSC()"); + push_block("Method", + dm_version == QEMU_XEN_TRADITIONAL ? "_L02" : "_E02"); + stmt("\\_SB.PRSC ()", NULL); pop_block(); pop_block(); /**** Processor end ****/ @@ -374,8 +371,7 @@ int main(int argc, char **argv) push_block("Device", "S%i", slot); { stmt("Name", "_ADR, %#06x0000", slot); push_block("Method", "_EJ0,1"); { - stmt("Store", "ShiftLeft(1, %#06x), B0EJ", slot); - stmt("Return", "0x0"); + stmt("Store", "%#010x, B0EJ", 1 << slot); } pop_block(); stmt("Name", "_SUN, %i", slot); } pop_block(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:04:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:04: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 1YCx1I-0001Vb-SI; Sun, 18 Jan 2015 21:04:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1I-0001VS-Et for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:28 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id C0/3C-11581-BDF1CB45; Sun, 18 Jan 2015 21:04:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1421615066!15815339!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21116 invoked from network); 18 Jan 2015 21:04:27 -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; 18 Jan 2015 21:04:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1G-0001CU-25 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx1G-00049Q-1M for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:26 +0000 Date: Sun, 18 Jan 2015 21:04:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: certain methods are not supposed to have a 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 64ce4209cd79d414a1fbef2ede63e5c584b08b40 Author: Jan Beulich AuthorDate: Fri Jan 9 17:33:11 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:33:11 2015 +0100 hvmloader: certain methods are not supposed to have a return value Newer iasl complains about this being violated. Also convert a ShiftLeft(, ) to a plain constant. Reported-by: Ian Campbell Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- tools/firmware/hvmloader/acpi/mk_dsdt.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/mk_dsdt.c b/tools/firmware/hvmloader/acpi/mk_dsdt.c index a4b693b..1392525 100644 --- a/tools/firmware/hvmloader/acpi/mk_dsdt.c +++ b/tools/firmware/hvmloader/acpi/mk_dsdt.c @@ -222,12 +222,9 @@ int main(int argc, char **argv) /* Define GPE control method. */ push_block("Scope", "\\_GPE"); - if (dm_version == QEMU_XEN_TRADITIONAL) { - push_block("Method", "_L02"); - } else { - push_block("Method", "_E02"); - } - stmt("Return", "\\_SB.PRSC()"); + push_block("Method", + dm_version == QEMU_XEN_TRADITIONAL ? "_L02" : "_E02"); + stmt("\\_SB.PRSC ()", NULL); pop_block(); pop_block(); /**** Processor end ****/ @@ -374,8 +371,7 @@ int main(int argc, char **argv) push_block("Device", "S%i", slot); { stmt("Name", "_ADR, %#06x0000", slot); push_block("Method", "_EJ0,1"); { - stmt("Store", "ShiftLeft(1, %#06x), B0EJ", slot); - stmt("Return", "0x0"); + stmt("Store", "%#010x, B0EJ", 1 << slot); } pop_block(); stmt("Name", "_SUN, %i", slot); } pop_block(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:04:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:04: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 1YCx1S-0001X3-Uz; Sun, 18 Jan 2015 21:04:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1S-0001Wv-GI for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:38 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 12/E3-09842-5EF1CB45; Sun, 18 Jan 2015 21:04:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1421615076!22263921!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7913 invoked from network); 18 Jan 2015 21:04:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:04:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1Q-0001Cc-7p for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx1Q-0004A5-6q for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:36 +0000 Date: Sun, 18 Jan 2015 21:04:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: expose CMT L3 event mask to user space X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 877eda3223161b995feacce8d2356ced1f627fa8 Author: Chao Peng AuthorDate: Fri Jan 9 17:35:43 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:35:43 2015 +0100 x86: expose CMT L3 event mask to user space L3 event mask indicates the event types supported in host, including cache occupancy event as well as local/total memory bandwidth events for Memory Bandwidth Monitoring(MBM). Expose it so all these events can be monitored in user space. Signed-off-by: Chao Peng Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/sysctl.c | 3 +++ xen/include/public/sysctl.h | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index 57ad992..611a291 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -157,6 +157,9 @@ long arch_do_sysctl( sysctl->u.psr_cmt_op.u.data = (ret ? 0 : info.size); break; } + case XEN_SYSCTL_PSR_CMT_get_l3_event_mask: + sysctl->u.psr_cmt_op.u.data = psr_cmt->l3.features; + break; default: sysctl->u.psr_cmt_op.u.data = 0; ret = -ENOSYS; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index b3713b3..8552dc6 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -641,6 +641,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_sysctl_coverage_op_t); /* The L3 cache size is returned in KB unit */ #define XEN_SYSCTL_PSR_CMT_get_l3_cache_size 2 #define XEN_SYSCTL_PSR_CMT_enabled 3 +#define XEN_SYSCTL_PSR_CMT_get_l3_event_mask 4 struct xen_sysctl_psr_cmt_op { uint32_t cmd; /* IN: XEN_SYSCTL_PSR_CMT_* */ uint32_t flags; /* padding variable, may be extended for future 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 Sun Jan 18 21:04:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:04: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 1YCx1S-0001X3-Uz; Sun, 18 Jan 2015 21:04:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1S-0001Wv-GI for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:38 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 12/E3-09842-5EF1CB45; Sun, 18 Jan 2015 21:04:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1421615076!22263921!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7913 invoked from network); 18 Jan 2015 21:04:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:04:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1Q-0001Cc-7p for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx1Q-0004A5-6q for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:36 +0000 Date: Sun, 18 Jan 2015 21:04:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: expose CMT L3 event mask to user space X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 877eda3223161b995feacce8d2356ced1f627fa8 Author: Chao Peng AuthorDate: Fri Jan 9 17:35:43 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 9 17:35:43 2015 +0100 x86: expose CMT L3 event mask to user space L3 event mask indicates the event types supported in host, including cache occupancy event as well as local/total memory bandwidth events for Memory Bandwidth Monitoring(MBM). Expose it so all these events can be monitored in user space. Signed-off-by: Chao Peng Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/sysctl.c | 3 +++ xen/include/public/sysctl.h | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index 57ad992..611a291 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -157,6 +157,9 @@ long arch_do_sysctl( sysctl->u.psr_cmt_op.u.data = (ret ? 0 : info.size); break; } + case XEN_SYSCTL_PSR_CMT_get_l3_event_mask: + sysctl->u.psr_cmt_op.u.data = psr_cmt->l3.features; + break; default: sysctl->u.psr_cmt_op.u.data = 0; ret = -ENOSYS; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index b3713b3..8552dc6 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -641,6 +641,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_sysctl_coverage_op_t); /* The L3 cache size is returned in KB unit */ #define XEN_SYSCTL_PSR_CMT_get_l3_cache_size 2 #define XEN_SYSCTL_PSR_CMT_enabled 3 +#define XEN_SYSCTL_PSR_CMT_get_l3_event_mask 4 struct xen_sysctl_psr_cmt_op { uint32_t cmd; /* IN: XEN_SYSCTL_PSR_CMT_* */ uint32_t flags; /* padding variable, may be extended for future 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 Sun Jan 18 21:04:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:04: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 1YCx1e-0001Ym-22; Sun, 18 Jan 2015 21:04:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1d-0001Yc-0p for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:49 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id D3/4D-29352-0FF1CB45; Sun, 18 Jan 2015 21:04:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1421615086!18681222!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19305 invoked from network); 18 Jan 2015 21:04:47 -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; 18 Jan 2015 21:04:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1a-0001Ci-GH for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx1a-0004Ag-CO for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:46 +0000 Date: Sun, 18 Jan 2015 21:04:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: make hvm_efer_valid() honor guest features X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 07a6aa869bae0699d2f7e1b75d188229eb70c9e4 Author: Jan Beulich AuthorDate: Mon Jan 12 15:39:09 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 12 15:39:09 2015 +0100 x86/HVM: make hvm_efer_valid() honor guest features Following the earlier similar change validating CR4 modifications. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 66 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 47 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8b06bfd..82ee7e8 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1672,20 +1672,53 @@ static int hvm_save_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) return 0; } -static bool_t hvm_efer_valid(struct domain *d, - uint64_t value, uint64_t efer_validbits) +static bool_t hvm_efer_valid(const struct vcpu *v, uint64_t value, + signed int cr0_pg) { - if ( nestedhvm_enabled(d) && cpu_has_svm ) - efer_validbits |= EFER_SVME; + unsigned int ext1_ecx = 0, ext1_edx = 0; - return !((value & ~efer_validbits) || - ((sizeof(long) != 8) && (value & EFER_LME)) || - (!cpu_has_svm && (value & EFER_SVME)) || - (!cpu_has_nx && (value & EFER_NX)) || - (!cpu_has_syscall && (value & EFER_SCE)) || - (!cpu_has_lmsl && (value & EFER_LMSLE)) || - (!cpu_has_ffxsr && (value & EFER_FFXSE)) || - ((value & (EFER_LME|EFER_LMA)) == EFER_LMA)); + if ( cr0_pg < 0 && !is_hardware_domain(v->domain) ) + { + unsigned int level; + + ASSERT(v == current); + hvm_cpuid(0x80000000, &level, NULL, NULL, NULL); + if ( level >= 0x80000001 ) + hvm_cpuid(0x80000001, NULL, NULL, &ext1_ecx, &ext1_edx); + } + else + { + ext1_edx = boot_cpu_data.x86_capability[X86_FEATURE_LM / 32]; + ext1_ecx = boot_cpu_data.x86_capability[X86_FEATURE_SVM / 32]; + } + + if ( (value & EFER_SCE) && + !(ext1_edx & cpufeat_mask(X86_FEATURE_SYSCALL)) ) + return 0; + + if ( (value & (EFER_LME | EFER_LMA)) && + !(ext1_edx & cpufeat_mask(X86_FEATURE_LM)) ) + return 0; + + if ( cr0_pg > 0 && (value & EFER_LMA) && (!(value & EFER_LME) || !cr0_pg) ) + return 0; + + if ( (value & EFER_NX) && !(ext1_edx & cpufeat_mask(X86_FEATURE_NX)) ) + return 0; + + if ( (value & EFER_SVME) && + (!(ext1_ecx & cpufeat_mask(X86_FEATURE_SVM)) || + !nestedhvm_enabled(v->domain)) ) + return 0; + + if ( (value & EFER_LMSLE) && !cpu_has_lmsl ) + return 0; + + if ( (value & EFER_FFXSE) && + !(ext1_edx & cpufeat_mask(X86_FEATURE_FFXSR)) ) + return 0; + + return 1; } /* These reserved bits in lower 32 remain 0 after any load of CR0 */ @@ -1763,7 +1796,6 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) struct vcpu *v; struct hvm_hw_cpu ctxt; struct segment_register seg; - uint64_t efer_validbits; /* Which vcpu is this? */ vcpuid = hvm_load_instance(h); @@ -1794,9 +1826,7 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) return -EINVAL; } - efer_validbits = EFER_FFXSE | EFER_LMSLE | EFER_LME | EFER_LMA - | EFER_NX | EFER_SCE; - if ( !hvm_efer_valid(d, ctxt.msr_efer, efer_validbits) ) + if ( !hvm_efer_valid(v, ctxt.msr_efer, MASK_EXTR(ctxt.cr0, X86_CR0_PG)) ) { printk(XENLOG_G_ERR "HVM%d restore: bad EFER %#" PRIx64 "\n", d->domain_id, ctxt.msr_efer); @@ -2936,12 +2966,10 @@ err: int hvm_set_efer(uint64_t value) { struct vcpu *v = current; - uint64_t efer_validbits; value &= ~EFER_LMA; - efer_validbits = EFER_FFXSE | EFER_LMSLE | EFER_LME | EFER_NX | EFER_SCE; - if ( !hvm_efer_valid(v->domain, value, efer_validbits) ) + if ( !hvm_efer_valid(v, value, -1) ) { gdprintk(XENLOG_WARNING, "Trying to set reserved bit in " "EFER: %#"PRIx64"\n", value); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:04:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:04: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 1YCx1e-0001Ym-22; Sun, 18 Jan 2015 21:04:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1d-0001Yc-0p for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:49 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id D3/4D-29352-0FF1CB45; Sun, 18 Jan 2015 21:04:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1421615086!18681222!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19305 invoked from network); 18 Jan 2015 21:04:47 -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; 18 Jan 2015 21:04:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1a-0001Ci-GH for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx1a-0004Ag-CO for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:46 +0000 Date: Sun, 18 Jan 2015 21:04:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: make hvm_efer_valid() honor guest features X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 07a6aa869bae0699d2f7e1b75d188229eb70c9e4 Author: Jan Beulich AuthorDate: Mon Jan 12 15:39:09 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 12 15:39:09 2015 +0100 x86/HVM: make hvm_efer_valid() honor guest features Following the earlier similar change validating CR4 modifications. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 66 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 47 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8b06bfd..82ee7e8 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1672,20 +1672,53 @@ static int hvm_save_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) return 0; } -static bool_t hvm_efer_valid(struct domain *d, - uint64_t value, uint64_t efer_validbits) +static bool_t hvm_efer_valid(const struct vcpu *v, uint64_t value, + signed int cr0_pg) { - if ( nestedhvm_enabled(d) && cpu_has_svm ) - efer_validbits |= EFER_SVME; + unsigned int ext1_ecx = 0, ext1_edx = 0; - return !((value & ~efer_validbits) || - ((sizeof(long) != 8) && (value & EFER_LME)) || - (!cpu_has_svm && (value & EFER_SVME)) || - (!cpu_has_nx && (value & EFER_NX)) || - (!cpu_has_syscall && (value & EFER_SCE)) || - (!cpu_has_lmsl && (value & EFER_LMSLE)) || - (!cpu_has_ffxsr && (value & EFER_FFXSE)) || - ((value & (EFER_LME|EFER_LMA)) == EFER_LMA)); + if ( cr0_pg < 0 && !is_hardware_domain(v->domain) ) + { + unsigned int level; + + ASSERT(v == current); + hvm_cpuid(0x80000000, &level, NULL, NULL, NULL); + if ( level >= 0x80000001 ) + hvm_cpuid(0x80000001, NULL, NULL, &ext1_ecx, &ext1_edx); + } + else + { + ext1_edx = boot_cpu_data.x86_capability[X86_FEATURE_LM / 32]; + ext1_ecx = boot_cpu_data.x86_capability[X86_FEATURE_SVM / 32]; + } + + if ( (value & EFER_SCE) && + !(ext1_edx & cpufeat_mask(X86_FEATURE_SYSCALL)) ) + return 0; + + if ( (value & (EFER_LME | EFER_LMA)) && + !(ext1_edx & cpufeat_mask(X86_FEATURE_LM)) ) + return 0; + + if ( cr0_pg > 0 && (value & EFER_LMA) && (!(value & EFER_LME) || !cr0_pg) ) + return 0; + + if ( (value & EFER_NX) && !(ext1_edx & cpufeat_mask(X86_FEATURE_NX)) ) + return 0; + + if ( (value & EFER_SVME) && + (!(ext1_ecx & cpufeat_mask(X86_FEATURE_SVM)) || + !nestedhvm_enabled(v->domain)) ) + return 0; + + if ( (value & EFER_LMSLE) && !cpu_has_lmsl ) + return 0; + + if ( (value & EFER_FFXSE) && + !(ext1_edx & cpufeat_mask(X86_FEATURE_FFXSR)) ) + return 0; + + return 1; } /* These reserved bits in lower 32 remain 0 after any load of CR0 */ @@ -1763,7 +1796,6 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) struct vcpu *v; struct hvm_hw_cpu ctxt; struct segment_register seg; - uint64_t efer_validbits; /* Which vcpu is this? */ vcpuid = hvm_load_instance(h); @@ -1794,9 +1826,7 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) return -EINVAL; } - efer_validbits = EFER_FFXSE | EFER_LMSLE | EFER_LME | EFER_LMA - | EFER_NX | EFER_SCE; - if ( !hvm_efer_valid(d, ctxt.msr_efer, efer_validbits) ) + if ( !hvm_efer_valid(v, ctxt.msr_efer, MASK_EXTR(ctxt.cr0, X86_CR0_PG)) ) { printk(XENLOG_G_ERR "HVM%d restore: bad EFER %#" PRIx64 "\n", d->domain_id, ctxt.msr_efer); @@ -2936,12 +2966,10 @@ err: int hvm_set_efer(uint64_t value) { struct vcpu *v = current; - uint64_t efer_validbits; value &= ~EFER_LMA; - efer_validbits = EFER_FFXSE | EFER_LMSLE | EFER_LME | EFER_NX | EFER_SCE; - if ( !hvm_efer_valid(v->domain, value, efer_validbits) ) + if ( !hvm_efer_valid(v, value, -1) ) { gdprintk(XENLOG_WARNING, "Trying to set reserved bit in " "EFER: %#"PRIx64"\n", value); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:05:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:05: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 1YCx1o-0001ah-6u; Sun, 18 Jan 2015 21:05:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1n-0001aX-A1 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:59 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 7C/AC-02760-AFF1CB45; Sun, 18 Jan 2015 21:04:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1421615096!15902107!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16207 invoked from network); 18 Jan 2015 21:04:57 -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; 18 Jan 2015 21:04:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1k-0001Cr-Lr for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx1k-0004C9-KO for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:56 +0000 Date: Sun, 18 Jan 2015 21:04:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: also allow REP STOS emulation acceleration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cacdb0faaa121ac8f792d5bd34cc6bc7c72d21da Author: Jan Beulich AuthorDate: Mon Jan 12 15:40:06 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 12 15:40:06 2015 +0100 x86: also allow REP STOS emulation acceleration While the REP MOVS acceleration appears to have helped qemu-traditional based guests, qemu-upstream (or really the respective video BIOSes) doesn't appear to benefit from that. Instead the acceleration added here provides a visible performance improvement during very early HVM guest boot. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/hvm/emulate.c | 120 ++++++++++++++++++++++++++++++++ xen/arch/x86/hvm/stdvga.c | 15 +++-- xen/arch/x86/x86_emulate/x86_emulate.c | 20 ++++-- xen/arch/x86/x86_emulate/x86_emulate.h | 14 ++++ xen/include/xen/lib.h | 2 + 5 files changed, 161 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 14c1847..2ed4344 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -731,6 +731,17 @@ static int hvmemul_rep_movs_discard( return X86EMUL_OKAY; } +static int hvmemul_rep_stos_discard( + void *p_data, + enum x86_segment seg, + unsigned long offset, + unsigned int bytes_per_rep, + unsigned long *reps, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + static int hvmemul_rep_outs_discard( enum x86_segment src_seg, unsigned long src_offset, @@ -982,6 +993,113 @@ static int hvmemul_rep_movs( return X86EMUL_OKAY; } +static int hvmemul_rep_stos( + void *p_data, + enum x86_segment seg, + unsigned long offset, + unsigned int bytes_per_rep, + unsigned long *reps, + struct x86_emulate_ctxt *ctxt) +{ + struct hvm_emulate_ctxt *hvmemul_ctxt = + container_of(ctxt, struct hvm_emulate_ctxt, ctxt); + unsigned long addr; + paddr_t gpa; + p2m_type_t p2mt; + bool_t df = !!(ctxt->regs->eflags & X86_EFLAGS_DF); + int rc = hvmemul_virtual_to_linear(seg, offset, bytes_per_rep, reps, + hvm_access_write, hvmemul_ctxt, &addr); + + if ( rc == X86EMUL_OKAY ) + { + uint32_t pfec = PFEC_page_present | PFEC_write_access; + + if ( hvmemul_ctxt->seg_reg[x86_seg_ss].attr.fields.dpl == 3 ) + pfec |= PFEC_user_mode; + + rc = hvmemul_linear_to_phys( + addr, &gpa, bytes_per_rep, reps, pfec, hvmemul_ctxt); + } + if ( rc != X86EMUL_OKAY ) + return rc; + + /* Check for MMIO op */ + (void)get_gfn_query_unlocked(current->domain, gpa >> PAGE_SHIFT, &p2mt); + + switch ( p2mt ) + { + unsigned long bytes; + void *buf; + + default: + /* Allocate temporary buffer. */ + for ( ; ; ) + { + bytes = *reps * bytes_per_rep; + buf = xmalloc_bytes(bytes); + if ( buf || *reps <= 1 ) + break; + *reps >>= 1; + } + + if ( !buf ) + buf = p_data; + else + switch ( bytes_per_rep ) + { + unsigned long dummy; + +#define CASE(bits, suffix) \ + case (bits) / 8: \ + asm ( "rep stos" #suffix \ + : "=m" (*(char (*)[bytes])buf), \ + "=D" (dummy), "=c" (dummy) \ + : "a" (*(const uint##bits##_t *)p_data), \ + "1" (buf), "2" (*reps) ); \ + break + CASE(8, b); + CASE(16, w); + CASE(32, l); + CASE(64, q); +#undef CASE + + default: + ASSERT_UNREACHABLE(); + xfree(buf); + return X86EMUL_UNHANDLEABLE; + } + + /* Adjust address for reverse store. */ + if ( df ) + gpa -= bytes - bytes_per_rep; + + rc = hvm_copy_to_guest_phys(gpa, buf, bytes); + + if ( buf != p_data ) + xfree(buf); + + switch ( rc ) + { + case HVMCOPY_gfn_paged_out: + case HVMCOPY_gfn_shared: + return X86EMUL_RETRY; + case HVMCOPY_okay: + return X86EMUL_OKAY; + } + + gdprintk(XENLOG_WARNING, + "Failed REP STOS: gpa=%"PRIpaddr" reps=%lu bytes_per_rep=%u\n", + gpa, *reps, bytes_per_rep); + /* fall through */ + case p2m_mmio_direct: + return X86EMUL_UNHANDLEABLE; + + case p2m_mmio_dm: + return hvmemul_do_mmio(gpa, reps, bytes_per_rep, 0, IOREQ_WRITE, df, + p_data); + } +} + static int hvmemul_read_segment( enum x86_segment seg, struct segment_register *reg, @@ -1239,6 +1357,7 @@ static const struct x86_emulate_ops hvm_emulate_ops = { .rep_ins = hvmemul_rep_ins, .rep_outs = hvmemul_rep_outs, .rep_movs = hvmemul_rep_movs, + .rep_stos = hvmemul_rep_stos, .read_segment = hvmemul_read_segment, .write_segment = hvmemul_write_segment, .read_io = hvmemul_read_io, @@ -1264,6 +1383,7 @@ static const struct x86_emulate_ops hvm_emulate_ops_no_write = { .rep_ins = hvmemul_rep_ins_discard, .rep_outs = hvmemul_rep_outs_discard, .rep_movs = hvmemul_rep_movs_discard, + .rep_stos = hvmemul_rep_stos_discard, .read_segment = hvmemul_read_segment, .write_segment = hvmemul_write_segment, .read_io = hvmemul_read_io_discard, diff --git a/xen/arch/x86/hvm/stdvga.c b/xen/arch/x86/hvm/stdvga.c index 19e80ed..060512a 100644 --- a/xen/arch/x86/hvm/stdvga.c +++ b/xen/arch/x86/hvm/stdvga.c @@ -470,11 +470,11 @@ static int mmio_move(struct hvm_hw_stdvga *s, ioreq_t *p) uint64_t addr = p->addr; p2m_type_t p2mt; struct domain *d = current->domain; + int step = p->df ? -p->size : p->size; if ( p->data_is_ptr ) { uint64_t data = p->data, tmp; - int step = p->df ? -p->size : p->size; if ( p->dir == IOREQ_READ ) { @@ -529,13 +529,18 @@ static int mmio_move(struct hvm_hw_stdvga *s, ioreq_t *p) } } } + else if ( p->dir == IOREQ_WRITE ) + { + for ( i = 0; i < p->count; i++ ) + { + stdvga_mem_write(addr, p->data, p->size); + addr += step; + } + } else { ASSERT(p->count == 1); - if ( p->dir == IOREQ_READ ) - p->data = stdvga_mem_read(addr, p->size); - else - stdvga_mem_write(addr, p->data, p->size); + p->data = stdvga_mem_read(addr, p->size); } read_data = p->data; diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index fef97ea..be07ffb 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -2568,15 +2568,25 @@ x86_emulate( } case 0xaa ... 0xab: /* stos */ { - /* unsigned long max_reps = */get_rep_prefix(); - dst.type = OP_MEM; + unsigned long nr_reps = get_rep_prefix(); dst.bytes = (d & ByteOp) ? 1 : op_bytes; dst.mem.seg = x86_seg_es; dst.mem.off = truncate_ea(_regs.edi); - dst.val = _regs.eax; + if ( (nr_reps == 1) || !ops->rep_stos || + ((rc = ops->rep_stos(&_regs.eax, + dst.mem.seg, dst.mem.off, dst.bytes, + &nr_reps, ctxt)) == X86EMUL_UNHANDLEABLE) ) + { + dst.val = _regs.eax; + dst.type = OP_MEM; + nr_reps = 1; + } + else if ( rc != X86EMUL_OKAY ) + goto done; register_address_increment( - _regs.edi, (_regs.eflags & EFLG_DF) ? -dst.bytes : dst.bytes); - put_rep_prefix(1); + _regs.edi, + nr_reps * ((_regs.eflags & EFLG_DF) ? -dst.bytes : dst.bytes)); + put_rep_prefix(nr_reps); break; } diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index b059341..bdce861 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -241,6 +241,20 @@ struct x86_emulate_ops struct x86_emulate_ctxt *ctxt); /* + * rep_stos: Emulate STOS: <*p_data> -> . + * @bytes_per_rep: [IN ] Bytes transferred per repetition. + * @reps: [IN ] Maximum repetitions to be emulated. + * [OUT] Number of repetitions actually emulated. + */ + int (*rep_stos)( + void *p_data, + enum x86_segment seg, + unsigned long offset, + unsigned int bytes_per_rep, + unsigned long *reps, + struct x86_emulate_ctxt *ctxt); + + /* * read_segment: Emulate a read of full context of a segment register. * @reg: [OUT] Contents of segment register (visible and hidden state). */ diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 8f9cadb..ca3916b 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#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:05:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:05: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 1YCx1o-0001ah-6u; Sun, 18 Jan 2015 21:05:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1n-0001aX-A1 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:59 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 7C/AC-02760-AFF1CB45; Sun, 18 Jan 2015 21:04:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1421615096!15902107!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16207 invoked from network); 18 Jan 2015 21:04:57 -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; 18 Jan 2015 21:04:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1k-0001Cr-Lr for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx1k-0004C9-KO for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:04:56 +0000 Date: Sun, 18 Jan 2015 21:04:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: also allow REP STOS emulation acceleration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cacdb0faaa121ac8f792d5bd34cc6bc7c72d21da Author: Jan Beulich AuthorDate: Mon Jan 12 15:40:06 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 12 15:40:06 2015 +0100 x86: also allow REP STOS emulation acceleration While the REP MOVS acceleration appears to have helped qemu-traditional based guests, qemu-upstream (or really the respective video BIOSes) doesn't appear to benefit from that. Instead the acceleration added here provides a visible performance improvement during very early HVM guest boot. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/hvm/emulate.c | 120 ++++++++++++++++++++++++++++++++ xen/arch/x86/hvm/stdvga.c | 15 +++-- xen/arch/x86/x86_emulate/x86_emulate.c | 20 ++++-- xen/arch/x86/x86_emulate/x86_emulate.h | 14 ++++ xen/include/xen/lib.h | 2 + 5 files changed, 161 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 14c1847..2ed4344 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -731,6 +731,17 @@ static int hvmemul_rep_movs_discard( return X86EMUL_OKAY; } +static int hvmemul_rep_stos_discard( + void *p_data, + enum x86_segment seg, + unsigned long offset, + unsigned int bytes_per_rep, + unsigned long *reps, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + static int hvmemul_rep_outs_discard( enum x86_segment src_seg, unsigned long src_offset, @@ -982,6 +993,113 @@ static int hvmemul_rep_movs( return X86EMUL_OKAY; } +static int hvmemul_rep_stos( + void *p_data, + enum x86_segment seg, + unsigned long offset, + unsigned int bytes_per_rep, + unsigned long *reps, + struct x86_emulate_ctxt *ctxt) +{ + struct hvm_emulate_ctxt *hvmemul_ctxt = + container_of(ctxt, struct hvm_emulate_ctxt, ctxt); + unsigned long addr; + paddr_t gpa; + p2m_type_t p2mt; + bool_t df = !!(ctxt->regs->eflags & X86_EFLAGS_DF); + int rc = hvmemul_virtual_to_linear(seg, offset, bytes_per_rep, reps, + hvm_access_write, hvmemul_ctxt, &addr); + + if ( rc == X86EMUL_OKAY ) + { + uint32_t pfec = PFEC_page_present | PFEC_write_access; + + if ( hvmemul_ctxt->seg_reg[x86_seg_ss].attr.fields.dpl == 3 ) + pfec |= PFEC_user_mode; + + rc = hvmemul_linear_to_phys( + addr, &gpa, bytes_per_rep, reps, pfec, hvmemul_ctxt); + } + if ( rc != X86EMUL_OKAY ) + return rc; + + /* Check for MMIO op */ + (void)get_gfn_query_unlocked(current->domain, gpa >> PAGE_SHIFT, &p2mt); + + switch ( p2mt ) + { + unsigned long bytes; + void *buf; + + default: + /* Allocate temporary buffer. */ + for ( ; ; ) + { + bytes = *reps * bytes_per_rep; + buf = xmalloc_bytes(bytes); + if ( buf || *reps <= 1 ) + break; + *reps >>= 1; + } + + if ( !buf ) + buf = p_data; + else + switch ( bytes_per_rep ) + { + unsigned long dummy; + +#define CASE(bits, suffix) \ + case (bits) / 8: \ + asm ( "rep stos" #suffix \ + : "=m" (*(char (*)[bytes])buf), \ + "=D" (dummy), "=c" (dummy) \ + : "a" (*(const uint##bits##_t *)p_data), \ + "1" (buf), "2" (*reps) ); \ + break + CASE(8, b); + CASE(16, w); + CASE(32, l); + CASE(64, q); +#undef CASE + + default: + ASSERT_UNREACHABLE(); + xfree(buf); + return X86EMUL_UNHANDLEABLE; + } + + /* Adjust address for reverse store. */ + if ( df ) + gpa -= bytes - bytes_per_rep; + + rc = hvm_copy_to_guest_phys(gpa, buf, bytes); + + if ( buf != p_data ) + xfree(buf); + + switch ( rc ) + { + case HVMCOPY_gfn_paged_out: + case HVMCOPY_gfn_shared: + return X86EMUL_RETRY; + case HVMCOPY_okay: + return X86EMUL_OKAY; + } + + gdprintk(XENLOG_WARNING, + "Failed REP STOS: gpa=%"PRIpaddr" reps=%lu bytes_per_rep=%u\n", + gpa, *reps, bytes_per_rep); + /* fall through */ + case p2m_mmio_direct: + return X86EMUL_UNHANDLEABLE; + + case p2m_mmio_dm: + return hvmemul_do_mmio(gpa, reps, bytes_per_rep, 0, IOREQ_WRITE, df, + p_data); + } +} + static int hvmemul_read_segment( enum x86_segment seg, struct segment_register *reg, @@ -1239,6 +1357,7 @@ static const struct x86_emulate_ops hvm_emulate_ops = { .rep_ins = hvmemul_rep_ins, .rep_outs = hvmemul_rep_outs, .rep_movs = hvmemul_rep_movs, + .rep_stos = hvmemul_rep_stos, .read_segment = hvmemul_read_segment, .write_segment = hvmemul_write_segment, .read_io = hvmemul_read_io, @@ -1264,6 +1383,7 @@ static const struct x86_emulate_ops hvm_emulate_ops_no_write = { .rep_ins = hvmemul_rep_ins_discard, .rep_outs = hvmemul_rep_outs_discard, .rep_movs = hvmemul_rep_movs_discard, + .rep_stos = hvmemul_rep_stos_discard, .read_segment = hvmemul_read_segment, .write_segment = hvmemul_write_segment, .read_io = hvmemul_read_io_discard, diff --git a/xen/arch/x86/hvm/stdvga.c b/xen/arch/x86/hvm/stdvga.c index 19e80ed..060512a 100644 --- a/xen/arch/x86/hvm/stdvga.c +++ b/xen/arch/x86/hvm/stdvga.c @@ -470,11 +470,11 @@ static int mmio_move(struct hvm_hw_stdvga *s, ioreq_t *p) uint64_t addr = p->addr; p2m_type_t p2mt; struct domain *d = current->domain; + int step = p->df ? -p->size : p->size; if ( p->data_is_ptr ) { uint64_t data = p->data, tmp; - int step = p->df ? -p->size : p->size; if ( p->dir == IOREQ_READ ) { @@ -529,13 +529,18 @@ static int mmio_move(struct hvm_hw_stdvga *s, ioreq_t *p) } } } + else if ( p->dir == IOREQ_WRITE ) + { + for ( i = 0; i < p->count; i++ ) + { + stdvga_mem_write(addr, p->data, p->size); + addr += step; + } + } else { ASSERT(p->count == 1); - if ( p->dir == IOREQ_READ ) - p->data = stdvga_mem_read(addr, p->size); - else - stdvga_mem_write(addr, p->data, p->size); + p->data = stdvga_mem_read(addr, p->size); } read_data = p->data; diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index fef97ea..be07ffb 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -2568,15 +2568,25 @@ x86_emulate( } case 0xaa ... 0xab: /* stos */ { - /* unsigned long max_reps = */get_rep_prefix(); - dst.type = OP_MEM; + unsigned long nr_reps = get_rep_prefix(); dst.bytes = (d & ByteOp) ? 1 : op_bytes; dst.mem.seg = x86_seg_es; dst.mem.off = truncate_ea(_regs.edi); - dst.val = _regs.eax; + if ( (nr_reps == 1) || !ops->rep_stos || + ((rc = ops->rep_stos(&_regs.eax, + dst.mem.seg, dst.mem.off, dst.bytes, + &nr_reps, ctxt)) == X86EMUL_UNHANDLEABLE) ) + { + dst.val = _regs.eax; + dst.type = OP_MEM; + nr_reps = 1; + } + else if ( rc != X86EMUL_OKAY ) + goto done; register_address_increment( - _regs.edi, (_regs.eflags & EFLG_DF) ? -dst.bytes : dst.bytes); - put_rep_prefix(1); + _regs.edi, + nr_reps * ((_regs.eflags & EFLG_DF) ? -dst.bytes : dst.bytes)); + put_rep_prefix(nr_reps); break; } diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index b059341..bdce861 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -241,6 +241,20 @@ struct x86_emulate_ops struct x86_emulate_ctxt *ctxt); /* + * rep_stos: Emulate STOS: <*p_data> -> . + * @bytes_per_rep: [IN ] Bytes transferred per repetition. + * @reps: [IN ] Maximum repetitions to be emulated. + * [OUT] Number of repetitions actually emulated. + */ + int (*rep_stos)( + void *p_data, + enum x86_segment seg, + unsigned long offset, + unsigned int bytes_per_rep, + unsigned long *reps, + struct x86_emulate_ctxt *ctxt); + + /* * read_segment: Emulate a read of full context of a segment register. * @reg: [OUT] Contents of segment register (visible and hidden state). */ diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 8f9cadb..ca3916b 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#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:05:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:05: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 1YCx20-0001cF-9y; Sun, 18 Jan 2015 21:05:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1z-0001c5-Ex for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:11 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 18/DC-16982-6002CB45; Sun, 18 Jan 2015 21:05:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1421615107!20435440!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31188 invoked from network); 18 Jan 2015 21:05:08 -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; 18 Jan 2015 21:05:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1u-0001DP-To for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx1u-0004Cs-Ra for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:06 +0000 Date: Sun, 18 Jan 2015 21:05:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86emul: tighten CLFLUSH 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 9d03db6b81d1880bf3aa4fc83a60346bf02be251 Author: Jan Beulich AuthorDate: Mon Jan 12 15:41:12 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 12 15:41:12 2015 +0100 x86emul: tighten CLFLUSH emulation While for us it's not as bad as it was for Linux, their commit 13e457e0ee ("KVM: x86: Emulator does not decode clflush well", by Nadav Amit ) nevertheless points out two shortcomings in our code: opcode 0F AE /7 is clflush only when it uses a memory mode (otherwise it's SFENCE) and when there's no REP prefix (an operand size prefix is fine, as that's CLFLUSHOPT). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/x86_emulate/x86_emulate.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index be07ffb..f13f07d 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -4410,7 +4410,9 @@ x86_emulate( case 0xae: /* Grp15 */ switch ( modrm_reg & 7 ) { - case 7: /* clflush */ + case 7: /* clflush{,opt} */ + fail_if(modrm_mod == 3); + fail_if(rep_prefix()); fail_if(ops->wbinvd == NULL); if ( (rc = ops->wbinvd(ctxt)) != 0 ) goto done; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:05:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:05: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 1YCx20-0001cF-9y; Sun, 18 Jan 2015 21:05:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1z-0001c5-Ex for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:11 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 18/DC-16982-6002CB45; Sun, 18 Jan 2015 21:05:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1421615107!20435440!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31188 invoked from network); 18 Jan 2015 21:05:08 -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; 18 Jan 2015 21:05:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx1u-0001DP-To for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx1u-0004Cs-Ra for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:06 +0000 Date: Sun, 18 Jan 2015 21:05:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86emul: tighten CLFLUSH 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 9d03db6b81d1880bf3aa4fc83a60346bf02be251 Author: Jan Beulich AuthorDate: Mon Jan 12 15:41:12 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 12 15:41:12 2015 +0100 x86emul: tighten CLFLUSH emulation While for us it's not as bad as it was for Linux, their commit 13e457e0ee ("KVM: x86: Emulator does not decode clflush well", by Nadav Amit ) nevertheless points out two shortcomings in our code: opcode 0F AE /7 is clflush only when it uses a memory mode (otherwise it's SFENCE) and when there's no REP prefix (an operand size prefix is fine, as that's CLFLUSHOPT). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/x86_emulate/x86_emulate.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index be07ffb..f13f07d 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -4410,7 +4410,9 @@ x86_emulate( case 0xae: /* Grp15 */ switch ( modrm_reg & 7 ) { - case 7: /* clflush */ + case 7: /* clflush{,opt} */ + fail_if(modrm_mod == 3); + fail_if(rep_prefix()); fail_if(ops->wbinvd == NULL); if ( (rc = ops->wbinvd(ctxt)) != 0 ) goto done; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:05:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:05: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 1YCx2A-0001dW-CX; Sun, 18 Jan 2015 21:05:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx29-0001dO-Cx for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:21 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 89/64-14727-0102CB45; Sun, 18 Jan 2015 21:05:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1421615117!15336382!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15175 invoked from network); 18 Jan 2015 21:05:18 -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; 18 Jan 2015 21:05:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx25-0001DW-2k for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx25-0004DJ-20 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:17 +0000 Date: Sun, 18 Jan 2015 21:05:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MCE: allow overriding the CMCI threshold X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b350fec7d3c85e4daa0ca057810e0faec2aef523 Author: Jan Beulich AuthorDate: Mon Jan 12 15:41:39 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 12 15:41:39 2015 +0100 x86/MCE: allow overriding the CMCI threshold We've had reports of systems where CMCIs would surface at a relatively high rate during certain periods of time, without them apparently causing subsequent more severe problems (see Xeon E7-8800/4800/2800 specification clarification SC1). Give the admin a knob to lower the impact on the system logs. Signed-off-by: Jan Beulich Acked-by: Christoph Egger Acked-by: Liu Jinsong --- docs/misc/xen-command-line.markdown | 8 ++++++++ xen/arch/x86/cpu/mcheck/mce_intel.c | 22 +++++++++++++++++++--- xen/arch/x86/cpu/mcheck/x86_mca.h | 2 -- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 152ae03..8bd75cd 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -242,6 +242,14 @@ the NMI watchdog is also enabled. If set, override Xen's default choice for the platform timer. +### cmci-threshold +> `= ` + +> Default: `2` + +Specify the event count threshold for raising Corrected Machine Check +Interrupts. Specifying zero disables CMCI handling. + ### cmos-rtc-probe > `= ` diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index 94db396..193366b 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -492,6 +492,9 @@ static int do_cmci_discover(int i) { unsigned msr = MSR_IA32_MCx_CTL2(i); u64 val; + unsigned int threshold, max_threshold; + static unsigned int cmci_threshold = 2; + integer_param("cmci-threshold", cmci_threshold); rdmsrl(msr, val); /* Some other CPU already owns this bank. */ @@ -500,15 +503,28 @@ static int do_cmci_discover(int i) goto out; } - val &= ~CMCI_THRESHOLD_MASK; - wrmsrl(msr, val | CMCI_EN | CMCI_THRESHOLD); - rdmsrl(msr, val); + if ( cmci_threshold ) + { + wrmsrl(msr, val | CMCI_EN | CMCI_THRESHOLD_MASK); + rdmsrl(msr, val); + } if (!(val & CMCI_EN)) { /* This bank does not support CMCI. Polling timer has to handle it. */ mcabanks_set(i, __get_cpu_var(no_cmci_banks)); + wrmsrl(msr, val & ~CMCI_THRESHOLD_MASK); return 0; } + max_threshold = MASK_EXTR(val, CMCI_THRESHOLD_MASK); + threshold = cmci_threshold; + if ( threshold > max_threshold ) + { + mce_printk(MCE_QUIET, + "CMCI: threshold %#x too large for CPU%u bank %u, using %#x\n", + threshold, smp_processor_id(), i, max_threshold); + threshold = max_threshold; + } + wrmsrl(msr, (val & ~CMCI_THRESHOLD_MASK) | CMCI_EN | threshold); mcabanks_set(i, __get_cpu_var(mce_banks_owned)); out: mcabanks_clear(i, __get_cpu_var(no_cmci_banks)); diff --git a/xen/arch/x86/cpu/mcheck/x86_mca.h b/xen/arch/x86/cpu/mcheck/x86_mca.h index a2cd37e..93c586d 100644 --- a/xen/arch/x86/cpu/mcheck/x86_mca.h +++ b/xen/arch/x86/cpu/mcheck/x86_mca.h @@ -87,8 +87,6 @@ #define K8_HWCR_MCi_STATUS_WREN (1ULL << 18) /*Intel Specific bitfield*/ -#define CMCI_THRESHOLD 0x2 - #define MCi_MISC_ADDRMOD_MASK (0x7UL << 6) #define MCi_MISC_PHYSMOD (0x2UL << 6) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:05:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:05: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 1YCx2A-0001dW-CX; Sun, 18 Jan 2015 21:05:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx29-0001dO-Cx for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:21 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 89/64-14727-0102CB45; Sun, 18 Jan 2015 21:05:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1421615117!15336382!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15175 invoked from network); 18 Jan 2015 21:05:18 -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; 18 Jan 2015 21:05:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx25-0001DW-2k for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx25-0004DJ-20 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:17 +0000 Date: Sun, 18 Jan 2015 21:05:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MCE: allow overriding the CMCI threshold X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b350fec7d3c85e4daa0ca057810e0faec2aef523 Author: Jan Beulich AuthorDate: Mon Jan 12 15:41:39 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 12 15:41:39 2015 +0100 x86/MCE: allow overriding the CMCI threshold We've had reports of systems where CMCIs would surface at a relatively high rate during certain periods of time, without them apparently causing subsequent more severe problems (see Xeon E7-8800/4800/2800 specification clarification SC1). Give the admin a knob to lower the impact on the system logs. Signed-off-by: Jan Beulich Acked-by: Christoph Egger Acked-by: Liu Jinsong --- docs/misc/xen-command-line.markdown | 8 ++++++++ xen/arch/x86/cpu/mcheck/mce_intel.c | 22 +++++++++++++++++++--- xen/arch/x86/cpu/mcheck/x86_mca.h | 2 -- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 152ae03..8bd75cd 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -242,6 +242,14 @@ the NMI watchdog is also enabled. If set, override Xen's default choice for the platform timer. +### cmci-threshold +> `= ` + +> Default: `2` + +Specify the event count threshold for raising Corrected Machine Check +Interrupts. Specifying zero disables CMCI handling. + ### cmos-rtc-probe > `= ` diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index 94db396..193366b 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -492,6 +492,9 @@ static int do_cmci_discover(int i) { unsigned msr = MSR_IA32_MCx_CTL2(i); u64 val; + unsigned int threshold, max_threshold; + static unsigned int cmci_threshold = 2; + integer_param("cmci-threshold", cmci_threshold); rdmsrl(msr, val); /* Some other CPU already owns this bank. */ @@ -500,15 +503,28 @@ static int do_cmci_discover(int i) goto out; } - val &= ~CMCI_THRESHOLD_MASK; - wrmsrl(msr, val | CMCI_EN | CMCI_THRESHOLD); - rdmsrl(msr, val); + if ( cmci_threshold ) + { + wrmsrl(msr, val | CMCI_EN | CMCI_THRESHOLD_MASK); + rdmsrl(msr, val); + } if (!(val & CMCI_EN)) { /* This bank does not support CMCI. Polling timer has to handle it. */ mcabanks_set(i, __get_cpu_var(no_cmci_banks)); + wrmsrl(msr, val & ~CMCI_THRESHOLD_MASK); return 0; } + max_threshold = MASK_EXTR(val, CMCI_THRESHOLD_MASK); + threshold = cmci_threshold; + if ( threshold > max_threshold ) + { + mce_printk(MCE_QUIET, + "CMCI: threshold %#x too large for CPU%u bank %u, using %#x\n", + threshold, smp_processor_id(), i, max_threshold); + threshold = max_threshold; + } + wrmsrl(msr, (val & ~CMCI_THRESHOLD_MASK) | CMCI_EN | threshold); mcabanks_set(i, __get_cpu_var(mce_banks_owned)); out: mcabanks_clear(i, __get_cpu_var(no_cmci_banks)); diff --git a/xen/arch/x86/cpu/mcheck/x86_mca.h b/xen/arch/x86/cpu/mcheck/x86_mca.h index a2cd37e..93c586d 100644 --- a/xen/arch/x86/cpu/mcheck/x86_mca.h +++ b/xen/arch/x86/cpu/mcheck/x86_mca.h @@ -87,8 +87,6 @@ #define K8_HWCR_MCi_STATUS_WREN (1ULL << 18) /*Intel Specific bitfield*/ -#define CMCI_THRESHOLD 0x2 - #define MCi_MISC_ADDRMOD_MASK (0x7UL << 6) #define MCi_MISC_PHYSMOD (0x2UL << 6) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:05:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:05: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 1YCx2J-0001ev-FC; Sun, 18 Jan 2015 21:05:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2H-0001ef-R4 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:29 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 81/9A-08051-9102CB45; Sun, 18 Jan 2015 21:05:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1421615127!13646473!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19217 invoked from network); 18 Jan 2015 21:05:28 -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 Jan 2015 21:05:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2F-0001Dc-8a for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx2F-0004Di-7n for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:27 +0000 Date: Sun, 18 Jan 2015 21:05:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm64/EFI: minor corrections X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c2acd532896d3e6da6fad84102f60c7361906941 Author: Jan Beulich AuthorDate: Mon Jan 12 15:42:53 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 12 15:42:53 2015 +0100 arm64/EFI: minor corrections - don't bail when using the last slot of bootinfo.mem.bank[] (due to premature incrementing of the array index) - GUIDs should be static const (and placed into .init.* whenever possible) - PrintErrMsg() issues a CR/LF pair itself - no need to explicitly append one to the message passed to the function Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/efi/efi-boot.h | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 639942d..b02cc02 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -104,7 +104,7 @@ static int __init fdt_set_reg(void *fdt, int node, int addr_cells, static void __init *lookup_fdt_config_table(EFI_SYSTEM_TABLE *sys_table) { - const EFI_GUID fdt_guid = DEVICE_TREE_GUID; + static const EFI_GUID __initconst fdt_guid = DEVICE_TREE_GUID; EFI_CONFIGURATION_TABLE *tables; void *fdt = NULL; int i; @@ -135,15 +135,15 @@ static EFI_STATUS __init efi_process_memory_map_bootinfo(EFI_MEMORY_DESCRIPTOR * || desc_ptr->Type == EfiBootServicesCode || desc_ptr->Type == EfiBootServicesData ) { - bootinfo.mem.bank[i].start = desc_ptr->PhysicalStart; - bootinfo.mem.bank[i].size = desc_ptr->NumberOfPages * EFI_PAGE_SIZE; - if ( ++i >= NR_MEM_BANKS ) + if ( i >= NR_MEM_BANKS ) { - PrintStr(L"Warning: All "); - DisplayUint(NR_MEM_BANKS, -1); - PrintStr(L" bootinfo mem banks exhausted.\r\n"); + PrintStr(L"Warning: All " __stringify(NR_MEM_BANKS) + " bootinfo mem banks exhausted.\r\n"); break; } + bootinfo.mem.bank[i].start = desc_ptr->PhysicalStart; + bootinfo.mem.bank[i].size = desc_ptr->NumberOfPages * EFI_PAGE_SIZE; + ++i; } desc_ptr = NextMemoryDescriptor(desc_ptr, desc_size); } @@ -334,7 +334,7 @@ static void __init efi_arch_process_memory_map(EFI_SYSTEM_TABLE *SystemTable, status = fdt_add_uefi_nodes(SystemTable, fdt, map, map_size, desc_size, desc_ver); if ( EFI_ERROR(status) ) - PrintErrMesg(L"Updating FDT failed\r\n", status); + PrintErrMesg(L"Updating FDT failed", status); } static void __init efi_arch_pre_exit_boot(void) @@ -408,7 +408,7 @@ static void __init efi_arch_handle_cmdline(CHAR16 *image_name, status = efi_bs->AllocatePool(EfiBootServicesData, EFI_PAGE_SIZE, (void **)&buf); if ( EFI_ERROR(status) ) - PrintErrMesg(L"Unable to allocate string buffer\r\n", status); + PrintErrMesg(L"Unable to allocate string buffer", status); if ( image_name ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:05:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:05: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 1YCx2J-0001ev-FC; Sun, 18 Jan 2015 21:05:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2H-0001ef-R4 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:29 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 81/9A-08051-9102CB45; Sun, 18 Jan 2015 21:05:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1421615127!13646473!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19217 invoked from network); 18 Jan 2015 21:05:28 -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 Jan 2015 21:05:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2F-0001Dc-8a for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx2F-0004Di-7n for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:27 +0000 Date: Sun, 18 Jan 2015 21:05:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm64/EFI: minor corrections X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c2acd532896d3e6da6fad84102f60c7361906941 Author: Jan Beulich AuthorDate: Mon Jan 12 15:42:53 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 12 15:42:53 2015 +0100 arm64/EFI: minor corrections - don't bail when using the last slot of bootinfo.mem.bank[] (due to premature incrementing of the array index) - GUIDs should be static const (and placed into .init.* whenever possible) - PrintErrMsg() issues a CR/LF pair itself - no need to explicitly append one to the message passed to the function Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/efi/efi-boot.h | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 639942d..b02cc02 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -104,7 +104,7 @@ static int __init fdt_set_reg(void *fdt, int node, int addr_cells, static void __init *lookup_fdt_config_table(EFI_SYSTEM_TABLE *sys_table) { - const EFI_GUID fdt_guid = DEVICE_TREE_GUID; + static const EFI_GUID __initconst fdt_guid = DEVICE_TREE_GUID; EFI_CONFIGURATION_TABLE *tables; void *fdt = NULL; int i; @@ -135,15 +135,15 @@ static EFI_STATUS __init efi_process_memory_map_bootinfo(EFI_MEMORY_DESCRIPTOR * || desc_ptr->Type == EfiBootServicesCode || desc_ptr->Type == EfiBootServicesData ) { - bootinfo.mem.bank[i].start = desc_ptr->PhysicalStart; - bootinfo.mem.bank[i].size = desc_ptr->NumberOfPages * EFI_PAGE_SIZE; - if ( ++i >= NR_MEM_BANKS ) + if ( i >= NR_MEM_BANKS ) { - PrintStr(L"Warning: All "); - DisplayUint(NR_MEM_BANKS, -1); - PrintStr(L" bootinfo mem banks exhausted.\r\n"); + PrintStr(L"Warning: All " __stringify(NR_MEM_BANKS) + " bootinfo mem banks exhausted.\r\n"); break; } + bootinfo.mem.bank[i].start = desc_ptr->PhysicalStart; + bootinfo.mem.bank[i].size = desc_ptr->NumberOfPages * EFI_PAGE_SIZE; + ++i; } desc_ptr = NextMemoryDescriptor(desc_ptr, desc_size); } @@ -334,7 +334,7 @@ static void __init efi_arch_process_memory_map(EFI_SYSTEM_TABLE *SystemTable, status = fdt_add_uefi_nodes(SystemTable, fdt, map, map_size, desc_size, desc_ver); if ( EFI_ERROR(status) ) - PrintErrMesg(L"Updating FDT failed\r\n", status); + PrintErrMesg(L"Updating FDT failed", status); } static void __init efi_arch_pre_exit_boot(void) @@ -408,7 +408,7 @@ static void __init efi_arch_handle_cmdline(CHAR16 *image_name, status = efi_bs->AllocatePool(EfiBootServicesData, EFI_PAGE_SIZE, (void **)&buf); if ( EFI_ERROR(status) ) - PrintErrMesg(L"Unable to allocate string buffer\r\n", status); + PrintErrMesg(L"Unable to allocate string buffer", status); if ( image_name ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:05:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:05: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 1YCx2T-0001gK-Hp; Sun, 18 Jan 2015 21:05:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2R-0001g1-R0 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:39 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id D0/2F-22737-3202CB45; Sun, 18 Jan 2015 21:05:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1421615137!15336401!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15834 invoked from network); 18 Jan 2015 21:05:38 -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; 18 Jan 2015 21:05:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2P-0001Dk-Gz for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx2P-0004EE-CL for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:37 +0000 Date: Sun, 18 Jan 2015 21:05:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] extend list of sections convertible to .init.* ones in init-only objects X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c972bf4835c2c7d34c763ebe7c3023b6fd3d6177 Author: Jan Beulich AuthorDate: Mon Jan 12 15:44:06 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 12 15:44:06 2015 +0100 extend list of sections convertible to .init.* ones in init-only objects In particular the .rodata.str2 case is relevant for the EFI boot code (moving around 3k from permanent to init-time sections). Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/Rules.mk | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index a97405c..feb08d6 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -170,7 +170,10 @@ _clean_%/: FORCE %.o: %.S Makefile $(CC) $(AFLAGS) -c $< -o $@ -SPECIAL_DATA_SECTIONS := rodata $(foreach n,1 2 4 8,rodata.str1.$(n)) \ +SPECIAL_DATA_SECTIONS := rodata $(foreach a,1 2 4 8 16, \ + $(foreach w,1 2 4, \ + rodata.str$(w).$(a)) \ + rodata.cst$(a)) \ $(foreach r,rel rel.ro,data.$(r).local) $(filter %.init.o,$(obj-y) $(obj-bin-y) $(extra-y)): %.init.o: %.o Makefile -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:05:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:05: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 1YCx2T-0001gK-Hp; Sun, 18 Jan 2015 21:05:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2R-0001g1-R0 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:39 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id D0/2F-22737-3202CB45; Sun, 18 Jan 2015 21:05:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1421615137!15336401!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15834 invoked from network); 18 Jan 2015 21:05:38 -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; 18 Jan 2015 21:05:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2P-0001Dk-Gz for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx2P-0004EE-CL for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:37 +0000 Date: Sun, 18 Jan 2015 21:05:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] extend list of sections convertible to .init.* ones in init-only objects X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c972bf4835c2c7d34c763ebe7c3023b6fd3d6177 Author: Jan Beulich AuthorDate: Mon Jan 12 15:44:06 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 12 15:44:06 2015 +0100 extend list of sections convertible to .init.* ones in init-only objects In particular the .rodata.str2 case is relevant for the EFI boot code (moving around 3k from permanent to init-time sections). Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/Rules.mk | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index a97405c..feb08d6 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -170,7 +170,10 @@ _clean_%/: FORCE %.o: %.S Makefile $(CC) $(AFLAGS) -c $< -o $@ -SPECIAL_DATA_SECTIONS := rodata $(foreach n,1 2 4 8,rodata.str1.$(n)) \ +SPECIAL_DATA_SECTIONS := rodata $(foreach a,1 2 4 8 16, \ + $(foreach w,1 2 4, \ + rodata.str$(w).$(a)) \ + rodata.cst$(a)) \ $(foreach r,rel rel.ro,data.$(r).local) $(filter %.init.o,$(obj-y) $(obj-bin-y) $(extra-y)): %.init.o: %.o Makefile -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:05:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:05: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 1YCx2d-0001hk-Kp; Sun, 18 Jan 2015 21:05:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2c-0001hT-Cu for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:50 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id BF/DC-10925-D202CB45; Sun, 18 Jan 2015 21:05:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1421615147!22275106!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5227 invoked from network); 18 Jan 2015 21:05:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:05:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2Z-0001Dq-NI for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx2Z-0004Fl-LL for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:47 +0000 Date: Sun, 18 Jan 2015 21:05:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: directly initialise saved_* in _libxl_types.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 03f15f8d602efd974d4c3507c7f780cd6efaec40 Author: Ian Campbell AuthorDate: Thu Jan 8 10:57:47 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 15:14:20 2015 +0000 tools: libxl: directly initialise saved_* in _libxl_types.c Coverity complains: > /tools/libxl/_libxl_types.c: 9194 in libxl__device_channel_parse_json() > 9188 } > 9189 x = libxl__json_map_get("connection.socket", o, JSON_MAP); > 9190 if (x) { > 9191 libxl_device_channel_init_connection(p, LIBXL_CHANNEL_CONNECTION_SOCKET); > 9192 { > 9193 const libxl__json_object *saved_path = NULL; > >>> CID 1261758: Unused value (UNUSED_VALUE) > >>> Value from "x" is assigned to "saved_path" here, but that > >>> stored value is not used before it is overwritten. > 9194 saved_path = x; > 9195 x = libxl__json_map_get("path", x, JSON_STRING | JSON_NULL); > 9196 if (x) { > 9197 rc = libxl__string_parse_json(gc, x, &p->u.socket.path); > 9198 if (rc) > 9199 goto out; Which we can avoid by initialising saved_%s as we define it. Resulting in numerous instances of the generated code changing like this: if (x) { libxl_channelinfo_init_connection(p, LIBXL_CHANNEL_CONNECTION_PTY); { - const libxl__json_object *saved_path = NULL; - saved_path = x; + const libxl__json_object *saved_path = x; x = libxl__json_map_get("path", x, JSON_STRING | JSON_NULL); if (x) { rc = libxl__string_parse_json(gc, x, &p->u.pty.path); CID: 1261758, 1261759 (and I would have expected others, but not seeing them for some reason). Signed-off-by: Ian Campbell Acked-by: Wei Liu --- 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 3e73821..d9e14fd 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -432,8 +432,7 @@ def libxl_C_type_parse_json(ty, w, v, indent = " ", parent = None, discrimina for f in [f for f in ty.fields if not f.const and not f.type.private]: saved_var_name = "saved_%s" % f.name s += "{\n" - s += " const libxl__json_object *%s = NULL;\n" % saved_var_name - s += " %s = x;\n" % saved_var_name + s += " const libxl__json_object *%s = x;\n" % saved_var_name if isinstance(f.type, idl.KeyedUnion): for x in f.type.fields: s += " x = libxl__json_map_get(\"%s\", %s, JSON_MAP);\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 Sun Jan 18 21:05:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:05: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 1YCx2d-0001hk-Kp; Sun, 18 Jan 2015 21:05:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2c-0001hT-Cu for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:50 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id BF/DC-10925-D202CB45; Sun, 18 Jan 2015 21:05:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1421615147!22275106!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5227 invoked from network); 18 Jan 2015 21:05:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:05:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2Z-0001Dq-NI for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx2Z-0004Fl-LL for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:47 +0000 Date: Sun, 18 Jan 2015 21:05:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: directly initialise saved_* in _libxl_types.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 03f15f8d602efd974d4c3507c7f780cd6efaec40 Author: Ian Campbell AuthorDate: Thu Jan 8 10:57:47 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 15:14:20 2015 +0000 tools: libxl: directly initialise saved_* in _libxl_types.c Coverity complains: > /tools/libxl/_libxl_types.c: 9194 in libxl__device_channel_parse_json() > 9188 } > 9189 x = libxl__json_map_get("connection.socket", o, JSON_MAP); > 9190 if (x) { > 9191 libxl_device_channel_init_connection(p, LIBXL_CHANNEL_CONNECTION_SOCKET); > 9192 { > 9193 const libxl__json_object *saved_path = NULL; > >>> CID 1261758: Unused value (UNUSED_VALUE) > >>> Value from "x" is assigned to "saved_path" here, but that > >>> stored value is not used before it is overwritten. > 9194 saved_path = x; > 9195 x = libxl__json_map_get("path", x, JSON_STRING | JSON_NULL); > 9196 if (x) { > 9197 rc = libxl__string_parse_json(gc, x, &p->u.socket.path); > 9198 if (rc) > 9199 goto out; Which we can avoid by initialising saved_%s as we define it. Resulting in numerous instances of the generated code changing like this: if (x) { libxl_channelinfo_init_connection(p, LIBXL_CHANNEL_CONNECTION_PTY); { - const libxl__json_object *saved_path = NULL; - saved_path = x; + const libxl__json_object *saved_path = x; x = libxl__json_map_get("path", x, JSON_STRING | JSON_NULL); if (x) { rc = libxl__string_parse_json(gc, x, &p->u.pty.path); CID: 1261758, 1261759 (and I would have expected others, but not seeing them for some reason). Signed-off-by: Ian Campbell Acked-by: Wei Liu --- 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 3e73821..d9e14fd 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -432,8 +432,7 @@ def libxl_C_type_parse_json(ty, w, v, indent = " ", parent = None, discrimina for f in [f for f in ty.fields if not f.const and not f.type.private]: saved_var_name = "saved_%s" % f.name s += "{\n" - s += " const libxl__json_object *%s = NULL;\n" % saved_var_name - s += " %s = x;\n" % saved_var_name + s += " const libxl__json_object *%s = x;\n" % saved_var_name if isinstance(f.type, idl.KeyedUnion): for x in f.type.fields: s += " x = libxl__json_map_get(\"%s\", %s, JSON_MAP);\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 Sun Jan 18 21:06:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:06: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 1YCx2n-0001jZ-Pi; Sun, 18 Jan 2015 21:06:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2m-0001jJ-AD for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:00 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id EC/2E-02697-7302CB45; Sun, 18 Jan 2015 21:05:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1421615158!18696252!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 986 invoked from network); 18 Jan 2015 21:05:58 -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; 18 Jan 2015 21:05:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2j-0001Dz-Sq for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx2j-0004GQ-Rw for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:57 +0000 Date: Sun, 18 Jan 2015 21:05:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstored: log tdb message via xenstored's logging mechanisms X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 16cc7dc7ae32c72f73f95d83fe36cdea366e398a Author: Ian Campbell AuthorDate: Mon Jan 12 15:18:02 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:02:43 2015 +0000 xenstored: log tdb message via xenstored's logging mechanisms TDB provides us with a callback for this purpose. Use it in both xenstored and xs_tdb_dump. While at it make the existing log() macro tollerate memory failures. Signed-off-by: Ian Campbell Acked-by: Wei Liu --- tools/xenstore/xenstored_core.c | 39 +++++++++++++++++++++++++++++++++------ tools/xenstore/xs_tdb_dump.c | 12 +++++++++++- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 4eaff57..3fd9a20 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -89,9 +89,14 @@ static void check_store(void); #define log(...) \ do { \ char *s = talloc_asprintf(NULL, __VA_ARGS__); \ - trace("%s\n", s); \ - syslog(LOG_ERR, "%s", s); \ - talloc_free(s); \ + if (s) { \ + trace("%s\n", s); \ + syslog(LOG_ERR, "%s", s); \ + talloc_free(s); \ + } else { \ + trace("talloc failure during logging\n"); \ + syslog(LOG_ERR, "talloc failure during logging\n"); \ + } \ } while (0) @@ -1479,13 +1484,35 @@ static void manual_node(const char *name, const char *child) talloc_free(node); } +static void tdb_logger(TDB_CONTEXT *tdb, int level, const char * fmt, ...) +{ + va_list ap; + char *s; + + va_start(ap, fmt); + s = talloc_vasprintf(NULL, fmt, ap); + va_end(ap); + + if (s) { + trace("TDB: %s\n", s); + syslog(LOG_ERR, "TDB: %s", s); + if (verbose) + xprintf("TDB: %s", s); + talloc_free(s); + } else { + trace("talloc failure during logging\n"); + syslog(LOG_ERR, "talloc failure during logging\n"); + } +} + static void setup_structure(void) { char *tdbname; tdbname = talloc_strdup(talloc_autofree_context(), xs_daemon_tdb()); if (!(tdb_flags & TDB_INTERNAL)) - tdb_ctx = tdb_open(tdbname, 0, tdb_flags, O_RDWR, 0); + tdb_ctx = tdb_open_ex(tdbname, 0, tdb_flags, O_RDWR, 0, + &tdb_logger, NULL); if (tdb_ctx) { /* XXX When we make xenstored able to restart, this will have @@ -1516,8 +1543,8 @@ static void setup_structure(void) talloc_free(tlocal); } else { - tdb_ctx = tdb_open(tdbname, 7919, tdb_flags, O_RDWR|O_CREAT, - 0640); + tdb_ctx = tdb_open_ex(tdbname, 7919, tdb_flags, O_RDWR|O_CREAT, + 0640, &tdb_logger, NULL); if (!tdb_ctx) barf_perror("Could not create tdb file %s", tdbname); diff --git a/tools/xenstore/xs_tdb_dump.c b/tools/xenstore/xs_tdb_dump.c index b91cdef..9f636f9 100644 --- a/tools/xenstore/xs_tdb_dump.c +++ b/tools/xenstore/xs_tdb_dump.c @@ -33,6 +33,15 @@ static char perm_to_char(enum xs_perm_type perm) '?'; } +static void tdb_logger(TDB_CONTEXT *tdb, int level, const char * fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); +} + int main(int argc, char *argv[]) { TDB_DATA key; @@ -41,7 +50,8 @@ int main(int argc, char *argv[]) if (argc != 2) barf("Usage: xs_tdb_dump "); - tdb = tdb_open(talloc_strdup(NULL, argv[1]), 0, 0, O_RDONLY, 0); + tdb = tdb_open_ex(talloc_strdup(NULL, argv[1]), 0, 0, O_RDONLY, 0, + &tdb_logger, NULL); if (!tdb) barf_perror("Could not open %s", argv[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 Sun Jan 18 21:06:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:06: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 1YCx2n-0001jZ-Pi; Sun, 18 Jan 2015 21:06:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2m-0001jJ-AD for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:00 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id EC/2E-02697-7302CB45; Sun, 18 Jan 2015 21:05:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1421615158!18696252!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 986 invoked from network); 18 Jan 2015 21:05:58 -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; 18 Jan 2015 21:05:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2j-0001Dz-Sq for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx2j-0004GQ-Rw for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:05:57 +0000 Date: Sun, 18 Jan 2015 21:05:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstored: log tdb message via xenstored's logging mechanisms X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 16cc7dc7ae32c72f73f95d83fe36cdea366e398a Author: Ian Campbell AuthorDate: Mon Jan 12 15:18:02 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:02:43 2015 +0000 xenstored: log tdb message via xenstored's logging mechanisms TDB provides us with a callback for this purpose. Use it in both xenstored and xs_tdb_dump. While at it make the existing log() macro tollerate memory failures. Signed-off-by: Ian Campbell Acked-by: Wei Liu --- tools/xenstore/xenstored_core.c | 39 +++++++++++++++++++++++++++++++++------ tools/xenstore/xs_tdb_dump.c | 12 +++++++++++- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 4eaff57..3fd9a20 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -89,9 +89,14 @@ static void check_store(void); #define log(...) \ do { \ char *s = talloc_asprintf(NULL, __VA_ARGS__); \ - trace("%s\n", s); \ - syslog(LOG_ERR, "%s", s); \ - talloc_free(s); \ + if (s) { \ + trace("%s\n", s); \ + syslog(LOG_ERR, "%s", s); \ + talloc_free(s); \ + } else { \ + trace("talloc failure during logging\n"); \ + syslog(LOG_ERR, "talloc failure during logging\n"); \ + } \ } while (0) @@ -1479,13 +1484,35 @@ static void manual_node(const char *name, const char *child) talloc_free(node); } +static void tdb_logger(TDB_CONTEXT *tdb, int level, const char * fmt, ...) +{ + va_list ap; + char *s; + + va_start(ap, fmt); + s = talloc_vasprintf(NULL, fmt, ap); + va_end(ap); + + if (s) { + trace("TDB: %s\n", s); + syslog(LOG_ERR, "TDB: %s", s); + if (verbose) + xprintf("TDB: %s", s); + talloc_free(s); + } else { + trace("talloc failure during logging\n"); + syslog(LOG_ERR, "talloc failure during logging\n"); + } +} + static void setup_structure(void) { char *tdbname; tdbname = talloc_strdup(talloc_autofree_context(), xs_daemon_tdb()); if (!(tdb_flags & TDB_INTERNAL)) - tdb_ctx = tdb_open(tdbname, 0, tdb_flags, O_RDWR, 0); + tdb_ctx = tdb_open_ex(tdbname, 0, tdb_flags, O_RDWR, 0, + &tdb_logger, NULL); if (tdb_ctx) { /* XXX When we make xenstored able to restart, this will have @@ -1516,8 +1543,8 @@ static void setup_structure(void) talloc_free(tlocal); } else { - tdb_ctx = tdb_open(tdbname, 7919, tdb_flags, O_RDWR|O_CREAT, - 0640); + tdb_ctx = tdb_open_ex(tdbname, 7919, tdb_flags, O_RDWR|O_CREAT, + 0640, &tdb_logger, NULL); if (!tdb_ctx) barf_perror("Could not create tdb file %s", tdbname); diff --git a/tools/xenstore/xs_tdb_dump.c b/tools/xenstore/xs_tdb_dump.c index b91cdef..9f636f9 100644 --- a/tools/xenstore/xs_tdb_dump.c +++ b/tools/xenstore/xs_tdb_dump.c @@ -33,6 +33,15 @@ static char perm_to_char(enum xs_perm_type perm) '?'; } +static void tdb_logger(TDB_CONTEXT *tdb, int level, const char * fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); +} + int main(int argc, char *argv[]) { TDB_DATA key; @@ -41,7 +50,8 @@ int main(int argc, char *argv[]) if (argc != 2) barf("Usage: xs_tdb_dump "); - tdb = tdb_open(talloc_strdup(NULL, argv[1]), 0, 0, O_RDONLY, 0); + tdb = tdb_open_ex(talloc_strdup(NULL, argv[1]), 0, 0, O_RDONLY, 0, + &tdb_logger, NULL); if (!tdb) barf_perror("Could not open %s", argv[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 Sun Jan 18 21:06:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:06: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 1YCx2x-0001lB-Sl; Sun, 18 Jan 2015 21:06:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2w-0001kw-An for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:10 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 11/0B-22819-1402CB45; Sun, 18 Jan 2015 21:06:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1421615168!11110257!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26653 invoked from network); 18 Jan 2015 21:06: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; 18 Jan 2015 21:06:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2u-0001EY-2k for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx2u-0004HP-0U for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:08 +0000 Date: Sun, 18 Jan 2015 21:06:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] dt-uart: add an emacs magic 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 3c63de34b86386701769c401476a9f6f441b97ba Author: Ian Campbell AuthorDate: Thu Jan 8 11:53:53 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:04:23 2015 +0000 dt-uart: add an emacs magic block Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/drivers/char/dt-uart.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/dt-uart.c b/xen/drivers/char/dt-uart.c index fa92b5c..45a87a6 100644 --- a/xen/drivers/char/dt-uart.c +++ b/xen/drivers/char/dt-uart.c @@ -70,3 +70,13 @@ void __init dt_uart_init(void) if ( ret ) printk("Unable to initialize serial: %d\n", ret); } + +/* + * 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 Sun Jan 18 21:06:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:06: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 1YCx2x-0001lB-Sl; Sun, 18 Jan 2015 21:06:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2w-0001kw-An for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:10 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 11/0B-22819-1402CB45; Sun, 18 Jan 2015 21:06:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1421615168!11110257!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26653 invoked from network); 18 Jan 2015 21:06: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; 18 Jan 2015 21:06:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx2u-0001EY-2k for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx2u-0004HP-0U for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:08 +0000 Date: Sun, 18 Jan 2015 21:06:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] dt-uart: add an emacs magic 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 3c63de34b86386701769c401476a9f6f441b97ba Author: Ian Campbell AuthorDate: Thu Jan 8 11:53:53 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:04:23 2015 +0000 dt-uart: add an emacs magic block Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/drivers/char/dt-uart.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/dt-uart.c b/xen/drivers/char/dt-uart.c index fa92b5c..45a87a6 100644 --- a/xen/drivers/char/dt-uart.c +++ b/xen/drivers/char/dt-uart.c @@ -70,3 +70,13 @@ void __init dt_uart_init(void) if ( ret ) printk("Unable to initialize serial: %d\n", ret); } + +/* + * 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 Sun Jan 18 21:06:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:06: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 1YCx37-0001mh-VW; Sun, 18 Jan 2015 21:06:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx36-0001mT-ID for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:20 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 50/C4-14727-B402CB45; Sun, 18 Jan 2015 21:06:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1421615178!13284734!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25961 invoked from network); 18 Jan 2015 21:06:19 -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; 18 Jan 2015 21:06:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx34-0001Ee-8Y for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx34-0004I2-6w for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:18 +0000 Date: Sun, 18 Jan 2015 21:06:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] dt-uart: Clarify log messages at init 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 7c9fb01e02a25fe683d99e6ec244349c5053ec03 Author: Ian Campbell AuthorDate: Thu Jan 8 11:53:54 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:04:23 2015 +0000 dt-uart: Clarify log messages at init time. - Don't log at all if console=dtuart (the default) was not present, in that case the user has asked for something else, no need for every other driver to tell them this. - Use "dtuart" in all other messages, rather than just "console" or "uart". - Be more explicit if we are exiting because dtuart= wasn't given. - Log the options which we've parsed. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/drivers/char/dt-uart.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/drivers/char/dt-uart.c b/xen/drivers/char/dt-uart.c index 45a87a6..04dbb97 100644 --- a/xen/drivers/char/dt-uart.c +++ b/xen/drivers/char/dt-uart.c @@ -41,9 +41,12 @@ void __init dt_uart_init(void) const char *devpath = opt_dtuart; char *options; - if ( !console_has("dtuart") || !strcmp(opt_dtuart, "") ) + if ( !console_has("dtuart") ) + return; /* Not for us */ + + if ( !strcmp(opt_dtuart, "") ) { - printk("No console\n"); + printk("No dtuart path configured\n"); return; } @@ -53,7 +56,7 @@ void __init dt_uart_init(void) else options = ""; - printk("Looking for UART console %s\n", devpath); + printk("Looking for dtuart at \"%s\", options \"%s\"\n", devpath, options); if ( *devpath == '/' ) dev = dt_find_node_by_path(devpath); else @@ -68,7 +71,7 @@ void __init dt_uart_init(void) ret = device_init(dev, DEVICE_SERIAL, options); if ( ret ) - printk("Unable to initialize serial: %d\n", ret); + printk("Unable to initialize dtuart: %d\n", 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 Sun Jan 18 21:06:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:06: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 1YCx37-0001mh-VW; Sun, 18 Jan 2015 21:06:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx36-0001mT-ID for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:20 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 50/C4-14727-B402CB45; Sun, 18 Jan 2015 21:06:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1421615178!13284734!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25961 invoked from network); 18 Jan 2015 21:06:19 -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; 18 Jan 2015 21:06:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx34-0001Ee-8Y for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx34-0004I2-6w for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:18 +0000 Date: Sun, 18 Jan 2015 21:06:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] dt-uart: Clarify log messages at init 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 7c9fb01e02a25fe683d99e6ec244349c5053ec03 Author: Ian Campbell AuthorDate: Thu Jan 8 11:53:54 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:04:23 2015 +0000 dt-uart: Clarify log messages at init time. - Don't log at all if console=dtuart (the default) was not present, in that case the user has asked for something else, no need for every other driver to tell them this. - Use "dtuart" in all other messages, rather than just "console" or "uart". - Be more explicit if we are exiting because dtuart= wasn't given. - Log the options which we've parsed. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/drivers/char/dt-uart.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/drivers/char/dt-uart.c b/xen/drivers/char/dt-uart.c index 45a87a6..04dbb97 100644 --- a/xen/drivers/char/dt-uart.c +++ b/xen/drivers/char/dt-uart.c @@ -41,9 +41,12 @@ void __init dt_uart_init(void) const char *devpath = opt_dtuart; char *options; - if ( !console_has("dtuart") || !strcmp(opt_dtuart, "") ) + if ( !console_has("dtuart") ) + return; /* Not for us */ + + if ( !strcmp(opt_dtuart, "") ) { - printk("No console\n"); + printk("No dtuart path configured\n"); return; } @@ -53,7 +56,7 @@ void __init dt_uart_init(void) else options = ""; - printk("Looking for UART console %s\n", devpath); + printk("Looking for dtuart at \"%s\", options \"%s\"\n", devpath, options); if ( *devpath == '/' ) dev = dt_find_node_by_path(devpath); else @@ -68,7 +71,7 @@ void __init dt_uart_init(void) ret = device_init(dev, DEVICE_SERIAL, options); if ( ret ) - printk("Unable to initialize serial: %d\n", ret); + printk("Unable to initialize dtuart: %d\n", 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 Sun Jan 18 21:06:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:06: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 1YCx3J-0001oD-22; Sun, 18 Jan 2015 21:06:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3H-0001nv-6h for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:31 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 2E/4D-16982-6502CB45; Sun, 18 Jan 2015 21:06:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1421615188!20492870!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15133 invoked from network); 18 Jan 2015 21:06: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; 18 Jan 2015 21:06:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3E-0001Em-Ea for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx3E-0004Id-Cn for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:28 +0000 Date: Sun, 18 Jan 2015 21:06:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] dt-uart: use ':' as separator between path and options X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f01af57300cb60ab0fd8487fb5bbbe97bee234f0 Author: Ian Campbell AuthorDate: Thu Jan 8 11:53:55 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:04:54 2015 +0000 dt-uart: use ':' as separator between path and options ',' is a valid character in a device-tree path (see ePAPR v1.1 Table 2-1), in fact ',' is actually pretty common in node names. Using ',' as a separator breaks for example on fast models. If you use the full path (/smb/motherboard/iofpga@3,00000000/uart@090000) rather than the alias then earlyprintk gives: (XEN) Looking for UART console /smb/motherboard/iofpga@3 (XEN) Unable to find device "/smb/motherboard/iofpga@3" (XEN) Bad console= option 'dtuart' I actually noticed this on Jetson where the uart is "/serial@0,70006300" and there happened to be no alias defined. Instead use ':' as the separator, it is defined to terminate the path in the context of /chosen/stdout-path (Table 3-4) which is pretty closely analogous to the dtuart= option and so makes a pretty good choice (especially since the next patch adds support for stdout-path). Since no DT aware driver current supports any options there is no point in retaining support for ',' for backwards compatibility. Additionally, expand the buffer for the dtuart option, a path can be far longer than 30 characters (in fact the maximum size of a single node name is 31, so it's not even necessarily enough for an alias). 128 is completely arbitrary and allows for paths at least 8 deep even with worst case node names. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- docs/misc/xen-command-line.markdown | 2 +- xen/drivers/char/dt-uart.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 8bd75cd..a061aa4 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -558,7 +558,7 @@ Pin dom0 vcpus to their respective pcpus Flag that makes a 64bit dom0 boot in PVH mode. No 32bit support at present. ### dtuart (ARM) -> `= path [,options]` +> `= path [:options]` > Default: `""` diff --git a/xen/drivers/char/dt-uart.c b/xen/drivers/char/dt-uart.c index 04dbb97..695fdaa 100644 --- a/xen/drivers/char/dt-uart.c +++ b/xen/drivers/char/dt-uart.c @@ -25,13 +25,13 @@ /* * Configure UART port with a string: - * path,options + * path:options * * @path: full path used in the device tree for the UART. If the path * doesn't start with '/', we assuming that it's an alias. * @options: UART speficic options (see in each UART driver) */ -static char __initdata opt_dtuart[30] = ""; +static char __initdata opt_dtuart[256] = ""; string_param("dtuart", opt_dtuart); void __init dt_uart_init(void) @@ -50,7 +50,7 @@ void __init dt_uart_init(void) return; } - options = strchr(opt_dtuart, ','); + options = strchr(opt_dtuart, ':'); if ( options != NULL ) *(options++) = '\0'; else -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:06:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:06: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 1YCx3J-0001oD-22; Sun, 18 Jan 2015 21:06:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3H-0001nv-6h for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:31 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 2E/4D-16982-6502CB45; Sun, 18 Jan 2015 21:06:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1421615188!20492870!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15133 invoked from network); 18 Jan 2015 21:06: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; 18 Jan 2015 21:06:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3E-0001Em-Ea for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx3E-0004Id-Cn for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:28 +0000 Date: Sun, 18 Jan 2015 21:06:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] dt-uart: use ':' as separator between path and options X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f01af57300cb60ab0fd8487fb5bbbe97bee234f0 Author: Ian Campbell AuthorDate: Thu Jan 8 11:53:55 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:04:54 2015 +0000 dt-uart: use ':' as separator between path and options ',' is a valid character in a device-tree path (see ePAPR v1.1 Table 2-1), in fact ',' is actually pretty common in node names. Using ',' as a separator breaks for example on fast models. If you use the full path (/smb/motherboard/iofpga@3,00000000/uart@090000) rather than the alias then earlyprintk gives: (XEN) Looking for UART console /smb/motherboard/iofpga@3 (XEN) Unable to find device "/smb/motherboard/iofpga@3" (XEN) Bad console= option 'dtuart' I actually noticed this on Jetson where the uart is "/serial@0,70006300" and there happened to be no alias defined. Instead use ':' as the separator, it is defined to terminate the path in the context of /chosen/stdout-path (Table 3-4) which is pretty closely analogous to the dtuart= option and so makes a pretty good choice (especially since the next patch adds support for stdout-path). Since no DT aware driver current supports any options there is no point in retaining support for ',' for backwards compatibility. Additionally, expand the buffer for the dtuart option, a path can be far longer than 30 characters (in fact the maximum size of a single node name is 31, so it's not even necessarily enough for an alias). 128 is completely arbitrary and allows for paths at least 8 deep even with worst case node names. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- docs/misc/xen-command-line.markdown | 2 +- xen/drivers/char/dt-uart.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 8bd75cd..a061aa4 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -558,7 +558,7 @@ Pin dom0 vcpus to their respective pcpus Flag that makes a 64bit dom0 boot in PVH mode. No 32bit support at present. ### dtuart (ARM) -> `= path [,options]` +> `= path [:options]` > Default: `""` diff --git a/xen/drivers/char/dt-uart.c b/xen/drivers/char/dt-uart.c index 04dbb97..695fdaa 100644 --- a/xen/drivers/char/dt-uart.c +++ b/xen/drivers/char/dt-uart.c @@ -25,13 +25,13 @@ /* * Configure UART port with a string: - * path,options + * path:options * * @path: full path used in the device tree for the UART. If the path * doesn't start with '/', we assuming that it's an alias. * @options: UART speficic options (see in each UART driver) */ -static char __initdata opt_dtuart[30] = ""; +static char __initdata opt_dtuart[256] = ""; string_param("dtuart", opt_dtuart); void __init dt_uart_init(void) @@ -50,7 +50,7 @@ void __init dt_uart_init(void) return; } - options = strchr(opt_dtuart, ','); + options = strchr(opt_dtuart, ':'); if ( options != NULL ) *(options++) = '\0'; else -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:06:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:06: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 1YCx3T-0001pT-4i; Sun, 18 Jan 2015 21:06:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3Q-0001pG-W4 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:41 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id A7/4C-15461-0602CB45; Sun, 18 Jan 2015 21:06:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1421615198!22228021!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14047 invoked from network); 18 Jan 2015 21:06:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:06:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3O-0001Es-Kn for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx3O-0004JG-IZ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:38 +0000 Date: Sun, 18 Jan 2015 21:06:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] dt-uart: support /chosen/stdout-path property. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c69ec40e260d54f5e0915fd59c67330efb442437 Author: Ian Campbell AuthorDate: Thu Jan 8 11:53:56 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:05:15 2015 +0000 dt-uart: support /chosen/stdout-path property. ePAPR v1.1 section 3.5 defines the /chosen/stdout-path property to refer to the device to be used for boot console output, so if no dtuart property is given try to use that instead. This will make Xen find a suitable console by default on DT platforms which include this property. As it happens the dtuart option has the exact same syntax as stdout-path, so we can just copy the value into that buffer if it is empty. If the string is too large for the buffer we truncate and warn but continue in the hopes that enough of the path survived (i.e. only the options part was dropped) to get something out. FWIW support for this was added to Linux in v3.19-rc1 (7914a7c5651a "of: support passing console options with stdout-path") and a fairly large number of the dts files shipped with Linux have already included a stdout-path property for quite a while now. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/domain_build.c | 2 ++ xen/drivers/char/dt-uart.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index de180d8..c33a73c 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -424,6 +424,7 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, * bootargs (from module #1, above). * * remove bootargs, xen,dom0-bootargs, xen,xen-bootargs, * linux,initrd-start and linux,initrd-end. + * * remove stdout-path. * * remove bootargs, linux,uefi-system-table, * linux,uefi-mmap-start, linux,uefi-mmap-size, * linux,uefi-mmap-desc-size, and linux,uefi-mmap-desc-ver @@ -434,6 +435,7 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, if ( dt_property_name_is_equal(prop, "xen,xen-bootargs") || dt_property_name_is_equal(prop, "linux,initrd-start") || dt_property_name_is_equal(prop, "linux,initrd-end") || + dt_property_name_is_equal(prop, "stdout-path") || dt_property_name_is_equal(prop, "linux,uefi-system-table") || dt_property_name_is_equal(prop, "linux,uefi-mmap-start") || dt_property_name_is_equal(prop, "linux,uefi-mmap-size") || diff --git a/xen/drivers/char/dt-uart.c b/xen/drivers/char/dt-uart.c index 695fdaa..d599322 100644 --- a/xen/drivers/char/dt-uart.c +++ b/xen/drivers/char/dt-uart.c @@ -22,6 +22,7 @@ #include #include #include +#include /* * Configure UART port with a string: @@ -46,6 +47,27 @@ void __init dt_uart_init(void) if ( !strcmp(opt_dtuart, "") ) { + const struct dt_device_node *chosen = dt_find_node_by_path("/chosen"); + + if ( chosen ) + { + const char *stdout; + + ret = dt_property_read_string(chosen, "stdout-path", &stdout); + if ( ret >= 0 ) + { + printk("Taking dtuart configuration from /chosen/stdout-path\n"); + if ( strlcpy(opt_dtuart, stdout, sizeof(opt_dtuart)) + >= sizeof(opt_dtuart) ) + printk("WARNING: /chosen/stdout-path too long, truncated\n"); + } + else if ( ret != -EINVAL /* Not present */ ) + printk("Failed to read /chosen/stdout-path (%d)\n", ret); + } + } + + if ( !strcmp(opt_dtuart, "") ) + { printk("No dtuart path configured\n"); 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 Sun Jan 18 21:06:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:06: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 1YCx3T-0001pT-4i; Sun, 18 Jan 2015 21:06:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3Q-0001pG-W4 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:41 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id A7/4C-15461-0602CB45; Sun, 18 Jan 2015 21:06:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1421615198!22228021!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14047 invoked from network); 18 Jan 2015 21:06:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:06:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3O-0001Es-Kn for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx3O-0004JG-IZ for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:38 +0000 Date: Sun, 18 Jan 2015 21:06:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] dt-uart: support /chosen/stdout-path property. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c69ec40e260d54f5e0915fd59c67330efb442437 Author: Ian Campbell AuthorDate: Thu Jan 8 11:53:56 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:05:15 2015 +0000 dt-uart: support /chosen/stdout-path property. ePAPR v1.1 section 3.5 defines the /chosen/stdout-path property to refer to the device to be used for boot console output, so if no dtuart property is given try to use that instead. This will make Xen find a suitable console by default on DT platforms which include this property. As it happens the dtuart option has the exact same syntax as stdout-path, so we can just copy the value into that buffer if it is empty. If the string is too large for the buffer we truncate and warn but continue in the hopes that enough of the path survived (i.e. only the options part was dropped) to get something out. FWIW support for this was added to Linux in v3.19-rc1 (7914a7c5651a "of: support passing console options with stdout-path") and a fairly large number of the dts files shipped with Linux have already included a stdout-path property for quite a while now. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/domain_build.c | 2 ++ xen/drivers/char/dt-uart.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index de180d8..c33a73c 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -424,6 +424,7 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, * bootargs (from module #1, above). * * remove bootargs, xen,dom0-bootargs, xen,xen-bootargs, * linux,initrd-start and linux,initrd-end. + * * remove stdout-path. * * remove bootargs, linux,uefi-system-table, * linux,uefi-mmap-start, linux,uefi-mmap-size, * linux,uefi-mmap-desc-size, and linux,uefi-mmap-desc-ver @@ -434,6 +435,7 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, if ( dt_property_name_is_equal(prop, "xen,xen-bootargs") || dt_property_name_is_equal(prop, "linux,initrd-start") || dt_property_name_is_equal(prop, "linux,initrd-end") || + dt_property_name_is_equal(prop, "stdout-path") || dt_property_name_is_equal(prop, "linux,uefi-system-table") || dt_property_name_is_equal(prop, "linux,uefi-mmap-start") || dt_property_name_is_equal(prop, "linux,uefi-mmap-size") || diff --git a/xen/drivers/char/dt-uart.c b/xen/drivers/char/dt-uart.c index 695fdaa..d599322 100644 --- a/xen/drivers/char/dt-uart.c +++ b/xen/drivers/char/dt-uart.c @@ -22,6 +22,7 @@ #include #include #include +#include /* * Configure UART port with a string: @@ -46,6 +47,27 @@ void __init dt_uart_init(void) if ( !strcmp(opt_dtuart, "") ) { + const struct dt_device_node *chosen = dt_find_node_by_path("/chosen"); + + if ( chosen ) + { + const char *stdout; + + ret = dt_property_read_string(chosen, "stdout-path", &stdout); + if ( ret >= 0 ) + { + printk("Taking dtuart configuration from /chosen/stdout-path\n"); + if ( strlcpy(opt_dtuart, stdout, sizeof(opt_dtuart)) + >= sizeof(opt_dtuart) ) + printk("WARNING: /chosen/stdout-path too long, truncated\n"); + } + else if ( ret != -EINVAL /* Not present */ ) + printk("Failed to read /chosen/stdout-path (%d)\n", ret); + } + } + + if ( !strcmp(opt_dtuart, "") ) + { printk("No dtuart path configured\n"); 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 Sun Jan 18 21:06:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:06: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 1YCx3c-0001qm-7N; Sun, 18 Jan 2015 21:06:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3b-0001qc-3Z for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:51 +0000 Content-Length: 5259 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id FA/74-09842-A602CB45; Sun, 18 Jan 2015 21:06:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1421615209!22203573!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18348 invoked from network); 18 Jan 2015 21:06:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:06:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3Y-0001Ey-Ra for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx3Y-0004Kd-Q3 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:48 +0000 Date: Sun, 18 Jan 2015 21:06:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl, hotplug/Linux: default to phy backend for raw format file, take 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: multipart/mixed; boundary="===============0459244397644382468==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0459244397644382468== Content-Length: 4950 Content-Transfer-Encoding: quoted-printable commit a0a2dc45f1bdbabc661332e8530c480a77391d85 Author: Wei Liu AuthorDate: Thu Jan 8 13:46:53 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:07:35 2015 +0000 libxl, hotplug/Linux: default to phy backend for raw format file, take 2 This patch resurrects 11a63a166. The previous patch had a bug that wrong "physical-device" was written to xenstore causing block script execution fail. This patch fixes that problem. Following configurations have been tested: 1. Raw file and PV 2. Raw file and HVM 3. Block device and PV 4. Block device and HVM Creation / destruction / local migration all worked. Original commit message from 11a63a166: Modify libxl and hotplug script to allow raw format file to use phy backend. The block script now tests the path and determine the actual type of file (block device or regular file) then use the actual type to determine which branch to run. With these changes, plus the current ordering of backend preference (phy > qdisk > tap), we will use phy backend for raw format file by default. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Stefano Stabellini Cc: Ian Jackson Cc: Roger Pau Monn=C3=A9 Acked-by: Roger Pau Monn=C3=A9 Acked-by: Ian Campbell --- tools/hotplug/Linux/block | 16 +++++++++------- tools/libxl/libxl.c | 6 +++--- tools/libxl/libxl_device.c | 2 ++ tools/libxl/libxl_linux.c | 6 +++--- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/tools/hotplug/Linux/block b/tools/hotplug/Linux/block index da26e22..8d2ee9d 100644 --- a/tools/hotplug/Linux/block +++ b/tools/hotplug/Linux/block @@ -206,6 +206,13 @@ and so cannot be mounted ${m2}${when}." t=3D$(xenstore_read_default "$XENBUS_PATH/type" 'MISSING') +p=3D$(xenstore_read "$XENBUS_PATH/params") +mode=3D$(xenstore_read "$XENBUS_PATH/mode") +if [ -b "$p" ]; then + truetype=3D"phy" +elif [ -f "$p" ]; then + truetype=3D"file" +fi case "$command" in add) @@ -217,16 +224,11 @@ case "$command" in exit 0 fi - if [ -n "$t" ] - then - p=3D$(xenstore_read "$XENBUS_PATH/params") - mode=3D$(xenstore_read "$XENBUS_PATH/mode") - fi FRONTEND_ID=3D$(xenstore_read "$XENBUS_PATH/frontend-id") FRONTEND_UUID=3D$(xenstore_read_default \ "/local/domain/$FRONTEND_ID/vm" 'unknown') - case $t in + case $truetype in phy) dev=3D$(expand_dev $p) @@ -319,7 +321,7 @@ mount it read-write in a guest domain." ;; remove) - case $t in + case $truetype in phy) exit 0 ;; diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 372dd3b..11cf0e1 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2416,9 +2416,9 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, if (!disk->script && disk->backend_domid =3D=3D LIBXL_TOOLSTACK_DOMID) { int major, minor; - libxl__device_physdisk_major_minor(dev, &major, &minor); - flexarray_append_pair(back, "physical-device", - libxl__sprintf(gc, "%x:%x", major, minor)); + if (!libxl__device_physdisk_major_minor(dev, &major, &minor)) + flexarray_append_pair(back, "physical-device", + libxl__sprintf(gc, "%x:%x", major, minor)); } assert(device->backend_kind =3D=3D LIBXL__DEVICE_KIND_VBD); diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 4b51ded..0f50d04 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -332,6 +332,8 @@ int libxl__device_physdisk_major_minor(const char *physpath, int *major, int *mi struct stat buf; if (stat(physpath, &buf) < 0) return -1; + if (!S_ISBLK(buf.st_mode)) + return -1; *major =3D major(buf.st_rdev); *minor =3D minor(buf.st_rdev); return 0; diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index ea5d8c1..b51930c 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -19,11 +19,11 @@ int libxl__try_phy_backend(mode_t st_mode) { - if (!S_ISBLK(st_mode)) { - return 0; + if (S_ISBLK(st_mode) || S_ISREG(st_mode)) { + return 1; } - return 1; + return 0; } #define EXT_SHIFT 28 -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0459244397644382468== 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 --===============0459244397644382468==-- From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:06:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:06: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 1YCx3c-0001qm-7N; Sun, 18 Jan 2015 21:06:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3b-0001qc-3Z for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:51 +0000 Content-Length: 5259 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id FA/74-09842-A602CB45; Sun, 18 Jan 2015 21:06:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1421615209!22203573!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18348 invoked from network); 18 Jan 2015 21:06:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:06:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3Y-0001Ey-Ra for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx3Y-0004Kd-Q3 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:48 +0000 Date: Sun, 18 Jan 2015 21:06:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl, hotplug/Linux: default to phy backend for raw format file, take 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: multipart/mixed; boundary="===============0459244397644382468==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0459244397644382468== Content-Length: 4950 Content-Transfer-Encoding: quoted-printable commit a0a2dc45f1bdbabc661332e8530c480a77391d85 Author: Wei Liu AuthorDate: Thu Jan 8 13:46:53 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:07:35 2015 +0000 libxl, hotplug/Linux: default to phy backend for raw format file, take 2 This patch resurrects 11a63a166. The previous patch had a bug that wrong "physical-device" was written to xenstore causing block script execution fail. This patch fixes that problem. Following configurations have been tested: 1. Raw file and PV 2. Raw file and HVM 3. Block device and PV 4. Block device and HVM Creation / destruction / local migration all worked. Original commit message from 11a63a166: Modify libxl and hotplug script to allow raw format file to use phy backend. The block script now tests the path and determine the actual type of file (block device or regular file) then use the actual type to determine which branch to run. With these changes, plus the current ordering of backend preference (phy > qdisk > tap), we will use phy backend for raw format file by default. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Stefano Stabellini Cc: Ian Jackson Cc: Roger Pau Monn=C3=A9 Acked-by: Roger Pau Monn=C3=A9 Acked-by: Ian Campbell --- tools/hotplug/Linux/block | 16 +++++++++------- tools/libxl/libxl.c | 6 +++--- tools/libxl/libxl_device.c | 2 ++ tools/libxl/libxl_linux.c | 6 +++--- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/tools/hotplug/Linux/block b/tools/hotplug/Linux/block index da26e22..8d2ee9d 100644 --- a/tools/hotplug/Linux/block +++ b/tools/hotplug/Linux/block @@ -206,6 +206,13 @@ and so cannot be mounted ${m2}${when}." t=3D$(xenstore_read_default "$XENBUS_PATH/type" 'MISSING') +p=3D$(xenstore_read "$XENBUS_PATH/params") +mode=3D$(xenstore_read "$XENBUS_PATH/mode") +if [ -b "$p" ]; then + truetype=3D"phy" +elif [ -f "$p" ]; then + truetype=3D"file" +fi case "$command" in add) @@ -217,16 +224,11 @@ case "$command" in exit 0 fi - if [ -n "$t" ] - then - p=3D$(xenstore_read "$XENBUS_PATH/params") - mode=3D$(xenstore_read "$XENBUS_PATH/mode") - fi FRONTEND_ID=3D$(xenstore_read "$XENBUS_PATH/frontend-id") FRONTEND_UUID=3D$(xenstore_read_default \ "/local/domain/$FRONTEND_ID/vm" 'unknown') - case $t in + case $truetype in phy) dev=3D$(expand_dev $p) @@ -319,7 +321,7 @@ mount it read-write in a guest domain." ;; remove) - case $t in + case $truetype in phy) exit 0 ;; diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 372dd3b..11cf0e1 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2416,9 +2416,9 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, if (!disk->script && disk->backend_domid =3D=3D LIBXL_TOOLSTACK_DOMID) { int major, minor; - libxl__device_physdisk_major_minor(dev, &major, &minor); - flexarray_append_pair(back, "physical-device", - libxl__sprintf(gc, "%x:%x", major, minor)); + if (!libxl__device_physdisk_major_minor(dev, &major, &minor)) + flexarray_append_pair(back, "physical-device", + libxl__sprintf(gc, "%x:%x", major, minor)); } assert(device->backend_kind =3D=3D LIBXL__DEVICE_KIND_VBD); diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 4b51ded..0f50d04 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -332,6 +332,8 @@ int libxl__device_physdisk_major_minor(const char *physpath, int *major, int *mi struct stat buf; if (stat(physpath, &buf) < 0) return -1; + if (!S_ISBLK(buf.st_mode)) + return -1; *major =3D major(buf.st_rdev); *minor =3D minor(buf.st_rdev); return 0; diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index ea5d8c1..b51930c 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -19,11 +19,11 @@ int libxl__try_phy_backend(mode_t st_mode) { - if (!S_ISBLK(st_mode)) { - return 0; + if (S_ISBLK(st_mode) || S_ISREG(st_mode)) { + return 1; } - return 1; + return 0; } #define EXT_SHIFT 28 -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0459244397644382468== 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 --===============0459244397644382468==-- From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:07:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:07: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 1YCx3n-0001sU-CW; Sun, 18 Jan 2015 21:07:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3m-0001sK-4e for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:02 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 64/84-09842-5702CB45; Sun, 18 Jan 2015 21:07:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1421615219!22256524!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14874 invoked from network); 18 Jan 2015 21:07:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:07:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3j-0001F7-1k for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx3j-0004LC-00 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:59 +0000 Date: Sun, 18 Jan 2015 21:06:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/arm: Correctly spelled FDT_ERR_* in a comment X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2dabd88b12c2ba1dfaa7443f1d8bf1a8373113ea Author: Julien Grall AuthorDate: Fri Jan 9 16:13:02 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:08:36 2015 +0000 libxl/arm: Correctly spelled FDT_ERR_* in a comment Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_arm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 448ac07..ce0be84 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -546,7 +546,7 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, LOG(DEBUG, " - vGIC version: %s", gicv_to_string(config.gic_version)); /* - * Call "call" handling FDR_ERR_*. Will either: + * Call "call" handling FDT_ERR_*. Will either: * - loop back to retry_resize * - set rc and goto out * - fall through successfully -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:07:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:07: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 1YCx3n-0001sU-CW; Sun, 18 Jan 2015 21:07:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3m-0001sK-4e for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:02 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 64/84-09842-5702CB45; Sun, 18 Jan 2015 21:07:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1421615219!22256524!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14874 invoked from network); 18 Jan 2015 21:07:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:07:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3j-0001F7-1k for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx3j-0004LC-00 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:06:59 +0000 Date: Sun, 18 Jan 2015 21:06:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/arm: Correctly spelled FDT_ERR_* in a comment X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2dabd88b12c2ba1dfaa7443f1d8bf1a8373113ea Author: Julien Grall AuthorDate: Fri Jan 9 16:13:02 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:08:36 2015 +0000 libxl/arm: Correctly spelled FDT_ERR_* in a comment Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_arm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 448ac07..ce0be84 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -546,7 +546,7 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, LOG(DEBUG, " - vGIC version: %s", gicv_to_string(config.gic_version)); /* - * Call "call" handling FDR_ERR_*. Will either: + * Call "call" handling FDT_ERR_*. Will either: * - loop back to retry_resize * - set rc and goto out * - fall through successfully -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:07:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:07: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 1YCx3w-0001u3-F4; Sun, 18 Jan 2015 21:07:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3v-0001tu-Ky for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:11 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 61/DC-27785-F702CB45; Sun, 18 Jan 2015 21:07:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1421615229!21348947!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12076 invoked from network); 18 Jan 2015 21:07:10 -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; 18 Jan 2015 21:07:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3t-0001Fg-7h for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx3t-0004M5-6p for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:09 +0000 Date: Sun, 18 Jan 2015 21:07:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Don't ignore error when we fail to give access to ioport/irq/iomem X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7070eec417934360bf3aed434191246dfe4f8091 Author: Julien Grall AuthorDate: Fri Jan 9 15:56:45 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:08:58 2015 +0000 libxl: Don't ignore error when we fail to give access to ioport/irq/iomem If we fail to give the access, the domain will unlikely work correctly. So we should bail out at the first error. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Wei Liu --- tools/libxl/libxl_create.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 1198225..6f87d1c 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1167,6 +1167,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to ioports %"PRIx32"-%"PRIx32, domid, io->first, io->first + io->number - 1); ret = ERROR_FAIL; + goto error_out; } } @@ -1182,6 +1183,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, if (ret < 0) { LOGE(ERROR, "failed give dom%d access to irq %d", domid, irq); ret = ERROR_FAIL; + goto error_out; } } @@ -1198,7 +1200,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to iomem range %"PRIx64"-%"PRIx64, domid, io->start, io->start + io->number - 1); ret = ERROR_FAIL; - continue; + goto error_out; } ret = xc_domain_memory_mapping(CTX->xch, domid, io->gfn, io->start, @@ -1209,6 +1211,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, " to guest address %"PRIx64, domid, io->start, io->start + io->number - 1, io->gfn); ret = ERROR_FAIL; + goto error_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 Sun Jan 18 21:07:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:07: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 1YCx3w-0001u3-F4; Sun, 18 Jan 2015 21:07:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3v-0001tu-Ky for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:11 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 61/DC-27785-F702CB45; Sun, 18 Jan 2015 21:07:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1421615229!21348947!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12076 invoked from network); 18 Jan 2015 21:07:10 -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; 18 Jan 2015 21:07:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx3t-0001Fg-7h for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx3t-0004M5-6p for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:09 +0000 Date: Sun, 18 Jan 2015 21:07:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Don't ignore error when we fail to give access to ioport/irq/iomem X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7070eec417934360bf3aed434191246dfe4f8091 Author: Julien Grall AuthorDate: Fri Jan 9 15:56:45 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:08:58 2015 +0000 libxl: Don't ignore error when we fail to give access to ioport/irq/iomem If we fail to give the access, the domain will unlikely work correctly. So we should bail out at the first error. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Wei Liu --- tools/libxl/libxl_create.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 1198225..6f87d1c 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1167,6 +1167,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to ioports %"PRIx32"-%"PRIx32, domid, io->first, io->first + io->number - 1); ret = ERROR_FAIL; + goto error_out; } } @@ -1182,6 +1183,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, if (ret < 0) { LOGE(ERROR, "failed give dom%d access to irq %d", domid, irq); ret = ERROR_FAIL; + goto error_out; } } @@ -1198,7 +1200,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to iomem range %"PRIx64"-%"PRIx64, domid, io->start, io->start + io->number - 1); ret = ERROR_FAIL; - continue; + goto error_out; } ret = xc_domain_memory_mapping(CTX->xch, domid, io->gfn, io->start, @@ -1209,6 +1211,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, " to guest address %"PRIx64, domid, io->start, io->start + io->number - 1, io->gfn); ret = ERROR_FAIL; + goto error_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 Sun Jan 18 21:07:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:07: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 1YCx47-0001w0-LO; Sun, 18 Jan 2015 21:07:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx46-0001ve-5X for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:22 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 48/2F-25547-9802CB45; Sun, 18 Jan 2015 21:07:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1421615239!20492953!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16469 invoked from network); 18 Jan 2015 21:07:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:07:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx43-0001Fm-Dg for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx43-0004Me-CK for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:19 +0000 Date: Sun, 18 Jan 2015 21:07:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/Rules.mk: Don't optimize debug builds; add macro debugging information X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1166ecf781b1016eaa61f8d5ba4fb1fde9d599b6 Author: Euan Harris AuthorDate: Mon Dec 1 14:21:05 2014 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:10:51 2015 +0000 tools/Rules.mk: Don't optimize debug builds; add macro debugging information Tools debug builds are built with optimization level -O1, inherited from the CFLAGS definition in StdGNU.mk. Optimizations confuse the debugger, and the comment justifying -O1 in StdGNU.mk should not apply for a userspace library. Disable optimization by appending -O0 to CFLAGS, which overrides the -O1 flag specified earlier. Also specify -g3, to add macro debugging information which allows gdb to expand macro invocations. This is useful as libxl uses many non-trivial macros. Signed-off-by: Euan Harris Acked-by: Ian Campbell [ ijc -- inserted a clarifying "enable" into comment ] --- tools/Rules.mk | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 87a56dc..962a743 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -54,6 +54,11 @@ CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN) LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -L$(XEN_LIBVCHAN) -lxenvchan SHLIB_libxenvchan = -Wl,-rpath-link=$(XEN_LIBVCHAN) +ifeq ($(debug),y) +# Disable optimizations and enable debugging information for macros +CFLAGS += -O0 -g3 +endif + LIBXL_BLKTAP ?= $(CONFIG_BLKTAP2) ifeq ($(LIBXL_BLKTAP),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 Sun Jan 18 21:07:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:07: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 1YCx47-0001w0-LO; Sun, 18 Jan 2015 21:07:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx46-0001ve-5X for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:22 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 48/2F-25547-9802CB45; Sun, 18 Jan 2015 21:07:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1421615239!20492953!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16469 invoked from network); 18 Jan 2015 21:07:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:07:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx43-0001Fm-Dg for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx43-0004Me-CK for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:19 +0000 Date: Sun, 18 Jan 2015 21:07:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/Rules.mk: Don't optimize debug builds; add macro debugging information X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1166ecf781b1016eaa61f8d5ba4fb1fde9d599b6 Author: Euan Harris AuthorDate: Mon Dec 1 14:21:05 2014 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:10:51 2015 +0000 tools/Rules.mk: Don't optimize debug builds; add macro debugging information Tools debug builds are built with optimization level -O1, inherited from the CFLAGS definition in StdGNU.mk. Optimizations confuse the debugger, and the comment justifying -O1 in StdGNU.mk should not apply for a userspace library. Disable optimization by appending -O0 to CFLAGS, which overrides the -O1 flag specified earlier. Also specify -g3, to add macro debugging information which allows gdb to expand macro invocations. This is useful as libxl uses many non-trivial macros. Signed-off-by: Euan Harris Acked-by: Ian Campbell [ ijc -- inserted a clarifying "enable" into comment ] --- tools/Rules.mk | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 87a56dc..962a743 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -54,6 +54,11 @@ CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN) LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -L$(XEN_LIBVCHAN) -lxenvchan SHLIB_libxenvchan = -Wl,-rpath-link=$(XEN_LIBVCHAN) +ifeq ($(debug),y) +# Disable optimizations and enable debugging information for macros +CFLAGS += -O0 -g3 +endif + LIBXL_BLKTAP ?= $(CONFIG_BLKTAP2) ifeq ($(LIBXL_BLKTAP),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 Sun Jan 18 21:07:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:07: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 1YCx4H-0001xu-OG; Sun, 18 Jan 2015 21:07:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4G-0001xa-8h for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:32 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 0D/CF-22737-3902CB45; Sun, 18 Jan 2015 21:07:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1421615249!15336486!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20798 invoked from network); 18 Jan 2015 21:07: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; 18 Jan 2015 21:07:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4D-0001Fu-JI for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx4D-0004NH-HX for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:29 +0000 Date: Sun, 18 Jan 2015 21:07:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/misc: Cleanup 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 9a7078623d084a638c1bf4f66b5f13fe4274f6ef Author: Andrew Cooper AuthorDate: Thu Jan 8 13:34:22 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:12:51 2015 +0000 tools/misc: Cleanup makefile The existing makefile was awkward with needing to express conditional inclusion for both the build and install rules, and contained both split and unsplit long lines. The INSTALL_* rules now contain the conditional inclusion information, while the TARGET_* rules generate the build list from the complete install list, less the minority of scripts which simply need copying into place. Comments are introduces to aid clarity. In addition, collect the CFLAGS expressions, remove the unreferenced and empty HDRS list, and restrict the libxc internals build fix to the offending binaries. No functional change as a result of this patch, but it is rather more simple to add or remove utilities. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Wei Liu --- tools/misc/Makefile | 77 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 46 insertions(+), 31 deletions(-) diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 7a2bfd2..a255c22 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -1,42 +1,53 @@ XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -Werror - +CFLAGS += -Werror -I$(XEN_ROOT)/tools CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_xeninclude) CFLAGS += $(CFLAGS_libxenstore) -# xen-hptool.c and xen-mfndump.c incorrectly use libxc internals -CFLAGS += -I$(XEN_ROOT)/tools/libxc - -HDRS = $(wildcard *.h) -TARGETS-y := xenperf xenpm xen-tmem-list-parse gtraceview gtracestat xenlockprof xenwatchdogd xencov -TARGETS-$(CONFIG_X86) += xen-detect xen-hvmctx xen-hvmcrash xen-lowmemd xen-mfndump -TARGETS-$(CONFIG_MIGRATE) += xen-hptool -TARGETS := $(TARGETS-y) +# Everything to be installed in regular bin/ +INSTALL_BIN-$(CONFIG_X86) += xen-detect +INSTALL_BIN += xencons +INSTALL_BIN += xencov_split +INSTALL_BIN += $(INSTALL_BIN-y) -INSTALL_BIN-y := xencons xencov_split -INSTALL_BIN-$(CONFIG_X86) += xen-detect -INSTALL_BIN := $(INSTALL_BIN-y) - -INSTALL_SBIN-y := xen-bugtool xenperf xenpm xen-tmem-list-parse gtraceview \ - gtracestat xenlockprof xenwatchdogd xen-ringwatch xencov -INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash xen-lowmemd xen-mfndump +# Everything to be installed in regular sbin/ +INSTALL_SBIN += gtracestat +INSTALL_SBIN += gtraceview +INSTALL_SBIN += xen-bugtool INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool -INSTALL_SBIN := $(INSTALL_SBIN-y) - -INSTALL_PRIVBIN-y := xenpvnetboot -INSTALL_PRIVBIN := $(INSTALL_PRIVBIN-y) - -# Include configure output (config.h) to headers search path -CFLAGS += -I$(XEN_ROOT)/tools - -.PHONY: all -all: build - -.PHONY: build -build: $(TARGETS) +INSTALL_SBIN-$(CONFIG_X86) += xen-hvmcrash +INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx +INSTALL_SBIN-$(CONFIG_X86) += xen-lowmemd +INSTALL_SBIN-$(CONFIG_X86) += xen-mfndump +INSTALL_SBIN += xen-ringwatch +INSTALL_SBIN += xen-tmem-list-parse +INSTALL_SBIN += xencov +INSTALL_SBIN += xenlockprof +INSTALL_SBIN += xenperf +INSTALL_SBIN += xenpm +INSTALL_SBIN += xenwatchdogd +INSTALL_SBIN += $(INSTALL_SBIN-y) + +# Everything to be installed in a private bin/ +INSTALL_PRIVBIN += xenpvnetboot + +# Everything to be installed +TARGETS_ALL := $(INSTALL_BIN) $(INSTALL_SBIN) $(INSTALL_PRIVBIN) + +# Everything which only needs copying to install +TARGETS_COPY += xen-bugtool +TARGETS_COPY += xen-ringwatch +TARGETS_COPY += xencons +TARGETS_COPY += xencov_split +TARGETS_COPY += xenpvnetboot + +# Everything which needs to be built +TARGETS_BUILD := $(filter-out $(TARGETS_COPY),$(TARGETS_ALL)) + +.PHONY: all build +all build: $(TARGETS_BUILD) .PHONY: install install: build @@ -49,7 +60,7 @@ install: build .PHONY: clean clean: - $(RM) *.o $(TARGETS) *~ $(DEPS) + $(RM) *.o $(TARGETS_BUILD) *~ $(DEPS) xen-hvmctx: xen-hvmctx.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) @@ -69,9 +80,13 @@ gtracestat: gtracestat.o xenlockprof: xenlockprof.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) +# xen-hptool incorrectly uses libxc internals +xen-hptool.o: CFLAGS += -I$(XEN_ROOT)/tools/libxc xen-hptool: xen-hptool.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(APPEND_LDFLAGS) +# xen-mfndump incorrectly uses libxc internals +xen-mfndump.o: CFLAGS += -I$(XEN_ROOT)/tools/libxc xen-mfndump: xen-mfndump.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:07:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:07: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 1YCx4H-0001xu-OG; Sun, 18 Jan 2015 21:07:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4G-0001xa-8h for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:32 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 0D/CF-22737-3902CB45; Sun, 18 Jan 2015 21:07:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1421615249!15336486!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20798 invoked from network); 18 Jan 2015 21:07: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; 18 Jan 2015 21:07:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4D-0001Fu-JI for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx4D-0004NH-HX for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:29 +0000 Date: Sun, 18 Jan 2015 21:07:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/misc: Cleanup 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 9a7078623d084a638c1bf4f66b5f13fe4274f6ef Author: Andrew Cooper AuthorDate: Thu Jan 8 13:34:22 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 16:12:51 2015 +0000 tools/misc: Cleanup makefile The existing makefile was awkward with needing to express conditional inclusion for both the build and install rules, and contained both split and unsplit long lines. The INSTALL_* rules now contain the conditional inclusion information, while the TARGET_* rules generate the build list from the complete install list, less the minority of scripts which simply need copying into place. Comments are introduces to aid clarity. In addition, collect the CFLAGS expressions, remove the unreferenced and empty HDRS list, and restrict the libxc internals build fix to the offending binaries. No functional change as a result of this patch, but it is rather more simple to add or remove utilities. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Wei Liu --- tools/misc/Makefile | 77 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 46 insertions(+), 31 deletions(-) diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 7a2bfd2..a255c22 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -1,42 +1,53 @@ XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -Werror - +CFLAGS += -Werror -I$(XEN_ROOT)/tools CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_xeninclude) CFLAGS += $(CFLAGS_libxenstore) -# xen-hptool.c and xen-mfndump.c incorrectly use libxc internals -CFLAGS += -I$(XEN_ROOT)/tools/libxc - -HDRS = $(wildcard *.h) -TARGETS-y := xenperf xenpm xen-tmem-list-parse gtraceview gtracestat xenlockprof xenwatchdogd xencov -TARGETS-$(CONFIG_X86) += xen-detect xen-hvmctx xen-hvmcrash xen-lowmemd xen-mfndump -TARGETS-$(CONFIG_MIGRATE) += xen-hptool -TARGETS := $(TARGETS-y) +# Everything to be installed in regular bin/ +INSTALL_BIN-$(CONFIG_X86) += xen-detect +INSTALL_BIN += xencons +INSTALL_BIN += xencov_split +INSTALL_BIN += $(INSTALL_BIN-y) -INSTALL_BIN-y := xencons xencov_split -INSTALL_BIN-$(CONFIG_X86) += xen-detect -INSTALL_BIN := $(INSTALL_BIN-y) - -INSTALL_SBIN-y := xen-bugtool xenperf xenpm xen-tmem-list-parse gtraceview \ - gtracestat xenlockprof xenwatchdogd xen-ringwatch xencov -INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash xen-lowmemd xen-mfndump +# Everything to be installed in regular sbin/ +INSTALL_SBIN += gtracestat +INSTALL_SBIN += gtraceview +INSTALL_SBIN += xen-bugtool INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool -INSTALL_SBIN := $(INSTALL_SBIN-y) - -INSTALL_PRIVBIN-y := xenpvnetboot -INSTALL_PRIVBIN := $(INSTALL_PRIVBIN-y) - -# Include configure output (config.h) to headers search path -CFLAGS += -I$(XEN_ROOT)/tools - -.PHONY: all -all: build - -.PHONY: build -build: $(TARGETS) +INSTALL_SBIN-$(CONFIG_X86) += xen-hvmcrash +INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx +INSTALL_SBIN-$(CONFIG_X86) += xen-lowmemd +INSTALL_SBIN-$(CONFIG_X86) += xen-mfndump +INSTALL_SBIN += xen-ringwatch +INSTALL_SBIN += xen-tmem-list-parse +INSTALL_SBIN += xencov +INSTALL_SBIN += xenlockprof +INSTALL_SBIN += xenperf +INSTALL_SBIN += xenpm +INSTALL_SBIN += xenwatchdogd +INSTALL_SBIN += $(INSTALL_SBIN-y) + +# Everything to be installed in a private bin/ +INSTALL_PRIVBIN += xenpvnetboot + +# Everything to be installed +TARGETS_ALL := $(INSTALL_BIN) $(INSTALL_SBIN) $(INSTALL_PRIVBIN) + +# Everything which only needs copying to install +TARGETS_COPY += xen-bugtool +TARGETS_COPY += xen-ringwatch +TARGETS_COPY += xencons +TARGETS_COPY += xencov_split +TARGETS_COPY += xenpvnetboot + +# Everything which needs to be built +TARGETS_BUILD := $(filter-out $(TARGETS_COPY),$(TARGETS_ALL)) + +.PHONY: all build +all build: $(TARGETS_BUILD) .PHONY: install install: build @@ -49,7 +60,7 @@ install: build .PHONY: clean clean: - $(RM) *.o $(TARGETS) *~ $(DEPS) + $(RM) *.o $(TARGETS_BUILD) *~ $(DEPS) xen-hvmctx: xen-hvmctx.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) @@ -69,9 +80,13 @@ gtracestat: gtracestat.o xenlockprof: xenlockprof.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) +# xen-hptool incorrectly uses libxc internals +xen-hptool.o: CFLAGS += -I$(XEN_ROOT)/tools/libxc xen-hptool: xen-hptool.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(APPEND_LDFLAGS) +# xen-mfndump incorrectly uses libxc internals +xen-mfndump.o: CFLAGS += -I$(XEN_ROOT)/tools/libxc xen-mfndump: xen-mfndump.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:07:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:07: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 1YCx4Q-0001zV-R0; Sun, 18 Jan 2015 21:07:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4P-0001zG-OD for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:41 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 07/B4-09842-D902CB45; Sun, 18 Jan 2015 21:07:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1421615259!14944581!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12346 invoked from network); 18 Jan 2015 21:07:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:07:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4N-0001Fx-OV for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx4N-0004Nt-Nk for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:39 +0000 Date: Sun, 18 Jan 2015 21:07:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add emacs local variables in libxl_{x86, arm}.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 cb3cd625899249da3919dc16989e6b21aa0e66a4 Author: Wei Liu AuthorDate: Mon Dec 1 15:33:28 2014 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 17:11:20 2015 +0000 libxl: add emacs local variables in libxl_{x86, arm}.c Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Dario Faggioli Cc: Elena Ufimtseva Acked-by: Ian Campbell --- tools/libxl/libxl_arm.c | 8 ++++++++ tools/libxl/libxl_x86.c | 8 ++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index ce0be84..65a762b 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -706,3 +706,11 @@ int libxl__arch_domain_finalise_hw_description(libxl__gc *gc, return 0; } + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c index 7589060..9ceb373 100644 --- a/tools/libxl/libxl_x86.c +++ b/tools/libxl/libxl_x86.c @@ -324,3 +324,11 @@ int libxl__arch_domain_finalise_hw_description(libxl__gc *gc, { return 0; } + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:07:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:07: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 1YCx4Q-0001zV-R0; Sun, 18 Jan 2015 21:07:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4P-0001zG-OD for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:41 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 07/B4-09842-D902CB45; Sun, 18 Jan 2015 21:07:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1421615259!14944581!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12346 invoked from network); 18 Jan 2015 21:07:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:07:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4N-0001Fx-OV for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx4N-0004Nt-Nk for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:39 +0000 Date: Sun, 18 Jan 2015 21:07:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add emacs local variables in libxl_{x86, arm}.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 cb3cd625899249da3919dc16989e6b21aa0e66a4 Author: Wei Liu AuthorDate: Mon Dec 1 15:33:28 2014 +0000 Commit: Ian Campbell CommitDate: Mon Jan 12 17:11:20 2015 +0000 libxl: add emacs local variables in libxl_{x86, arm}.c Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Dario Faggioli Cc: Elena Ufimtseva Acked-by: Ian Campbell --- tools/libxl/libxl_arm.c | 8 ++++++++ tools/libxl/libxl_x86.c | 8 ++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index ce0be84..65a762b 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -706,3 +706,11 @@ int libxl__arch_domain_finalise_hw_description(libxl__gc *gc, return 0; } + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c index 7589060..9ceb373 100644 --- a/tools/libxl/libxl_x86.c +++ b/tools/libxl/libxl_x86.c @@ -324,3 +324,11 @@ int libxl__arch_domain_finalise_hw_description(libxl__gc *gc, { return 0; } + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:07:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:07: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 1YCx4b-00021L-UC; Sun, 18 Jan 2015 21:07:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4a-000218-L5 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:52 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 8A/9E-18267-7A02CB45; Sun, 18 Jan 2015 21:07:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1421615270!17979056!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.6 required=7.0 tests=DIET_1 X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3876 invoked from network); 18 Jan 2015 21:07:51 -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; 18 Jan 2015 21:07:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4X-0001G6-Tq for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx4X-0004Ox-T0 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:49 +0000 Date: Sun, 18 Jan 2015 21:07:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xl: Call init function for libxl_domain_sched_params X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 06a4ef1a4dfb844e83eda2cc439d6c5e340c7acb Author: Uma Sharma AuthorDate: Tue Oct 21 03:12:11 2014 +0530 Commit: Ian Campbell CommitDate: Mon Jan 12 17:35:44 2015 +0000 tools/xl: Call init function for libxl_domain_sched_params This patch calls init function for libxl_domain_sched_params before passing it as reference to sched_domain_get() function in tools/libxl/xl_cmdimpl.c IDL generated libxl types should be used only after calling the init function even if the variable is simply being passed by reference as an output parameter to a libxl function Signed-off-by: Uma Sharma Acked-by: Wei Liu -- --- tools/libxl/xl_cmdimpl.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index ed0d478..fb7573e 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5387,6 +5387,8 @@ static int sched_credit_domain_output(int domid) printf("%-33s %4s %6s %4s\n", "Name", "ID", "Weight", "Cap"); return 0; } + + libxl_domain_sched_params_init(&scinfo); rc = sched_domain_get(LIBXL_SCHEDULER_CREDIT, domid, &scinfo); if (rc) return rc; @@ -5433,6 +5435,8 @@ static int sched_credit2_domain_output( printf("%-33s %4s %6s\n", "Name", "ID", "Weight"); return 0; } + + libxl_domain_sched_params_init(&scinfo); rc = sched_domain_get(LIBXL_SCHEDULER_CREDIT2, domid, &scinfo); if (rc) return rc; @@ -5458,6 +5462,8 @@ static int sched_sedf_domain_output( "Slice", "Latency", "Extra", "Weight"); return 0; } + + libxl_domain_sched_params_init(&scinfo); rc = sched_domain_get(LIBXL_SCHEDULER_SEDF, domid, &scinfo); if (rc) 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 Sun Jan 18 21:07:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:07: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 1YCx4b-00021L-UC; Sun, 18 Jan 2015 21:07:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4a-000218-L5 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:52 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 8A/9E-18267-7A02CB45; Sun, 18 Jan 2015 21:07:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1421615270!17979056!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.6 required=7.0 tests=DIET_1 X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3876 invoked from network); 18 Jan 2015 21:07:51 -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; 18 Jan 2015 21:07:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4X-0001G6-Tq for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx4X-0004Ox-T0 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:07:49 +0000 Date: Sun, 18 Jan 2015 21:07:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xl: Call init function for libxl_domain_sched_params X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 06a4ef1a4dfb844e83eda2cc439d6c5e340c7acb Author: Uma Sharma AuthorDate: Tue Oct 21 03:12:11 2014 +0530 Commit: Ian Campbell CommitDate: Mon Jan 12 17:35:44 2015 +0000 tools/xl: Call init function for libxl_domain_sched_params This patch calls init function for libxl_domain_sched_params before passing it as reference to sched_domain_get() function in tools/libxl/xl_cmdimpl.c IDL generated libxl types should be used only after calling the init function even if the variable is simply being passed by reference as an output parameter to a libxl function Signed-off-by: Uma Sharma Acked-by: Wei Liu -- --- tools/libxl/xl_cmdimpl.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index ed0d478..fb7573e 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5387,6 +5387,8 @@ static int sched_credit_domain_output(int domid) printf("%-33s %4s %6s %4s\n", "Name", "ID", "Weight", "Cap"); return 0; } + + libxl_domain_sched_params_init(&scinfo); rc = sched_domain_get(LIBXL_SCHEDULER_CREDIT, domid, &scinfo); if (rc) return rc; @@ -5433,6 +5435,8 @@ static int sched_credit2_domain_output( printf("%-33s %4s %6s\n", "Name", "ID", "Weight"); return 0; } + + libxl_domain_sched_params_init(&scinfo); rc = sched_domain_get(LIBXL_SCHEDULER_CREDIT2, domid, &scinfo); if (rc) return rc; @@ -5458,6 +5462,8 @@ static int sched_sedf_domain_output( "Slice", "Latency", "Extra", "Weight"); return 0; } + + libxl_domain_sched_params_init(&scinfo); rc = sched_domain_get(LIBXL_SCHEDULER_SEDF, domid, &scinfo); if (rc) 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 Sun Jan 18 21:08:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:08: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 1YCx4m-00022q-0t; Sun, 18 Jan 2015 21:08:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4k-00022c-Kt for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:03 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 35/AC-15461-1B02CB45; Sun, 18 Jan 2015 21:08:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1421615280!14944611!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13290 invoked from network); 18 Jan 2015 21:08:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:08:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4i-0001GI-4L for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx4i-0004Pc-2q for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:00 +0000 Date: Sun, 18 Jan 2015 21:08:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xl: Call init function for libxl_bitmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c3d8888dacd0abf9fe20dd62d294f5c937114851 Author: Uma Sharma AuthorDate: Tue Oct 21 03:15:10 2014 +0530 Commit: Ian Campbell CommitDate: Mon Jan 12 17:35:56 2015 +0000 tools/xl: Call init function for libxl_bitmap This patch calls init function for libxl_bitmap in main_cpupoolnumasplit() and vcpuset() tools/libxl/xl_cmdimpl.c IDL generated libxl types should be used only after calling the init function even if the variable is simply being passed by reference as an output parameter to a libxl function Signed-off-by: Uma Sharma Acked-by: Wei Liu -- --- tools/libxl/xl_cmdimpl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index fb7573e..dd07665 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5016,6 +5016,7 @@ static void vcpuset(uint32_t domid, const char* nr_vcpus, int check_host) unsigned int max_vcpus, i; libxl_bitmap cpumap; + libxl_bitmap_init(&cpumap); max_vcpus = strtoul(nr_vcpus, &endptr, 10); if (nr_vcpus == endptr) { fprintf(stderr, "Error: Invalid argument.\n"); @@ -7480,6 +7481,7 @@ int main_cpupoolnumasplit(int argc, char **argv) ret = 0; + libxl_bitmap_init(&cpumap); poolinfo = libxl_list_cpupool(ctx, &n_pools); if (!poolinfo) { fprintf(stderr, "error getting cpupool info\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 Sun Jan 18 21:08:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:08: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 1YCx4m-00022q-0t; Sun, 18 Jan 2015 21:08:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4k-00022c-Kt for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:03 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 35/AC-15461-1B02CB45; Sun, 18 Jan 2015 21:08:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1421615280!14944611!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13290 invoked from network); 18 Jan 2015 21:08:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:08:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4i-0001GI-4L for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx4i-0004Pc-2q for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:00 +0000 Date: Sun, 18 Jan 2015 21:08:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xl: Call init function for libxl_bitmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c3d8888dacd0abf9fe20dd62d294f5c937114851 Author: Uma Sharma AuthorDate: Tue Oct 21 03:15:10 2014 +0530 Commit: Ian Campbell CommitDate: Mon Jan 12 17:35:56 2015 +0000 tools/xl: Call init function for libxl_bitmap This patch calls init function for libxl_bitmap in main_cpupoolnumasplit() and vcpuset() tools/libxl/xl_cmdimpl.c IDL generated libxl types should be used only after calling the init function even if the variable is simply being passed by reference as an output parameter to a libxl function Signed-off-by: Uma Sharma Acked-by: Wei Liu -- --- tools/libxl/xl_cmdimpl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index fb7573e..dd07665 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5016,6 +5016,7 @@ static void vcpuset(uint32_t domid, const char* nr_vcpus, int check_host) unsigned int max_vcpus, i; libxl_bitmap cpumap; + libxl_bitmap_init(&cpumap); max_vcpus = strtoul(nr_vcpus, &endptr, 10); if (nr_vcpus == endptr) { fprintf(stderr, "Error: Invalid argument.\n"); @@ -7480,6 +7481,7 @@ int main_cpupoolnumasplit(int argc, char **argv) ret = 0; + libxl_bitmap_init(&cpumap); poolinfo = libxl_list_cpupool(ctx, &n_pools); if (!poolinfo) { fprintf(stderr, "error getting cpupool info\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 Sun Jan 18 21:08:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:08: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 1YCx4x-000252-5X; Sun, 18 Jan 2015 21:08:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4v-00024r-D9 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:13 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id E3/26-09284-CB02CB45; Sun, 18 Jan 2015 21:08:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1421615290!11573567!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7148 invoked from network); 18 Jan 2015 21:08:11 -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; 18 Jan 2015 21:08:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4s-0001Gr-AH for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx4s-0004QI-9T for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:10 +0000 Date: Sun, 18 Jan 2015 21:08:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: xl: refactor code to parse network device options X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 762c08496e9732822f172801d5576cd24fff784a Author: Alexandra Sandulescu AuthorDate: Wed Oct 22 00:36:21 2014 +0300 Commit: Ian Campbell CommitDate: Mon Jan 12 17:37:28 2015 +0000 tools: xl: refactor code to parse network device options This patch removes duplicate code in /tools/libxl/xl_cmdimpl.c by adding parse_nic_config function. This function parses configuration data and adds the information into libxl_device_nic struct. It is called in both main_networkattach and parse_config_data functions to replace duplicate code. Signed-off-by: Alexandra Sandulescu Acked-by: Wei Liu --- tools/libxl/xl_cmdimpl.c | 187 +++++++++++++++++----------------------------- 1 files changed, 70 insertions(+), 117 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index dd07665..0b02a6c 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -910,6 +910,73 @@ static void replace_string(char **str, const char *val) *str = xstrdup(val); } +static int match_option_size(const char *prefix, size_t len, + char *arg, char **argopt) +{ + int rc = strncmp(prefix, arg, len); + if (!rc) *argopt = arg+len; + return !rc; +} +#define MATCH_OPTION(prefix, arg, oparg) \ + match_option_size((prefix "="), sizeof((prefix)), (arg), &(oparg)) + +/* Parses network data and adds info into nic + * Returns 1 if the input token does not match one of the keys + * or parsed values are not correct. Successful parse returns 0 */ +static int parse_nic_config(libxl_device_nic *nic, XLU_Config **config, char *token) +{ + char *endptr, *oparg; + int i; + unsigned int val; + + if (MATCH_OPTION("type", token, oparg)) { + if (!strcmp("vif", oparg)) { + nic->nictype = LIBXL_NIC_TYPE_VIF; + } else if (!strcmp("ioemu", oparg)) { + nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; + } else { + fprintf(stderr, "Invalid parameter `type'.\n"); + return 1; + } + } else if (MATCH_OPTION("mac", token, oparg)) { + for (i = 0; i < 6; i++) { + val = strtoul(oparg, &endptr, 16); + if ((oparg == endptr) || (val > 255)) { + fprintf(stderr, "Invalid parameter `mac'.\n"); + return 1; + } + nic->mac[i] = val; + oparg = endptr + 1; + } + } else if (MATCH_OPTION("bridge", token, oparg)) { + replace_string(&nic->bridge, oparg); + } else if (MATCH_OPTION("netdev", token, oparg)) { + fprintf(stderr, "the netdev parameter is deprecated, " + "please use gatewaydev instead\n"); + replace_string(&nic->gatewaydev, oparg); + } else if (MATCH_OPTION("gatewaydev", token, oparg)) { + replace_string(&nic->gatewaydev, oparg); + } else if (MATCH_OPTION("ip", token, oparg)) { + replace_string(&nic->ip, oparg); + } else if (MATCH_OPTION("script", token, oparg)) { + replace_string(&nic->script, oparg); + } else if (MATCH_OPTION("backend", token, oparg)) { + replace_string(&nic->backend_domname, oparg); + } else if (MATCH_OPTION("vifname", token, oparg)) { + replace_string(&nic->ifname, oparg); + } else if (MATCH_OPTION("model", token, oparg)) { + replace_string(&nic->model, oparg); + } else if (MATCH_OPTION("rate", token, oparg)) { + parse_vif_rate(config, oparg, nic); + } else if (MATCH_OPTION("accel", token, oparg)) { + fprintf(stderr, "the accel parameter for vifs is currently not supported\n"); + } else { + fprintf(stderr, "unrecognized argument `%s'\n", token); + return 1; + } + return 0; +} + static void parse_config_data(const char *config_source, const char *config_data, int config_len, @@ -1552,7 +1619,7 @@ static void parse_config_data(const char *config_source, while ((buf = xlu_cfg_get_listitem (nics, d_config->num_nics)) != NULL) { libxl_device_nic *nic; char *buf2 = strdup(buf); - char *p, *p2; + char *p; d_config->nics = (libxl_device_nic *) realloc(d_config->nics, sizeof (libxl_device_nic) * (d_config->num_nics+1)); nic = d_config->nics + d_config->num_nics; @@ -1566,64 +1633,7 @@ static void parse_config_data(const char *config_source, do { while (*p == ' ') p++; - if ((p2 = strchr(p, '=')) == NULL) - break; - *p2 = '\0'; - if (!strcmp(p, "model")) { - free(nic->model); - nic->model = strdup(p2 + 1); - } else if (!strcmp(p, "mac")) { - char *p3 = p2 + 1; - *(p3 + 2) = '\0'; - nic->mac[0] = strtol(p3, NULL, 16); - p3 = p3 + 3; - *(p3 + 2) = '\0'; - nic->mac[1] = strtol(p3, NULL, 16); - p3 = p3 + 3; - *(p3 + 2) = '\0'; - nic->mac[2] = strtol(p3, NULL, 16); - p3 = p3 + 3; - *(p3 + 2) = '\0'; - nic->mac[3] = strtol(p3, NULL, 16); - p3 = p3 + 3; - *(p3 + 2) = '\0'; - nic->mac[4] = strtol(p3, NULL, 16); - p3 = p3 + 3; - *(p3 + 2) = '\0'; - nic->mac[5] = strtol(p3, NULL, 16); - } else if (!strcmp(p, "bridge")) { - free(nic->bridge); - nic->bridge = strdup(p2 + 1); - } else if (!strcmp(p, "type")) { - if (!strcmp(p2 + 1, "ioemu")) - nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; - else - nic->nictype = LIBXL_NIC_TYPE_VIF; - } else if (!strcmp(p, "ip")) { - free(nic->ip); - nic->ip = strdup(p2 + 1); - } else if (!strcmp(p, "script")) { - free(nic->script); - nic->script = strdup(p2 + 1); - } else if (!strcmp(p, "vifname")) { - free(nic->ifname); - nic->ifname = strdup(p2 + 1); - } else if (!strcmp(p, "backend")) { - free(nic->backend_domname); - nic->backend_domname = strdup(p2 + 1); - } else if (!strcmp(p, "rate")) { - parse_vif_rate(&config, (p2 + 1), nic); - } else if (!strcmp(p, "accel")) { - fprintf(stderr, "the accel parameter for vifs is currently not supported\n"); - } else if (!strcmp(p, "netdev")) { - fprintf(stderr, "the netdev parameter is deprecated, " - "please use gatewaydev instead\n"); - free(nic->gatewaydev); - nic->gatewaydev = strdup(p2 + 1); - } else if (!strcmp(p, "gatewaydev")) { - free(nic->gatewaydev); - nic->gatewaydev = strdup(p2 + 1); - } + parse_nic_config(nic, &config, p); } while ((p = strtok(NULL, ",")) != NULL); skip_nic: free(buf2); @@ -2137,17 +2147,6 @@ static int handle_domain_death(uint32_t *r_domid, return restart; } -/* for now used only by main_networkattach, but can be reused elsewhere */ -static int match_option_size(const char *prefix, size_t len, - char *arg, char **argopt) -{ - int rc = strncmp(prefix, arg, len); - if (!rc) *argopt = arg+len; - return !rc; -} -#define MATCH_OPTION(prefix, arg, oparg) \ - match_option_size((prefix "="), sizeof((prefix)), (arg), &(oparg)) - /* Preserve a copy of a domain under a new name. Updates *r_domid */ static int preserve_domain(uint32_t *r_domid, libxl_event *event, libxl_domain_config *d_config) @@ -6166,10 +6165,6 @@ int main_networkattach(int argc, char **argv) int opt; libxl_device_nic nic; XLU_Config *config = 0; - char *endptr, *oparg; - const char *tok; - int i; - unsigned int val; SWITCH_FOREACH_OPT(opt, "", NULL, "network-attach", 1) { /* No options */ @@ -6192,50 +6187,8 @@ int main_networkattach(int argc, char **argv) set_default_nic_values(&nic); for (argv += optind+1, argc -= optind+1; argc > 0; ++argv, --argc) { - if (MATCH_OPTION("type", *argv, oparg)) { - if (!strcmp("vif", oparg)) { - nic.nictype = LIBXL_NIC_TYPE_VIF; - } else if (!strcmp("ioemu", oparg)) { - nic.nictype = LIBXL_NIC_TYPE_VIF_IOEMU; - } else { - fprintf(stderr, "Invalid parameter `type'.\n"); - return 1; - } - } else if (MATCH_OPTION("mac", *argv, oparg)) { - tok = strtok(oparg, ":"); - for (i = 0; tok && i < 6; tok = strtok(NULL, ":"), ++i) { - val = strtoul(tok, &endptr, 16); - if ((tok == endptr) || (val > 255)) { - fprintf(stderr, "Invalid parameter `mac'.\n"); - return 1; - } - nic.mac[i] = val; - } - } else if (MATCH_OPTION("bridge", *argv, oparg)) { - replace_string(&nic.bridge, oparg); - } else if (MATCH_OPTION("netdev", *argv, oparg)) { - fprintf(stderr, "the netdev parameter is deprecated, " - "please use gatewaydev instead\n"); - replace_string(&nic.gatewaydev, oparg); - } else if (MATCH_OPTION("gatewaydev", *argv, oparg)) { - replace_string(&nic.gatewaydev, oparg); - } else if (MATCH_OPTION("ip", *argv, oparg)) { - replace_string(&nic.ip, oparg); - } else if (MATCH_OPTION("script", *argv, oparg)) { - replace_string(&nic.script, oparg); - } else if (MATCH_OPTION("backend", *argv, oparg)) { - replace_string(&nic.backend_domname, oparg); - } else if (MATCH_OPTION("vifname", *argv, oparg)) { - replace_string(&nic.ifname, oparg); - } else if (MATCH_OPTION("model", *argv, oparg)) { - replace_string(&nic.model, oparg); - } else if (MATCH_OPTION("rate", *argv, oparg)) { - parse_vif_rate(&config, oparg, &nic); - } else if (MATCH_OPTION("accel", *argv, oparg)) { - } else { - fprintf(stderr, "unrecognized argument `%s'\n", *argv); + if (parse_nic_config(&nic, &config, *argv)) return 1; - } } if (dryrun_only) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:08:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:08: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 1YCx4x-000252-5X; Sun, 18 Jan 2015 21:08:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4v-00024r-D9 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:13 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id E3/26-09284-CB02CB45; Sun, 18 Jan 2015 21:08:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1421615290!11573567!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7148 invoked from network); 18 Jan 2015 21:08:11 -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; 18 Jan 2015 21:08:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx4s-0001Gr-AH for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx4s-0004QI-9T for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:10 +0000 Date: Sun, 18 Jan 2015 21:08:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: xl: refactor code to parse network device options X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 762c08496e9732822f172801d5576cd24fff784a Author: Alexandra Sandulescu AuthorDate: Wed Oct 22 00:36:21 2014 +0300 Commit: Ian Campbell CommitDate: Mon Jan 12 17:37:28 2015 +0000 tools: xl: refactor code to parse network device options This patch removes duplicate code in /tools/libxl/xl_cmdimpl.c by adding parse_nic_config function. This function parses configuration data and adds the information into libxl_device_nic struct. It is called in both main_networkattach and parse_config_data functions to replace duplicate code. Signed-off-by: Alexandra Sandulescu Acked-by: Wei Liu --- tools/libxl/xl_cmdimpl.c | 187 +++++++++++++++++----------------------------- 1 files changed, 70 insertions(+), 117 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index dd07665..0b02a6c 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -910,6 +910,73 @@ static void replace_string(char **str, const char *val) *str = xstrdup(val); } +static int match_option_size(const char *prefix, size_t len, + char *arg, char **argopt) +{ + int rc = strncmp(prefix, arg, len); + if (!rc) *argopt = arg+len; + return !rc; +} +#define MATCH_OPTION(prefix, arg, oparg) \ + match_option_size((prefix "="), sizeof((prefix)), (arg), &(oparg)) + +/* Parses network data and adds info into nic + * Returns 1 if the input token does not match one of the keys + * or parsed values are not correct. Successful parse returns 0 */ +static int parse_nic_config(libxl_device_nic *nic, XLU_Config **config, char *token) +{ + char *endptr, *oparg; + int i; + unsigned int val; + + if (MATCH_OPTION("type", token, oparg)) { + if (!strcmp("vif", oparg)) { + nic->nictype = LIBXL_NIC_TYPE_VIF; + } else if (!strcmp("ioemu", oparg)) { + nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; + } else { + fprintf(stderr, "Invalid parameter `type'.\n"); + return 1; + } + } else if (MATCH_OPTION("mac", token, oparg)) { + for (i = 0; i < 6; i++) { + val = strtoul(oparg, &endptr, 16); + if ((oparg == endptr) || (val > 255)) { + fprintf(stderr, "Invalid parameter `mac'.\n"); + return 1; + } + nic->mac[i] = val; + oparg = endptr + 1; + } + } else if (MATCH_OPTION("bridge", token, oparg)) { + replace_string(&nic->bridge, oparg); + } else if (MATCH_OPTION("netdev", token, oparg)) { + fprintf(stderr, "the netdev parameter is deprecated, " + "please use gatewaydev instead\n"); + replace_string(&nic->gatewaydev, oparg); + } else if (MATCH_OPTION("gatewaydev", token, oparg)) { + replace_string(&nic->gatewaydev, oparg); + } else if (MATCH_OPTION("ip", token, oparg)) { + replace_string(&nic->ip, oparg); + } else if (MATCH_OPTION("script", token, oparg)) { + replace_string(&nic->script, oparg); + } else if (MATCH_OPTION("backend", token, oparg)) { + replace_string(&nic->backend_domname, oparg); + } else if (MATCH_OPTION("vifname", token, oparg)) { + replace_string(&nic->ifname, oparg); + } else if (MATCH_OPTION("model", token, oparg)) { + replace_string(&nic->model, oparg); + } else if (MATCH_OPTION("rate", token, oparg)) { + parse_vif_rate(config, oparg, nic); + } else if (MATCH_OPTION("accel", token, oparg)) { + fprintf(stderr, "the accel parameter for vifs is currently not supported\n"); + } else { + fprintf(stderr, "unrecognized argument `%s'\n", token); + return 1; + } + return 0; +} + static void parse_config_data(const char *config_source, const char *config_data, int config_len, @@ -1552,7 +1619,7 @@ static void parse_config_data(const char *config_source, while ((buf = xlu_cfg_get_listitem (nics, d_config->num_nics)) != NULL) { libxl_device_nic *nic; char *buf2 = strdup(buf); - char *p, *p2; + char *p; d_config->nics = (libxl_device_nic *) realloc(d_config->nics, sizeof (libxl_device_nic) * (d_config->num_nics+1)); nic = d_config->nics + d_config->num_nics; @@ -1566,64 +1633,7 @@ static void parse_config_data(const char *config_source, do { while (*p == ' ') p++; - if ((p2 = strchr(p, '=')) == NULL) - break; - *p2 = '\0'; - if (!strcmp(p, "model")) { - free(nic->model); - nic->model = strdup(p2 + 1); - } else if (!strcmp(p, "mac")) { - char *p3 = p2 + 1; - *(p3 + 2) = '\0'; - nic->mac[0] = strtol(p3, NULL, 16); - p3 = p3 + 3; - *(p3 + 2) = '\0'; - nic->mac[1] = strtol(p3, NULL, 16); - p3 = p3 + 3; - *(p3 + 2) = '\0'; - nic->mac[2] = strtol(p3, NULL, 16); - p3 = p3 + 3; - *(p3 + 2) = '\0'; - nic->mac[3] = strtol(p3, NULL, 16); - p3 = p3 + 3; - *(p3 + 2) = '\0'; - nic->mac[4] = strtol(p3, NULL, 16); - p3 = p3 + 3; - *(p3 + 2) = '\0'; - nic->mac[5] = strtol(p3, NULL, 16); - } else if (!strcmp(p, "bridge")) { - free(nic->bridge); - nic->bridge = strdup(p2 + 1); - } else if (!strcmp(p, "type")) { - if (!strcmp(p2 + 1, "ioemu")) - nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; - else - nic->nictype = LIBXL_NIC_TYPE_VIF; - } else if (!strcmp(p, "ip")) { - free(nic->ip); - nic->ip = strdup(p2 + 1); - } else if (!strcmp(p, "script")) { - free(nic->script); - nic->script = strdup(p2 + 1); - } else if (!strcmp(p, "vifname")) { - free(nic->ifname); - nic->ifname = strdup(p2 + 1); - } else if (!strcmp(p, "backend")) { - free(nic->backend_domname); - nic->backend_domname = strdup(p2 + 1); - } else if (!strcmp(p, "rate")) { - parse_vif_rate(&config, (p2 + 1), nic); - } else if (!strcmp(p, "accel")) { - fprintf(stderr, "the accel parameter for vifs is currently not supported\n"); - } else if (!strcmp(p, "netdev")) { - fprintf(stderr, "the netdev parameter is deprecated, " - "please use gatewaydev instead\n"); - free(nic->gatewaydev); - nic->gatewaydev = strdup(p2 + 1); - } else if (!strcmp(p, "gatewaydev")) { - free(nic->gatewaydev); - nic->gatewaydev = strdup(p2 + 1); - } + parse_nic_config(nic, &config, p); } while ((p = strtok(NULL, ",")) != NULL); skip_nic: free(buf2); @@ -2137,17 +2147,6 @@ static int handle_domain_death(uint32_t *r_domid, return restart; } -/* for now used only by main_networkattach, but can be reused elsewhere */ -static int match_option_size(const char *prefix, size_t len, - char *arg, char **argopt) -{ - int rc = strncmp(prefix, arg, len); - if (!rc) *argopt = arg+len; - return !rc; -} -#define MATCH_OPTION(prefix, arg, oparg) \ - match_option_size((prefix "="), sizeof((prefix)), (arg), &(oparg)) - /* Preserve a copy of a domain under a new name. Updates *r_domid */ static int preserve_domain(uint32_t *r_domid, libxl_event *event, libxl_domain_config *d_config) @@ -6166,10 +6165,6 @@ int main_networkattach(int argc, char **argv) int opt; libxl_device_nic nic; XLU_Config *config = 0; - char *endptr, *oparg; - const char *tok; - int i; - unsigned int val; SWITCH_FOREACH_OPT(opt, "", NULL, "network-attach", 1) { /* No options */ @@ -6192,50 +6187,8 @@ int main_networkattach(int argc, char **argv) set_default_nic_values(&nic); for (argv += optind+1, argc -= optind+1; argc > 0; ++argv, --argc) { - if (MATCH_OPTION("type", *argv, oparg)) { - if (!strcmp("vif", oparg)) { - nic.nictype = LIBXL_NIC_TYPE_VIF; - } else if (!strcmp("ioemu", oparg)) { - nic.nictype = LIBXL_NIC_TYPE_VIF_IOEMU; - } else { - fprintf(stderr, "Invalid parameter `type'.\n"); - return 1; - } - } else if (MATCH_OPTION("mac", *argv, oparg)) { - tok = strtok(oparg, ":"); - for (i = 0; tok && i < 6; tok = strtok(NULL, ":"), ++i) { - val = strtoul(tok, &endptr, 16); - if ((tok == endptr) || (val > 255)) { - fprintf(stderr, "Invalid parameter `mac'.\n"); - return 1; - } - nic.mac[i] = val; - } - } else if (MATCH_OPTION("bridge", *argv, oparg)) { - replace_string(&nic.bridge, oparg); - } else if (MATCH_OPTION("netdev", *argv, oparg)) { - fprintf(stderr, "the netdev parameter is deprecated, " - "please use gatewaydev instead\n"); - replace_string(&nic.gatewaydev, oparg); - } else if (MATCH_OPTION("gatewaydev", *argv, oparg)) { - replace_string(&nic.gatewaydev, oparg); - } else if (MATCH_OPTION("ip", *argv, oparg)) { - replace_string(&nic.ip, oparg); - } else if (MATCH_OPTION("script", *argv, oparg)) { - replace_string(&nic.script, oparg); - } else if (MATCH_OPTION("backend", *argv, oparg)) { - replace_string(&nic.backend_domname, oparg); - } else if (MATCH_OPTION("vifname", *argv, oparg)) { - replace_string(&nic.ifname, oparg); - } else if (MATCH_OPTION("model", *argv, oparg)) { - replace_string(&nic.model, oparg); - } else if (MATCH_OPTION("rate", *argv, oparg)) { - parse_vif_rate(&config, oparg, &nic); - } else if (MATCH_OPTION("accel", *argv, oparg)) { - } else { - fprintf(stderr, "unrecognized argument `%s'\n", *argv); + if (parse_nic_config(&nic, &config, *argv)) return 1; - } } if (dryrun_only) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:08:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:08: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 1YCx57-00026P-9H; Sun, 18 Jan 2015 21:08:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx55-00026A-Bt for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:23 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id FF/CB-26740-6C02CB45; Sun, 18 Jan 2015 21:08:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1421615300!16730847!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1552 invoked from network); 18 Jan 2015 21:08:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:08:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx52-0001Gx-FK for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx52-0004Qo-Dz for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:20 +0000 Date: Sun, 18 Jan 2015 21:08:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Mini-OS: netfront: Fix rx ring starvation in network_rx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eed8d774ce19dcae26e1cc077088397681ad65eb Author: Martin Lucina AuthorDate: Thu Dec 4 14:33:53 2014 +0100 Commit: Ian Campbell CommitDate: Tue Jan 13 10:40:28 2015 +0000 Mini-OS: netfront: Fix rx ring starvation in network_rx In network_rx() we must push the same amount of requests back onto the ring in the second loop that we consumed in the first loop. Otherwise the ring will eventually starve itself of free request slots and no packets will be delivered. Further, we make the HAVE_LIBC codepath clearer to follow by removing the "some" variable from the for loop initialisation and conditions. Signed-off-by: Martin Lucina Acked-by: Samuel Thibault --- extras/mini-os/netfront.c | 36 +++++++++++++++++------------------- 1 files changed, 17 insertions(+), 19 deletions(-) diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index 44c3995..42bb103 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -96,42 +96,35 @@ static inline int xennet_rxidx(RING_IDX idx) void network_rx(struct netfront_dev *dev) { RING_IDX rp,cons,req_prod; - struct netif_rx_response *rx; - int nr_consumed, some, more, i, notify; - + int nr_consumed, more, i, notify; +#ifdef HAVE_LIBC + int some; +#endif + nr_consumed = 0; moretodo: rp = dev->rx.sring->rsp_prod; rmb(); /* Ensure we see queued responses up to 'rp'. */ - cons = dev->rx.rsp_cons; - for (nr_consumed = 0, some = 0; - (cons != rp) && !some; - nr_consumed++, cons++) +#ifdef HAVE_LIBC + some = 0; +#endif + for (cons = dev->rx.rsp_cons; cons != rp; nr_consumed++, cons++) { struct net_buffer* buf; unsigned char* page; int id; - rx = RING_GET_RESPONSE(&dev->rx, cons); - - if (rx->flags & NETRXF_extra_info) - { - printk("+++++++++++++++++++++ we have extras!\n"); - continue; - } - - - if (rx->status == NETIF_RSP_NULL) continue; + struct netif_rx_response *rx = RING_GET_RESPONSE(&dev->rx, cons); id = rx->id; - BUG_ON(id >= NET_TX_RING_SIZE); + BUG_ON(id >= NET_RX_RING_SIZE); buf = &dev->rx_buffers[id]; page = (unsigned char*)buf->page; gnttab_end_access(buf->gref); - if(rx->status>0) + if (rx->status > NETIF_RSP_NULL) { #ifdef HAVE_LIBC if (dev->netif_rx == NETIF_SELECT_RX) { @@ -142,6 +135,7 @@ moretodo: memcpy(dev->data, page+rx->offset, len); dev->rlen = len; some = 1; + break; } else #endif dev->netif_rx(page+rx->offset,rx->status); @@ -150,7 +144,11 @@ moretodo: dev->rx.rsp_cons=cons; RING_FINAL_CHECK_FOR_RESPONSES(&dev->rx,more); +#ifdef HAVE_LIBC if(more && !some) goto moretodo; +#else + if(more) goto moretodo; +#endif req_prod = dev->rx.req_prod_pvt; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:08:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:08: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 1YCx57-00026P-9H; Sun, 18 Jan 2015 21:08:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx55-00026A-Bt for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:23 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id FF/CB-26740-6C02CB45; Sun, 18 Jan 2015 21:08:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1421615300!16730847!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1552 invoked from network); 18 Jan 2015 21:08:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:08:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx52-0001Gx-FK for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx52-0004Qo-Dz for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:20 +0000 Date: Sun, 18 Jan 2015 21:08:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Mini-OS: netfront: Fix rx ring starvation in network_rx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eed8d774ce19dcae26e1cc077088397681ad65eb Author: Martin Lucina AuthorDate: Thu Dec 4 14:33:53 2014 +0100 Commit: Ian Campbell CommitDate: Tue Jan 13 10:40:28 2015 +0000 Mini-OS: netfront: Fix rx ring starvation in network_rx In network_rx() we must push the same amount of requests back onto the ring in the second loop that we consumed in the first loop. Otherwise the ring will eventually starve itself of free request slots and no packets will be delivered. Further, we make the HAVE_LIBC codepath clearer to follow by removing the "some" variable from the for loop initialisation and conditions. Signed-off-by: Martin Lucina Acked-by: Samuel Thibault --- extras/mini-os/netfront.c | 36 +++++++++++++++++------------------- 1 files changed, 17 insertions(+), 19 deletions(-) diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index 44c3995..42bb103 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -96,42 +96,35 @@ static inline int xennet_rxidx(RING_IDX idx) void network_rx(struct netfront_dev *dev) { RING_IDX rp,cons,req_prod; - struct netif_rx_response *rx; - int nr_consumed, some, more, i, notify; - + int nr_consumed, more, i, notify; +#ifdef HAVE_LIBC + int some; +#endif + nr_consumed = 0; moretodo: rp = dev->rx.sring->rsp_prod; rmb(); /* Ensure we see queued responses up to 'rp'. */ - cons = dev->rx.rsp_cons; - for (nr_consumed = 0, some = 0; - (cons != rp) && !some; - nr_consumed++, cons++) +#ifdef HAVE_LIBC + some = 0; +#endif + for (cons = dev->rx.rsp_cons; cons != rp; nr_consumed++, cons++) { struct net_buffer* buf; unsigned char* page; int id; - rx = RING_GET_RESPONSE(&dev->rx, cons); - - if (rx->flags & NETRXF_extra_info) - { - printk("+++++++++++++++++++++ we have extras!\n"); - continue; - } - - - if (rx->status == NETIF_RSP_NULL) continue; + struct netif_rx_response *rx = RING_GET_RESPONSE(&dev->rx, cons); id = rx->id; - BUG_ON(id >= NET_TX_RING_SIZE); + BUG_ON(id >= NET_RX_RING_SIZE); buf = &dev->rx_buffers[id]; page = (unsigned char*)buf->page; gnttab_end_access(buf->gref); - if(rx->status>0) + if (rx->status > NETIF_RSP_NULL) { #ifdef HAVE_LIBC if (dev->netif_rx == NETIF_SELECT_RX) { @@ -142,6 +135,7 @@ moretodo: memcpy(dev->data, page+rx->offset, len); dev->rlen = len; some = 1; + break; } else #endif dev->netif_rx(page+rx->offset,rx->status); @@ -150,7 +144,11 @@ moretodo: dev->rx.rsp_cons=cons; RING_FINAL_CHECK_FOR_RESPONSES(&dev->rx,more); +#ifdef HAVE_LIBC if(more && !some) goto moretodo; +#else + if(more) goto moretodo; +#endif req_prod = dev->rx.req_prod_pvt; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:08:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:08: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 1YCx5G-00027u-C2; Sun, 18 Jan 2015 21:08:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5F-00027i-3G for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:33 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 6B/AD-02760-0D02CB45; Sun, 18 Jan 2015 21:08:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1421615310!16628549!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29705 invoked from network); 18 Jan 2015 21:08:31 -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; 18 Jan 2015 21:08:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5C-0001H5-Lp for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx5C-0004RR-Jq for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:30 +0000 Date: Sun, 18 Jan 2015 21:08:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "x86/HVM: make hvm_efer_valid() honor guest features" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6af4e1db6c91ba79789ee0e0d363f90ef5b2370 Author: Jan Beulich AuthorDate: Wed Jan 14 11:53:28 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 14 11:53:28 2015 +0100 Revert "x86/HVM: make hvm_efer_valid() honor guest features" This reverts commit 07a6aa869bae0699d2f7e1b75d188229eb70c9e4. Some HVM guests don't survive the new checking (EFER=0x901 reported invalid). --- xen/arch/x86/hvm/hvm.c | 66 ++++++++++++++---------------------------------- 1 files changed, 19 insertions(+), 47 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 82ee7e8..8b06bfd 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1672,53 +1672,20 @@ static int hvm_save_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) return 0; } -static bool_t hvm_efer_valid(const struct vcpu *v, uint64_t value, - signed int cr0_pg) +static bool_t hvm_efer_valid(struct domain *d, + uint64_t value, uint64_t efer_validbits) { - unsigned int ext1_ecx = 0, ext1_edx = 0; + if ( nestedhvm_enabled(d) && cpu_has_svm ) + efer_validbits |= EFER_SVME; - if ( cr0_pg < 0 && !is_hardware_domain(v->domain) ) - { - unsigned int level; - - ASSERT(v == current); - hvm_cpuid(0x80000000, &level, NULL, NULL, NULL); - if ( level >= 0x80000001 ) - hvm_cpuid(0x80000001, NULL, NULL, &ext1_ecx, &ext1_edx); - } - else - { - ext1_edx = boot_cpu_data.x86_capability[X86_FEATURE_LM / 32]; - ext1_ecx = boot_cpu_data.x86_capability[X86_FEATURE_SVM / 32]; - } - - if ( (value & EFER_SCE) && - !(ext1_edx & cpufeat_mask(X86_FEATURE_SYSCALL)) ) - return 0; - - if ( (value & (EFER_LME | EFER_LMA)) && - !(ext1_edx & cpufeat_mask(X86_FEATURE_LM)) ) - return 0; - - if ( cr0_pg > 0 && (value & EFER_LMA) && (!(value & EFER_LME) || !cr0_pg) ) - return 0; - - if ( (value & EFER_NX) && !(ext1_edx & cpufeat_mask(X86_FEATURE_NX)) ) - return 0; - - if ( (value & EFER_SVME) && - (!(ext1_ecx & cpufeat_mask(X86_FEATURE_SVM)) || - !nestedhvm_enabled(v->domain)) ) - return 0; - - if ( (value & EFER_LMSLE) && !cpu_has_lmsl ) - return 0; - - if ( (value & EFER_FFXSE) && - !(ext1_edx & cpufeat_mask(X86_FEATURE_FFXSR)) ) - return 0; - - return 1; + return !((value & ~efer_validbits) || + ((sizeof(long) != 8) && (value & EFER_LME)) || + (!cpu_has_svm && (value & EFER_SVME)) || + (!cpu_has_nx && (value & EFER_NX)) || + (!cpu_has_syscall && (value & EFER_SCE)) || + (!cpu_has_lmsl && (value & EFER_LMSLE)) || + (!cpu_has_ffxsr && (value & EFER_FFXSE)) || + ((value & (EFER_LME|EFER_LMA)) == EFER_LMA)); } /* These reserved bits in lower 32 remain 0 after any load of CR0 */ @@ -1796,6 +1763,7 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) struct vcpu *v; struct hvm_hw_cpu ctxt; struct segment_register seg; + uint64_t efer_validbits; /* Which vcpu is this? */ vcpuid = hvm_load_instance(h); @@ -1826,7 +1794,9 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) return -EINVAL; } - if ( !hvm_efer_valid(v, ctxt.msr_efer, MASK_EXTR(ctxt.cr0, X86_CR0_PG)) ) + efer_validbits = EFER_FFXSE | EFER_LMSLE | EFER_LME | EFER_LMA + | EFER_NX | EFER_SCE; + if ( !hvm_efer_valid(d, ctxt.msr_efer, efer_validbits) ) { printk(XENLOG_G_ERR "HVM%d restore: bad EFER %#" PRIx64 "\n", d->domain_id, ctxt.msr_efer); @@ -2966,10 +2936,12 @@ err: int hvm_set_efer(uint64_t value) { struct vcpu *v = current; + uint64_t efer_validbits; value &= ~EFER_LMA; - if ( !hvm_efer_valid(v, value, -1) ) + efer_validbits = EFER_FFXSE | EFER_LMSLE | EFER_LME | EFER_NX | EFER_SCE; + if ( !hvm_efer_valid(v->domain, value, efer_validbits) ) { gdprintk(XENLOG_WARNING, "Trying to set reserved bit in " "EFER: %#"PRIx64"\n", value); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:08:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:08: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 1YCx5G-00027u-C2; Sun, 18 Jan 2015 21:08:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5F-00027i-3G for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:33 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 6B/AD-02760-0D02CB45; Sun, 18 Jan 2015 21:08:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1421615310!16628549!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29705 invoked from network); 18 Jan 2015 21:08:31 -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; 18 Jan 2015 21:08:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5C-0001H5-Lp for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx5C-0004RR-Jq for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:30 +0000 Date: Sun, 18 Jan 2015 21:08:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "x86/HVM: make hvm_efer_valid() honor guest features" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6af4e1db6c91ba79789ee0e0d363f90ef5b2370 Author: Jan Beulich AuthorDate: Wed Jan 14 11:53:28 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 14 11:53:28 2015 +0100 Revert "x86/HVM: make hvm_efer_valid() honor guest features" This reverts commit 07a6aa869bae0699d2f7e1b75d188229eb70c9e4. Some HVM guests don't survive the new checking (EFER=0x901 reported invalid). --- xen/arch/x86/hvm/hvm.c | 66 ++++++++++++++---------------------------------- 1 files changed, 19 insertions(+), 47 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 82ee7e8..8b06bfd 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1672,53 +1672,20 @@ static int hvm_save_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) return 0; } -static bool_t hvm_efer_valid(const struct vcpu *v, uint64_t value, - signed int cr0_pg) +static bool_t hvm_efer_valid(struct domain *d, + uint64_t value, uint64_t efer_validbits) { - unsigned int ext1_ecx = 0, ext1_edx = 0; + if ( nestedhvm_enabled(d) && cpu_has_svm ) + efer_validbits |= EFER_SVME; - if ( cr0_pg < 0 && !is_hardware_domain(v->domain) ) - { - unsigned int level; - - ASSERT(v == current); - hvm_cpuid(0x80000000, &level, NULL, NULL, NULL); - if ( level >= 0x80000001 ) - hvm_cpuid(0x80000001, NULL, NULL, &ext1_ecx, &ext1_edx); - } - else - { - ext1_edx = boot_cpu_data.x86_capability[X86_FEATURE_LM / 32]; - ext1_ecx = boot_cpu_data.x86_capability[X86_FEATURE_SVM / 32]; - } - - if ( (value & EFER_SCE) && - !(ext1_edx & cpufeat_mask(X86_FEATURE_SYSCALL)) ) - return 0; - - if ( (value & (EFER_LME | EFER_LMA)) && - !(ext1_edx & cpufeat_mask(X86_FEATURE_LM)) ) - return 0; - - if ( cr0_pg > 0 && (value & EFER_LMA) && (!(value & EFER_LME) || !cr0_pg) ) - return 0; - - if ( (value & EFER_NX) && !(ext1_edx & cpufeat_mask(X86_FEATURE_NX)) ) - return 0; - - if ( (value & EFER_SVME) && - (!(ext1_ecx & cpufeat_mask(X86_FEATURE_SVM)) || - !nestedhvm_enabled(v->domain)) ) - return 0; - - if ( (value & EFER_LMSLE) && !cpu_has_lmsl ) - return 0; - - if ( (value & EFER_FFXSE) && - !(ext1_edx & cpufeat_mask(X86_FEATURE_FFXSR)) ) - return 0; - - return 1; + return !((value & ~efer_validbits) || + ((sizeof(long) != 8) && (value & EFER_LME)) || + (!cpu_has_svm && (value & EFER_SVME)) || + (!cpu_has_nx && (value & EFER_NX)) || + (!cpu_has_syscall && (value & EFER_SCE)) || + (!cpu_has_lmsl && (value & EFER_LMSLE)) || + (!cpu_has_ffxsr && (value & EFER_FFXSE)) || + ((value & (EFER_LME|EFER_LMA)) == EFER_LMA)); } /* These reserved bits in lower 32 remain 0 after any load of CR0 */ @@ -1796,6 +1763,7 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) struct vcpu *v; struct hvm_hw_cpu ctxt; struct segment_register seg; + uint64_t efer_validbits; /* Which vcpu is this? */ vcpuid = hvm_load_instance(h); @@ -1826,7 +1794,9 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) return -EINVAL; } - if ( !hvm_efer_valid(v, ctxt.msr_efer, MASK_EXTR(ctxt.cr0, X86_CR0_PG)) ) + efer_validbits = EFER_FFXSE | EFER_LMSLE | EFER_LME | EFER_LMA + | EFER_NX | EFER_SCE; + if ( !hvm_efer_valid(d, ctxt.msr_efer, efer_validbits) ) { printk(XENLOG_G_ERR "HVM%d restore: bad EFER %#" PRIx64 "\n", d->domain_id, ctxt.msr_efer); @@ -2966,10 +2936,12 @@ err: int hvm_set_efer(uint64_t value) { struct vcpu *v = current; + uint64_t efer_validbits; value &= ~EFER_LMA; - if ( !hvm_efer_valid(v, value, -1) ) + efer_validbits = EFER_FFXSE | EFER_LMSLE | EFER_LME | EFER_NX | EFER_SCE; + if ( !hvm_efer_valid(v->domain, value, efer_validbits) ) { gdprintk(XENLOG_WARNING, "Trying to set reserved bit in " "EFER: %#"PRIx64"\n", value); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:08:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:08: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 1YCx5R-00029T-FP; Sun, 18 Jan 2015 21:08:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5P-000297-Cs for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:43 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id A6/04-07724-AD02CB45; Sun, 18 Jan 2015 21:08:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1421615321!20458176!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10769 invoked from network); 18 Jan 2015 21:08:42 -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 Jan 2015 21:08:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5M-0001HB-R8 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx5M-0004Rq-Px for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:40 +0000 Date: Sun, 18 Jan 2015 21:08:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Remove the define INVALID_GFN from arch-arm/grant_table.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 f23952fbe4b84435aaa68d22cff300e3660f3aca Author: Julien Grall AuthorDate: Tue Jan 13 18:17:20 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 15 13:44:41 2015 +0000 xen/arm: Remove the define INVALID_GFN from arch-arm/grant_table.h The define INVALID_GFN is misplaced in arch-arm/grant_table.h and is never used in neither in ARM nor in the common code. Therefore we can safely remove it. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/grant_table.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/grant_table.h b/xen/include/asm-arm/grant_table.h index 0edad67..88ee3c6 100644 --- a/xen/include/asm-arm/grant_table.h +++ b/xen/include/asm-arm/grant_table.h @@ -3,7 +3,6 @@ #include -#define INVALID_GFN (-1UL) #define INITIAL_NR_GRANT_FRAMES 1 void gnttab_clear_flag(unsigned long nr, uint16_t *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 Sun Jan 18 21:08:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:08: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 1YCx5R-00029T-FP; Sun, 18 Jan 2015 21:08:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5P-000297-Cs for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:43 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id A6/04-07724-AD02CB45; Sun, 18 Jan 2015 21:08:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1421615321!20458176!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10769 invoked from network); 18 Jan 2015 21:08:42 -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 Jan 2015 21:08:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5M-0001HB-R8 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx5M-0004Rq-Px for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:40 +0000 Date: Sun, 18 Jan 2015 21:08:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Remove the define INVALID_GFN from arch-arm/grant_table.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 f23952fbe4b84435aaa68d22cff300e3660f3aca Author: Julien Grall AuthorDate: Tue Jan 13 18:17:20 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 15 13:44:41 2015 +0000 xen/arm: Remove the define INVALID_GFN from arch-arm/grant_table.h The define INVALID_GFN is misplaced in arch-arm/grant_table.h and is never used in neither in ARM nor in the common code. Therefore we can safely remove it. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/grant_table.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/grant_table.h b/xen/include/asm-arm/grant_table.h index 0edad67..88ee3c6 100644 --- a/xen/include/asm-arm/grant_table.h +++ b/xen/include/asm-arm/grant_table.h @@ -3,7 +3,6 @@ #include -#define INVALID_GFN (-1UL) #define INITIAL_NR_GRANT_FRAMES 1 void gnttab_clear_flag(unsigned long nr, uint16_t *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 Sun Jan 18 21:08:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:08: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 1YCx5c-0002At-Ia; Sun, 18 Jan 2015 21:08:56 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5Z-0002Ad-N6 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:54 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 02/75-24859-4E02CB45; Sun, 18 Jan 2015 21:08:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1421615331!20504856!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26592 invoked from network); 18 Jan 2015 21:08:52 -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; 18 Jan 2015 21:08:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5X-0001HR-1B for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx5W-0004Sy-VP for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:51 +0000 Date: Sun, 18 Jan 2015 21:08:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: grant-table: Increased the initial number of grant frame to 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 ee0941e83c31528da06d62a9cabb9b6fef1d2617 Author: Julien Grall AuthorDate: Tue Jan 13 18:17:21 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 15 13:44:41 2015 +0000 xen/arm: grant-table: Increased the initial number of grant frame to 4 When a domain is created on ARM, the grant table code initialized one grant frame. With a basic load (i.e disk usage), Xen is quickly trying to expand the number of frames: (XEN) grant_table.c:1305:d2v0 Expanding dom (2) grant table from (1) to (2) frames. (XEN) grant_table.c:1305:d2v0 Expanding dom (2) grant table from (2) to (3) frames. (XEN) grant_table.c:311:d0v0 Increased maptrack size to 2 frames (XEN) grant_table.c:311:d0v0 Increased maptrack size to 3 frames The x86 code is initialied 4 frames (I didn't find the exact reason). I think we could use the same default value. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/grant_table.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/grant_table.h b/xen/include/asm-arm/grant_table.h index 88ee3c6..5e076cc 100644 --- a/xen/include/asm-arm/grant_table.h +++ b/xen/include/asm-arm/grant_table.h @@ -3,7 +3,7 @@ #include -#define INITIAL_NR_GRANT_FRAMES 1 +#define INITIAL_NR_GRANT_FRAMES 4 void gnttab_clear_flag(unsigned long nr, uint16_t *addr); int create_grant_host_mapping(unsigned long gpaddr, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:08:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:08: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 1YCx5c-0002At-Ia; Sun, 18 Jan 2015 21:08:56 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5Z-0002Ad-N6 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:54 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 02/75-24859-4E02CB45; Sun, 18 Jan 2015 21:08:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1421615331!20504856!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26592 invoked from network); 18 Jan 2015 21:08:52 -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; 18 Jan 2015 21:08:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5X-0001HR-1B for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx5W-0004Sy-VP for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:08:51 +0000 Date: Sun, 18 Jan 2015 21:08:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: grant-table: Increased the initial number of grant frame to 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 ee0941e83c31528da06d62a9cabb9b6fef1d2617 Author: Julien Grall AuthorDate: Tue Jan 13 18:17:21 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 15 13:44:41 2015 +0000 xen/arm: grant-table: Increased the initial number of grant frame to 4 When a domain is created on ARM, the grant table code initialized one grant frame. With a basic load (i.e disk usage), Xen is quickly trying to expand the number of frames: (XEN) grant_table.c:1305:d2v0 Expanding dom (2) grant table from (1) to (2) frames. (XEN) grant_table.c:1305:d2v0 Expanding dom (2) grant table from (2) to (3) frames. (XEN) grant_table.c:311:d0v0 Increased maptrack size to 2 frames (XEN) grant_table.c:311:d0v0 Increased maptrack size to 3 frames The x86 code is initialied 4 frames (I didn't find the exact reason). I think we could use the same default value. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/grant_table.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/grant_table.h b/xen/include/asm-arm/grant_table.h index 88ee3c6..5e076cc 100644 --- a/xen/include/asm-arm/grant_table.h +++ b/xen/include/asm-arm/grant_table.h @@ -3,7 +3,7 @@ #include -#define INITIAL_NR_GRANT_FRAMES 1 +#define INITIAL_NR_GRANT_FRAMES 4 void gnttab_clear_flag(unsigned long nr, uint16_t *addr); int create_grant_host_mapping(unsigned long gpaddr, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:09:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:09: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 1YCx5k-0002CV-NR; Sun, 18 Jan 2015 21:09:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5j-0002CM-To for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:04 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id BB/0E-16982-FE02CB45; Sun, 18 Jan 2015 21:09:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1421615341!20493110!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18838 invoked from network); 18 Jan 2015 21:09:02 -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 Jan 2015 21:09:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5h-0001Ha-AA for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx5h-0004TL-5N for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:01 +0000 Date: Sun, 18 Jan 2015 21:09:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Blacklist the memory mapped timer (armv7-timer-mem) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 770ca104b5bb4dd3fee4071e2d8f1133f3c6d134 Author: Julien Grall AuthorDate: Wed Jan 14 18:00:43 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 15 13:49:17 2015 +0000 xen/arm: Blacklist the memory mapped timer (armv7-timer-mem) Some platform (such as the VFP Base AEMv8 model) has a memory mapped timer. We don't want DOM0 use this timer rather than the generic ARM timer. So blacklist it for all platforms. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index c33a73c..c2dcb49 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1031,6 +1031,8 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("arm,psci"), DT_MATCH_PATH("/cpus"), DT_MATCH_TYPE("memory"), + /* The memory mapped timer is not supported by Xen. */ + DT_MATCH_COMPATIBLE("arm,armv7-timer-mem"), { /* sentinel */ }, }; static const struct dt_device_match gic_matches[] __initconst = -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:09:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:09: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 1YCx5k-0002CV-NR; Sun, 18 Jan 2015 21:09:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5j-0002CM-To for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:04 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id BB/0E-16982-FE02CB45; Sun, 18 Jan 2015 21:09:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1421615341!20493110!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18838 invoked from network); 18 Jan 2015 21:09:02 -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 Jan 2015 21:09:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5h-0001Ha-AA for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx5h-0004TL-5N for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:01 +0000 Date: Sun, 18 Jan 2015 21:09:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Blacklist the memory mapped timer (armv7-timer-mem) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 770ca104b5bb4dd3fee4071e2d8f1133f3c6d134 Author: Julien Grall AuthorDate: Wed Jan 14 18:00:43 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 15 13:49:17 2015 +0000 xen/arm: Blacklist the memory mapped timer (armv7-timer-mem) Some platform (such as the VFP Base AEMv8 model) has a memory mapped timer. We don't want DOM0 use this timer rather than the generic ARM timer. So blacklist it for all platforms. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index c33a73c..c2dcb49 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1031,6 +1031,8 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("arm,psci"), DT_MATCH_PATH("/cpus"), DT_MATCH_TYPE("memory"), + /* The memory mapped timer is not supported by Xen. */ + DT_MATCH_COMPATIBLE("arm,armv7-timer-mem"), { /* sentinel */ }, }; static const struct dt_device_match gic_matches[] __initconst = -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:09:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:09: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 1YCx5v-0002EA-RR; Sun, 18 Jan 2015 21:09:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5v-0002E1-4H for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:15 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 72/35-09842-AF02CB45; Sun, 18 Jan 2015 21:09:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1421615351!14944712!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15663 invoked from network); 18 Jan 2015 21:09:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:09:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5r-0001I9-I5 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx5r-0004Tt-Ff for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:11 +0000 Date: Sun, 18 Jan 2015 21:09:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: enable perf 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 f62b0ef8feae62c9b83b43bb3714c58d9d5dbacd Author: Ian Campbell AuthorDate: Wed Jan 14 16:16:50 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 15 13:51:57 2015 +0000 xen: arm: enable perf counters As well as the existing common perf counters add a bunch of ARM specifics, including the various trap types, vuart/vgic/vtimer accesses and different types of interrupt. Adjust the common code so that the columns line up again, not sure when/where this went wrong. This is mostly the set of stuff I happened to be interested in, it can be made more (or less) fine grained as the need arises. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/gic.c | 3 + xen/arch/arm/irq.c | 10 ++++- xen/arch/arm/time.c | 4 ++ xen/arch/arm/traps.c | 35 ++++++++++++++++- xen/arch/arm/vgic-v2.c | 4 ++ xen/arch/arm/vgic-v3.c | 13 ++++++ xen/arch/arm/vgic.c | 9 ++++ xen/arch/arm/vtimer.c | 22 ++++++++++ xen/arch/arm/vuart.c | 5 ++ xen/common/perfc.c | 4 +- xen/include/asm-arm/config.h | 2 + xen/include/asm-arm/perfc.h | 21 ++++++++++ xen/include/asm-arm/perfc_defn.h | 82 ++++++++++++++++++++++++++++++++++++++ 13 files changed, 210 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index e7a1af5..390c8b0 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -536,6 +536,8 @@ static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) /* Lower the priority */ struct irq_desc *desc = irq_to_desc(sgi); + perfc_incr(ipis); + /* Lower the priority */ gic_hw_ops->eoi_irq(desc); @@ -604,6 +606,7 @@ static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs *r * GICH_HCR_UIE is cleared before reading GICC_IAR. As a consequence * this handler is not called. */ + perfc_incr(maintenance_irqs); } void gic_dump_info(struct vcpu *v) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 25ecf1d..cb9c99b 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -179,7 +179,14 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) { struct irq_desc *desc = irq_to_desc(irq); - /* TODO: perfc_incr(irqs); */ + perfc_incr(irqs); + + ASSERT(irq >= 16); /* SGIs do not come down this path */ + + if (irq < 32) + perfc_incr(ppis); + else + perfc_incr(spis); /* TODO: this_cpu(irq_count)++; */ @@ -199,6 +206,7 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) { struct domain *d = irq_get_domain(desc); + perfc_incr(guest_irqs); desc->handler->end(desc); set_bit(_IRQ_INPROGRESS, &desc->status); diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 0add494..455f217 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -151,6 +151,7 @@ static void timer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) if ( irq == (timer_irq[TIMER_HYP_PPI]) && READ_SYSREG32(CNTHP_CTL_EL2) & CNTx_CTL_PENDING ) { + perfc_incr(hyp_timer_irqs); /* Signal the generic timer code to do its work */ raise_softirq(TIMER_SOFTIRQ); /* Disable the timer to avoid more interrupts */ @@ -160,6 +161,7 @@ static void timer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) if ( irq == (timer_irq[TIMER_PHYS_NONSECURE_PPI]) && READ_SYSREG32(CNTP_CTL_EL0) & CNTx_CTL_PENDING ) { + perfc_incr(phys_timer_irqs); /* Signal the generic timer code to do its work */ raise_softirq(TIMER_SOFTIRQ); /* Disable the timer to avoid more interrupts */ @@ -182,6 +184,8 @@ static void vtimer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) if ( unlikely(is_idle_vcpu(current)) ) return; + perfc_incr(virt_timer_irqs); + current->arch.virt_timer.ctl = READ_SYSREG32(CNTV_CTL_EL0); WRITE_SYSREG32(current->arch.virt_timer.ctl | CNTx_CTL_MASK, CNTV_CTL_EL0); vgic_vcpu_inject_irq(current, current->arch.virt_timer.irq); diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 4c93250..ad046e8 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -1240,6 +1241,7 @@ static void do_trap_psci(struct cpu_user_regs *regs) case PSCI_cpu_off: { uint32_t pstate = PSCI_ARG32(regs,1); + perfc_incr(vpsci_cpu_off); PSCI_RESULT_REG(regs) = do_psci_cpu_off(pstate); } break; @@ -1247,33 +1249,41 @@ static void do_trap_psci(struct cpu_user_regs *regs) { uint32_t vcpuid = PSCI_ARG32(regs,1); register_t epoint = PSCI_ARG(regs,2); + perfc_incr(vpsci_cpu_on); PSCI_RESULT_REG(regs) = do_psci_cpu_on(vcpuid, epoint); } break; case PSCI_0_2_FN_PSCI_VERSION: + perfc_incr(vpsci_version); PSCI_RESULT_REG(regs) = do_psci_0_2_version(); break; case PSCI_0_2_FN_CPU_OFF: + perfc_incr(vpsci_cpu_off); PSCI_RESULT_REG(regs) = do_psci_0_2_cpu_off(); break; case PSCI_0_2_FN_MIGRATE_INFO_TYPE: + perfc_incr(vpsci_migrate_info_type); PSCI_RESULT_REG(regs) = do_psci_0_2_migrate_info_type(); break; case PSCI_0_2_FN_MIGRATE_INFO_UP_CPU: case PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU: + perfc_incr(vpsci_migrate_info_up_cpu); if ( psci_mode_check(current->domain, fid) ) PSCI_RESULT_REG(regs) = do_psci_0_2_migrate_info_up_cpu(); break; case PSCI_0_2_FN_SYSTEM_OFF: + perfc_incr(vpsci_system_off); do_psci_0_2_system_off(); PSCI_RESULT_REG(regs) = PSCI_INTERNAL_FAILURE; break; case PSCI_0_2_FN_SYSTEM_RESET: + perfc_incr(vpsci_system_reset); do_psci_0_2_system_reset(); PSCI_RESULT_REG(regs) = PSCI_INTERNAL_FAILURE; break; case PSCI_0_2_FN_CPU_ON: case PSCI_0_2_FN64_CPU_ON: + perfc_incr(vpsci_cpu_on); if ( psci_mode_check(current->domain, fid) ) { register_t vcpuid = PSCI_ARG(regs,1); @@ -1285,6 +1295,7 @@ static void do_trap_psci(struct cpu_user_regs *regs) break; case PSCI_0_2_FN_CPU_SUSPEND: case PSCI_0_2_FN64_CPU_SUSPEND: + perfc_incr(vpsci_cpu_suspend); if ( psci_mode_check(current->domain, fid) ) { uint32_t pstate = PSCI_ARG32(regs,1); @@ -1296,6 +1307,7 @@ static void do_trap_psci(struct cpu_user_regs *regs) break; case PSCI_0_2_FN_AFFINITY_INFO: case PSCI_0_2_FN64_AFFINITY_INFO: + perfc_incr(vpsci_cpu_affinity_info); if ( psci_mode_check(current->domain, fid) ) { register_t taff = PSCI_ARG(regs,1); @@ -1306,6 +1318,7 @@ static void do_trap_psci(struct cpu_user_regs *regs) break; case PSCI_0_2_FN_MIGRATE: case PSCI_0_2_FN64_MIGRATE: + perfc_incr(vpsci_cpu_migrate); if ( psci_mode_check(current->domain, fid) ) { uint32_t tcpu = PSCI_ARG32(regs,1); @@ -1344,15 +1357,19 @@ static void do_trap_hypercall(struct cpu_user_regs *regs, register_t *nr, register_t orig_pc = regs->pc; #endif + BUILD_BUG_ON(NR_hypercalls < ARRAY_SIZE(arm_hypercall_table) ); + if ( iss != XEN_HYPERCALL_TAG ) domain_crash_synchronous(); if ( *nr >= ARRAY_SIZE(arm_hypercall_table) ) { + perfc_incr(invalid_hypercalls); HYPERCALL_RESULT_REG(regs) = -ENOSYS; return; } + perfc_incra(hypercalls, *nr); call = arm_hypercall_table[*nr].fn; if ( call == NULL ) { @@ -1492,8 +1509,10 @@ static int check_conditional_instr(struct cpu_user_regs *regs, union hsr hsr) cpsr_cond = cpsr >> 28; if ( !((cc_map[cond] >> cpsr_cond) & 1) ) + { + perfc_incr(trap_uncond); return 0; - + } return 1; } @@ -2034,9 +2053,11 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) } if ( hsr.wfi_wfe.ti ) { /* Yield the VCPU for WFE */ + perfc_incr(trap_wfe); vcpu_yield(); } else { /* Block the VCPU for WFI */ + perfc_incr(trap_wfi); vcpu_block_unless_event_pending(current); } advance_pc(regs, hsr); @@ -2044,32 +2065,39 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) case HSR_EC_CP15_32: if ( !is_32bit_domain(current->domain) ) goto bad_trap; + perfc_incr(trap_cp15_32); do_cp15_32(regs, hsr); break; case HSR_EC_CP15_64: if ( !is_32bit_domain(current->domain) ) goto bad_trap; + perfc_incr(trap_cp15_64); do_cp15_64(regs, hsr); break; case HSR_EC_CP14_32: if ( !is_32bit_domain(current->domain) ) goto bad_trap; + perfc_incr(trap_cp14_32); do_cp14_32(regs, hsr); break; case HSR_EC_CP14_DBG: if ( !is_32bit_domain(current->domain) ) goto bad_trap; + perfc_incr(trap_cp14_dbg); do_cp14_dbg(regs, hsr); break; case HSR_EC_CP: if ( !is_32bit_domain(current->domain) ) goto bad_trap; + perfc_incr(trap_cp); do_cp(regs, hsr); break; case HSR_EC_SMC32: + perfc_incr(trap_smc32); inject_undef32_exception(regs); break; case HSR_EC_HVC32: + perfc_incr(trap_hvc32); #ifndef NDEBUG if ( (hsr.iss & 0xff00) == 0xff00 ) return do_debug_trap(regs, hsr.iss & 0x00ff); @@ -2080,6 +2108,7 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) break; #ifdef CONFIG_ARM_64 case HSR_EC_HVC64: + perfc_incr(trap_hvc64); #ifndef NDEBUG if ( (hsr.iss & 0xff00) == 0xff00 ) return do_debug_trap(regs, hsr.iss & 0x00ff); @@ -2089,19 +2118,23 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) do_trap_hypercall(regs, ®s->x16, hsr.iss); break; case HSR_EC_SMC64: + perfc_incr(trap_smc64); inject_undef64_exception(regs, hsr.len); break; case HSR_EC_SYSREG: if ( is_32bit_domain(current->domain) ) goto bad_trap; + perfc_incr(trap_sysreg); do_sysreg(regs, hsr); break; #endif case HSR_EC_INSTR_ABORT_LOWER_EL: + perfc_incr(trap_iabt); do_trap_instr_abort_guest(regs, hsr); break; case HSR_EC_DATA_ABORT_LOWER_EL: + perfc_incr(trap_dabt); do_trap_data_abort_guest(regs, hsr); break; diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 1369f78..4dc2267 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -41,6 +41,8 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); unsigned long flags; + perfc_incr(vgicd_reads); + switch ( gicd_reg ) { case GICD_CTLR: @@ -271,6 +273,8 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) uint32_t tr; unsigned long flags; + perfc_incr(vgicd_writes); + switch ( gicd_reg ) { case GICD_CTLR: diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index ff99e50..c738ca9 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -605,6 +605,8 @@ static int vgic_v3_rdistr_mmio_read(struct vcpu *v, mmio_info_t *info) { uint32_t offset; + perfc_incr(vgicr_reads); + if ( v->domain->arch.vgic.rdist_stride != 0 ) offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); else @@ -627,6 +629,8 @@ static int vgic_v3_rdistr_mmio_write(struct vcpu *v, mmio_info_t *info) { uint32_t offset; + perfc_incr(vgicr_writes); + if ( v->domain->arch.vgic.rdist_stride != 0 ) offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); else @@ -656,6 +660,8 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) unsigned int vcpu_id; int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); + perfc_incr(vgicd_reads); + switch ( gicd_reg ) { case GICD_CTLR: @@ -801,6 +807,8 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) struct vcpu *old_vcpu, *new_vcpu; int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); + perfc_incr(vgicd_writes); + switch ( gicd_reg ) { case GICD_CTLR: @@ -980,6 +988,11 @@ static int vgic_v3_emulate_sysreg(struct cpu_user_regs *regs, union hsr hsr) ASSERT (hsr.ec == HSR_EC_SYSREG); + if ( sysreg.read ) + perfc_incr(vgic_sysreg_reads); + else + perfc_incr(vgic_sysreg_writes); + switch ( hsr.bits & HSR_SYSREG_REGS_MASK ) { case HSR_SYSREG_ICC_SGI1R_EL1: diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index b8bd38b..8938a69 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -24,6 +24,7 @@ #include #include #include +#include #include @@ -185,6 +186,8 @@ void vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq) if ( test_bit(GIC_IRQ_GUEST_MIGRATING, &p->status) ) return; + perfc_incr(vgic_irq_migrates); + spin_lock_irqsave(&old->arch.vgic.lock, flags); if ( list_empty(&p->inflight) ) @@ -301,12 +304,14 @@ int vgic_to_sgi(struct vcpu *v, register_t sgir, enum gic_sgi_mode irqmode, int switch ( irqmode ) { case SGI_TARGET_LIST: + perfc_incr(vgic_sgi_list); break; case SGI_TARGET_OTHERS: /* * We expect vcpu_mask to be 0 for SGI_TARGET_OTHERS and * SGI_TARGET_SELF mode. So Force vcpu_mask to 0 */ + perfc_incr(vgic_sgi_others); vcpu_mask = 0; for ( i = 0; i < d->max_vcpus; i++ ) { @@ -320,6 +325,7 @@ int vgic_to_sgi(struct vcpu *v, register_t sgir, enum gic_sgi_mode irqmode, int * We expect vcpu_mask to be 0 for SGI_TARGET_OTHERS and * SGI_TARGET_SELF mode. So Force vcpu_mask to 0 */ + perfc_incr(vgic_sgi_self); vcpu_mask = 0; set_bit(current->vcpu_id, &vcpu_mask); break; @@ -418,7 +424,10 @@ out: running = v->is_running; vcpu_unblock(v); if ( running && v != current ) + { + perfc_incr(vgic_cross_cpu_intr_inject); smp_send_event_check_mask(cpumask_of(v->processor)); + } } void vgic_vcpu_inject_spi(struct domain *d, unsigned int irq) diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index 2e95ceb..848e2c6 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -35,7 +36,12 @@ static void phys_timer_expired(void *data) struct vtimer *t = data; t->ctl |= CNTx_CTL_PENDING; if ( !(t->ctl & CNTx_CTL_MASK) ) + { + perfc_incr(vtimer_phys_inject); vgic_vcpu_inject_irq(t->v, t->irq); + } + else + perfc_incr(vtimer_phys_masked); } static void virt_timer_expired(void *data) @@ -43,6 +49,7 @@ static void virt_timer_expired(void *data) struct vtimer *t = data; t->ctl |= CNTx_CTL_MASK; vgic_vcpu_inject_irq(t->v, t->irq); + perfc_incr(vtimer_virt_inject); } int domain_vtimer_init(struct domain *d) @@ -196,6 +203,11 @@ static int vtimer_emulate_cp32(struct cpu_user_regs *regs, union hsr hsr) struct hsr_cp32 cp32 = hsr.cp32; uint32_t *r = (uint32_t *)select_user_reg(regs, cp32.reg); + if ( cp32.read ) + perfc_incr(vtimer_cp32_reads); + else + perfc_incr(vtimer_cp32_writes); + switch ( hsr.bits & HSR_CP32_REGS_MASK ) { case HSR_CPREG32(CNTP_CTL): @@ -218,6 +230,11 @@ static int vtimer_emulate_cp64(struct cpu_user_regs *regs, union hsr hsr) uint32_t *r2 = (uint32_t *)select_user_reg(regs, cp64.reg2); uint64_t x; + if ( cp64.read ) + perfc_incr(vtimer_cp64_reads); + else + perfc_incr(vtimer_cp64_writes); + switch ( hsr.bits & HSR_CP64_REGS_MASK ) { case HSR_CPREG64(CNTPCT): @@ -243,6 +260,11 @@ static int vtimer_emulate_sysreg(struct cpu_user_regs *regs, union hsr hsr) register_t *x = select_user_reg(regs, sysreg.reg); uint32_t r = (uint32_t)*x; + if ( sysreg.read ) + perfc_incr(vtimer_sysreg_reads); + else + perfc_incr(vtimer_sysreg_writes); + switch ( hsr.bits & HSR_SYSREG_REGS_MASK ) { case HSR_SYSREG_CNTP_CTL_EL0: diff --git a/xen/arch/arm/vuart.c b/xen/arch/arm/vuart.c index e327c15..d9f4249 100644 --- a/xen/arch/arm/vuart.c +++ b/xen/arch/arm/vuart.c @@ -39,6 +39,7 @@ #include #include #include +#include #include "vuart.h" @@ -112,6 +113,8 @@ static int vuart_mmio_read(struct vcpu *v, mmio_info_t *info) register_t *r = select_user_reg(regs, dabt.reg); paddr_t offset = info->gpa - d->arch.vuart.info->base_addr; + perfc_incr(vuart_reads); + /* By default zeroed the register */ *r = 0; @@ -130,6 +133,8 @@ static int vuart_mmio_write(struct vcpu *v, mmio_info_t *info) register_t *r = select_user_reg(regs, dabt.reg); paddr_t offset = info->gpa - d->arch.vuart.info->base_addr; + perfc_incr(vuart_writes); + if ( offset == d->arch.vuart.info->data_off ) /* ignore any status bits */ vuart_print_char(v, *r & 0xFF); diff --git a/xen/common/perfc.c b/xen/common/perfc.c index 96a4245..9f078e1 100644 --- a/xen/common/perfc.c +++ b/xen/common/perfc.c @@ -57,7 +57,7 @@ void perfc_printall(unsigned char key) for_each_online_cpu ( cpu ) { if ( k > 0 && (k % 4) == 0 ) - printk("\n%46s", ""); + printk("\n%53s", ""); printk(" CPU%02u[%10"PRIperfc"u]", cpu, per_cpu(perfcounters, cpu)[j]); ++k; } @@ -103,7 +103,7 @@ void perfc_printall(unsigned char key) if ( perfc_info[i].type == TYPE_S_ARRAY ) sum = (perfc_t) sum; if ( k > 0 && (k % 4) == 0 ) - printk("\n%46s", ""); + printk("\n%53s", ""); printk(" CPU%02u[%10Lu]", cpu, sum); ++k; } diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 9e165db..1b5a842 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -187,6 +187,8 @@ #define PAGE_MASK (~(PAGE_SIZE-1)) #define PAGE_FLAG_MASK (~0) +#define NR_hypercalls 64 + #define STACK_ORDER 3 #define STACK_SIZE (PAGE_SIZE << STACK_ORDER) diff --git a/xen/include/asm-arm/perfc.h b/xen/include/asm-arm/perfc.h new file mode 100644 index 0000000..95c4b2b --- /dev/null +++ b/xen/include/asm-arm/perfc.h @@ -0,0 +1,21 @@ +#ifndef __ASM_PERFC_H__ +#define __ASM_PERFC_H__ + +static inline void arch_perfc_reset(void) +{ +} + +static inline void arch_perfc_gather(void) +{ +} + +#endif + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/perfc_defn.h b/xen/include/asm-arm/perfc_defn.h new file mode 100644 index 0000000..46015f5 --- /dev/null +++ b/xen/include/asm-arm/perfc_defn.h @@ -0,0 +1,82 @@ +/* This file is legitimately included multiple times. */ +/*#ifndef __XEN_PERFC_DEFN_H__*/ +/*#define __XEN_PERFC_DEFN_H__*/ + +PERFCOUNTER(invalid_hypercalls, "invalid hypercalls") + +PERFCOUNTER(trap_wfi, "trap: wfi") +PERFCOUNTER(trap_wfe, "trap: wfe") +PERFCOUNTER(trap_cp15_32, "trap: cp15 32-bit access") +PERFCOUNTER(trap_cp15_64, "trap: cp15 64-bit access") +PERFCOUNTER(trap_cp14_32, "trap: cp14 32-bit access") +PERFCOUNTER(trap_cp14_dbg, "trap: cp14 dbg access") +PERFCOUNTER(trap_cp, "trap: cp access") +PERFCOUNTER(trap_smc32, "trap: 32-bit smc") +PERFCOUNTER(trap_hvc32, "trap: 32-bit hvc") +#ifdef CONFIG_ARM_64 +PERFCOUNTER(trap_smc64, "trap: 64-bit smc") +PERFCOUNTER(trap_hvc64, "trap: 64-bit hvc") +PERFCOUNTER(trap_sysreg, "trap: sysreg access") +#endif +PERFCOUNTER(trap_iabt, "trap: guest instr abort") +PERFCOUNTER(trap_dabt, "trap: guest data abort") +PERFCOUNTER(trap_uncond, "trap: condition failed") + +PERFCOUNTER(vpsci_cpu_on, "vpsci: cpu_on") +PERFCOUNTER(vpsci_cpu_off, "vpsci: cpu_off") +PERFCOUNTER(vpsci_version, "vpsci: version") +PERFCOUNTER(vpsci_migrate_info_type, "vpsci: migrate_info_type") +PERFCOUNTER(vpsci_migrate_info_up_cpu, "vpsci: migrate_info_up_cpu") +PERFCOUNTER(vpsci_system_off, "vpsci: system_off") +PERFCOUNTER(vpsci_system_reset, "vpsci: system_reset") +PERFCOUNTER(vpsci_cpu_suspend, "vpsci: cpu_suspend") +PERFCOUNTER(vpsci_cpu_affinity_info, "vpsci: cpu_affinity_info") +PERFCOUNTER(vpsci_cpu_migrate, "vpsci: cpu_migrate") + +PERFCOUNTER(vgicd_reads, "vgicd: read") +PERFCOUNTER(vgicd_writes, "vgicd: write") +PERFCOUNTER(vgicr_reads, "vgicr: read") +PERFCOUNTER(vgicr_writes, "vgicr: write") +PERFCOUNTER(vgic_sysreg_reads, "vgic: sysreg read") +PERFCOUNTER(vgic_sysreg_writes, "vgic: sysreg write") +PERFCOUNTER(vgic_sgi_list , "vgic: SGI send to list") +PERFCOUNTER(vgic_sgi_others, "vgic: SGI send to others") +PERFCOUNTER(vgic_sgi_self, "vgic: SGI send to self") +PERFCOUNTER(vgic_cross_cpu_intr_inject, "vgic: cross-CPU irq inject") +PERFCOUNTER(vgic_irq_migrates, "vgic: irq migration") + +PERFCOUNTER(vuart_reads, "vuart: read") +PERFCOUNTER(vuart_writes, "vuart: write") + +PERFCOUNTER(vtimer_cp32_reads, "vtimer: cp32 read") +PERFCOUNTER(vtimer_cp32_writes, "vtimer: cp32 write") + +PERFCOUNTER(vtimer_cp64_reads, "vtimer: cp64 read") +PERFCOUNTER(vtimer_cp64_writes, "vtimer: cp64 write") + +PERFCOUNTER(vtimer_sysreg_reads, "vtimer: sysreg read") +PERFCOUNTER(vtimer_sysreg_writes, "vtimer: sysreg write") + +PERFCOUNTER(vtimer_phys_inject, "vtimer: phys expired, injected") +PERFCOUNTER(vtimer_phys_masked, "vtimer: phys expired, masked") +PERFCOUNTER(vtimer_virt_inject, "vtimer: virt expired, injected") + +PERFCOUNTER(ppis, "#PPIs") +PERFCOUNTER(spis, "#SPIs") +PERFCOUNTER(guest_irqs, "#GUEST-IRQS") + +PERFCOUNTER(hyp_timer_irqs, "Hypervisor timer interrupts") +PERFCOUNTER(phys_timer_irqs, "Physical timer interrupts") +PERFCOUNTER(virt_timer_irqs, "Virtual timer interrupts") +PERFCOUNTER(maintenance_irqs, "Maintenance interrupts") + +/*#endif*/ /* __XEN_PERFC_DEFN_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 Sun Jan 18 21:09:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:09: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 1YCx5v-0002EA-RR; Sun, 18 Jan 2015 21:09:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5v-0002E1-4H for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:15 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 72/35-09842-AF02CB45; Sun, 18 Jan 2015 21:09:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1421615351!14944712!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15663 invoked from network); 18 Jan 2015 21:09:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:09:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx5r-0001I9-I5 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx5r-0004Tt-Ff for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:11 +0000 Date: Sun, 18 Jan 2015 21:09:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: enable perf 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 f62b0ef8feae62c9b83b43bb3714c58d9d5dbacd Author: Ian Campbell AuthorDate: Wed Jan 14 16:16:50 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 15 13:51:57 2015 +0000 xen: arm: enable perf counters As well as the existing common perf counters add a bunch of ARM specifics, including the various trap types, vuart/vgic/vtimer accesses and different types of interrupt. Adjust the common code so that the columns line up again, not sure when/where this went wrong. This is mostly the set of stuff I happened to be interested in, it can be made more (or less) fine grained as the need arises. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/gic.c | 3 + xen/arch/arm/irq.c | 10 ++++- xen/arch/arm/time.c | 4 ++ xen/arch/arm/traps.c | 35 ++++++++++++++++- xen/arch/arm/vgic-v2.c | 4 ++ xen/arch/arm/vgic-v3.c | 13 ++++++ xen/arch/arm/vgic.c | 9 ++++ xen/arch/arm/vtimer.c | 22 ++++++++++ xen/arch/arm/vuart.c | 5 ++ xen/common/perfc.c | 4 +- xen/include/asm-arm/config.h | 2 + xen/include/asm-arm/perfc.h | 21 ++++++++++ xen/include/asm-arm/perfc_defn.h | 82 ++++++++++++++++++++++++++++++++++++++ 13 files changed, 210 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index e7a1af5..390c8b0 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -536,6 +536,8 @@ static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) /* Lower the priority */ struct irq_desc *desc = irq_to_desc(sgi); + perfc_incr(ipis); + /* Lower the priority */ gic_hw_ops->eoi_irq(desc); @@ -604,6 +606,7 @@ static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs *r * GICH_HCR_UIE is cleared before reading GICC_IAR. As a consequence * this handler is not called. */ + perfc_incr(maintenance_irqs); } void gic_dump_info(struct vcpu *v) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 25ecf1d..cb9c99b 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -179,7 +179,14 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) { struct irq_desc *desc = irq_to_desc(irq); - /* TODO: perfc_incr(irqs); */ + perfc_incr(irqs); + + ASSERT(irq >= 16); /* SGIs do not come down this path */ + + if (irq < 32) + perfc_incr(ppis); + else + perfc_incr(spis); /* TODO: this_cpu(irq_count)++; */ @@ -199,6 +206,7 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) { struct domain *d = irq_get_domain(desc); + perfc_incr(guest_irqs); desc->handler->end(desc); set_bit(_IRQ_INPROGRESS, &desc->status); diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 0add494..455f217 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -151,6 +151,7 @@ static void timer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) if ( irq == (timer_irq[TIMER_HYP_PPI]) && READ_SYSREG32(CNTHP_CTL_EL2) & CNTx_CTL_PENDING ) { + perfc_incr(hyp_timer_irqs); /* Signal the generic timer code to do its work */ raise_softirq(TIMER_SOFTIRQ); /* Disable the timer to avoid more interrupts */ @@ -160,6 +161,7 @@ static void timer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) if ( irq == (timer_irq[TIMER_PHYS_NONSECURE_PPI]) && READ_SYSREG32(CNTP_CTL_EL0) & CNTx_CTL_PENDING ) { + perfc_incr(phys_timer_irqs); /* Signal the generic timer code to do its work */ raise_softirq(TIMER_SOFTIRQ); /* Disable the timer to avoid more interrupts */ @@ -182,6 +184,8 @@ static void vtimer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) if ( unlikely(is_idle_vcpu(current)) ) return; + perfc_incr(virt_timer_irqs); + current->arch.virt_timer.ctl = READ_SYSREG32(CNTV_CTL_EL0); WRITE_SYSREG32(current->arch.virt_timer.ctl | CNTx_CTL_MASK, CNTV_CTL_EL0); vgic_vcpu_inject_irq(current, current->arch.virt_timer.irq); diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 4c93250..ad046e8 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -1240,6 +1241,7 @@ static void do_trap_psci(struct cpu_user_regs *regs) case PSCI_cpu_off: { uint32_t pstate = PSCI_ARG32(regs,1); + perfc_incr(vpsci_cpu_off); PSCI_RESULT_REG(regs) = do_psci_cpu_off(pstate); } break; @@ -1247,33 +1249,41 @@ static void do_trap_psci(struct cpu_user_regs *regs) { uint32_t vcpuid = PSCI_ARG32(regs,1); register_t epoint = PSCI_ARG(regs,2); + perfc_incr(vpsci_cpu_on); PSCI_RESULT_REG(regs) = do_psci_cpu_on(vcpuid, epoint); } break; case PSCI_0_2_FN_PSCI_VERSION: + perfc_incr(vpsci_version); PSCI_RESULT_REG(regs) = do_psci_0_2_version(); break; case PSCI_0_2_FN_CPU_OFF: + perfc_incr(vpsci_cpu_off); PSCI_RESULT_REG(regs) = do_psci_0_2_cpu_off(); break; case PSCI_0_2_FN_MIGRATE_INFO_TYPE: + perfc_incr(vpsci_migrate_info_type); PSCI_RESULT_REG(regs) = do_psci_0_2_migrate_info_type(); break; case PSCI_0_2_FN_MIGRATE_INFO_UP_CPU: case PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU: + perfc_incr(vpsci_migrate_info_up_cpu); if ( psci_mode_check(current->domain, fid) ) PSCI_RESULT_REG(regs) = do_psci_0_2_migrate_info_up_cpu(); break; case PSCI_0_2_FN_SYSTEM_OFF: + perfc_incr(vpsci_system_off); do_psci_0_2_system_off(); PSCI_RESULT_REG(regs) = PSCI_INTERNAL_FAILURE; break; case PSCI_0_2_FN_SYSTEM_RESET: + perfc_incr(vpsci_system_reset); do_psci_0_2_system_reset(); PSCI_RESULT_REG(regs) = PSCI_INTERNAL_FAILURE; break; case PSCI_0_2_FN_CPU_ON: case PSCI_0_2_FN64_CPU_ON: + perfc_incr(vpsci_cpu_on); if ( psci_mode_check(current->domain, fid) ) { register_t vcpuid = PSCI_ARG(regs,1); @@ -1285,6 +1295,7 @@ static void do_trap_psci(struct cpu_user_regs *regs) break; case PSCI_0_2_FN_CPU_SUSPEND: case PSCI_0_2_FN64_CPU_SUSPEND: + perfc_incr(vpsci_cpu_suspend); if ( psci_mode_check(current->domain, fid) ) { uint32_t pstate = PSCI_ARG32(regs,1); @@ -1296,6 +1307,7 @@ static void do_trap_psci(struct cpu_user_regs *regs) break; case PSCI_0_2_FN_AFFINITY_INFO: case PSCI_0_2_FN64_AFFINITY_INFO: + perfc_incr(vpsci_cpu_affinity_info); if ( psci_mode_check(current->domain, fid) ) { register_t taff = PSCI_ARG(regs,1); @@ -1306,6 +1318,7 @@ static void do_trap_psci(struct cpu_user_regs *regs) break; case PSCI_0_2_FN_MIGRATE: case PSCI_0_2_FN64_MIGRATE: + perfc_incr(vpsci_cpu_migrate); if ( psci_mode_check(current->domain, fid) ) { uint32_t tcpu = PSCI_ARG32(regs,1); @@ -1344,15 +1357,19 @@ static void do_trap_hypercall(struct cpu_user_regs *regs, register_t *nr, register_t orig_pc = regs->pc; #endif + BUILD_BUG_ON(NR_hypercalls < ARRAY_SIZE(arm_hypercall_table) ); + if ( iss != XEN_HYPERCALL_TAG ) domain_crash_synchronous(); if ( *nr >= ARRAY_SIZE(arm_hypercall_table) ) { + perfc_incr(invalid_hypercalls); HYPERCALL_RESULT_REG(regs) = -ENOSYS; return; } + perfc_incra(hypercalls, *nr); call = arm_hypercall_table[*nr].fn; if ( call == NULL ) { @@ -1492,8 +1509,10 @@ static int check_conditional_instr(struct cpu_user_regs *regs, union hsr hsr) cpsr_cond = cpsr >> 28; if ( !((cc_map[cond] >> cpsr_cond) & 1) ) + { + perfc_incr(trap_uncond); return 0; - + } return 1; } @@ -2034,9 +2053,11 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) } if ( hsr.wfi_wfe.ti ) { /* Yield the VCPU for WFE */ + perfc_incr(trap_wfe); vcpu_yield(); } else { /* Block the VCPU for WFI */ + perfc_incr(trap_wfi); vcpu_block_unless_event_pending(current); } advance_pc(regs, hsr); @@ -2044,32 +2065,39 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) case HSR_EC_CP15_32: if ( !is_32bit_domain(current->domain) ) goto bad_trap; + perfc_incr(trap_cp15_32); do_cp15_32(regs, hsr); break; case HSR_EC_CP15_64: if ( !is_32bit_domain(current->domain) ) goto bad_trap; + perfc_incr(trap_cp15_64); do_cp15_64(regs, hsr); break; case HSR_EC_CP14_32: if ( !is_32bit_domain(current->domain) ) goto bad_trap; + perfc_incr(trap_cp14_32); do_cp14_32(regs, hsr); break; case HSR_EC_CP14_DBG: if ( !is_32bit_domain(current->domain) ) goto bad_trap; + perfc_incr(trap_cp14_dbg); do_cp14_dbg(regs, hsr); break; case HSR_EC_CP: if ( !is_32bit_domain(current->domain) ) goto bad_trap; + perfc_incr(trap_cp); do_cp(regs, hsr); break; case HSR_EC_SMC32: + perfc_incr(trap_smc32); inject_undef32_exception(regs); break; case HSR_EC_HVC32: + perfc_incr(trap_hvc32); #ifndef NDEBUG if ( (hsr.iss & 0xff00) == 0xff00 ) return do_debug_trap(regs, hsr.iss & 0x00ff); @@ -2080,6 +2108,7 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) break; #ifdef CONFIG_ARM_64 case HSR_EC_HVC64: + perfc_incr(trap_hvc64); #ifndef NDEBUG if ( (hsr.iss & 0xff00) == 0xff00 ) return do_debug_trap(regs, hsr.iss & 0x00ff); @@ -2089,19 +2118,23 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) do_trap_hypercall(regs, ®s->x16, hsr.iss); break; case HSR_EC_SMC64: + perfc_incr(trap_smc64); inject_undef64_exception(regs, hsr.len); break; case HSR_EC_SYSREG: if ( is_32bit_domain(current->domain) ) goto bad_trap; + perfc_incr(trap_sysreg); do_sysreg(regs, hsr); break; #endif case HSR_EC_INSTR_ABORT_LOWER_EL: + perfc_incr(trap_iabt); do_trap_instr_abort_guest(regs, hsr); break; case HSR_EC_DATA_ABORT_LOWER_EL: + perfc_incr(trap_dabt); do_trap_data_abort_guest(regs, hsr); break; diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 1369f78..4dc2267 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -41,6 +41,8 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); unsigned long flags; + perfc_incr(vgicd_reads); + switch ( gicd_reg ) { case GICD_CTLR: @@ -271,6 +273,8 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) uint32_t tr; unsigned long flags; + perfc_incr(vgicd_writes); + switch ( gicd_reg ) { case GICD_CTLR: diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index ff99e50..c738ca9 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -605,6 +605,8 @@ static int vgic_v3_rdistr_mmio_read(struct vcpu *v, mmio_info_t *info) { uint32_t offset; + perfc_incr(vgicr_reads); + if ( v->domain->arch.vgic.rdist_stride != 0 ) offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); else @@ -627,6 +629,8 @@ static int vgic_v3_rdistr_mmio_write(struct vcpu *v, mmio_info_t *info) { uint32_t offset; + perfc_incr(vgicr_writes); + if ( v->domain->arch.vgic.rdist_stride != 0 ) offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); else @@ -656,6 +660,8 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) unsigned int vcpu_id; int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); + perfc_incr(vgicd_reads); + switch ( gicd_reg ) { case GICD_CTLR: @@ -801,6 +807,8 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) struct vcpu *old_vcpu, *new_vcpu; int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); + perfc_incr(vgicd_writes); + switch ( gicd_reg ) { case GICD_CTLR: @@ -980,6 +988,11 @@ static int vgic_v3_emulate_sysreg(struct cpu_user_regs *regs, union hsr hsr) ASSERT (hsr.ec == HSR_EC_SYSREG); + if ( sysreg.read ) + perfc_incr(vgic_sysreg_reads); + else + perfc_incr(vgic_sysreg_writes); + switch ( hsr.bits & HSR_SYSREG_REGS_MASK ) { case HSR_SYSREG_ICC_SGI1R_EL1: diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index b8bd38b..8938a69 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -24,6 +24,7 @@ #include #include #include +#include #include @@ -185,6 +186,8 @@ void vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq) if ( test_bit(GIC_IRQ_GUEST_MIGRATING, &p->status) ) return; + perfc_incr(vgic_irq_migrates); + spin_lock_irqsave(&old->arch.vgic.lock, flags); if ( list_empty(&p->inflight) ) @@ -301,12 +304,14 @@ int vgic_to_sgi(struct vcpu *v, register_t sgir, enum gic_sgi_mode irqmode, int switch ( irqmode ) { case SGI_TARGET_LIST: + perfc_incr(vgic_sgi_list); break; case SGI_TARGET_OTHERS: /* * We expect vcpu_mask to be 0 for SGI_TARGET_OTHERS and * SGI_TARGET_SELF mode. So Force vcpu_mask to 0 */ + perfc_incr(vgic_sgi_others); vcpu_mask = 0; for ( i = 0; i < d->max_vcpus; i++ ) { @@ -320,6 +325,7 @@ int vgic_to_sgi(struct vcpu *v, register_t sgir, enum gic_sgi_mode irqmode, int * We expect vcpu_mask to be 0 for SGI_TARGET_OTHERS and * SGI_TARGET_SELF mode. So Force vcpu_mask to 0 */ + perfc_incr(vgic_sgi_self); vcpu_mask = 0; set_bit(current->vcpu_id, &vcpu_mask); break; @@ -418,7 +424,10 @@ out: running = v->is_running; vcpu_unblock(v); if ( running && v != current ) + { + perfc_incr(vgic_cross_cpu_intr_inject); smp_send_event_check_mask(cpumask_of(v->processor)); + } } void vgic_vcpu_inject_spi(struct domain *d, unsigned int irq) diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index 2e95ceb..848e2c6 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -35,7 +36,12 @@ static void phys_timer_expired(void *data) struct vtimer *t = data; t->ctl |= CNTx_CTL_PENDING; if ( !(t->ctl & CNTx_CTL_MASK) ) + { + perfc_incr(vtimer_phys_inject); vgic_vcpu_inject_irq(t->v, t->irq); + } + else + perfc_incr(vtimer_phys_masked); } static void virt_timer_expired(void *data) @@ -43,6 +49,7 @@ static void virt_timer_expired(void *data) struct vtimer *t = data; t->ctl |= CNTx_CTL_MASK; vgic_vcpu_inject_irq(t->v, t->irq); + perfc_incr(vtimer_virt_inject); } int domain_vtimer_init(struct domain *d) @@ -196,6 +203,11 @@ static int vtimer_emulate_cp32(struct cpu_user_regs *regs, union hsr hsr) struct hsr_cp32 cp32 = hsr.cp32; uint32_t *r = (uint32_t *)select_user_reg(regs, cp32.reg); + if ( cp32.read ) + perfc_incr(vtimer_cp32_reads); + else + perfc_incr(vtimer_cp32_writes); + switch ( hsr.bits & HSR_CP32_REGS_MASK ) { case HSR_CPREG32(CNTP_CTL): @@ -218,6 +230,11 @@ static int vtimer_emulate_cp64(struct cpu_user_regs *regs, union hsr hsr) uint32_t *r2 = (uint32_t *)select_user_reg(regs, cp64.reg2); uint64_t x; + if ( cp64.read ) + perfc_incr(vtimer_cp64_reads); + else + perfc_incr(vtimer_cp64_writes); + switch ( hsr.bits & HSR_CP64_REGS_MASK ) { case HSR_CPREG64(CNTPCT): @@ -243,6 +260,11 @@ static int vtimer_emulate_sysreg(struct cpu_user_regs *regs, union hsr hsr) register_t *x = select_user_reg(regs, sysreg.reg); uint32_t r = (uint32_t)*x; + if ( sysreg.read ) + perfc_incr(vtimer_sysreg_reads); + else + perfc_incr(vtimer_sysreg_writes); + switch ( hsr.bits & HSR_SYSREG_REGS_MASK ) { case HSR_SYSREG_CNTP_CTL_EL0: diff --git a/xen/arch/arm/vuart.c b/xen/arch/arm/vuart.c index e327c15..d9f4249 100644 --- a/xen/arch/arm/vuart.c +++ b/xen/arch/arm/vuart.c @@ -39,6 +39,7 @@ #include #include #include +#include #include "vuart.h" @@ -112,6 +113,8 @@ static int vuart_mmio_read(struct vcpu *v, mmio_info_t *info) register_t *r = select_user_reg(regs, dabt.reg); paddr_t offset = info->gpa - d->arch.vuart.info->base_addr; + perfc_incr(vuart_reads); + /* By default zeroed the register */ *r = 0; @@ -130,6 +133,8 @@ static int vuart_mmio_write(struct vcpu *v, mmio_info_t *info) register_t *r = select_user_reg(regs, dabt.reg); paddr_t offset = info->gpa - d->arch.vuart.info->base_addr; + perfc_incr(vuart_writes); + if ( offset == d->arch.vuart.info->data_off ) /* ignore any status bits */ vuart_print_char(v, *r & 0xFF); diff --git a/xen/common/perfc.c b/xen/common/perfc.c index 96a4245..9f078e1 100644 --- a/xen/common/perfc.c +++ b/xen/common/perfc.c @@ -57,7 +57,7 @@ void perfc_printall(unsigned char key) for_each_online_cpu ( cpu ) { if ( k > 0 && (k % 4) == 0 ) - printk("\n%46s", ""); + printk("\n%53s", ""); printk(" CPU%02u[%10"PRIperfc"u]", cpu, per_cpu(perfcounters, cpu)[j]); ++k; } @@ -103,7 +103,7 @@ void perfc_printall(unsigned char key) if ( perfc_info[i].type == TYPE_S_ARRAY ) sum = (perfc_t) sum; if ( k > 0 && (k % 4) == 0 ) - printk("\n%46s", ""); + printk("\n%53s", ""); printk(" CPU%02u[%10Lu]", cpu, sum); ++k; } diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 9e165db..1b5a842 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -187,6 +187,8 @@ #define PAGE_MASK (~(PAGE_SIZE-1)) #define PAGE_FLAG_MASK (~0) +#define NR_hypercalls 64 + #define STACK_ORDER 3 #define STACK_SIZE (PAGE_SIZE << STACK_ORDER) diff --git a/xen/include/asm-arm/perfc.h b/xen/include/asm-arm/perfc.h new file mode 100644 index 0000000..95c4b2b --- /dev/null +++ b/xen/include/asm-arm/perfc.h @@ -0,0 +1,21 @@ +#ifndef __ASM_PERFC_H__ +#define __ASM_PERFC_H__ + +static inline void arch_perfc_reset(void) +{ +} + +static inline void arch_perfc_gather(void) +{ +} + +#endif + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/perfc_defn.h b/xen/include/asm-arm/perfc_defn.h new file mode 100644 index 0000000..46015f5 --- /dev/null +++ b/xen/include/asm-arm/perfc_defn.h @@ -0,0 +1,82 @@ +/* This file is legitimately included multiple times. */ +/*#ifndef __XEN_PERFC_DEFN_H__*/ +/*#define __XEN_PERFC_DEFN_H__*/ + +PERFCOUNTER(invalid_hypercalls, "invalid hypercalls") + +PERFCOUNTER(trap_wfi, "trap: wfi") +PERFCOUNTER(trap_wfe, "trap: wfe") +PERFCOUNTER(trap_cp15_32, "trap: cp15 32-bit access") +PERFCOUNTER(trap_cp15_64, "trap: cp15 64-bit access") +PERFCOUNTER(trap_cp14_32, "trap: cp14 32-bit access") +PERFCOUNTER(trap_cp14_dbg, "trap: cp14 dbg access") +PERFCOUNTER(trap_cp, "trap: cp access") +PERFCOUNTER(trap_smc32, "trap: 32-bit smc") +PERFCOUNTER(trap_hvc32, "trap: 32-bit hvc") +#ifdef CONFIG_ARM_64 +PERFCOUNTER(trap_smc64, "trap: 64-bit smc") +PERFCOUNTER(trap_hvc64, "trap: 64-bit hvc") +PERFCOUNTER(trap_sysreg, "trap: sysreg access") +#endif +PERFCOUNTER(trap_iabt, "trap: guest instr abort") +PERFCOUNTER(trap_dabt, "trap: guest data abort") +PERFCOUNTER(trap_uncond, "trap: condition failed") + +PERFCOUNTER(vpsci_cpu_on, "vpsci: cpu_on") +PERFCOUNTER(vpsci_cpu_off, "vpsci: cpu_off") +PERFCOUNTER(vpsci_version, "vpsci: version") +PERFCOUNTER(vpsci_migrate_info_type, "vpsci: migrate_info_type") +PERFCOUNTER(vpsci_migrate_info_up_cpu, "vpsci: migrate_info_up_cpu") +PERFCOUNTER(vpsci_system_off, "vpsci: system_off") +PERFCOUNTER(vpsci_system_reset, "vpsci: system_reset") +PERFCOUNTER(vpsci_cpu_suspend, "vpsci: cpu_suspend") +PERFCOUNTER(vpsci_cpu_affinity_info, "vpsci: cpu_affinity_info") +PERFCOUNTER(vpsci_cpu_migrate, "vpsci: cpu_migrate") + +PERFCOUNTER(vgicd_reads, "vgicd: read") +PERFCOUNTER(vgicd_writes, "vgicd: write") +PERFCOUNTER(vgicr_reads, "vgicr: read") +PERFCOUNTER(vgicr_writes, "vgicr: write") +PERFCOUNTER(vgic_sysreg_reads, "vgic: sysreg read") +PERFCOUNTER(vgic_sysreg_writes, "vgic: sysreg write") +PERFCOUNTER(vgic_sgi_list , "vgic: SGI send to list") +PERFCOUNTER(vgic_sgi_others, "vgic: SGI send to others") +PERFCOUNTER(vgic_sgi_self, "vgic: SGI send to self") +PERFCOUNTER(vgic_cross_cpu_intr_inject, "vgic: cross-CPU irq inject") +PERFCOUNTER(vgic_irq_migrates, "vgic: irq migration") + +PERFCOUNTER(vuart_reads, "vuart: read") +PERFCOUNTER(vuart_writes, "vuart: write") + +PERFCOUNTER(vtimer_cp32_reads, "vtimer: cp32 read") +PERFCOUNTER(vtimer_cp32_writes, "vtimer: cp32 write") + +PERFCOUNTER(vtimer_cp64_reads, "vtimer: cp64 read") +PERFCOUNTER(vtimer_cp64_writes, "vtimer: cp64 write") + +PERFCOUNTER(vtimer_sysreg_reads, "vtimer: sysreg read") +PERFCOUNTER(vtimer_sysreg_writes, "vtimer: sysreg write") + +PERFCOUNTER(vtimer_phys_inject, "vtimer: phys expired, injected") +PERFCOUNTER(vtimer_phys_masked, "vtimer: phys expired, masked") +PERFCOUNTER(vtimer_virt_inject, "vtimer: virt expired, injected") + +PERFCOUNTER(ppis, "#PPIs") +PERFCOUNTER(spis, "#SPIs") +PERFCOUNTER(guest_irqs, "#GUEST-IRQS") + +PERFCOUNTER(hyp_timer_irqs, "Hypervisor timer interrupts") +PERFCOUNTER(phys_timer_irqs, "Physical timer interrupts") +PERFCOUNTER(virt_timer_irqs, "Virtual timer interrupts") +PERFCOUNTER(maintenance_irqs, "Maintenance interrupts") + +/*#endif*/ /* __XEN_PERFC_DEFN_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 Sun Jan 18 21:09:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:09: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 1YCx65-0002FU-Ui; Sun, 18 Jan 2015 21:09:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx64-0002FK-W5 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:25 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id D1/20-03145-4012CB45; Sun, 18 Jan 2015 21:09:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1421615362!15902475!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26333 invoked from network); 18 Jan 2015 21:09:22 -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; 18 Jan 2015 21:09:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx61-0001IF-UN for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx61-0004UG-MS for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:21 +0000 Date: Sun, 18 Jan 2015 21:09:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: wait 1000ms for a CPU to come up, instead of forever X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 908e12099a5c90fcb8e5b3cbf025a9f70bbc2d49 Author: Ian Campbell AuthorDate: Wed Jan 14 15:47:36 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 15 13:52:40 2015 +0000 xen: arm: wait 1000ms for a CPU to come up, instead of forever Otherwise continue without it, which is preferable to the current infinite hang. Slightly tweak the grammar of a comment in the same function. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/smpboot.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 14054ae..a96cda2 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -357,6 +357,7 @@ int __init cpu_up_send_sgi(int cpu) int __cpu_up(unsigned int cpu) { int rc; + s_time_t deadline; printk("Bringing up CPU%d\n", cpu); @@ -369,7 +370,7 @@ int __cpu_up(unsigned int cpu) /* Tell the remote CPU which stack to boot on. */ init_data.stack = idle_vcpu[cpu]->arch.stack; - /* Tell the remote CPU what is it's logical CPU ID */ + /* Tell the remote CPU what its logical CPU ID is. */ init_data.cpuid = cpu; /* Open the gate for this CPU */ @@ -386,12 +387,34 @@ int __cpu_up(unsigned int cpu) return rc; } - while ( !cpu_online(cpu) ) + deadline = NOW() + MILLISECS(1000); + + while ( !cpu_online(cpu) && NOW() < deadline ) { cpu_relax(); process_pending_softirqs(); } + /* + * Nuke start of day info before checking one last time if the CPU + * actually came online. If it is not online it may still be + * trying to come up and may show up later unexpectedly. + * + * This doesn't completely avoid the possibility of the supposedly + * failed CPU trying to progress with another CPUs stack settings + * etc, but better than nothing, hopefully. + */ + init_data.stack = NULL; + init_data.cpuid = ~0; + smp_up_cpu = MPIDR_INVALID; + clean_dcache(smp_up_cpu); + + if ( !cpu_online(cpu) ) + { + printk("CPU%d never came online\n", cpu); + return -EIO; + } + 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 Sun Jan 18 21:09:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:09: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 1YCx65-0002FU-Ui; Sun, 18 Jan 2015 21:09:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx64-0002FK-W5 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:25 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id D1/20-03145-4012CB45; Sun, 18 Jan 2015 21:09:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1421615362!15902475!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26333 invoked from network); 18 Jan 2015 21:09:22 -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; 18 Jan 2015 21:09:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx61-0001IF-UN for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx61-0004UG-MS for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:21 +0000 Date: Sun, 18 Jan 2015 21:09:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: wait 1000ms for a CPU to come up, instead of forever X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 908e12099a5c90fcb8e5b3cbf025a9f70bbc2d49 Author: Ian Campbell AuthorDate: Wed Jan 14 15:47:36 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 15 13:52:40 2015 +0000 xen: arm: wait 1000ms for a CPU to come up, instead of forever Otherwise continue without it, which is preferable to the current infinite hang. Slightly tweak the grammar of a comment in the same function. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/smpboot.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 14054ae..a96cda2 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -357,6 +357,7 @@ int __init cpu_up_send_sgi(int cpu) int __cpu_up(unsigned int cpu) { int rc; + s_time_t deadline; printk("Bringing up CPU%d\n", cpu); @@ -369,7 +370,7 @@ int __cpu_up(unsigned int cpu) /* Tell the remote CPU which stack to boot on. */ init_data.stack = idle_vcpu[cpu]->arch.stack; - /* Tell the remote CPU what is it's logical CPU ID */ + /* Tell the remote CPU what its logical CPU ID is. */ init_data.cpuid = cpu; /* Open the gate for this CPU */ @@ -386,12 +387,34 @@ int __cpu_up(unsigned int cpu) return rc; } - while ( !cpu_online(cpu) ) + deadline = NOW() + MILLISECS(1000); + + while ( !cpu_online(cpu) && NOW() < deadline ) { cpu_relax(); process_pending_softirqs(); } + /* + * Nuke start of day info before checking one last time if the CPU + * actually came online. If it is not online it may still be + * trying to come up and may show up later unexpectedly. + * + * This doesn't completely avoid the possibility of the supposedly + * failed CPU trying to progress with another CPUs stack settings + * etc, but better than nothing, hopefully. + */ + init_data.stack = NULL; + init_data.cpuid = ~0; + smp_up_cpu = MPIDR_INVALID; + clean_dcache(smp_up_cpu); + + if ( !cpu_online(cpu) ) + { + printk("CPU%d never came online\n", cpu); + return -EIO; + } + 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 Sun Jan 18 21:09:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:09: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 1YCx6G-0002HI-3N; Sun, 18 Jan 2015 21:09:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6F-0002H3-5V for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:35 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id A1/C9-22777-E012CB45; Sun, 18 Jan 2015 21:09:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1421615372!18696470!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5337 invoked from network); 18 Jan 2015 21:09:33 -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; 18 Jan 2015 21:09:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6C-0001IN-41 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx6C-0004Ug-3D for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:32 +0000 Date: Sun, 18 Jan 2015 21:09:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: unhook blktap1 from the build and remove all references to it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d97402376ef79d9212f79cc11ce7e515bcfafb5b Author: Ian Campbell AuthorDate: Fri Jan 9 13:37:03 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 15 13:53:55 2015 +0000 tools: unhook blktap1 from the build and remove all references to it This was disabled by default in Xen 4.4. Since xend has now been removed from the tree I don't believe anything is using it. We need to pass an explicit CONFIG_BLKTAP1=n to qemu-xen-traditional otherwise it defaults to y and doesn't build. This patch does all the ground work, the tools/blktap directory will be removed in the next (*huge*) patch. Note that this has no impact on blktap2, which is what libxl supports. blktap1 was only usable via xend which has already been removed. Signed-off-by: Ian Campbell Acked-by: Wei Liu Acked-by: Ian Jackson --- INSTALL | 1 - config/Tools.mk.in | 1 - tools/Makefile | 2 +- tools/configure | 29 +--------- tools/configure.ac | 4 +- tools/hotplug/Linux/Makefile | 1 - tools/hotplug/Linux/blktap | 94 ------------------------------ tools/hotplug/Linux/xen-backend.rules.in | 2 - 8 files changed, 3 insertions(+), 131 deletions(-) diff --git a/INSTALL b/INSTALL index 71dd0eb..33f65ba 100644 --- a/INSTALL +++ b/INSTALL @@ -142,7 +142,6 @@ this detection and the sysv runlevel scripts have to be used. The old backend drivers are disabled because qdisk is now the default. This option can be used to build them anyway. - --enable-blktap1 --enable-blktap2 Build various stubom components, some are only example code. Its usually diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 89de5bd..30267fa 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -57,7 +57,6 @@ CONFIG_ROMBIOS := @rombios@ CONFIG_SEABIOS := @seabios@ CONFIG_QEMU_TRAD := @qemu_traditional@ CONFIG_QEMU_XEN := @qemu_xen@ -CONFIG_BLKTAP1 := @blktap1@ CONFIG_BLKTAP2 := @blktap2@ CONFIG_QEMUU_EXTRA_ARGS:= @EXTRA_QEMUU_CONFIGURE_ARGS@ CONFIG_REMUS_NETBUF := @remus_netbuf@ diff --git a/tools/Makefile b/tools/Makefile index af9798a..1ad7a5d 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -16,7 +16,6 @@ SUBDIRS-y += console SUBDIRS-y += xenmon SUBDIRS-y += xenstat SUBDIRS-$(CONFIG_Linux) += memshr -SUBDIRS-$(CONFIG_BLKTAP1) += blktap SUBDIRS-$(CONFIG_BLKTAP2) += blktap2 SUBDIRS-$(CONFIG_NetBSD) += xenbackendd SUBDIRS-y += libfsimage @@ -169,6 +168,7 @@ subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find set -e; \ $(buildmakevars2shellvars); \ + export CONFIG_BLKTAP1=n; \ cd qemu-xen-traditional-dir; \ $(QEMU_ROOT)/xen-setup \ --extra-cflags="$(EXTRA_CFLAGS_QEMU_TRADITIONAL)" \ diff --git a/tools/configure b/tools/configure index e971070..4117c83 100755 --- a/tools/configure +++ b/tools/configure @@ -700,7 +700,6 @@ rombios qemu_traditional blktap2 LINUX_BACKEND_MODULES -blktap1 debug seabios ovmf @@ -790,7 +789,6 @@ enable_xsmpolicy enable_ovmf enable_seabios enable_debug -enable_blktap1 with_linux_backend_modules enable_blktap2 enable_qemu_traditional @@ -1463,7 +1461,6 @@ Optional Features: --enable-ovmf Enable OVMF (default is DISABLED) --disable-seabios Disable SeaBIOS (default is ENABLED) --disable-debug Disable debug build of tools (default is ENABLED) - --enable-blktap1 Enable blktap1 tools (default is DISABLED) --enable-blktap2 Enable blktap2, (DEFAULT is on for Linux, otherwise off) --enable-qemu-traditional @@ -3991,29 +3988,6 @@ debug=$ax_cv_debug -# Check whether --enable-blktap1 was given. -if test "${enable_blktap1+set}" = set; then : - enableval=$enable_blktap1; -fi - - -if test "x$enable_blktap1" = "xno"; then : - - ax_cv_blktap1="n" - -elif test "x$enable_blktap1" = "xyes"; then : - - ax_cv_blktap1="y" - -elif test -z $ax_cv_blktap1; then : - - ax_cv_blktap1="n" - -fi -blktap1=$ax_cv_blktap1 - - - # Check whether --with-linux-backend-modules was given. if test "${with_linux_backend_modules+set}" = set; then : @@ -4037,7 +4011,6 @@ usbbk pciback xen-acpi-processor blktap2 -blktap " ;; *) @@ -7935,7 +7908,7 @@ fi -if test "x$enable_blktap1" = "xyes" || test "x$enable_blktap2" = "xyes"; then : +if test "x$enable_blktap2" = "xyes"]; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for io_setup in -laio" >&5 $as_echo_n "checking for io_setup in -laio... " >&6; } diff --git a/tools/configure.ac b/tools/configure.ac index 1ac63a3..72e2465 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -89,7 +89,6 @@ AX_ARG_DEFAULT_ENABLE([xsmpolicy], [Disable XSM policy compilation]) AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF]) AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS]) AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools]) -AX_ARG_DEFAULT_DISABLE([blktap1], [Enable blktap1 tools]) AC_ARG_WITH([linux-backend-modules], AS_HELP_STRING([--with-linux-backend-modules="mod1 mod2"], @@ -113,7 +112,6 @@ usbbk pciback xen-acpi-processor blktap2 -blktap " ;; *) @@ -338,7 +336,7 @@ AC_CHECK_HEADER([lzo/lzo1x.h], [ AC_CHECK_LIB([lzo2], [lzo1x_decompress], [zlib="$zlib -DHAVE_LZO1X -llzo2"]) ]) AC_SUBST(zlib) -AS_IF([test "x$enable_blktap1" = "xyes" || test "x$enable_blktap2" = "xyes"], [ +AS_IF(test "x$enable_blktap2" = "xyes"], [ AC_CHECK_LIB([aio], [io_setup], [], [AC_MSG_ERROR([Could not find libaio])]) ]) AC_SUBST(system_aio) diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 1706c05..b8490f9 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -19,7 +19,6 @@ XEN_SCRIPTS += vif-setup XEN_SCRIPTS-$(CONFIG_REMUS_NETBUF) += remus-netbuf-setup XEN_SCRIPTS += block XEN_SCRIPTS += block-enbd block-nbd -XEN_SCRIPTS-$(CONFIG_BLKTAP1) += blktap XEN_SCRIPTS += xen-hotplug-cleanup XEN_SCRIPTS += external-device-migrate XEN_SCRIPTS += vscsi diff --git a/tools/hotplug/Linux/blktap b/tools/hotplug/Linux/blktap deleted file mode 100644 index cd30a38..0000000 --- a/tools/hotplug/Linux/blktap +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2005, XenSource Ltd. - -dir=$(dirname "$0") -. "$dir/xen-hotplug-common.sh" -. "$dir/block-common.sh" - -findCommand "$@" - -## -# check_blktap_sharing file mode -# -# Perform the sharing check for the given blktap and mode. -# -check_blktap_sharing() -{ - local file="$1" - local mode="$2" - - local base_path="$XENBUS_BASE_PATH/$XENBUS_TYPE" - for dom in $(xenstore-list "$base_path") - do - for dev in $(xenstore-list "$base_path/$dom") - do - params=$(xenstore_read_default "$base_path/$dom/$dev/params" "" | cut -d: -f2) - if [ "$file" = "$params" ] - then - - if [ "$mode" = 'w' ] - then - if ! same_vm "$dom" - then - echo 'guest' - return - fi - else - local m=$(xenstore_read_default "$base_path/$dom/$dev/mode" "") - m=$(canonicalise_mode "$m") - - if [ "$m" = 'w' ] - then - if ! same_vm "$dom" - then - echo 'guest' - return - fi - fi - fi - fi - done - done - - echo 'ok' -} - - -t=$(xenstore_read_default "$XENBUS_PATH/type" 'MISSING') -if [ -n "$t" ] -then - p=$(xenstore_read "$XENBUS_PATH/params") - p=${p#tapdisk:} - # if we have a ':', chew from head including : - if echo $p | grep -q \: - then - p=${p#*:} - fi -fi -# some versions of readlink cannot be passed a regular file -if [ -L "$p" ]; then - file=$(readlink -f "$p") || fatal "$p link does not exist." -else - file="$p" -fi - -if [ "$command" = 'add' ] -then - [ -e "$file" ] || { fatal $file does not exist; } - - FRONTEND_ID=$(xenstore_read "$XENBUS_PATH/frontend-id") - FRONTEND_UUID=$(xenstore_read "/local/domain/$FRONTEND_ID/vm") - mode=$(xenstore_read "$XENBUS_PATH/mode") - mode=$(canonicalise_mode "$mode") - - if [ "$mode" != '!' ] - then - result=$(check_blktap_sharing "$file" "$mode") - [ "$result" = 'ok' ] || ebusy "$file already in use by other domain" - fi - - success -fi - -exit 0 diff --git a/tools/hotplug/Linux/xen-backend.rules.in b/tools/hotplug/Linux/xen-backend.rules.in index 7d2f914..ee107af 100644 --- a/tools/hotplug/Linux/xen-backend.rules.in +++ b/tools/hotplug/Linux/xen-backend.rules.in @@ -1,4 +1,3 @@ -SUBSYSTEM=="xen-backend", KERNEL=="tap*", ENV{UDEV_CALL}="1", RUN+="@XEN_SCRIPT_DIR@/blktap $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vbd*", ENV{UDEV_CALL}="1", RUN+="@XEN_SCRIPT_DIR@/block $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vif2-*", RUN+="@XEN_SCRIPT_DIR@/vif2 $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="online", RUN+="@XEN_SCRIPT_DIR@/vif-setup online type_if=vif" @@ -6,7 +5,6 @@ SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="offline" SUBSYSTEM=="xen-backend", KERNEL=="vscsi*", RUN+="@XEN_SCRIPT_DIR@/vscsi $env{ACTION}" SUBSYSTEM=="xen-backend", ACTION=="remove", ENV{UDEV_CALL}="1", RUN+="@XEN_SCRIPT_DIR@/xen-hotplug-cleanup" KERNEL=="evtchn", NAME="xen/%k" -SUBSYSTEM=="xen", KERNEL=="blktap[0-9]*", NAME="xen/%k", MODE="0600" SUBSYSTEM=="blktap2", KERNEL=="blktap[0-9]*", NAME="xen/blktap-2/%k", MODE="0600" KERNEL=="blktap-control", NAME="xen/blktap-2/control", MODE="0600" KERNEL=="gntdev", NAME="xen/%k", MODE="0600" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:09:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:09: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 1YCx6G-0002HI-3N; Sun, 18 Jan 2015 21:09:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6F-0002H3-5V for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:35 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id A1/C9-22777-E012CB45; Sun, 18 Jan 2015 21:09:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1421615372!18696470!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5337 invoked from network); 18 Jan 2015 21:09:33 -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; 18 Jan 2015 21:09:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6C-0001IN-41 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx6C-0004Ug-3D for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:32 +0000 Date: Sun, 18 Jan 2015 21:09:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: unhook blktap1 from the build and remove all references to it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d97402376ef79d9212f79cc11ce7e515bcfafb5b Author: Ian Campbell AuthorDate: Fri Jan 9 13:37:03 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 15 13:53:55 2015 +0000 tools: unhook blktap1 from the build and remove all references to it This was disabled by default in Xen 4.4. Since xend has now been removed from the tree I don't believe anything is using it. We need to pass an explicit CONFIG_BLKTAP1=n to qemu-xen-traditional otherwise it defaults to y and doesn't build. This patch does all the ground work, the tools/blktap directory will be removed in the next (*huge*) patch. Note that this has no impact on blktap2, which is what libxl supports. blktap1 was only usable via xend which has already been removed. Signed-off-by: Ian Campbell Acked-by: Wei Liu Acked-by: Ian Jackson --- INSTALL | 1 - config/Tools.mk.in | 1 - tools/Makefile | 2 +- tools/configure | 29 +--------- tools/configure.ac | 4 +- tools/hotplug/Linux/Makefile | 1 - tools/hotplug/Linux/blktap | 94 ------------------------------ tools/hotplug/Linux/xen-backend.rules.in | 2 - 8 files changed, 3 insertions(+), 131 deletions(-) diff --git a/INSTALL b/INSTALL index 71dd0eb..33f65ba 100644 --- a/INSTALL +++ b/INSTALL @@ -142,7 +142,6 @@ this detection and the sysv runlevel scripts have to be used. The old backend drivers are disabled because qdisk is now the default. This option can be used to build them anyway. - --enable-blktap1 --enable-blktap2 Build various stubom components, some are only example code. Its usually diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 89de5bd..30267fa 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -57,7 +57,6 @@ CONFIG_ROMBIOS := @rombios@ CONFIG_SEABIOS := @seabios@ CONFIG_QEMU_TRAD := @qemu_traditional@ CONFIG_QEMU_XEN := @qemu_xen@ -CONFIG_BLKTAP1 := @blktap1@ CONFIG_BLKTAP2 := @blktap2@ CONFIG_QEMUU_EXTRA_ARGS:= @EXTRA_QEMUU_CONFIGURE_ARGS@ CONFIG_REMUS_NETBUF := @remus_netbuf@ diff --git a/tools/Makefile b/tools/Makefile index af9798a..1ad7a5d 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -16,7 +16,6 @@ SUBDIRS-y += console SUBDIRS-y += xenmon SUBDIRS-y += xenstat SUBDIRS-$(CONFIG_Linux) += memshr -SUBDIRS-$(CONFIG_BLKTAP1) += blktap SUBDIRS-$(CONFIG_BLKTAP2) += blktap2 SUBDIRS-$(CONFIG_NetBSD) += xenbackendd SUBDIRS-y += libfsimage @@ -169,6 +168,7 @@ subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find set -e; \ $(buildmakevars2shellvars); \ + export CONFIG_BLKTAP1=n; \ cd qemu-xen-traditional-dir; \ $(QEMU_ROOT)/xen-setup \ --extra-cflags="$(EXTRA_CFLAGS_QEMU_TRADITIONAL)" \ diff --git a/tools/configure b/tools/configure index e971070..4117c83 100755 --- a/tools/configure +++ b/tools/configure @@ -700,7 +700,6 @@ rombios qemu_traditional blktap2 LINUX_BACKEND_MODULES -blktap1 debug seabios ovmf @@ -790,7 +789,6 @@ enable_xsmpolicy enable_ovmf enable_seabios enable_debug -enable_blktap1 with_linux_backend_modules enable_blktap2 enable_qemu_traditional @@ -1463,7 +1461,6 @@ Optional Features: --enable-ovmf Enable OVMF (default is DISABLED) --disable-seabios Disable SeaBIOS (default is ENABLED) --disable-debug Disable debug build of tools (default is ENABLED) - --enable-blktap1 Enable blktap1 tools (default is DISABLED) --enable-blktap2 Enable blktap2, (DEFAULT is on for Linux, otherwise off) --enable-qemu-traditional @@ -3991,29 +3988,6 @@ debug=$ax_cv_debug -# Check whether --enable-blktap1 was given. -if test "${enable_blktap1+set}" = set; then : - enableval=$enable_blktap1; -fi - - -if test "x$enable_blktap1" = "xno"; then : - - ax_cv_blktap1="n" - -elif test "x$enable_blktap1" = "xyes"; then : - - ax_cv_blktap1="y" - -elif test -z $ax_cv_blktap1; then : - - ax_cv_blktap1="n" - -fi -blktap1=$ax_cv_blktap1 - - - # Check whether --with-linux-backend-modules was given. if test "${with_linux_backend_modules+set}" = set; then : @@ -4037,7 +4011,6 @@ usbbk pciback xen-acpi-processor blktap2 -blktap " ;; *) @@ -7935,7 +7908,7 @@ fi -if test "x$enable_blktap1" = "xyes" || test "x$enable_blktap2" = "xyes"; then : +if test "x$enable_blktap2" = "xyes"]; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for io_setup in -laio" >&5 $as_echo_n "checking for io_setup in -laio... " >&6; } diff --git a/tools/configure.ac b/tools/configure.ac index 1ac63a3..72e2465 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -89,7 +89,6 @@ AX_ARG_DEFAULT_ENABLE([xsmpolicy], [Disable XSM policy compilation]) AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF]) AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS]) AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools]) -AX_ARG_DEFAULT_DISABLE([blktap1], [Enable blktap1 tools]) AC_ARG_WITH([linux-backend-modules], AS_HELP_STRING([--with-linux-backend-modules="mod1 mod2"], @@ -113,7 +112,6 @@ usbbk pciback xen-acpi-processor blktap2 -blktap " ;; *) @@ -338,7 +336,7 @@ AC_CHECK_HEADER([lzo/lzo1x.h], [ AC_CHECK_LIB([lzo2], [lzo1x_decompress], [zlib="$zlib -DHAVE_LZO1X -llzo2"]) ]) AC_SUBST(zlib) -AS_IF([test "x$enable_blktap1" = "xyes" || test "x$enable_blktap2" = "xyes"], [ +AS_IF(test "x$enable_blktap2" = "xyes"], [ AC_CHECK_LIB([aio], [io_setup], [], [AC_MSG_ERROR([Could not find libaio])]) ]) AC_SUBST(system_aio) diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 1706c05..b8490f9 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -19,7 +19,6 @@ XEN_SCRIPTS += vif-setup XEN_SCRIPTS-$(CONFIG_REMUS_NETBUF) += remus-netbuf-setup XEN_SCRIPTS += block XEN_SCRIPTS += block-enbd block-nbd -XEN_SCRIPTS-$(CONFIG_BLKTAP1) += blktap XEN_SCRIPTS += xen-hotplug-cleanup XEN_SCRIPTS += external-device-migrate XEN_SCRIPTS += vscsi diff --git a/tools/hotplug/Linux/blktap b/tools/hotplug/Linux/blktap deleted file mode 100644 index cd30a38..0000000 --- a/tools/hotplug/Linux/blktap +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2005, XenSource Ltd. - -dir=$(dirname "$0") -. "$dir/xen-hotplug-common.sh" -. "$dir/block-common.sh" - -findCommand "$@" - -## -# check_blktap_sharing file mode -# -# Perform the sharing check for the given blktap and mode. -# -check_blktap_sharing() -{ - local file="$1" - local mode="$2" - - local base_path="$XENBUS_BASE_PATH/$XENBUS_TYPE" - for dom in $(xenstore-list "$base_path") - do - for dev in $(xenstore-list "$base_path/$dom") - do - params=$(xenstore_read_default "$base_path/$dom/$dev/params" "" | cut -d: -f2) - if [ "$file" = "$params" ] - then - - if [ "$mode" = 'w' ] - then - if ! same_vm "$dom" - then - echo 'guest' - return - fi - else - local m=$(xenstore_read_default "$base_path/$dom/$dev/mode" "") - m=$(canonicalise_mode "$m") - - if [ "$m" = 'w' ] - then - if ! same_vm "$dom" - then - echo 'guest' - return - fi - fi - fi - fi - done - done - - echo 'ok' -} - - -t=$(xenstore_read_default "$XENBUS_PATH/type" 'MISSING') -if [ -n "$t" ] -then - p=$(xenstore_read "$XENBUS_PATH/params") - p=${p#tapdisk:} - # if we have a ':', chew from head including : - if echo $p | grep -q \: - then - p=${p#*:} - fi -fi -# some versions of readlink cannot be passed a regular file -if [ -L "$p" ]; then - file=$(readlink -f "$p") || fatal "$p link does not exist." -else - file="$p" -fi - -if [ "$command" = 'add' ] -then - [ -e "$file" ] || { fatal $file does not exist; } - - FRONTEND_ID=$(xenstore_read "$XENBUS_PATH/frontend-id") - FRONTEND_UUID=$(xenstore_read "/local/domain/$FRONTEND_ID/vm") - mode=$(xenstore_read "$XENBUS_PATH/mode") - mode=$(canonicalise_mode "$mode") - - if [ "$mode" != '!' ] - then - result=$(check_blktap_sharing "$file" "$mode") - [ "$result" = 'ok' ] || ebusy "$file already in use by other domain" - fi - - success -fi - -exit 0 diff --git a/tools/hotplug/Linux/xen-backend.rules.in b/tools/hotplug/Linux/xen-backend.rules.in index 7d2f914..ee107af 100644 --- a/tools/hotplug/Linux/xen-backend.rules.in +++ b/tools/hotplug/Linux/xen-backend.rules.in @@ -1,4 +1,3 @@ -SUBSYSTEM=="xen-backend", KERNEL=="tap*", ENV{UDEV_CALL}="1", RUN+="@XEN_SCRIPT_DIR@/blktap $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vbd*", ENV{UDEV_CALL}="1", RUN+="@XEN_SCRIPT_DIR@/block $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vif2-*", RUN+="@XEN_SCRIPT_DIR@/vif2 $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="online", RUN+="@XEN_SCRIPT_DIR@/vif-setup online type_if=vif" @@ -6,7 +5,6 @@ SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="offline" SUBSYSTEM=="xen-backend", KERNEL=="vscsi*", RUN+="@XEN_SCRIPT_DIR@/vscsi $env{ACTION}" SUBSYSTEM=="xen-backend", ACTION=="remove", ENV{UDEV_CALL}="1", RUN+="@XEN_SCRIPT_DIR@/xen-hotplug-cleanup" KERNEL=="evtchn", NAME="xen/%k" -SUBSYSTEM=="xen", KERNEL=="blktap[0-9]*", NAME="xen/%k", MODE="0600" SUBSYSTEM=="blktap2", KERNEL=="blktap[0-9]*", NAME="xen/blktap-2/%k", MODE="0600" KERNEL=="blktap-control", NAME="xen/blktap-2/control", MODE="0600" KERNEL=="gntdev", NAME="xen/%k", MODE="0600" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:09:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:09: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 1YCx6V-0002Iy-6Y; Sun, 18 Jan 2015 21:09:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6T-0002Is-CN for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:49 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id FB/1E-10925-C112CB45; Sun, 18 Jan 2015 21:09:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1421615382!22194441!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18486 invoked from network); 18 Jan 2015 21:09:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:09:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6M-0001IT-Ao for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx6M-0004V9-9Y for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:42 +0000 Date: Sun, 18 Jan 2015 21:09:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: remove blktap1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f6bcc035084ab11fde5eaec95fecaca5891d2385 Author: Ian Campbell AuthorDate: Tue Nov 4 10:41:25 2014 +0000 Commit: Ian Campbell CommitDate: Thu Jan 15 13:54:10 2015 +0000 tools: remove blktap1 Now that it is unhooked we can just remove it. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- .gitignore | 5 - .hgignore | 5 - tools/blktap/Makefile | 13 - tools/blktap/README | 122 -- tools/blktap/drivers/Makefile | 73 -- tools/blktap/drivers/aes.c | 1319 ------------------- tools/blktap/drivers/aes.h | 28 - tools/blktap/drivers/blk.h | 3 - tools/blktap/drivers/blk_linux.c | 42 - tools/blktap/drivers/blktapctrl.c | 937 -------------- tools/blktap/drivers/blktapctrl.h | 36 - tools/blktap/drivers/blktapctrl_linux.c | 89 -- tools/blktap/drivers/block-aio.c | 259 ---- tools/blktap/drivers/block-qcow.c | 1434 --------------------- tools/blktap/drivers/block-qcow2.c | 2098 ------------------------------- tools/blktap/drivers/block-ram.c | 295 ----- tools/blktap/drivers/block-sync.c | 242 ---- tools/blktap/drivers/block-vmdk.c | 428 ------- tools/blktap/drivers/bswap.h | 178 --- tools/blktap/drivers/img2qcow.c | 282 ----- tools/blktap/drivers/qcow-create.c | 130 -- tools/blktap/drivers/qcow2raw.c | 348 ----- tools/blktap/drivers/tapaio.c | 357 ------ tools/blktap/drivers/tapaio.h | 108 -- tools/blktap/drivers/tapdisk.c | 872 ------------- tools/blktap/drivers/tapdisk.h | 259 ---- tools/blktap/lib/Makefile | 60 - tools/blktap/lib/blkif.c | 185 --- tools/blktap/lib/blktaplib.h | 240 ---- tools/blktap/lib/list.h | 59 - tools/blktap/lib/xenbus.c | 617 --------- tools/blktap/lib/xs_api.c | 360 ------ tools/blktap/lib/xs_api.h | 50 - 33 files changed, 0 insertions(+), 11533 deletions(-) diff --git a/.gitignore b/.gitignore index 8c8c06f..a8f15d5 100644 --- a/.gitignore +++ b/.gitignore @@ -101,11 +101,6 @@ tools/blktap2/drivers/tapdisk2 tools/blktap2/drivers/td-util tools/blktap2/vhd/vhd-update tools/blktap2/vhd/vhd-util -tools/blktap/drivers/blktapctrl -tools/blktap/drivers/img2qcow -tools/blktap/drivers/qcow-create -tools/blktap/drivers/qcow2raw -tools/blktap/drivers/tapdisk tools/console/xenconsole tools/console/xenconsoled tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/* diff --git a/.hgignore b/.hgignore index da27f80..0bd29a1 100644 --- a/.hgignore +++ b/.hgignore @@ -140,11 +140,6 @@ ^tools/blktap2/drivers/td-util$ ^tools/blktap2/vhd/vhd-update$ ^tools/blktap2/vhd/vhd-util$ -^tools/blktap/drivers/blktapctrl$ -^tools/blktap/drivers/img2qcow$ -^tools/blktap/drivers/qcow-create$ -^tools/blktap/drivers/qcow2raw$ -^tools/blktap/drivers/tapdisk$ ^tools/check/\..*$ ^tools/console/xenconsole$ ^tools/console/xenconsoled$ diff --git a/tools/blktap/Makefile b/tools/blktap/Makefile deleted file mode 100644 index 4020566..0000000 --- a/tools/blktap/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -XEN_ROOT = $(CURDIR)/../.. -include $(XEN_ROOT)/tools/Rules.mk - -SUBDIRS-y := -SUBDIRS-y += lib -SUBDIRS-y += drivers - -.PHONY: all clean install -all clean install: %: subdirs-% - -install: - $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) - $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.blktap diff --git a/tools/blktap/README b/tools/blktap/README deleted file mode 100644 index 5e41080..0000000 --- a/tools/blktap/README +++ /dev/null @@ -1,122 +0,0 @@ -Blktap Userspace Tools + Library -================================ - -Andrew Warfield and Julian Chesterfield -16th June 2006 - -{firstname.lastname}@cl.cam.ac.uk - -The blktap userspace toolkit provides a user-level disk I/O -interface. The blktap mechanism involves a kernel driver that acts -similarly to the existing Xen/Linux blkback driver, and a set of -associated user-level libraries. Using these tools, blktap allows -virtual block devices presented to VMs to be implemented in userspace -and to be backed by raw partitions, files, network, etc. - -The key benefit of blktap is that it makes it easy and fast to write -arbitrary block backends, and that these user-level backends actually -perform very well. Specifically: - -- Metadata disk formats such as Copy-on-Write, encrypted disks, sparse - formats and other compression features can be easily implemented. - -- Accessing file-based images from userspace avoids problems related - to flushing dirty pages which are present in the Linux loopback - driver. (Specifically, doing a large number of writes to an - NFS-backed image don't result in the OOM killer going berserk.) - -- Per-disk handler processes enable easier userspace policing of block - resources, and process-granularity QoS techniques (disk scheduling - and related tools) may be trivially applied to block devices. - -- It's very easy to take advantage of userspace facilities such as - networking libraries, compression utilities, peer-to-peer - file-sharing systems and so on to build more complex block backends. - -- Crashes are contained -- incremental development/debugging is very - fast. - -How it works (in one paragraph): - -Working in conjunction with the kernel blktap driver, all disk I/O -requests from VMs are passed to the userspace deamon (using a shared -memory interface) through a character device. Each active disk is -mapped to an individual device node, allowing per-disk processes to -implement individual block devices where desired. The userspace -drivers are implemented using asynchronous (Linux libaio), -O_DIRECT-based calls to preserve the unbuffered, batched and -asynchronous request dispatch achieved with the existing blkback -code. We provide a simple, asynchronous virtual disk interface that -makes it quite easy to add new disk implementations. - -As of June 2006 the current supported disk formats are: - - - Raw Images (both on partitions and in image files) - - File-backed Qcow disks - - Standalone sparse Qcow disks - - Fast shareable RAM disk between VMs (requires some form of cluster-based - filesystem support e.g. OCFS2 in the guest kernel) - - Some VMDK images - your mileage may vary - -Raw and QCow images have asynchronous backends and so should perform -fairly well. VMDK is based directly on the qemu vmdk driver, which is -synchronous (a.k.a. slow). - -Build and Installation Instructions -=================================== - -Make to configure the blktap backend driver in your dom0 kernel. It -will cooperate fine with the existing backend driver, so you can -experiment with tap disks without breaking existing VM configs. - -To build the tools separately, "make && make install" in -tools/blktap. - - -Using the Tools -=============== - -Prepare the image for booting. For qcow files use the qcow utilities -installed earlier. e.g. qcow-create generates a blank standalone image -or a file-backed CoW image. img2qcow takes an existing image or -partition and creates a sparse, standalone qcow-based file. - -The userspace disk agent is configured to start automatically via xend -(alternatively you can start it manually => 'blktapctrl') - -Customise the VM config file to use the 'tap' handler, followed by the -driver type. e.g. for a raw image such as a file or partition: - -disk = ['tap:aio:,sda1,w'] - -e.g. for a qcow image: - -disk = ['tap:qcow:,sda1,w'] - - -Mounting images in Dom0 using the blktap driver -=============================================== -Tap (and blkback) disks are also mountable in Dom0 without requiring an -active VM to attach. You will need to build a xenlinux Dom0 kernel that -includes the blkfront driver (e.g. the default 'make world' or -'make kernels' build. Simply use the xm command-line tool to activate -the backend disks, and blkfront will generate a virtual block device that -can be accessed in the same way as a loop device or partition: - -e.g. for a raw image file that would normally be mounted using -the loopback driver (such as 'mount -o loop /mnt/disk'), do the -following: - -xm block-attach 0 tap:aio: /dev/xvda1 w 0 -mount /dev/xvda1 /mnt/disk <--- don't use loop driver - -In this way, you can use any of the userspace device-type drivers built -with the blktap userspace toolkit to open and mount disks such as qcow -or vmdk images: - -xm block-attach 0 tap:qcow: /dev/xvda1 w 0 -mount /dev/xvda1 /mnt/disk - - - - diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile deleted file mode 100644 index cea8b3b..0000000 --- a/tools/blktap/drivers/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/Rules.mk - -IBIN = blktapctrl tapdisk -QCOW_UTIL = img2qcow qcow2raw qcow-create - -CFLAGS += -Werror -CFLAGS += -Wno-unused -CFLAGS += -I../lib -CFLAGS += $(CFLAGS_libxenctrl) -CFLAGS += $(CFLAGS_libxenstore) -CFLAGS += -D_GNU_SOURCE - -ifeq ($(CONFIG_GCRYPT),y) -CFLAGS += -DUSE_GCRYPT -CRYPT_LIB := -lgcrypt -else -CRYPT_LIB := -lcrypto -$(warning === libgcrypt not installed: falling back to libcrypto ===) -endif - -MEMSHRLIBS := -ifeq ($(CONFIG_Linux), y) -MEMSHR_DIR = ../../memshr -CFLAGS += -DMEMSHR -CFLAGS += -I $(MEMSHR_DIR) -MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a -endif - -AIOLIBS := -laio - -CFLAGS += $(PTHREAD_CFLAGS) -LDFLAGS += $(PTHREAD_LDFLAGS) - -LDLIBS_blktapctrl := $(MEMSHRLIBS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) -L../lib -lblktap -lrt -lm $(PTHREAD_LIBS) -LDLIBS_img := $(AIOLIBS) $(CRYPT_LIB) $(PTHREAD_LIBS) -lz - -BLK-OBJS-y := block-aio.o -BLK-OBJS-y += block-sync.o -BLK-OBJS-y += block-vmdk.o -BLK-OBJS-y += block-ram.o -BLK-OBJS-y += block-qcow.o -BLK-OBJS-y += block-qcow2.o -BLK-OBJS-y += aes.o -BLK-OBJS-y += tapaio.o -BLK-OBJS-$(CONFIG_Linux) += blk_linux.o - -BLKTAB-OBJS-y := blktapctrl.o -BLKTAB-OBJS-$(CONFIG_Linux) += blktapctrl_linux.o - -all: $(IBIN) qcow-util - -blktapctrl: $(BLKTAB-OBJS-y) - $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_blktapctrl) - -tapdisk: tapdisk.o $(BLK-OBJS-y) - $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_img) - -.PHONY: qcow-util -qcow-util: img2qcow qcow2raw qcow-create - -img2qcow qcow2raw qcow-create: %: %.o $(BLK-OBJS-y) - $(CC) $(LDFLAGS) -o $* $^ $(LDLIBS_img) - -install: all - $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(SBINDIR) - -clean: - rm -rf *.o *~ $(DEPS) xen TAGS $(IBIN) $(LIB) $(QCOW_UTIL) $(VHD_UTIL) - -.PHONY: clean install - --include $(DEPS) diff --git a/tools/blktap/drivers/aes.c b/tools/blktap/drivers/aes.c deleted file mode 100644 index 4d83fac..0000000 --- a/tools/blktap/drivers/aes.c +++ /dev/null @@ -1,1319 +0,0 @@ -/** - * - * aes.c - integrated in QEMU by Fabrice Bellard from the OpenSSL project. - */ -/* - * rijndael-alg-fst.c - * - * @version 3.0 (December 2000) - * - * Optimised ANSI C code for the Rijndael cipher (now AES) - * - * @author Vincent Rijmen - * @author Antoon Bosselaers - * @author Paulo Barreto - * - * This code is hereby placed in the public domain. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''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 AUTHORS 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 "vl.h" -#include -#include -#include "aes.h" - -//#define NDEBUG -#include - -typedef uint32_t u32; -typedef uint16_t u16; -typedef uint8_t u8; - -#define MAXKC (256/32) -#define MAXKB (256/8) -#define MAXNR 14 - -/* This controls loop-unrolling in aes_core.c */ -#undef FULL_UNROLL -# define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] << 8) ^ ((u32)(pt)[3])) -# define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >> 8); (ct)[3] = (u8)(st); } - -/* -Te0[x] = S [x].[02, 01, 01, 03]; -Te1[x] = S [x].[03, 02, 01, 01]; -Te2[x] = S [x].[01, 03, 02, 01]; -Te3[x] = S [x].[01, 01, 03, 02]; -Te4[x] = S [x].[01, 01, 01, 01]; - -Td0[x] = Si[x].[0e, 09, 0d, 0b]; -Td1[x] = Si[x].[0b, 0e, 09, 0d]; -Td2[x] = Si[x].[0d, 0b, 0e, 09]; -Td3[x] = Si[x].[09, 0d, 0b, 0e]; -Td4[x] = Si[x].[01, 01, 01, 01]; -*/ - -static const u32 Te0[256] = { - 0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU, - 0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U, - 0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU, - 0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU, - 0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U, - 0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU, - 0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU, - 0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU, - 0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU, - 0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU, - 0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U, - 0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU, - 0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU, - 0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U, - 0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU, - 0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU, - 0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU, - 0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU, - 0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU, - 0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U, - 0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU, - 0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU, - 0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU, - 0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU, - 0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U, - 0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U, - 0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U, - 0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U, - 0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU, - 0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U, - 0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U, - 0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU, - 0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU, - 0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U, - 0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U, - 0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U, - 0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU, - 0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U, - 0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU, - 0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U, - 0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU, - 0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U, - 0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U, - 0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU, - 0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U, - 0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U, - 0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U, - 0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U, - 0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U, - 0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U, - 0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U, - 0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U, - 0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU, - 0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U, - 0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U, - 0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U, - 0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U, - 0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U, - 0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U, - 0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU, - 0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U, - 0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U, - 0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U, - 0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU, -}; -static const u32 Te1[256] = { - 0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU, - 0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U, - 0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU, - 0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U, - 0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU, - 0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U, - 0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU, - 0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U, - 0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U, - 0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU, - 0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U, - 0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U, - 0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U, - 0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU, - 0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U, - 0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U, - 0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU, - 0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U, - 0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U, - 0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U, - 0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU, - 0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU, - 0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U, - 0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU, - 0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU, - 0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U, - 0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU, - 0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U, - 0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU, - 0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U, - 0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U, - 0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U, - 0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU, - 0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U, - 0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU, - 0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U, - 0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU, - 0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U, - 0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U, - 0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU, - 0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU, - 0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU, - 0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U, - 0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U, - 0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU, - 0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U, - 0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU, - 0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U, - 0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU, - 0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U, - 0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU, - 0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU, - 0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U, - 0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU, - 0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U, - 0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU, - 0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U, - 0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U, - 0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U, - 0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU, - 0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU, - 0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U, - 0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU, - 0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U, -}; -static const u32 Te2[256] = { - 0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU, - 0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U, - 0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU, - 0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U, - 0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU, - 0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U, - 0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU, - 0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U, - 0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U, - 0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU, - 0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U, - 0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U, - 0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U, - 0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU, - 0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U, - 0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U, - 0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU, - 0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U, - 0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U, - 0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U, - 0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU, - 0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU, - 0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U, - 0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU, - 0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU, - 0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U, - 0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU, - 0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U, - 0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU, - 0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U, - 0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U, - 0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U, - 0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU, - 0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U, - 0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU, - 0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U, - 0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU, - 0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U, - 0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U, - 0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU, - 0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU, - 0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU, - 0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U, - 0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U, - 0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU, - 0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U, - 0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU, - 0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U, - 0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU, - 0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U, - 0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU, - 0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU, - 0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U, - 0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU, - 0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U, - 0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU, - 0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U, - 0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U, - 0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U, - 0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU, - 0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU, - 0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U, - 0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU, - 0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U, -}; -static const u32 Te3[256] = { - - 0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U, - 0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U, - 0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U, - 0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU, - 0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU, - 0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU, - 0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U, - 0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU, - 0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU, - 0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U, - 0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U, - 0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU, - 0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU, - 0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU, - 0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU, - 0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU, - 0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U, - 0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU, - 0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU, - 0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U, - 0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U, - 0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U, - 0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U, - 0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U, - 0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU, - 0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U, - 0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU, - 0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU, - 0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U, - 0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U, - 0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U, - 0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU, - 0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U, - 0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU, - 0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU, - 0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U, - 0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U, - 0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU, - 0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U, - 0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU, - 0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U, - 0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U, - 0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U, - 0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U, - 0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU, - 0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U, - 0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU, - 0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U, - 0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU, - 0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U, - 0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU, - 0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU, - 0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU, - 0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU, - 0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U, - 0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U, - 0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U, - 0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U, - 0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U, - 0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U, - 0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU, - 0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U, - 0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU, - 0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU, -}; -static const u32 Te4[256] = { - 0x63636363U, 0x7c7c7c7cU, 0x77777777U, 0x7b7b7b7bU, - 0xf2f2f2f2U, 0x6b6b6b6bU, 0x6f6f6f6fU, 0xc5c5c5c5U, - 0x30303030U, 0x01010101U, 0x67676767U, 0x2b2b2b2bU, - 0xfefefefeU, 0xd7d7d7d7U, 0xababababU, 0x76767676U, - 0xcacacacaU, 0x82828282U, 0xc9c9c9c9U, 0x7d7d7d7dU, - 0xfafafafaU, 0x59595959U, 0x47474747U, 0xf0f0f0f0U, - 0xadadadadU, 0xd4d4d4d4U, 0xa2a2a2a2U, 0xafafafafU, - 0x9c9c9c9cU, 0xa4a4a4a4U, 0x72727272U, 0xc0c0c0c0U, - 0xb7b7b7b7U, 0xfdfdfdfdU, 0x93939393U, 0x26262626U, - 0x36363636U, 0x3f3f3f3fU, 0xf7f7f7f7U, 0xccccccccU, - 0x34343434U, 0xa5a5a5a5U, 0xe5e5e5e5U, 0xf1f1f1f1U, - 0x71717171U, 0xd8d8d8d8U, 0x31313131U, 0x15151515U, - 0x04040404U, 0xc7c7c7c7U, 0x23232323U, 0xc3c3c3c3U, - 0x18181818U, 0x96969696U, 0x05050505U, 0x9a9a9a9aU, - 0x07070707U, 0x12121212U, 0x80808080U, 0xe2e2e2e2U, - 0xebebebebU, 0x27272727U, 0xb2b2b2b2U, 0x75757575U, - 0x09090909U, 0x83838383U, 0x2c2c2c2cU, 0x1a1a1a1aU, - 0x1b1b1b1bU, 0x6e6e6e6eU, 0x5a5a5a5aU, 0xa0a0a0a0U, - 0x52525252U, 0x3b3b3b3bU, 0xd6d6d6d6U, 0xb3b3b3b3U, - 0x29292929U, 0xe3e3e3e3U, 0x2f2f2f2fU, 0x84848484U, - 0x53535353U, 0xd1d1d1d1U, 0x00000000U, 0xededededU, - 0x20202020U, 0xfcfcfcfcU, 0xb1b1b1b1U, 0x5b5b5b5bU, - 0x6a6a6a6aU, 0xcbcbcbcbU, 0xbebebebeU, 0x39393939U, - 0x4a4a4a4aU, 0x4c4c4c4cU, 0x58585858U, 0xcfcfcfcfU, - 0xd0d0d0d0U, 0xefefefefU, 0xaaaaaaaaU, 0xfbfbfbfbU, - 0x43434343U, 0x4d4d4d4dU, 0x33333333U, 0x85858585U, - 0x45454545U, 0xf9f9f9f9U, 0x02020202U, 0x7f7f7f7fU, - 0x50505050U, 0x3c3c3c3cU, 0x9f9f9f9fU, 0xa8a8a8a8U, - 0x51515151U, 0xa3a3a3a3U, 0x40404040U, 0x8f8f8f8fU, - 0x92929292U, 0x9d9d9d9dU, 0x38383838U, 0xf5f5f5f5U, - 0xbcbcbcbcU, 0xb6b6b6b6U, 0xdadadadaU, 0x21212121U, - 0x10101010U, 0xffffffffU, 0xf3f3f3f3U, 0xd2d2d2d2U, - 0xcdcdcdcdU, 0x0c0c0c0cU, 0x13131313U, 0xececececU, - 0x5f5f5f5fU, 0x97979797U, 0x44444444U, 0x17171717U, - 0xc4c4c4c4U, 0xa7a7a7a7U, 0x7e7e7e7eU, 0x3d3d3d3dU, - 0x64646464U, 0x5d5d5d5dU, 0x19191919U, 0x73737373U, - 0x60606060U, 0x81818181U, 0x4f4f4f4fU, 0xdcdcdcdcU, - 0x22222222U, 0x2a2a2a2aU, 0x90909090U, 0x88888888U, - 0x46464646U, 0xeeeeeeeeU, 0xb8b8b8b8U, 0x14141414U, - 0xdedededeU, 0x5e5e5e5eU, 0x0b0b0b0bU, 0xdbdbdbdbU, - 0xe0e0e0e0U, 0x32323232U, 0x3a3a3a3aU, 0x0a0a0a0aU, - 0x49494949U, 0x06060606U, 0x24242424U, 0x5c5c5c5cU, - 0xc2c2c2c2U, 0xd3d3d3d3U, 0xacacacacU, 0x62626262U, - 0x91919191U, 0x95959595U, 0xe4e4e4e4U, 0x79797979U, - 0xe7e7e7e7U, 0xc8c8c8c8U, 0x37373737U, 0x6d6d6d6dU, - 0x8d8d8d8dU, 0xd5d5d5d5U, 0x4e4e4e4eU, 0xa9a9a9a9U, - 0x6c6c6c6cU, 0x56565656U, 0xf4f4f4f4U, 0xeaeaeaeaU, - 0x65656565U, 0x7a7a7a7aU, 0xaeaeaeaeU, 0x08080808U, - 0xbabababaU, 0x78787878U, 0x25252525U, 0x2e2e2e2eU, - 0x1c1c1c1cU, 0xa6a6a6a6U, 0xb4b4b4b4U, 0xc6c6c6c6U, - 0xe8e8e8e8U, 0xddddddddU, 0x74747474U, 0x1f1f1f1fU, - 0x4b4b4b4bU, 0xbdbdbdbdU, 0x8b8b8b8bU, 0x8a8a8a8aU, - 0x70707070U, 0x3e3e3e3eU, 0xb5b5b5b5U, 0x66666666U, - 0x48484848U, 0x03030303U, 0xf6f6f6f6U, 0x0e0e0e0eU, - 0x61616161U, 0x35353535U, 0x57575757U, 0xb9b9b9b9U, - 0x86868686U, 0xc1c1c1c1U, 0x1d1d1d1dU, 0x9e9e9e9eU, - 0xe1e1e1e1U, 0xf8f8f8f8U, 0x98989898U, 0x11111111U, - 0x69696969U, 0xd9d9d9d9U, 0x8e8e8e8eU, 0x94949494U, - 0x9b9b9b9bU, 0x1e1e1e1eU, 0x87878787U, 0xe9e9e9e9U, - 0xcecececeU, 0x55555555U, 0x28282828U, 0xdfdfdfdfU, - 0x8c8c8c8cU, 0xa1a1a1a1U, 0x89898989U, 0x0d0d0d0dU, - 0xbfbfbfbfU, 0xe6e6e6e6U, 0x42424242U, 0x68686868U, - 0x41414141U, 0x99999999U, 0x2d2d2d2dU, 0x0f0f0f0fU, - 0xb0b0b0b0U, 0x54545454U, 0xbbbbbbbbU, 0x16161616U, -}; -static const u32 Td0[256] = { - 0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U, - 0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U, - 0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U, - 0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU, - 0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U, - 0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U, - 0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU, - 0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U, - 0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU, - 0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U, - 0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U, - 0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U, - 0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U, - 0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU, - 0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U, - 0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU, - 0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U, - 0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU, - 0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U, - 0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U, - 0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U, - 0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU, - 0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U, - 0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU, - 0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U, - 0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU, - 0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U, - 0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU, - 0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU, - 0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U, - 0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU, - 0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U, - 0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU, - 0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U, - 0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U, - 0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U, - 0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU, - 0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U, - 0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U, - 0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU, - 0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U, - 0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U, - 0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U, - 0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U, - 0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U, - 0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU, - 0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U, - 0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U, - 0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U, - 0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U, - 0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U, - 0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU, - 0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU, - 0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU, - 0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU, - 0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U, - 0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U, - 0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU, - 0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU, - 0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U, - 0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU, - 0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U, - 0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U, - 0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U, -}; -static const u32 Td1[256] = { - 0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU, - 0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U, - 0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU, - 0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U, - 0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U, - 0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U, - 0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U, - 0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U, - 0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U, - 0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU, - 0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU, - 0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU, - 0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U, - 0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU, - 0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U, - 0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U, - 0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U, - 0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU, - 0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU, - 0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U, - 0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU, - 0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U, - 0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU, - 0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU, - 0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U, - 0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U, - 0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U, - 0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU, - 0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U, - 0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU, - 0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U, - 0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U, - 0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U, - 0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU, - 0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U, - 0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U, - 0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U, - 0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U, - 0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U, - 0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U, - 0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU, - 0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU, - 0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U, - 0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU, - 0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U, - 0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU, - 0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU, - 0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U, - 0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU, - 0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U, - 0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U, - 0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U, - 0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U, - 0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U, - 0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U, - 0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U, - 0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU, - 0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U, - 0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U, - 0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU, - 0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U, - 0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U, - 0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U, - 0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U, -}; -static const u32 Td2[256] = { - 0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U, - 0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U, - 0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U, - 0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U, - 0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU, - 0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U, - 0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U, - 0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U, - 0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U, - 0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU, - 0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U, - 0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U, - 0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU, - 0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U, - 0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U, - 0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U, - 0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U, - 0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U, - 0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U, - 0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU, - - 0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U, - 0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U, - 0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U, - 0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U, - 0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U, - 0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU, - 0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU, - 0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U, - 0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU, - 0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U, - 0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU, - 0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU, - 0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU, - 0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU, - 0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U, - 0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U, - 0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U, - 0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U, - 0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U, - 0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U, - 0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U, - 0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU, - 0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU, - 0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U, - 0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U, - 0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU, - 0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU, - 0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U, - 0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U, - 0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U, - 0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U, - 0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U, - 0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U, - 0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U, - 0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU, - 0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U, - 0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U, - 0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U, - 0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U, - 0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U, - 0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U, - 0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU, - 0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U, - 0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U, -}; -static const u32 Td3[256] = { - 0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU, - 0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU, - 0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U, - 0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U, - 0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU, - 0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU, - 0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U, - 0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU, - 0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U, - 0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU, - 0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U, - 0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U, - 0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U, - 0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U, - 0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U, - 0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU, - 0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU, - 0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U, - 0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U, - 0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU, - 0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU, - 0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U, - 0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U, - 0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U, - 0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U, - 0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU, - 0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U, - 0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U, - 0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU, - 0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU, - 0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U, - 0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U, - 0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U, - 0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU, - 0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U, - 0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U, - 0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U, - 0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U, - 0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U, - 0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U, - 0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U, - 0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU, - 0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U, - 0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U, - 0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU, - 0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU, - 0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U, - 0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU, - 0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U, - 0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U, - 0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U, - 0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U, - 0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U, - 0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U, - 0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU, - 0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU, - 0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU, - 0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU, - 0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U, - 0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U, - 0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U, - 0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU, - 0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U, - 0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U, -}; -static const u32 Td4[256] = { - 0x52525252U, 0x09090909U, 0x6a6a6a6aU, 0xd5d5d5d5U, - 0x30303030U, 0x36363636U, 0xa5a5a5a5U, 0x38383838U, - 0xbfbfbfbfU, 0x40404040U, 0xa3a3a3a3U, 0x9e9e9e9eU, - 0x81818181U, 0xf3f3f3f3U, 0xd7d7d7d7U, 0xfbfbfbfbU, - 0x7c7c7c7cU, 0xe3e3e3e3U, 0x39393939U, 0x82828282U, - 0x9b9b9b9bU, 0x2f2f2f2fU, 0xffffffffU, 0x87878787U, - 0x34343434U, 0x8e8e8e8eU, 0x43434343U, 0x44444444U, - 0xc4c4c4c4U, 0xdedededeU, 0xe9e9e9e9U, 0xcbcbcbcbU, - 0x54545454U, 0x7b7b7b7bU, 0x94949494U, 0x32323232U, - 0xa6a6a6a6U, 0xc2c2c2c2U, 0x23232323U, 0x3d3d3d3dU, - 0xeeeeeeeeU, 0x4c4c4c4cU, 0x95959595U, 0x0b0b0b0bU, - 0x42424242U, 0xfafafafaU, 0xc3c3c3c3U, 0x4e4e4e4eU, - 0x08080808U, 0x2e2e2e2eU, 0xa1a1a1a1U, 0x66666666U, - 0x28282828U, 0xd9d9d9d9U, 0x24242424U, 0xb2b2b2b2U, - 0x76767676U, 0x5b5b5b5bU, 0xa2a2a2a2U, 0x49494949U, - 0x6d6d6d6dU, 0x8b8b8b8bU, 0xd1d1d1d1U, 0x25252525U, - 0x72727272U, 0xf8f8f8f8U, 0xf6f6f6f6U, 0x64646464U, - 0x86868686U, 0x68686868U, 0x98989898U, 0x16161616U, - 0xd4d4d4d4U, 0xa4a4a4a4U, 0x5c5c5c5cU, 0xccccccccU, - 0x5d5d5d5dU, 0x65656565U, 0xb6b6b6b6U, 0x92929292U, - 0x6c6c6c6cU, 0x70707070U, 0x48484848U, 0x50505050U, - 0xfdfdfdfdU, 0xededededU, 0xb9b9b9b9U, 0xdadadadaU, - 0x5e5e5e5eU, 0x15151515U, 0x46464646U, 0x57575757U, - 0xa7a7a7a7U, 0x8d8d8d8dU, 0x9d9d9d9dU, 0x84848484U, - 0x90909090U, 0xd8d8d8d8U, 0xababababU, 0x00000000U, - 0x8c8c8c8cU, 0xbcbcbcbcU, 0xd3d3d3d3U, 0x0a0a0a0aU, - 0xf7f7f7f7U, 0xe4e4e4e4U, 0x58585858U, 0x05050505U, - 0xb8b8b8b8U, 0xb3b3b3b3U, 0x45454545U, 0x06060606U, - 0xd0d0d0d0U, 0x2c2c2c2cU, 0x1e1e1e1eU, 0x8f8f8f8fU, - 0xcacacacaU, 0x3f3f3f3fU, 0x0f0f0f0fU, 0x02020202U, - 0xc1c1c1c1U, 0xafafafafU, 0xbdbdbdbdU, 0x03030303U, - 0x01010101U, 0x13131313U, 0x8a8a8a8aU, 0x6b6b6b6bU, - 0x3a3a3a3aU, 0x91919191U, 0x11111111U, 0x41414141U, - 0x4f4f4f4fU, 0x67676767U, 0xdcdcdcdcU, 0xeaeaeaeaU, - 0x97979797U, 0xf2f2f2f2U, 0xcfcfcfcfU, 0xcecececeU, - 0xf0f0f0f0U, 0xb4b4b4b4U, 0xe6e6e6e6U, 0x73737373U, - 0x96969696U, 0xacacacacU, 0x74747474U, 0x22222222U, - 0xe7e7e7e7U, 0xadadadadU, 0x35353535U, 0x85858585U, - 0xe2e2e2e2U, 0xf9f9f9f9U, 0x37373737U, 0xe8e8e8e8U, - 0x1c1c1c1cU, 0x75757575U, 0xdfdfdfdfU, 0x6e6e6e6eU, - 0x47474747U, 0xf1f1f1f1U, 0x1a1a1a1aU, 0x71717171U, - 0x1d1d1d1dU, 0x29292929U, 0xc5c5c5c5U, 0x89898989U, - 0x6f6f6f6fU, 0xb7b7b7b7U, 0x62626262U, 0x0e0e0e0eU, - 0xaaaaaaaaU, 0x18181818U, 0xbebebebeU, 0x1b1b1b1bU, - 0xfcfcfcfcU, 0x56565656U, 0x3e3e3e3eU, 0x4b4b4b4bU, - 0xc6c6c6c6U, 0xd2d2d2d2U, 0x79797979U, 0x20202020U, - 0x9a9a9a9aU, 0xdbdbdbdbU, 0xc0c0c0c0U, 0xfefefefeU, - 0x78787878U, 0xcdcdcdcdU, 0x5a5a5a5aU, 0xf4f4f4f4U, - 0x1f1f1f1fU, 0xddddddddU, 0xa8a8a8a8U, 0x33333333U, - 0x88888888U, 0x07070707U, 0xc7c7c7c7U, 0x31313131U, - 0xb1b1b1b1U, 0x12121212U, 0x10101010U, 0x59595959U, - 0x27272727U, 0x80808080U, 0xececececU, 0x5f5f5f5fU, - 0x60606060U, 0x51515151U, 0x7f7f7f7fU, 0xa9a9a9a9U, - 0x19191919U, 0xb5b5b5b5U, 0x4a4a4a4aU, 0x0d0d0d0dU, - 0x2d2d2d2dU, 0xe5e5e5e5U, 0x7a7a7a7aU, 0x9f9f9f9fU, - 0x93939393U, 0xc9c9c9c9U, 0x9c9c9c9cU, 0xefefefefU, - 0xa0a0a0a0U, 0xe0e0e0e0U, 0x3b3b3b3bU, 0x4d4d4d4dU, - 0xaeaeaeaeU, 0x2a2a2a2aU, 0xf5f5f5f5U, 0xb0b0b0b0U, - 0xc8c8c8c8U, 0xebebebebU, 0xbbbbbbbbU, 0x3c3c3c3cU, - 0x83838383U, 0x53535353U, 0x99999999U, 0x61616161U, - 0x17171717U, 0x2b2b2b2bU, 0x04040404U, 0x7e7e7e7eU, - 0xbabababaU, 0x77777777U, 0xd6d6d6d6U, 0x26262626U, - 0xe1e1e1e1U, 0x69696969U, 0x14141414U, 0x63636363U, - 0x55555555U, 0x21212121U, 0x0c0c0c0cU, 0x7d7d7d7dU, -}; -static const u32 rcon[] = { - 0x01000000, 0x02000000, 0x04000000, 0x08000000, - 0x10000000, 0x20000000, 0x40000000, 0x80000000, - 0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */ -}; - -/** - * Expand the cipher key into the encryption key schedule. - */ -int AES_set_encrypt_key(const unsigned char *userKey, const int bits, - AES_KEY *key) { - - u32 *rk; - int i = 0; - u32 temp; - - if (!userKey || !key) - return -1; - if (bits != 128 && bits != 192 && bits != 256) - return -2; - - rk = key->rd_key; - - if (bits==128) - key->rounds = 10; - else if (bits==192) - key->rounds = 12; - else - key->rounds = 14; - - rk[0] = GETU32(userKey ); - rk[1] = GETU32(userKey + 4); - rk[2] = GETU32(userKey + 8); - rk[3] = GETU32(userKey + 12); - if (bits == 128) { - while (1) { - temp = rk[3]; - rk[4] = rk[0] ^ - (Te4[(temp >> 16) & 0xff] & 0xff000000) ^ - (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^ - (Te4[(temp ) & 0xff] & 0x0000ff00) ^ - (Te4[(temp >> 24) ] & 0x000000ff) ^ - rcon[i]; - rk[5] = rk[1] ^ rk[4]; - rk[6] = rk[2] ^ rk[5]; - rk[7] = rk[3] ^ rk[6]; - if (++i == 10) { - return 0; - } - rk += 4; - } - } - rk[4] = GETU32(userKey + 16); - rk[5] = GETU32(userKey + 20); - if (bits == 192) { - while (1) { - temp = rk[ 5]; - rk[ 6] = rk[ 0] ^ - (Te4[(temp >> 16) & 0xff] & 0xff000000) ^ - (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^ - (Te4[(temp ) & 0xff] & 0x0000ff00) ^ - (Te4[(temp >> 24) ] & 0x000000ff) ^ - rcon[i]; - rk[ 7] = rk[ 1] ^ rk[ 6]; - rk[ 8] = rk[ 2] ^ rk[ 7]; - rk[ 9] = rk[ 3] ^ rk[ 8]; - if (++i == 8) { - return 0; - } - rk[10] = rk[ 4] ^ rk[ 9]; - rk[11] = rk[ 5] ^ rk[10]; - rk += 6; - } - } - rk[6] = GETU32(userKey + 24); - rk[7] = GETU32(userKey + 28); - if (bits == 256) { - while (1) { - temp = rk[ 7]; - rk[ 8] = rk[ 0] ^ - (Te4[(temp >> 16) & 0xff] & 0xff000000) ^ - (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^ - (Te4[(temp ) & 0xff] & 0x0000ff00) ^ - (Te4[(temp >> 24) ] & 0x000000ff) ^ - rcon[i]; - rk[ 9] = rk[ 1] ^ rk[ 8]; - rk[10] = rk[ 2] ^ rk[ 9]; - rk[11] = rk[ 3] ^ rk[10]; - if (++i == 7) { - return 0; - } - temp = rk[11]; - rk[12] = rk[ 4] ^ - (Te4[(temp >> 24) ] & 0xff000000) ^ - (Te4[(temp >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(temp >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(temp ) & 0xff] & 0x000000ff); - rk[13] = rk[ 5] ^ rk[12]; - rk[14] = rk[ 6] ^ rk[13]; - rk[15] = rk[ 7] ^ rk[14]; - - rk += 8; - } - } - return 0; -} - -/** - * Expand the cipher key into the decryption key schedule. - */ -int AES_set_decrypt_key(const unsigned char *userKey, const int bits, - AES_KEY *key) { - - u32 *rk; - int i, j, status; - u32 temp; - - /* first, start with an encryption schedule */ - status = AES_set_encrypt_key(userKey, bits, key); - if (status < 0) - return status; - - rk = key->rd_key; - - /* invert the order of the round keys: */ - for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) { - temp = rk[i ]; rk[i ] = rk[j ]; rk[j ] = temp; - temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp; - temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp; - temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp; - } - /* apply the inverse MixColumn transform to all round keys but the first and the last: */ - for (i = 1; i < (key->rounds); i++) { - rk += 4; - rk[0] = - Td0[Te4[(rk[0] >> 24) ] & 0xff] ^ - Td1[Te4[(rk[0] >> 16) & 0xff] & 0xff] ^ - Td2[Te4[(rk[0] >> 8) & 0xff] & 0xff] ^ - Td3[Te4[(rk[0] ) & 0xff] & 0xff]; - rk[1] = - Td0[Te4[(rk[1] >> 24) ] & 0xff] ^ - Td1[Te4[(rk[1] >> 16) & 0xff] & 0xff] ^ - Td2[Te4[(rk[1] >> 8) & 0xff] & 0xff] ^ - Td3[Te4[(rk[1] ) & 0xff] & 0xff]; - rk[2] = - Td0[Te4[(rk[2] >> 24) ] & 0xff] ^ - Td1[Te4[(rk[2] >> 16) & 0xff] & 0xff] ^ - Td2[Te4[(rk[2] >> 8) & 0xff] & 0xff] ^ - Td3[Te4[(rk[2] ) & 0xff] & 0xff]; - rk[3] = - Td0[Te4[(rk[3] >> 24) ] & 0xff] ^ - Td1[Te4[(rk[3] >> 16) & 0xff] & 0xff] ^ - Td2[Te4[(rk[3] >> 8) & 0xff] & 0xff] ^ - Td3[Te4[(rk[3] ) & 0xff] & 0xff]; - } - return 0; -} - -#ifndef AES_ASM -/* - * Encrypt a single block - * in and out can overlap - */ -void AES_encrypt(const unsigned char *in, unsigned char *out, - const AES_KEY *key) { - - const u32 *rk; - u32 s0, s1, s2, s3, t0, t1, t2, t3; -#ifndef FULL_UNROLL - int r; -#endif /* ?FULL_UNROLL */ - - assert(in && out && key); - rk = key->rd_key; - - /* - * map byte array block to cipher state - * and add initial round key: - */ - s0 = GETU32(in ) ^ rk[0]; - s1 = GETU32(in + 4) ^ rk[1]; - s2 = GETU32(in + 8) ^ rk[2]; - s3 = GETU32(in + 12) ^ rk[3]; -#ifdef FULL_UNROLL - /* round 1: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[ 6]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[ 7]; - /* round 2: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[ 8]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[ 9]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11]; - /* round 3: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15]; - /* round 4: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19]; - /* round 5: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23]; - /* round 6: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27]; - /* round 7: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31]; - /* round 8: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35]; - /* round 9: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39]; - if (key->rounds > 10) { - /* round 10: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43]; - /* round 11: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47]; - if (key->rounds > 12) { - /* round 12: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51]; - /* round 13: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55]; - } - } - rk += key->rounds << 2; -#else /* !FULL_UNROLL */ - /* - * Nr - 1 full rounds: - */ - r = key->rounds >> 1; - for (;;) { - t0 = - Te0[(s0 >> 24) ] ^ - Te1[(s1 >> 16) & 0xff] ^ - Te2[(s2 >> 8) & 0xff] ^ - Te3[(s3 ) & 0xff] ^ - rk[4]; - t1 = - Te0[(s1 >> 24) ] ^ - Te1[(s2 >> 16) & 0xff] ^ - Te2[(s3 >> 8) & 0xff] ^ - Te3[(s0 ) & 0xff] ^ - rk[5]; - t2 = - Te0[(s2 >> 24) ] ^ - Te1[(s3 >> 16) & 0xff] ^ - Te2[(s0 >> 8) & 0xff] ^ - Te3[(s1 ) & 0xff] ^ - rk[6]; - t3 = - Te0[(s3 >> 24) ] ^ - Te1[(s0 >> 16) & 0xff] ^ - Te2[(s1 >> 8) & 0xff] ^ - Te3[(s2 ) & 0xff] ^ - rk[7]; - - rk += 8; - if (--r == 0) { - break; - } - - s0 = - Te0[(t0 >> 24) ] ^ - Te1[(t1 >> 16) & 0xff] ^ - Te2[(t2 >> 8) & 0xff] ^ - Te3[(t3 ) & 0xff] ^ - rk[0]; - s1 = - Te0[(t1 >> 24) ] ^ - Te1[(t2 >> 16) & 0xff] ^ - Te2[(t3 >> 8) & 0xff] ^ - Te3[(t0 ) & 0xff] ^ - rk[1]; - s2 = - Te0[(t2 >> 24) ] ^ - Te1[(t3 >> 16) & 0xff] ^ - Te2[(t0 >> 8) & 0xff] ^ - Te3[(t1 ) & 0xff] ^ - rk[2]; - s3 = - Te0[(t3 >> 24) ] ^ - Te1[(t0 >> 16) & 0xff] ^ - Te2[(t1 >> 8) & 0xff] ^ - Te3[(t2 ) & 0xff] ^ - rk[3]; - } -#endif /* ?FULL_UNROLL */ - /* - * apply last round and - * map cipher state to byte array block: - */ - s0 = - (Te4[(t0 >> 24) ] & 0xff000000) ^ - (Te4[(t1 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(t2 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(t3 ) & 0xff] & 0x000000ff) ^ - rk[0]; - PUTU32(out , s0); - s1 = - (Te4[(t1 >> 24) ] & 0xff000000) ^ - (Te4[(t2 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(t3 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(t0 ) & 0xff] & 0x000000ff) ^ - rk[1]; - PUTU32(out + 4, s1); - s2 = - (Te4[(t2 >> 24) ] & 0xff000000) ^ - (Te4[(t3 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(t0 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(t1 ) & 0xff] & 0x000000ff) ^ - rk[2]; - PUTU32(out + 8, s2); - s3 = - (Te4[(t3 >> 24) ] & 0xff000000) ^ - (Te4[(t0 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(t1 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(t2 ) & 0xff] & 0x000000ff) ^ - rk[3]; - PUTU32(out + 12, s3); -} - -/* - * Decrypt a single block - * in and out can overlap - */ -void AES_decrypt(const unsigned char *in, unsigned char *out, - const AES_KEY *key) { - - const u32 *rk; - u32 s0, s1, s2, s3, t0, t1, t2, t3; -#ifndef FULL_UNROLL - int r; -#endif /* ?FULL_UNROLL */ - - assert(in && out && key); - rk = key->rd_key; - - /* - * map byte array block to cipher state - * and add initial round key: - */ - s0 = GETU32(in ) ^ rk[0]; - s1 = GETU32(in + 4) ^ rk[1]; - s2 = GETU32(in + 8) ^ rk[2]; - s3 = GETU32(in + 12) ^ rk[3]; -#ifdef FULL_UNROLL - /* round 1: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[ 4]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[ 5]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[ 6]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[ 7]; - /* round 2: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[ 8]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[ 9]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[10]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[11]; - /* round 3: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[12]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[13]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[14]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[15]; - /* round 4: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[16]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[17]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[18]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[19]; - /* round 5: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[20]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[21]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[22]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[23]; - /* round 6: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[24]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[25]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[26]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[27]; - /* round 7: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[28]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[29]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[30]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[31]; - /* round 8: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[32]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[33]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[34]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[35]; - /* round 9: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[36]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[37]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39]; - if (key->rounds > 10) { - /* round 10: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43]; - /* round 11: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47]; - if (key->rounds > 12) { - /* round 12: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51]; - /* round 13: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55]; - } - } - rk += key->rounds << 2; -#else /* !FULL_UNROLL */ - /* - * Nr - 1 full rounds: - */ - r = key->rounds >> 1; - for (;;) { - t0 = - Td0[(s0 >> 24) ] ^ - Td1[(s3 >> 16) & 0xff] ^ - Td2[(s2 >> 8) & 0xff] ^ - Td3[(s1 ) & 0xff] ^ - rk[4]; - t1 = - Td0[(s1 >> 24) ] ^ - Td1[(s0 >> 16) & 0xff] ^ - Td2[(s3 >> 8) & 0xff] ^ - Td3[(s2 ) & 0xff] ^ - rk[5]; - t2 = - Td0[(s2 >> 24) ] ^ - Td1[(s1 >> 16) & 0xff] ^ - Td2[(s0 >> 8) & 0xff] ^ - Td3[(s3 ) & 0xff] ^ - rk[6]; - t3 = - Td0[(s3 >> 24) ] ^ - Td1[(s2 >> 16) & 0xff] ^ - Td2[(s1 >> 8) & 0xff] ^ - Td3[(s0 ) & 0xff] ^ - rk[7]; - - rk += 8; - if (--r == 0) { - break; - } - - s0 = - Td0[(t0 >> 24) ] ^ - Td1[(t3 >> 16) & 0xff] ^ - Td2[(t2 >> 8) & 0xff] ^ - Td3[(t1 ) & 0xff] ^ - rk[0]; - s1 = - Td0[(t1 >> 24) ] ^ - Td1[(t0 >> 16) & 0xff] ^ - Td2[(t3 >> 8) & 0xff] ^ - Td3[(t2 ) & 0xff] ^ - rk[1]; - s2 = - Td0[(t2 >> 24) ] ^ - Td1[(t1 >> 16) & 0xff] ^ - Td2[(t0 >> 8) & 0xff] ^ - Td3[(t3 ) & 0xff] ^ - rk[2]; - s3 = - Td0[(t3 >> 24) ] ^ - Td1[(t2 >> 16) & 0xff] ^ - Td2[(t1 >> 8) & 0xff] ^ - Td3[(t0 ) & 0xff] ^ - rk[3]; - } -#endif /* ?FULL_UNROLL */ - /* - * apply last round and - * map cipher state to byte array block: - */ - s0 = - (Td4[(t0 >> 24) ] & 0xff000000) ^ - (Td4[(t3 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(t2 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(t1 ) & 0xff] & 0x000000ff) ^ - rk[0]; - PUTU32(out , s0); - s1 = - (Td4[(t1 >> 24) ] & 0xff000000) ^ - (Td4[(t0 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(t3 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(t2 ) & 0xff] & 0x000000ff) ^ - rk[1]; - PUTU32(out + 4, s1); - s2 = - (Td4[(t2 >> 24) ] & 0xff000000) ^ - (Td4[(t1 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(t0 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(t3 ) & 0xff] & 0x000000ff) ^ - rk[2]; - PUTU32(out + 8, s2); - s3 = - (Td4[(t3 >> 24) ] & 0xff000000) ^ - (Td4[(t2 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(t1 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(t0 ) & 0xff] & 0x000000ff) ^ - rk[3]; - PUTU32(out + 12, s3); -} - -#endif /* AES_ASM */ - -void AES_cbc_encrypt(const unsigned char *in, unsigned char *out, - const unsigned long length, const AES_KEY *key, - unsigned char *ivec, const int enc) -{ - - unsigned long n; - unsigned long len = length; - unsigned char tmp[AES_BLOCK_SIZE]; - - assert(in && out && key && ivec); - - if (enc) { - while (len >= AES_BLOCK_SIZE) { - for(n=0; n < AES_BLOCK_SIZE; ++n) - tmp[n] = in[n] ^ ivec[n]; - AES_encrypt(tmp, out, key); - memcpy(ivec, out, AES_BLOCK_SIZE); - len -= AES_BLOCK_SIZE; - in += AES_BLOCK_SIZE; - out += AES_BLOCK_SIZE; - } - if (len) { - for(n=0; n < len; ++n) - tmp[n] = in[n] ^ ivec[n]; - for(n=len; n < AES_BLOCK_SIZE; ++n) - tmp[n] = ivec[n]; - AES_encrypt(tmp, tmp, key); - memcpy(out, tmp, AES_BLOCK_SIZE); - memcpy(ivec, tmp, AES_BLOCK_SIZE); - } - } else { - while (len >= AES_BLOCK_SIZE) { - memcpy(tmp, in, AES_BLOCK_SIZE); - AES_decrypt(in, out, key); - for(n=0; n < AES_BLOCK_SIZE; ++n) - out[n] ^= ivec[n]; - memcpy(ivec, tmp, AES_BLOCK_SIZE); - len -= AES_BLOCK_SIZE; - in += AES_BLOCK_SIZE; - out += AES_BLOCK_SIZE; - } - if (len) { - memcpy(tmp, in, AES_BLOCK_SIZE); - AES_decrypt(tmp, tmp, key); - for(n=0; n < len; ++n) - out[n] = tmp[n] ^ ivec[n]; - memcpy(ivec, tmp, AES_BLOCK_SIZE); - } - } -} diff --git a/tools/blktap/drivers/aes.h b/tools/blktap/drivers/aes.h deleted file mode 100644 index 9fb54a9..0000000 --- a/tools/blktap/drivers/aes.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef QEMU_AES_H -#define QEMU_AES_H - -#include - -#define AES_MAXNR 14 -#define AES_BLOCK_SIZE 16 - -struct aes_key_st { - uint32_t rd_key[4 *(AES_MAXNR + 1)]; - int rounds; -}; -typedef struct aes_key_st AES_KEY; - -int AES_set_encrypt_key(const unsigned char *userKey, const int bits, - AES_KEY *key); -int AES_set_decrypt_key(const unsigned char *userKey, const int bits, - AES_KEY *key); - -void AES_encrypt(const unsigned char *in, unsigned char *out, - const AES_KEY *key); -void AES_decrypt(const unsigned char *in, unsigned char *out, - const AES_KEY *key); -void AES_cbc_encrypt(const unsigned char *in, unsigned char *out, - const unsigned long length, const AES_KEY *key, - unsigned char *ivec, const int enc); - -#endif diff --git a/tools/blktap/drivers/blk.h b/tools/blktap/drivers/blk.h deleted file mode 100644 index 1cdc980..0000000 --- a/tools/blktap/drivers/blk.h +++ /dev/null @@ -1,3 +0,0 @@ - -int blk_getimagesize(int fd, uint64_t *size); -int blk_getsectorsize(int fd, uint64_t *sector_size); diff --git a/tools/blktap/drivers/blk_linux.c b/tools/blktap/drivers/blk_linux.c deleted file mode 100644 index bb52717..0000000 --- a/tools/blktap/drivers/blk_linux.c +++ /dev/null @@ -1,42 +0,0 @@ -#include -#include -#include -#include "tapdisk.h" -#include "blk.h" - -int blk_getimagesize(int fd, uint64_t *size) -{ - int rc; - - *size = 0; - rc = ioctl(fd, BLKGETSIZE, size); - if (rc) { - DPRINTF("ERR: BLKGETSIZE failed, couldn't stat image"); - return -EINVAL; - } - - return 0; -} - -int blk_getsectorsize(int fd, uint64_t *sector_size) -{ -#if defined(BLKSSZGET) - int rc; - - *sector_size = DEFAULT_SECTOR_SIZE; - rc = ioctl(fd, BLKSSZGET, sector_size); - if (rc) { - DPRINTF("ERR: BLKSSZGET failed. Falling back to use default sector size"); - *sector_size = DEFAULT_SECTOR_SIZE; - } - - if (*sector_size != DEFAULT_SECTOR_SIZE) - DPRINTF("Note: sector size is %"PRIu64" (not %u)\n", - *sector_size, DEFAULT_SECTOR_SIZE); -#else - *sector_size = DEFAULT_SECTOR_SIZE; -#endif - - return 0; -} - diff --git a/tools/blktap/drivers/blktapctrl.c b/tools/blktap/drivers/blktapctrl.c deleted file mode 100644 index 0a8b880..0000000 --- a/tools/blktap/drivers/blktapctrl.c +++ /dev/null @@ -1,937 +0,0 @@ -/* - * blktapctrl.c - * - * userspace controller for the blktap disks. - * As requests for new block devices arrive, - * the controller spawns off a separate process - * per-disk. - * - * - * Copyright (c) 2005 Julian Chesterfield and Andrew Warfield. - * - * 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef MEMSHR -#include -#endif -#include - -#include "blktaplib.h" -#include "blktapctrl.h" -#include "tapdisk.h" -#include "list.h" -#include "xs_api.h" /* for xs_fire_next_watch() */ - -#define PIDFILE "/var/run/blktapctrl.pid" - -#define NUM_POLL_FDS 2 -#define MSG_SIZE 4096 -#define MAX_TIMEOUT 10 -#define MAX_RAND_VAL 0xFFFF -#define MAX_ATTEMPTS 10 - -int run = 1; -int max_timeout = MAX_TIMEOUT; -int ctlfd = 0; - -int blktap_major; - -static int open_ctrl_socket(char *devname); -static int write_msg(int fd, int msgtype, void *ptr, void *ptr2); -static int read_msg(int fd, int msgtype, void *ptr); -static driver_list_entry_t *active_disks[MAX_DISK_TYPES]; - - -static unsigned long long tapdisk_get_size(blkif_t *blkif) -{ - image_t *img = (image_t *)blkif->prv; - return img->size; -} - -static unsigned long tapdisk_get_secsize(blkif_t *blkif) -{ - image_t *img = (image_t *)blkif->prv; - return img->secsize; -} - -static unsigned int tapdisk_get_info(blkif_t *blkif) -{ - image_t *img = (image_t *)blkif->prv; - return img->info; -} - -struct blkif_ops tapdisk_ops = { - .get_size = tapdisk_get_size, - .get_secsize = tapdisk_get_secsize, - .get_info = tapdisk_get_info, -}; - - -static void init_driver_list(void) -{ - int i; - - for (i = 0; i < MAX_DISK_TYPES; i++) - active_disks[i] = NULL; - return; -} - -static void init_rng(void) -{ - static uint32_t seed; - struct timeval tv; - - gettimeofday(&tv, NULL); - seed = tv.tv_usec; - srand48(seed); - return; -} - -static int get_tapdisk_pid(blkif_t *blkif) -{ - int ret; - - if ((ret = write_msg(blkif->fds[WRITE], CTLMSG_PID, blkif, NULL)) - <= 0) { - DPRINTF("Write_msg failed - CTLMSG_PID(%d)\n", ret); - return -EINVAL; - } - - if ((ret = read_msg(blkif->fds[READ], CTLMSG_PID_RSP, blkif)) - <= 0) { - DPRINTF("Read_msg failure - CTLMSG_PID(%d)\n", ret); - return -EINVAL; - } - return 1; -} - -/* Look up the disk specified by path: - * if found, dev points to the device string in the path - * type is the tapdisk driver type id - * blkif is the existing interface if this is a shared driver - * and NULL otherwise. - * return 0 on success, -1 on error. - */ - -static int test_path(char *path, char **dev, int *type, blkif_t **blkif, - int* use_ioemu) -{ - char *ptr, handle[10]; - int i, size, found = 0; - size_t handle_len; - - size = sizeof(dtypes)/sizeof(disk_info_t *); - *type = MAX_DISK_TYPES + 1; - *blkif = NULL; - - if (!strncmp(path, "tapdisk:", strlen("tapdisk:"))) { - *use_ioemu = 0; - path += strlen("tapdisk:"); - } else if (!strncmp(path, "ioemu:", strlen("ioemu:"))) { - *use_ioemu = 1; - path += strlen("ioemu:"); - } else { - // Use the default for the image type - *use_ioemu = -1; - } - - if ( (ptr = strstr(path, ":"))!=NULL) { - handle_len = (ptr - path); - memcpy(handle, path, handle_len); - *dev = ptr + 1; - ptr = handle + handle_len; - *ptr = '\0'; - DPRINTF("Detected handle: [%s]\n",handle); - - for (i = 0; i < size; i++) { - if ((strlen(dtypes[i]->handle) == handle_len) && - strncmp(handle, dtypes[i]->handle, - handle_len) == 0) { - found = 1; - } - - if (found) { - if (*use_ioemu == -1) - *use_ioemu = dtypes[i]->use_ioemu; - *type = dtypes[i]->idnum; - - if (dtypes[i]->single_handler == 1) { - /* Check whether tapdisk process - already exists */ - if (active_disks[dtypes[i]->idnum] == NULL) - *blkif = NULL; - else - *blkif = active_disks[dtypes[i] - ->idnum]->blkif; - } - - return 0; - } - } - } - - /* Fall-through case, we didn't find a disk driver. */ - DPRINTF("Unknown blktap disk type [%s]!\n",handle); - *dev = NULL; - return -1; -} - - -static void add_disktype(blkif_t *blkif, int type) -{ - driver_list_entry_t *entry, **pprev; - - if (type > MAX_DISK_TYPES) - return; - - entry = malloc(sizeof(driver_list_entry_t)); - entry->blkif = blkif; - entry->next = NULL; - - pprev = &active_disks[type]; - while (*pprev != NULL) - pprev = &(*pprev)->next; - - *pprev = entry; - entry->pprev = pprev; -} - -static int qemu_instance_has_disks(pid_t pid) -{ - int i; - int count = 0; - driver_list_entry_t *entry; - - for (i = 0; i < MAX_DISK_TYPES; i++) { - entry = active_disks[i]; - while (entry) { - if ((entry->blkif->tappid == pid) && dtypes[i]->use_ioemu) - count++; - entry = entry->next; - } - } - - return (count != 0); -} - -static int del_disktype(blkif_t *blkif) -{ - driver_list_entry_t *entry, **pprev; - int type = blkif->drivertype, count = 0, close = 0; - - if (type > MAX_DISK_TYPES) - return 1; - - pprev = &active_disks[type]; - while ((*pprev != NULL) && ((*pprev)->blkif != blkif)) - pprev = &(*pprev)->next; - - if ((entry = *pprev) == NULL) { - DPRINTF("DEL_DISKTYPE: No match\n"); - return 1; - } - - *pprev = entry->next; - if (entry->next) - entry->next->pprev = pprev; - - DPRINTF("DEL_DISKTYPE: Freeing entry\n"); - free(entry); - - /* - * When using ioemu, all disks of one VM are connected to the same - * qemu-dm instance. We may close the file handle only if there is - * no other disk left for this domain. - */ - if (dtypes[type]->use_ioemu) - return !qemu_instance_has_disks(blkif->tappid); - - /* Caller should close() if no single controller, or list is empty. */ - return (!dtypes[type]->single_handler || (active_disks[type] == NULL)); -} - -static int write_msg(int fd, int msgtype, void *ptr, void *ptr2) -{ - blkif_t *blkif; - blkif_info_t *blk; - msg_hdr_t *msg; - msg_newdev_t *msg_dev; - char *p, *buf, *path; - int msglen, len, ret; - fd_set writefds; - struct timeval timeout; - image_t *image, *img; - uint32_t seed; - - blkif = (blkif_t *)ptr; - blk = blkif->info; - image = blkif->prv; - len = 0; - - switch (msgtype) - { - case CTLMSG_PARAMS: - path = (char *)ptr2; - DPRINTF("Write_msg called: CTLMSG_PARAMS, sending [%s, %s]\n", - blk->params, path); - - msglen = sizeof(msg_hdr_t) + strlen(path) + 1; - buf = malloc(msglen); - - /*Assign header fields*/ - msg = (msg_hdr_t *)buf; - msg->type = CTLMSG_PARAMS; - msg->len = msglen; - msg->drivertype = blkif->drivertype; - msg->readonly = blkif->readonly; - - gettimeofday(&timeout, NULL); - msg->cookie = blkif->cookie; - DPRINTF("Generated cookie, %d\n",blkif->cookie); - - /*Copy blk->params to msg*/ - p = buf + sizeof(msg_hdr_t); - memcpy(p, path, strlen(path) + 1); - - break; - - case CTLMSG_NEWDEV: - DPRINTF("Write_msg called: CTLMSG_NEWDEV\n"); - - msglen = sizeof(msg_hdr_t) + sizeof(msg_newdev_t); - buf = malloc(msglen); - - /*Assign header fields*/ - msg = (msg_hdr_t *)buf; - msg->type = CTLMSG_NEWDEV; - msg->len = msglen; - msg->drivertype = blkif->drivertype; - msg->cookie = blkif->cookie; - - msg_dev = (msg_newdev_t *)(buf + sizeof(msg_hdr_t)); - msg_dev->devnum = blkif->minor; - msg_dev->domid = blkif->domid; - - break; - - case CTLMSG_CLOSE: - DPRINTF("Write_msg called: CTLMSG_CLOSE\n"); - - msglen = sizeof(msg_hdr_t); - buf = malloc(msglen); - - /*Assign header fields*/ - msg = (msg_hdr_t *)buf; - msg->type = CTLMSG_CLOSE; - msg->len = msglen; - msg->drivertype = blkif->drivertype; - msg->cookie = blkif->cookie; - - break; - - case CTLMSG_PID: - DPRINTF("Write_msg called: CTLMSG_PID\n"); - - msglen = sizeof(msg_hdr_t); - buf = malloc(msglen); - - /*Assign header fields*/ - msg = (msg_hdr_t *)buf; - msg->type = CTLMSG_PID; - msg->len = msglen; - msg->drivertype = blkif->drivertype; - msg->cookie = blkif->cookie; - - break; - - default: - return -1; - } - - /*Now send the message*/ - ret = 0; - FD_ZERO(&writefds); - FD_SET(fd,&writefds); - timeout.tv_sec = max_timeout; /*Wait for up to max_timeout seconds*/ - timeout.tv_usec = 0; - if (select(fd+1, (fd_set *) 0, &writefds, - (fd_set *) 0, &timeout) > 0) { - len = write(fd, buf, msglen); - if (len == -1) DPRINTF("Write failed: (%d)\n",errno); - } - free(buf); - - return len; -} - -static int read_msg(int fd, int msgtype, void *ptr) -{ - blkif_t *blkif; - blkif_info_t *blk; - msg_hdr_t *msg; - msg_pid_t *msg_pid; - char *p, *buf; - int msglen = MSG_SIZE, len, ret; - fd_set readfds; - struct timeval timeout; - image_t *image, *img; - - - blkif = (blkif_t *)ptr; - blk = blkif->info; - image = blkif->prv; - - buf = malloc(MSG_SIZE); - - ret = 0; - FD_ZERO(&readfds); - FD_SET(fd,&readfds); - timeout.tv_sec = max_timeout; /*Wait for up to max_timeout seconds*/ - timeout.tv_usec = 0; - if (select(fd+1, &readfds, (fd_set *) 0, - (fd_set *) 0, &timeout) > 0) { - ret = read(fd, buf, msglen); - } - if (ret > 0) { - msg = (msg_hdr_t *)buf; - switch (msg->type) - { - case CTLMSG_IMG: - img = (image_t *)(buf + sizeof(msg_hdr_t)); - image->size = img->size; - image->secsize = img->secsize; - image->info = img->info; - - DPRINTF("Received CTLMSG_IMG: %llu, %lu, %u\n", - image->size, image->secsize, image->info); - if(msgtype != CTLMSG_IMG) ret = 0; - break; - - case CTLMSG_IMG_FAIL: - DPRINTF("Received CTLMSG_IMG_FAIL, " - "unable to open image\n"); - ret = 0; - break; - - case CTLMSG_NEWDEV_RSP: - DPRINTF("Received CTLMSG_NEWDEV_RSP\n"); - if(msgtype != CTLMSG_NEWDEV_RSP) ret = 0; - break; - - case CTLMSG_NEWDEV_FAIL: - DPRINTF("Received CTLMSG_NEWDEV_FAIL\n"); - ret = 0; - break; - - case CTLMSG_CLOSE_RSP: - DPRINTF("Received CTLMSG_CLOSE_RSP\n"); - if (msgtype != CTLMSG_CLOSE_RSP) ret = 0; - break; - - case CTLMSG_PID_RSP: - DPRINTF("Received CTLMSG_PID_RSP\n"); - if (msgtype != CTLMSG_PID_RSP) ret = 0; - else { - msg_pid = (msg_pid_t *) - (buf + sizeof(msg_hdr_t)); - blkif->tappid = msg_pid->pid; - DPRINTF("\tPID: [%d]\n",blkif->tappid); - } - break; - default: - DPRINTF("UNKNOWN MESSAGE TYPE RECEIVED\n"); - ret = 0; - break; - } - } - - free(buf); - - return ret; - -} - -static int launch_tapdisk_provider(char **argv) -{ - pid_t child; - - if ((child = fork()) < 0) - return -1; - - if (!child) { - int i; - for (i = 0 ; i < sysconf(_SC_OPEN_MAX) ; i++) - if (i != STDIN_FILENO && - i != STDOUT_FILENO && - i != STDERR_FILENO) - close(i); - - execvp(argv[0], argv); - DPRINTF("execvp failed: %d (%s)\n", errno, strerror(errno)); - DPRINTF("PATH = %s\n", getenv("PATH")); - _exit(1); - } else { - pid_t got; - do { - got = waitpid(child, NULL, 0); - } while (got != child); - } - return child; -} - -static int launch_tapdisk(char *wrctldev, char *rdctldev) -{ - char *argv[] = { "tapdisk", wrctldev, rdctldev, NULL }; - - if (launch_tapdisk_provider(argv) < 0) - return -1; - - return 0; -} - -static int launch_tapdisk_ioemu(void) -{ - char *argv[] = { "tapdisk-ioemu", NULL }; - return launch_tapdisk_provider(argv); -} - -/* - * Connect to an ioemu based disk provider (qemu-dm or tapdisk-ioemu) - * - * If the domain has a device model, connect to qemu-dm through the - * domain specific pipe. Otherwise use a single tapdisk-ioemu instance - * which is represented by domid 0 and provides access for Dom0 and - * all DomUs without device model. - */ -static int connect_qemu(blkif_t *blkif, int domid) -{ - char *rdctldev, *wrctldev; - - static int tapdisk_ioemu_pid = 0; - static int dom0_readfd = 0; - static int dom0_writefd = 0; - int refresh_pid = 0; - - if (asprintf(&rdctldev, BLKTAP_CTRL_DIR "/qemu-read-%d", domid) < 0) - return -1; - - if (asprintf(&wrctldev, BLKTAP_CTRL_DIR "/qemu-write-%d", domid) < 0) { - free(rdctldev); - return -1; - } - - DPRINTF("Using qemu blktap pipe: %s\n", rdctldev); - - if (domid == 0) { - /* - * tapdisk-ioemu exits as soon as the last image is - * disconnected. Check if it is still running. - */ - if (tapdisk_ioemu_pid == 0 || kill(tapdisk_ioemu_pid, 0)) { - /* No device model and tapdisk-ioemu doesn't run yet */ - DPRINTF("Launching tapdisk-ioemu\n"); - launch_tapdisk_ioemu(); - - dom0_readfd = open_ctrl_socket(wrctldev); - dom0_writefd = open_ctrl_socket(rdctldev); - - refresh_pid = 1; - } - - DPRINTF("Using tapdisk-ioemu connection\n"); - blkif->fds[READ] = dom0_readfd; - blkif->fds[WRITE] = dom0_writefd; - - if (refresh_pid) { - get_tapdisk_pid(blkif); - tapdisk_ioemu_pid = blkif->tappid; - } - - } else if (access(rdctldev, R_OK | W_OK) == 0) { - /* Use existing pipe to the device model */ - DPRINTF("Using qemu-dm connection\n"); - blkif->fds[READ] = open_ctrl_socket(wrctldev); - blkif->fds[WRITE] = open_ctrl_socket(rdctldev); - } else { - /* No device model => try with tapdisk-ioemu */ - DPRINTF("No device model\n"); - connect_qemu(blkif, 0); - } - - free(rdctldev); - free(wrctldev); - - if (blkif->fds[READ] == -1 || blkif->fds[WRITE] == -1) - return -1; - - DPRINTF("Attached to qemu blktap pipes\n"); - return 0; -} - -/* Launch tapdisk instance */ -static int connect_tapdisk(blkif_t *blkif, int minor) -{ - char *rdctldev = NULL, *wrctldev = NULL; - int ret = -1; - - DPRINTF("tapdisk process does not exist:\n"); - - if (asprintf(&rdctldev, - "%s/tapctrlread%d", BLKTAP_CTRL_DIR, minor) == -1) - goto fail; - - if (asprintf(&wrctldev, - "%s/tapctrlwrite%d", BLKTAP_CTRL_DIR, minor) == -1) - goto fail; - - blkif->fds[READ] = open_ctrl_socket(rdctldev); - blkif->fds[WRITE] = open_ctrl_socket(wrctldev); - - if (blkif->fds[READ] == -1 || blkif->fds[WRITE] == -1) - goto fail; - - /*launch the new process*/ - DPRINTF("Launching process, CMDLINE [tapdisk %s %s]\n", - wrctldev, rdctldev); - - if (launch_tapdisk(wrctldev, rdctldev) == -1) { - DPRINTF("Unable to fork, cmdline: [tapdisk %s %s]\n", - wrctldev, rdctldev); - goto fail; - } - - ret = 0; - -fail: - if (rdctldev) - free(rdctldev); - - if (wrctldev) - free(wrctldev); - - return ret; -} - -static int blktapctrl_new_blkif(blkif_t *blkif) -{ - blkif_info_t *blk; - int major, minor, fd_read, fd_write, type, new; - char *rdctldev, *wrctldev, *ptr; - image_t *image; - blkif_t *exist = NULL; - static uint16_t next_cookie = 0; - int use_ioemu; - - DPRINTF("Received a poll for a new vbd\n"); - if ( ((blk=blkif->info) != NULL) && (blk->params != NULL) ) { - if (blktap_interface_create(ctlfd, &major, &minor, blkif) < 0) - return -1; - - if (test_path(blk->params, &ptr, &type, &exist, &use_ioemu) != 0) { - DPRINTF("Error in blktap device string(%s).\n", - blk->params); - goto fail; - } - blkif->drivertype = type; - blkif->cookie = next_cookie++; - - if (!exist) { - if (use_ioemu) { - if (connect_qemu(blkif, blkif->domid)) - goto fail; - } else { - if (connect_tapdisk(blkif, minor)) - goto fail; - } - - } else { - DPRINTF("Process exists!\n"); - blkif->fds[READ] = exist->fds[READ]; - blkif->fds[WRITE] = exist->fds[WRITE]; - } - - add_disktype(blkif, type); - blkif->major = major; - blkif->minor = minor; - - image = (image_t *)malloc(sizeof(image_t)); - blkif->prv = (void *)image; - blkif->ops = &tapdisk_ops; - - /*Retrieve the PID of the new process*/ - if (get_tapdisk_pid(blkif) <= 0) { - DPRINTF("Unable to contact disk process\n"); - goto fail; - } - - /* Both of the following read and write calls will block up to - * max_timeout val*/ - if (write_msg(blkif->fds[WRITE], CTLMSG_PARAMS, blkif, ptr) - <= 0) { - DPRINTF("Write_msg failed - CTLMSG_PARAMS\n"); - goto fail; - } - - if (read_msg(blkif->fds[READ], CTLMSG_IMG, blkif) <= 0) { - DPRINTF("Read_msg failure - CTLMSG_IMG\n"); - goto fail; - } - - } else return -1; - - return 0; -fail: - ioctl(ctlfd, BLKTAP_IOCTL_FREEINTF, minor); - return -EINVAL; -} - -static int map_new_blktapctrl(blkif_t *blkif) -{ - DPRINTF("Received a poll for a new devmap\n"); - if (write_msg(blkif->fds[WRITE], CTLMSG_NEWDEV, blkif, NULL) <= 0) { - DPRINTF("Write_msg failed - CTLMSG_NEWDEV\n"); - return -EINVAL; - } - - if (read_msg(blkif->fds[READ], CTLMSG_NEWDEV_RSP, blkif) <= 0) { - DPRINTF("Read_msg failed - CTLMSG_NEWDEV_RSP\n"); - return -EINVAL; - } - DPRINTF("Exiting map_new_blktapctrl\n"); - - return blkif->minor - 1; -} - -static int unmap_blktapctrl(blkif_t *blkif) -{ - DPRINTF("Unmapping vbd\n"); - - if (write_msg(blkif->fds[WRITE], CTLMSG_CLOSE, blkif, NULL) <= 0) { - DPRINTF("Write_msg failed - CTLMSG_CLOSE\n"); - return -EINVAL; - } - - if (del_disktype(blkif)) { - DPRINTF("Closing communication pipe to pid %d\n", blkif->tappid); - close(blkif->fds[WRITE]); - close(blkif->fds[READ]); - } - - return 0; -} - -int open_ctrl_socket(char *devname) -{ - int ret; - int ipc_fd; - fd_set socks; - struct timeval timeout; - - if (mkdir(BLKTAP_CTRL_DIR, 0755) == 0) - DPRINTF("Created %s directory\n", BLKTAP_CTRL_DIR); - ret = mkfifo(devname,S_IRWXU|S_IRWXG|S_IRWXO); - if ( (ret != 0) && (errno != EEXIST) ) { - DPRINTF("ERROR: pipe failed (%d)\n", errno); - exit(0); - } - - ipc_fd = open(devname,O_RDWR|O_NONBLOCK); - - if (ipc_fd < 0) { - DPRINTF("FD open failed\n"); - return -1; - } - - return ipc_fd; -} - -static void print_drivers(void) -{ - int i, size; - - size = sizeof(dtypes)/sizeof(disk_info_t *); - DPRINTF("blktapctrl: v1.0.0\n"); - for (i = 0; i < size; i++) - DPRINTF("Found driver: [%s]\n",dtypes[i]->name); -} - -static void write_pidfile(long pid) -{ - char buf[100]; - int len; - int fd; - int flags; - - fd = open(PIDFILE, O_RDWR | O_CREAT, 0600); - if (fd == -1) { - DPRINTF("Opening pid file failed (%d)\n", errno); - exit(1); - } - - /* We exit silently if daemon already running. */ - if (lockf(fd, F_TLOCK, 0) == -1) - exit(0); - - /* Set FD_CLOEXEC, so that tapdisk doesn't get this file - descriptor. */ - if ((flags = fcntl(fd, F_GETFD)) == -1) { - DPRINTF("F_GETFD failed (%d)\n", errno); - exit(1); - } - flags |= FD_CLOEXEC; - if (fcntl(fd, F_SETFD, flags) == -1) { - DPRINTF("F_SETFD failed (%d)\n", errno); - exit(1); - } - - len = snprintf(buf, sizeof(buf), "%ld\n", pid); - if (write(fd, buf, len) != len) { - DPRINTF("Writing pid file failed (%d)\n", errno); - exit(1); - } -} - -int main(int argc, char *argv[]) -{ - char *devname; - tapdev_info_t *ctlinfo; - int tap_pfd, store_pfd, xs_fd, ret, timeout, pfd_count, count=0; - struct xs_handle *h; - struct pollfd pfd[NUM_POLL_FDS]; - pid_t process; - char buf[128]; - - __init_blkif(); - snprintf(buf, sizeof(buf), "BLKTAPCTRL[%d]", getpid()); - openlog(buf, LOG_CONS|LOG_ODELAY, LOG_DAEMON); - if (daemon(0,0)) { - DPRINTF("daemon failed (%d)\n", errno); - goto open_failed; - } - - print_drivers(); - init_driver_list(); - init_rng(); - - register_new_blkif_hook(blktapctrl_new_blkif); - register_new_devmap_hook(map_new_blktapctrl); - register_new_unmap_hook(unmap_blktapctrl); - - ctlfd = blktap_interface_open(); - if (ctlfd < 0) { - DPRINTF("couldn't open blktap interface\n"); - goto open_failed; - } - -#ifdef MEMSHR - memshr_daemon_initialize(); -#endif - - retry: - /* Set up store connection and watch. */ - h = xs_daemon_open(); - if (h == NULL) { - DPRINTF("xs_daemon_open failed -- " - "is xenstore running?\n"); - if (count < MAX_ATTEMPTS) { - count++; - sleep(2); - goto retry; - } else goto open_failed; - } - - ret = setup_probe_watch(h); - if (ret != 0) { - DPRINTF("Failed adding device probewatch\n"); - xs_daemon_close(h); - goto open_failed; - } - - ioctl(ctlfd, BLKTAP_IOCTL_SETMODE, BLKTAP_MODE_INTERPOSE ); - - process = getpid(); - write_pidfile(process); - ret = ioctl(ctlfd, BLKTAP_IOCTL_SENDPID, process ); - - /*Static pollhooks*/ - pfd_count = 0; - tap_pfd = pfd_count++; - pfd[tap_pfd].fd = ctlfd; - pfd[tap_pfd].events = POLLIN; - - store_pfd = pfd_count++; - pfd[store_pfd].fd = xs_fileno(h); - pfd[store_pfd].events = POLLIN; - - while (run) { - timeout = 1000; /*Milliseconds*/ - ret = poll(pfd, pfd_count, timeout); - - if (ret > 0) { - if (pfd[store_pfd].revents) { - ret = xs_fire_next_watch(h); - } - } - } - - xs_daemon_close(h); - ioctl(ctlfd, BLKTAP_IOCTL_SETMODE, BLKTAP_MODE_PASSTHROUGH ); - close(ctlfd); - closelog(); - - return 0; - - open_failed: - DPRINTF("Unable to start blktapctrl\n"); - closelog(); - return -1; -} - -/* - * Local variables: - * c-file-style: "linux" - * indent-tabs-mode: t - * c-indent-level: 8 - * c-basic-offset: 8 - * tab-width: 8 - * End: - */ diff --git a/tools/blktap/drivers/blktapctrl.h b/tools/blktap/drivers/blktapctrl.h deleted file mode 100644 index 4512807..0000000 --- a/tools/blktap/drivers/blktapctrl.h +++ /dev/null @@ -1,36 +0,0 @@ -/* blktapctrl.h - * - * controller image utils. - * - * (c) 2004-6 Andrew Warfield and Julian Chesterfield - * - * 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. - */ - - -int blktap_interface_open(void); - -int blktap_interface_create(int ctlfd, int *major, int *minor, blkif_t *blkif); - diff --git a/tools/blktap/drivers/blktapctrl_linux.c b/tools/blktap/drivers/blktapctrl_linux.c deleted file mode 100644 index 6282fa6..0000000 --- a/tools/blktap/drivers/blktapctrl_linux.c +++ /dev/null @@ -1,89 +0,0 @@ - -#include -#include -#include -#include - -#include "tapdisk.h" -#include "blktaplib.h" -#include "blktapctrl.h" - -static void make_blktap_dev(char *devname, int major, int minor) -{ - struct stat st; - - if (lstat(devname, &st) != 0) { - /*Need to create device*/ - if (mkdir(BLKTAP_DEV_DIR, 0755) == 0) - DPRINTF("Created %s directory\n",BLKTAP_DEV_DIR); - if (mknod(devname, S_IFCHR|0600, - makedev(major, minor)) == 0) - DPRINTF("Created %s device\n",devname); - } else { - DPRINTF("%s device already exists\n",devname); - /* it already exists, but is it the same major number */ - if (((st.st_rdev>>8) & 0xff) != major) { - DPRINTF("%s has old major %d\n", - devname, - (unsigned int)((st.st_rdev >> 8) & 0xff)); - /* only try again if we succed in deleting it */ - if (!unlink(devname)) - make_blktap_dev(devname, major, minor); - } - } -} - -int blktap_interface_create(int ctlfd, int *major, int *minor, blkif_t *blkif) -{ - domid_translate_t tr; - domid_translate_ext_t tr_ext; - int ret; - char *devname; - - if (blkif->be_id >= (1<<28)) { - /* new-style backend-id, so use the extended structure */ - tr_ext.domid = blkif->domid; - tr_ext.busid = blkif->be_id; - ret = ioctl(ctlfd, BLKTAP_IOCTL_NEWINTF_EXT, &tr_ext); - DPRINTF("Sent domid %d and be_id %d\n", tr_ext.domid, - tr_ext.busid); - } - else { - /* old-style backend-id; use the old structure */ - tr.domid = blkif->domid; - tr.busid = (unsigned short)blkif->be_id; - ret = ioctl(ctlfd, BLKTAP_IOCTL_NEWINTF, tr); - DPRINTF("Sent domid %d and be_id %d\n", tr.domid, tr.busid); - } - - if ( (ret <= 0)||(ret > MAX_TAP_DEV) ) { - DPRINTF("Incorrect Dev ID [%d]\n",ret); - return -1; - } - - *minor = ret; - *major = ioctl(ctlfd, BLKTAP_IOCTL_MAJOR, ret ); - if (*major < 0) { - DPRINTF("Incorrect Major ID [%d]\n",*major); - return -1; - } - - if (asprintf(&devname,"%s/%s%d",BLKTAP_DEV_DIR, BLKTAP_DEV_NAME, *minor) == -1) - return -1; - make_blktap_dev(devname,*major,*minor); - DPRINTF("Received device id %d and major %d\n", - *minor, *major); - return 0; -} - - -int blktap_interface_open(void) -{ - int ctlfd; - - ctlfd = open(BLKTAP_DEV_DIR "/" BLKTAP_DEV_NAME "0", O_RDWR); - if (ctlfd == -1) - DPRINTF("blktap0 open failed\n"); - - return ctlfd; -} diff --git a/tools/blktap/drivers/block-aio.c b/tools/blktap/drivers/block-aio.c deleted file mode 100644 index 98727f4..0000000 --- a/tools/blktap/drivers/block-aio.c +++ /dev/null @@ -1,259 +0,0 @@ -/* block-aio.c - * - * libaio-based raw disk implementation. - * - * (c) 2006 Andrew Warfield and Julian Chesterfield - * - * NB: This code is not thread-safe. - * - * 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include "tapdisk.h" -#include "tapaio.h" -#include "blk.h" - -#define MAX_AIO_REQS (MAX_REQUESTS * MAX_SEGMENTS_PER_REQ) - -/* *BSD has no O_LARGEFILE */ -#ifndef O_LARGEFILE -#define O_LARGEFILE 0 -#endif - -struct tdaio_state { - int fd; - tap_aio_context_t aio; -}; - - -/*Get Image size, secsize*/ -static int get_image_info(struct td_state *s, int fd) -{ - int ret; - long size; - unsigned long total_size; - struct statvfs statBuf; - struct stat stat; - - ret = fstat(fd, &stat); - if (ret != 0) { - DPRINTF("ERROR: fstat failed, Couldn't stat image"); - return -EINVAL; - } - - if (S_ISBLK(stat.st_mode)) { - /*Accessing block device directly*/ - if (blk_getimagesize(fd, &s->size) != 0) - return -EINVAL; - - DPRINTF("Image size: \n\tpre sector_shift [%llu]\n\tpost " - "sector_shift [%llu]\n", - (long long unsigned)(s->size << SECTOR_SHIFT), - (long long unsigned)s->size); - - /*Get the sector size*/ - if (blk_getsectorsize(fd, &s->sector_size) != 0) - s->sector_size = DEFAULT_SECTOR_SIZE; - - } else { - /*Local file? try fstat instead*/ - s->size = (stat.st_size >> SECTOR_SHIFT); - s->sector_size = DEFAULT_SECTOR_SIZE; - DPRINTF("Image size: \n\tpre sector_shift [%llu]\n\tpost " - "sector_shift [%llu]\n", - (long long unsigned)(s->size << SECTOR_SHIFT), - (long long unsigned)s->size); - } - - if (s->size == 0) { - s->size =((uint64_t) 16836057); - s->sector_size = DEFAULT_SECTOR_SIZE; - } - s->info = 0; - - return 0; -} - -static inline void init_fds(struct disk_driver *dd) -{ - int i; - struct tdaio_state *prv = (struct tdaio_state *)dd->private; - - for(i = 0; i < MAX_IOFD; i++) - dd->io_fd[i] = 0; - - dd->io_fd[0] = prv->aio.aio_ctx.pollfd; -} - -/* Open the disk file and initialize aio state. */ -static int tdaio_open (struct disk_driver *dd, const char *name, td_flag_t flags) -{ - int i, fd, ret = 0, o_flags; - struct td_state *s = dd->td_state; - struct tdaio_state *prv = (struct tdaio_state *)dd->private; - - DPRINTF("block-aio open('%s')", name); - - /* Initialize AIO */ - ret = tap_aio_init(&prv->aio, 0, MAX_AIO_REQS); - if (ret != 0) - return ret; - - /* Open the file */ - o_flags = O_DIRECT | O_LARGEFILE | - ((flags == TD_RDONLY) ? O_RDONLY : O_RDWR); - fd = open(name, o_flags); - - if ( (fd == -1) && (errno == EINVAL) ) { - - /* Maybe O_DIRECT isn't supported. */ - o_flags &= ~O_DIRECT; - fd = open(name, o_flags); - if (fd != -1) DPRINTF("WARNING: Accessing image without" - "O_DIRECT! (%s)\n", name); - - } else if (fd != -1) DPRINTF("open(%s) with O_DIRECT\n", name); - - if (fd == -1) { - DPRINTF("Unable to open [%s] (%d)!\n", name, 0 - errno); - ret = 0 - errno; - goto done; - } - - prv->fd = fd; - - init_fds(dd); - ret = get_image_info(s, fd); - -done: - return ret; -} - -static int tdaio_queue_read(struct disk_driver *dd, uint64_t sector, - int nb_sectors, char *buf, td_callback_t cb, - int id, void *private) -{ - struct td_state *s = dd->td_state; - struct tdaio_state *prv = (struct tdaio_state *)dd->private; - int size = nb_sectors * s->sector_size; - uint64_t offset = sector * (uint64_t)s->sector_size; - - return tap_aio_read(&prv->aio, prv->fd, size, offset, buf, - cb, id, sector, private); -} - -static int tdaio_queue_write(struct disk_driver *dd, uint64_t sector, - int nb_sectors, char *buf, td_callback_t cb, - int id, void *private) -{ - struct td_state *s = dd->td_state; - struct tdaio_state *prv = (struct tdaio_state *)dd->private; - int size = nb_sectors * s->sector_size; - uint64_t offset = sector * (uint64_t)s->sector_size; - - return tap_aio_write(&prv->aio, prv->fd, size, offset, buf, - cb, id, sector, private); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:09:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:09: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 1YCx6V-0002Iy-6Y; Sun, 18 Jan 2015 21:09:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6T-0002Is-CN for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:49 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id FB/1E-10925-C112CB45; Sun, 18 Jan 2015 21:09:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1421615382!22194441!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18486 invoked from network); 18 Jan 2015 21:09:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:09:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6M-0001IT-Ao for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx6M-0004V9-9Y for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:42 +0000 Date: Sun, 18 Jan 2015 21:09:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: remove blktap1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f6bcc035084ab11fde5eaec95fecaca5891d2385 Author: Ian Campbell AuthorDate: Tue Nov 4 10:41:25 2014 +0000 Commit: Ian Campbell CommitDate: Thu Jan 15 13:54:10 2015 +0000 tools: remove blktap1 Now that it is unhooked we can just remove it. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- .gitignore | 5 - .hgignore | 5 - tools/blktap/Makefile | 13 - tools/blktap/README | 122 -- tools/blktap/drivers/Makefile | 73 -- tools/blktap/drivers/aes.c | 1319 ------------------- tools/blktap/drivers/aes.h | 28 - tools/blktap/drivers/blk.h | 3 - tools/blktap/drivers/blk_linux.c | 42 - tools/blktap/drivers/blktapctrl.c | 937 -------------- tools/blktap/drivers/blktapctrl.h | 36 - tools/blktap/drivers/blktapctrl_linux.c | 89 -- tools/blktap/drivers/block-aio.c | 259 ---- tools/blktap/drivers/block-qcow.c | 1434 --------------------- tools/blktap/drivers/block-qcow2.c | 2098 ------------------------------- tools/blktap/drivers/block-ram.c | 295 ----- tools/blktap/drivers/block-sync.c | 242 ---- tools/blktap/drivers/block-vmdk.c | 428 ------- tools/blktap/drivers/bswap.h | 178 --- tools/blktap/drivers/img2qcow.c | 282 ----- tools/blktap/drivers/qcow-create.c | 130 -- tools/blktap/drivers/qcow2raw.c | 348 ----- tools/blktap/drivers/tapaio.c | 357 ------ tools/blktap/drivers/tapaio.h | 108 -- tools/blktap/drivers/tapdisk.c | 872 ------------- tools/blktap/drivers/tapdisk.h | 259 ---- tools/blktap/lib/Makefile | 60 - tools/blktap/lib/blkif.c | 185 --- tools/blktap/lib/blktaplib.h | 240 ---- tools/blktap/lib/list.h | 59 - tools/blktap/lib/xenbus.c | 617 --------- tools/blktap/lib/xs_api.c | 360 ------ tools/blktap/lib/xs_api.h | 50 - 33 files changed, 0 insertions(+), 11533 deletions(-) diff --git a/.gitignore b/.gitignore index 8c8c06f..a8f15d5 100644 --- a/.gitignore +++ b/.gitignore @@ -101,11 +101,6 @@ tools/blktap2/drivers/tapdisk2 tools/blktap2/drivers/td-util tools/blktap2/vhd/vhd-update tools/blktap2/vhd/vhd-util -tools/blktap/drivers/blktapctrl -tools/blktap/drivers/img2qcow -tools/blktap/drivers/qcow-create -tools/blktap/drivers/qcow2raw -tools/blktap/drivers/tapdisk tools/console/xenconsole tools/console/xenconsoled tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/* diff --git a/.hgignore b/.hgignore index da27f80..0bd29a1 100644 --- a/.hgignore +++ b/.hgignore @@ -140,11 +140,6 @@ ^tools/blktap2/drivers/td-util$ ^tools/blktap2/vhd/vhd-update$ ^tools/blktap2/vhd/vhd-util$ -^tools/blktap/drivers/blktapctrl$ -^tools/blktap/drivers/img2qcow$ -^tools/blktap/drivers/qcow-create$ -^tools/blktap/drivers/qcow2raw$ -^tools/blktap/drivers/tapdisk$ ^tools/check/\..*$ ^tools/console/xenconsole$ ^tools/console/xenconsoled$ diff --git a/tools/blktap/Makefile b/tools/blktap/Makefile deleted file mode 100644 index 4020566..0000000 --- a/tools/blktap/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -XEN_ROOT = $(CURDIR)/../.. -include $(XEN_ROOT)/tools/Rules.mk - -SUBDIRS-y := -SUBDIRS-y += lib -SUBDIRS-y += drivers - -.PHONY: all clean install -all clean install: %: subdirs-% - -install: - $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) - $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.blktap diff --git a/tools/blktap/README b/tools/blktap/README deleted file mode 100644 index 5e41080..0000000 --- a/tools/blktap/README +++ /dev/null @@ -1,122 +0,0 @@ -Blktap Userspace Tools + Library -================================ - -Andrew Warfield and Julian Chesterfield -16th June 2006 - -{firstname.lastname}@cl.cam.ac.uk - -The blktap userspace toolkit provides a user-level disk I/O -interface. The blktap mechanism involves a kernel driver that acts -similarly to the existing Xen/Linux blkback driver, and a set of -associated user-level libraries. Using these tools, blktap allows -virtual block devices presented to VMs to be implemented in userspace -and to be backed by raw partitions, files, network, etc. - -The key benefit of blktap is that it makes it easy and fast to write -arbitrary block backends, and that these user-level backends actually -perform very well. Specifically: - -- Metadata disk formats such as Copy-on-Write, encrypted disks, sparse - formats and other compression features can be easily implemented. - -- Accessing file-based images from userspace avoids problems related - to flushing dirty pages which are present in the Linux loopback - driver. (Specifically, doing a large number of writes to an - NFS-backed image don't result in the OOM killer going berserk.) - -- Per-disk handler processes enable easier userspace policing of block - resources, and process-granularity QoS techniques (disk scheduling - and related tools) may be trivially applied to block devices. - -- It's very easy to take advantage of userspace facilities such as - networking libraries, compression utilities, peer-to-peer - file-sharing systems and so on to build more complex block backends. - -- Crashes are contained -- incremental development/debugging is very - fast. - -How it works (in one paragraph): - -Working in conjunction with the kernel blktap driver, all disk I/O -requests from VMs are passed to the userspace deamon (using a shared -memory interface) through a character device. Each active disk is -mapped to an individual device node, allowing per-disk processes to -implement individual block devices where desired. The userspace -drivers are implemented using asynchronous (Linux libaio), -O_DIRECT-based calls to preserve the unbuffered, batched and -asynchronous request dispatch achieved with the existing blkback -code. We provide a simple, asynchronous virtual disk interface that -makes it quite easy to add new disk implementations. - -As of June 2006 the current supported disk formats are: - - - Raw Images (both on partitions and in image files) - - File-backed Qcow disks - - Standalone sparse Qcow disks - - Fast shareable RAM disk between VMs (requires some form of cluster-based - filesystem support e.g. OCFS2 in the guest kernel) - - Some VMDK images - your mileage may vary - -Raw and QCow images have asynchronous backends and so should perform -fairly well. VMDK is based directly on the qemu vmdk driver, which is -synchronous (a.k.a. slow). - -Build and Installation Instructions -=================================== - -Make to configure the blktap backend driver in your dom0 kernel. It -will cooperate fine with the existing backend driver, so you can -experiment with tap disks without breaking existing VM configs. - -To build the tools separately, "make && make install" in -tools/blktap. - - -Using the Tools -=============== - -Prepare the image for booting. For qcow files use the qcow utilities -installed earlier. e.g. qcow-create generates a blank standalone image -or a file-backed CoW image. img2qcow takes an existing image or -partition and creates a sparse, standalone qcow-based file. - -The userspace disk agent is configured to start automatically via xend -(alternatively you can start it manually => 'blktapctrl') - -Customise the VM config file to use the 'tap' handler, followed by the -driver type. e.g. for a raw image such as a file or partition: - -disk = ['tap:aio:,sda1,w'] - -e.g. for a qcow image: - -disk = ['tap:qcow:,sda1,w'] - - -Mounting images in Dom0 using the blktap driver -=============================================== -Tap (and blkback) disks are also mountable in Dom0 without requiring an -active VM to attach. You will need to build a xenlinux Dom0 kernel that -includes the blkfront driver (e.g. the default 'make world' or -'make kernels' build. Simply use the xm command-line tool to activate -the backend disks, and blkfront will generate a virtual block device that -can be accessed in the same way as a loop device or partition: - -e.g. for a raw image file that would normally be mounted using -the loopback driver (such as 'mount -o loop /mnt/disk'), do the -following: - -xm block-attach 0 tap:aio: /dev/xvda1 w 0 -mount /dev/xvda1 /mnt/disk <--- don't use loop driver - -In this way, you can use any of the userspace device-type drivers built -with the blktap userspace toolkit to open and mount disks such as qcow -or vmdk images: - -xm block-attach 0 tap:qcow: /dev/xvda1 w 0 -mount /dev/xvda1 /mnt/disk - - - - diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile deleted file mode 100644 index cea8b3b..0000000 --- a/tools/blktap/drivers/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/Rules.mk - -IBIN = blktapctrl tapdisk -QCOW_UTIL = img2qcow qcow2raw qcow-create - -CFLAGS += -Werror -CFLAGS += -Wno-unused -CFLAGS += -I../lib -CFLAGS += $(CFLAGS_libxenctrl) -CFLAGS += $(CFLAGS_libxenstore) -CFLAGS += -D_GNU_SOURCE - -ifeq ($(CONFIG_GCRYPT),y) -CFLAGS += -DUSE_GCRYPT -CRYPT_LIB := -lgcrypt -else -CRYPT_LIB := -lcrypto -$(warning === libgcrypt not installed: falling back to libcrypto ===) -endif - -MEMSHRLIBS := -ifeq ($(CONFIG_Linux), y) -MEMSHR_DIR = ../../memshr -CFLAGS += -DMEMSHR -CFLAGS += -I $(MEMSHR_DIR) -MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a -endif - -AIOLIBS := -laio - -CFLAGS += $(PTHREAD_CFLAGS) -LDFLAGS += $(PTHREAD_LDFLAGS) - -LDLIBS_blktapctrl := $(MEMSHRLIBS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) -L../lib -lblktap -lrt -lm $(PTHREAD_LIBS) -LDLIBS_img := $(AIOLIBS) $(CRYPT_LIB) $(PTHREAD_LIBS) -lz - -BLK-OBJS-y := block-aio.o -BLK-OBJS-y += block-sync.o -BLK-OBJS-y += block-vmdk.o -BLK-OBJS-y += block-ram.o -BLK-OBJS-y += block-qcow.o -BLK-OBJS-y += block-qcow2.o -BLK-OBJS-y += aes.o -BLK-OBJS-y += tapaio.o -BLK-OBJS-$(CONFIG_Linux) += blk_linux.o - -BLKTAB-OBJS-y := blktapctrl.o -BLKTAB-OBJS-$(CONFIG_Linux) += blktapctrl_linux.o - -all: $(IBIN) qcow-util - -blktapctrl: $(BLKTAB-OBJS-y) - $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_blktapctrl) - -tapdisk: tapdisk.o $(BLK-OBJS-y) - $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_img) - -.PHONY: qcow-util -qcow-util: img2qcow qcow2raw qcow-create - -img2qcow qcow2raw qcow-create: %: %.o $(BLK-OBJS-y) - $(CC) $(LDFLAGS) -o $* $^ $(LDLIBS_img) - -install: all - $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(SBINDIR) - -clean: - rm -rf *.o *~ $(DEPS) xen TAGS $(IBIN) $(LIB) $(QCOW_UTIL) $(VHD_UTIL) - -.PHONY: clean install - --include $(DEPS) diff --git a/tools/blktap/drivers/aes.c b/tools/blktap/drivers/aes.c deleted file mode 100644 index 4d83fac..0000000 --- a/tools/blktap/drivers/aes.c +++ /dev/null @@ -1,1319 +0,0 @@ -/** - * - * aes.c - integrated in QEMU by Fabrice Bellard from the OpenSSL project. - */ -/* - * rijndael-alg-fst.c - * - * @version 3.0 (December 2000) - * - * Optimised ANSI C code for the Rijndael cipher (now AES) - * - * @author Vincent Rijmen - * @author Antoon Bosselaers - * @author Paulo Barreto - * - * This code is hereby placed in the public domain. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''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 AUTHORS 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 "vl.h" -#include -#include -#include "aes.h" - -//#define NDEBUG -#include - -typedef uint32_t u32; -typedef uint16_t u16; -typedef uint8_t u8; - -#define MAXKC (256/32) -#define MAXKB (256/8) -#define MAXNR 14 - -/* This controls loop-unrolling in aes_core.c */ -#undef FULL_UNROLL -# define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] << 8) ^ ((u32)(pt)[3])) -# define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >> 8); (ct)[3] = (u8)(st); } - -/* -Te0[x] = S [x].[02, 01, 01, 03]; -Te1[x] = S [x].[03, 02, 01, 01]; -Te2[x] = S [x].[01, 03, 02, 01]; -Te3[x] = S [x].[01, 01, 03, 02]; -Te4[x] = S [x].[01, 01, 01, 01]; - -Td0[x] = Si[x].[0e, 09, 0d, 0b]; -Td1[x] = Si[x].[0b, 0e, 09, 0d]; -Td2[x] = Si[x].[0d, 0b, 0e, 09]; -Td3[x] = Si[x].[09, 0d, 0b, 0e]; -Td4[x] = Si[x].[01, 01, 01, 01]; -*/ - -static const u32 Te0[256] = { - 0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU, - 0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U, - 0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU, - 0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU, - 0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U, - 0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU, - 0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU, - 0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU, - 0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU, - 0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU, - 0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U, - 0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU, - 0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU, - 0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U, - 0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU, - 0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU, - 0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU, - 0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU, - 0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU, - 0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U, - 0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU, - 0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU, - 0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU, - 0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU, - 0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U, - 0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U, - 0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U, - 0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U, - 0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU, - 0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U, - 0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U, - 0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU, - 0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU, - 0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U, - 0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U, - 0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U, - 0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU, - 0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U, - 0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU, - 0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U, - 0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU, - 0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U, - 0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U, - 0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU, - 0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U, - 0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U, - 0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U, - 0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U, - 0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U, - 0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U, - 0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U, - 0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U, - 0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU, - 0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U, - 0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U, - 0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U, - 0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U, - 0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U, - 0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U, - 0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU, - 0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U, - 0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U, - 0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U, - 0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU, -}; -static const u32 Te1[256] = { - 0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU, - 0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U, - 0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU, - 0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U, - 0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU, - 0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U, - 0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU, - 0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U, - 0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U, - 0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU, - 0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U, - 0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U, - 0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U, - 0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU, - 0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U, - 0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U, - 0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU, - 0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U, - 0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U, - 0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U, - 0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU, - 0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU, - 0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U, - 0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU, - 0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU, - 0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U, - 0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU, - 0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U, - 0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU, - 0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U, - 0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U, - 0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U, - 0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU, - 0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U, - 0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU, - 0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U, - 0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU, - 0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U, - 0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U, - 0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU, - 0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU, - 0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU, - 0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U, - 0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U, - 0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU, - 0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U, - 0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU, - 0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U, - 0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU, - 0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U, - 0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU, - 0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU, - 0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U, - 0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU, - 0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U, - 0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU, - 0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U, - 0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U, - 0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U, - 0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU, - 0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU, - 0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U, - 0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU, - 0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U, -}; -static const u32 Te2[256] = { - 0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU, - 0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U, - 0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU, - 0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U, - 0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU, - 0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U, - 0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU, - 0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U, - 0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U, - 0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU, - 0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U, - 0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U, - 0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U, - 0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU, - 0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U, - 0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U, - 0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU, - 0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U, - 0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U, - 0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U, - 0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU, - 0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU, - 0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U, - 0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU, - 0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU, - 0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U, - 0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU, - 0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U, - 0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU, - 0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U, - 0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U, - 0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U, - 0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU, - 0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U, - 0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU, - 0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U, - 0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU, - 0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U, - 0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U, - 0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU, - 0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU, - 0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU, - 0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U, - 0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U, - 0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU, - 0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U, - 0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU, - 0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U, - 0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU, - 0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U, - 0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU, - 0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU, - 0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U, - 0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU, - 0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U, - 0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU, - 0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U, - 0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U, - 0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U, - 0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU, - 0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU, - 0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U, - 0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU, - 0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U, -}; -static const u32 Te3[256] = { - - 0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U, - 0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U, - 0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U, - 0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU, - 0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU, - 0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU, - 0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U, - 0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU, - 0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU, - 0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U, - 0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U, - 0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU, - 0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU, - 0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU, - 0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU, - 0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU, - 0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U, - 0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU, - 0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU, - 0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U, - 0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U, - 0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U, - 0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U, - 0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U, - 0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU, - 0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U, - 0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU, - 0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU, - 0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U, - 0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U, - 0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U, - 0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU, - 0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U, - 0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU, - 0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU, - 0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U, - 0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U, - 0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU, - 0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U, - 0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU, - 0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U, - 0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U, - 0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U, - 0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U, - 0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU, - 0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U, - 0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU, - 0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U, - 0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU, - 0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U, - 0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU, - 0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU, - 0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU, - 0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU, - 0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U, - 0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U, - 0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U, - 0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U, - 0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U, - 0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U, - 0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU, - 0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U, - 0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU, - 0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU, -}; -static const u32 Te4[256] = { - 0x63636363U, 0x7c7c7c7cU, 0x77777777U, 0x7b7b7b7bU, - 0xf2f2f2f2U, 0x6b6b6b6bU, 0x6f6f6f6fU, 0xc5c5c5c5U, - 0x30303030U, 0x01010101U, 0x67676767U, 0x2b2b2b2bU, - 0xfefefefeU, 0xd7d7d7d7U, 0xababababU, 0x76767676U, - 0xcacacacaU, 0x82828282U, 0xc9c9c9c9U, 0x7d7d7d7dU, - 0xfafafafaU, 0x59595959U, 0x47474747U, 0xf0f0f0f0U, - 0xadadadadU, 0xd4d4d4d4U, 0xa2a2a2a2U, 0xafafafafU, - 0x9c9c9c9cU, 0xa4a4a4a4U, 0x72727272U, 0xc0c0c0c0U, - 0xb7b7b7b7U, 0xfdfdfdfdU, 0x93939393U, 0x26262626U, - 0x36363636U, 0x3f3f3f3fU, 0xf7f7f7f7U, 0xccccccccU, - 0x34343434U, 0xa5a5a5a5U, 0xe5e5e5e5U, 0xf1f1f1f1U, - 0x71717171U, 0xd8d8d8d8U, 0x31313131U, 0x15151515U, - 0x04040404U, 0xc7c7c7c7U, 0x23232323U, 0xc3c3c3c3U, - 0x18181818U, 0x96969696U, 0x05050505U, 0x9a9a9a9aU, - 0x07070707U, 0x12121212U, 0x80808080U, 0xe2e2e2e2U, - 0xebebebebU, 0x27272727U, 0xb2b2b2b2U, 0x75757575U, - 0x09090909U, 0x83838383U, 0x2c2c2c2cU, 0x1a1a1a1aU, - 0x1b1b1b1bU, 0x6e6e6e6eU, 0x5a5a5a5aU, 0xa0a0a0a0U, - 0x52525252U, 0x3b3b3b3bU, 0xd6d6d6d6U, 0xb3b3b3b3U, - 0x29292929U, 0xe3e3e3e3U, 0x2f2f2f2fU, 0x84848484U, - 0x53535353U, 0xd1d1d1d1U, 0x00000000U, 0xededededU, - 0x20202020U, 0xfcfcfcfcU, 0xb1b1b1b1U, 0x5b5b5b5bU, - 0x6a6a6a6aU, 0xcbcbcbcbU, 0xbebebebeU, 0x39393939U, - 0x4a4a4a4aU, 0x4c4c4c4cU, 0x58585858U, 0xcfcfcfcfU, - 0xd0d0d0d0U, 0xefefefefU, 0xaaaaaaaaU, 0xfbfbfbfbU, - 0x43434343U, 0x4d4d4d4dU, 0x33333333U, 0x85858585U, - 0x45454545U, 0xf9f9f9f9U, 0x02020202U, 0x7f7f7f7fU, - 0x50505050U, 0x3c3c3c3cU, 0x9f9f9f9fU, 0xa8a8a8a8U, - 0x51515151U, 0xa3a3a3a3U, 0x40404040U, 0x8f8f8f8fU, - 0x92929292U, 0x9d9d9d9dU, 0x38383838U, 0xf5f5f5f5U, - 0xbcbcbcbcU, 0xb6b6b6b6U, 0xdadadadaU, 0x21212121U, - 0x10101010U, 0xffffffffU, 0xf3f3f3f3U, 0xd2d2d2d2U, - 0xcdcdcdcdU, 0x0c0c0c0cU, 0x13131313U, 0xececececU, - 0x5f5f5f5fU, 0x97979797U, 0x44444444U, 0x17171717U, - 0xc4c4c4c4U, 0xa7a7a7a7U, 0x7e7e7e7eU, 0x3d3d3d3dU, - 0x64646464U, 0x5d5d5d5dU, 0x19191919U, 0x73737373U, - 0x60606060U, 0x81818181U, 0x4f4f4f4fU, 0xdcdcdcdcU, - 0x22222222U, 0x2a2a2a2aU, 0x90909090U, 0x88888888U, - 0x46464646U, 0xeeeeeeeeU, 0xb8b8b8b8U, 0x14141414U, - 0xdedededeU, 0x5e5e5e5eU, 0x0b0b0b0bU, 0xdbdbdbdbU, - 0xe0e0e0e0U, 0x32323232U, 0x3a3a3a3aU, 0x0a0a0a0aU, - 0x49494949U, 0x06060606U, 0x24242424U, 0x5c5c5c5cU, - 0xc2c2c2c2U, 0xd3d3d3d3U, 0xacacacacU, 0x62626262U, - 0x91919191U, 0x95959595U, 0xe4e4e4e4U, 0x79797979U, - 0xe7e7e7e7U, 0xc8c8c8c8U, 0x37373737U, 0x6d6d6d6dU, - 0x8d8d8d8dU, 0xd5d5d5d5U, 0x4e4e4e4eU, 0xa9a9a9a9U, - 0x6c6c6c6cU, 0x56565656U, 0xf4f4f4f4U, 0xeaeaeaeaU, - 0x65656565U, 0x7a7a7a7aU, 0xaeaeaeaeU, 0x08080808U, - 0xbabababaU, 0x78787878U, 0x25252525U, 0x2e2e2e2eU, - 0x1c1c1c1cU, 0xa6a6a6a6U, 0xb4b4b4b4U, 0xc6c6c6c6U, - 0xe8e8e8e8U, 0xddddddddU, 0x74747474U, 0x1f1f1f1fU, - 0x4b4b4b4bU, 0xbdbdbdbdU, 0x8b8b8b8bU, 0x8a8a8a8aU, - 0x70707070U, 0x3e3e3e3eU, 0xb5b5b5b5U, 0x66666666U, - 0x48484848U, 0x03030303U, 0xf6f6f6f6U, 0x0e0e0e0eU, - 0x61616161U, 0x35353535U, 0x57575757U, 0xb9b9b9b9U, - 0x86868686U, 0xc1c1c1c1U, 0x1d1d1d1dU, 0x9e9e9e9eU, - 0xe1e1e1e1U, 0xf8f8f8f8U, 0x98989898U, 0x11111111U, - 0x69696969U, 0xd9d9d9d9U, 0x8e8e8e8eU, 0x94949494U, - 0x9b9b9b9bU, 0x1e1e1e1eU, 0x87878787U, 0xe9e9e9e9U, - 0xcecececeU, 0x55555555U, 0x28282828U, 0xdfdfdfdfU, - 0x8c8c8c8cU, 0xa1a1a1a1U, 0x89898989U, 0x0d0d0d0dU, - 0xbfbfbfbfU, 0xe6e6e6e6U, 0x42424242U, 0x68686868U, - 0x41414141U, 0x99999999U, 0x2d2d2d2dU, 0x0f0f0f0fU, - 0xb0b0b0b0U, 0x54545454U, 0xbbbbbbbbU, 0x16161616U, -}; -static const u32 Td0[256] = { - 0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U, - 0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U, - 0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U, - 0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU, - 0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U, - 0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U, - 0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU, - 0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U, - 0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU, - 0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U, - 0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U, - 0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U, - 0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U, - 0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU, - 0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U, - 0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU, - 0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U, - 0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU, - 0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U, - 0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U, - 0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U, - 0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU, - 0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U, - 0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU, - 0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U, - 0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU, - 0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U, - 0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU, - 0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU, - 0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U, - 0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU, - 0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U, - 0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU, - 0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U, - 0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U, - 0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U, - 0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU, - 0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U, - 0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U, - 0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU, - 0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U, - 0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U, - 0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U, - 0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U, - 0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U, - 0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU, - 0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U, - 0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U, - 0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U, - 0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U, - 0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U, - 0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU, - 0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU, - 0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU, - 0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU, - 0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U, - 0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U, - 0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU, - 0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU, - 0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U, - 0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU, - 0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U, - 0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U, - 0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U, -}; -static const u32 Td1[256] = { - 0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU, - 0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U, - 0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU, - 0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U, - 0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U, - 0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U, - 0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U, - 0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U, - 0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U, - 0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU, - 0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU, - 0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU, - 0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U, - 0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU, - 0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U, - 0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U, - 0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U, - 0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU, - 0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU, - 0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U, - 0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU, - 0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U, - 0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU, - 0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU, - 0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U, - 0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U, - 0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U, - 0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU, - 0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U, - 0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU, - 0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U, - 0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U, - 0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U, - 0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU, - 0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U, - 0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U, - 0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U, - 0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U, - 0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U, - 0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U, - 0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU, - 0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU, - 0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U, - 0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU, - 0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U, - 0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU, - 0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU, - 0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U, - 0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU, - 0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U, - 0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U, - 0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U, - 0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U, - 0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U, - 0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U, - 0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U, - 0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU, - 0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U, - 0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U, - 0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU, - 0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U, - 0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U, - 0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U, - 0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U, -}; -static const u32 Td2[256] = { - 0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U, - 0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U, - 0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U, - 0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U, - 0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU, - 0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U, - 0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U, - 0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U, - 0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U, - 0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU, - 0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U, - 0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U, - 0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU, - 0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U, - 0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U, - 0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U, - 0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U, - 0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U, - 0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U, - 0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU, - - 0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U, - 0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U, - 0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U, - 0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U, - 0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U, - 0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU, - 0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU, - 0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U, - 0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU, - 0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U, - 0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU, - 0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU, - 0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU, - 0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU, - 0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U, - 0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U, - 0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U, - 0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U, - 0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U, - 0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U, - 0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U, - 0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU, - 0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU, - 0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U, - 0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U, - 0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU, - 0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU, - 0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U, - 0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U, - 0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U, - 0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U, - 0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U, - 0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U, - 0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U, - 0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU, - 0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U, - 0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U, - 0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U, - 0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U, - 0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U, - 0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U, - 0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU, - 0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U, - 0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U, -}; -static const u32 Td3[256] = { - 0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU, - 0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU, - 0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U, - 0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U, - 0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU, - 0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU, - 0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U, - 0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU, - 0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U, - 0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU, - 0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U, - 0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U, - 0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U, - 0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U, - 0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U, - 0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU, - 0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU, - 0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U, - 0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U, - 0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU, - 0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU, - 0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U, - 0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U, - 0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U, - 0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U, - 0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU, - 0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U, - 0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U, - 0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU, - 0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU, - 0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U, - 0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U, - 0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U, - 0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU, - 0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U, - 0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U, - 0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U, - 0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U, - 0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U, - 0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U, - 0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U, - 0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU, - 0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U, - 0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U, - 0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU, - 0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU, - 0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U, - 0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU, - 0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U, - 0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U, - 0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U, - 0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U, - 0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U, - 0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U, - 0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU, - 0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU, - 0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU, - 0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU, - 0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U, - 0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U, - 0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U, - 0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU, - 0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U, - 0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U, -}; -static const u32 Td4[256] = { - 0x52525252U, 0x09090909U, 0x6a6a6a6aU, 0xd5d5d5d5U, - 0x30303030U, 0x36363636U, 0xa5a5a5a5U, 0x38383838U, - 0xbfbfbfbfU, 0x40404040U, 0xa3a3a3a3U, 0x9e9e9e9eU, - 0x81818181U, 0xf3f3f3f3U, 0xd7d7d7d7U, 0xfbfbfbfbU, - 0x7c7c7c7cU, 0xe3e3e3e3U, 0x39393939U, 0x82828282U, - 0x9b9b9b9bU, 0x2f2f2f2fU, 0xffffffffU, 0x87878787U, - 0x34343434U, 0x8e8e8e8eU, 0x43434343U, 0x44444444U, - 0xc4c4c4c4U, 0xdedededeU, 0xe9e9e9e9U, 0xcbcbcbcbU, - 0x54545454U, 0x7b7b7b7bU, 0x94949494U, 0x32323232U, - 0xa6a6a6a6U, 0xc2c2c2c2U, 0x23232323U, 0x3d3d3d3dU, - 0xeeeeeeeeU, 0x4c4c4c4cU, 0x95959595U, 0x0b0b0b0bU, - 0x42424242U, 0xfafafafaU, 0xc3c3c3c3U, 0x4e4e4e4eU, - 0x08080808U, 0x2e2e2e2eU, 0xa1a1a1a1U, 0x66666666U, - 0x28282828U, 0xd9d9d9d9U, 0x24242424U, 0xb2b2b2b2U, - 0x76767676U, 0x5b5b5b5bU, 0xa2a2a2a2U, 0x49494949U, - 0x6d6d6d6dU, 0x8b8b8b8bU, 0xd1d1d1d1U, 0x25252525U, - 0x72727272U, 0xf8f8f8f8U, 0xf6f6f6f6U, 0x64646464U, - 0x86868686U, 0x68686868U, 0x98989898U, 0x16161616U, - 0xd4d4d4d4U, 0xa4a4a4a4U, 0x5c5c5c5cU, 0xccccccccU, - 0x5d5d5d5dU, 0x65656565U, 0xb6b6b6b6U, 0x92929292U, - 0x6c6c6c6cU, 0x70707070U, 0x48484848U, 0x50505050U, - 0xfdfdfdfdU, 0xededededU, 0xb9b9b9b9U, 0xdadadadaU, - 0x5e5e5e5eU, 0x15151515U, 0x46464646U, 0x57575757U, - 0xa7a7a7a7U, 0x8d8d8d8dU, 0x9d9d9d9dU, 0x84848484U, - 0x90909090U, 0xd8d8d8d8U, 0xababababU, 0x00000000U, - 0x8c8c8c8cU, 0xbcbcbcbcU, 0xd3d3d3d3U, 0x0a0a0a0aU, - 0xf7f7f7f7U, 0xe4e4e4e4U, 0x58585858U, 0x05050505U, - 0xb8b8b8b8U, 0xb3b3b3b3U, 0x45454545U, 0x06060606U, - 0xd0d0d0d0U, 0x2c2c2c2cU, 0x1e1e1e1eU, 0x8f8f8f8fU, - 0xcacacacaU, 0x3f3f3f3fU, 0x0f0f0f0fU, 0x02020202U, - 0xc1c1c1c1U, 0xafafafafU, 0xbdbdbdbdU, 0x03030303U, - 0x01010101U, 0x13131313U, 0x8a8a8a8aU, 0x6b6b6b6bU, - 0x3a3a3a3aU, 0x91919191U, 0x11111111U, 0x41414141U, - 0x4f4f4f4fU, 0x67676767U, 0xdcdcdcdcU, 0xeaeaeaeaU, - 0x97979797U, 0xf2f2f2f2U, 0xcfcfcfcfU, 0xcecececeU, - 0xf0f0f0f0U, 0xb4b4b4b4U, 0xe6e6e6e6U, 0x73737373U, - 0x96969696U, 0xacacacacU, 0x74747474U, 0x22222222U, - 0xe7e7e7e7U, 0xadadadadU, 0x35353535U, 0x85858585U, - 0xe2e2e2e2U, 0xf9f9f9f9U, 0x37373737U, 0xe8e8e8e8U, - 0x1c1c1c1cU, 0x75757575U, 0xdfdfdfdfU, 0x6e6e6e6eU, - 0x47474747U, 0xf1f1f1f1U, 0x1a1a1a1aU, 0x71717171U, - 0x1d1d1d1dU, 0x29292929U, 0xc5c5c5c5U, 0x89898989U, - 0x6f6f6f6fU, 0xb7b7b7b7U, 0x62626262U, 0x0e0e0e0eU, - 0xaaaaaaaaU, 0x18181818U, 0xbebebebeU, 0x1b1b1b1bU, - 0xfcfcfcfcU, 0x56565656U, 0x3e3e3e3eU, 0x4b4b4b4bU, - 0xc6c6c6c6U, 0xd2d2d2d2U, 0x79797979U, 0x20202020U, - 0x9a9a9a9aU, 0xdbdbdbdbU, 0xc0c0c0c0U, 0xfefefefeU, - 0x78787878U, 0xcdcdcdcdU, 0x5a5a5a5aU, 0xf4f4f4f4U, - 0x1f1f1f1fU, 0xddddddddU, 0xa8a8a8a8U, 0x33333333U, - 0x88888888U, 0x07070707U, 0xc7c7c7c7U, 0x31313131U, - 0xb1b1b1b1U, 0x12121212U, 0x10101010U, 0x59595959U, - 0x27272727U, 0x80808080U, 0xececececU, 0x5f5f5f5fU, - 0x60606060U, 0x51515151U, 0x7f7f7f7fU, 0xa9a9a9a9U, - 0x19191919U, 0xb5b5b5b5U, 0x4a4a4a4aU, 0x0d0d0d0dU, - 0x2d2d2d2dU, 0xe5e5e5e5U, 0x7a7a7a7aU, 0x9f9f9f9fU, - 0x93939393U, 0xc9c9c9c9U, 0x9c9c9c9cU, 0xefefefefU, - 0xa0a0a0a0U, 0xe0e0e0e0U, 0x3b3b3b3bU, 0x4d4d4d4dU, - 0xaeaeaeaeU, 0x2a2a2a2aU, 0xf5f5f5f5U, 0xb0b0b0b0U, - 0xc8c8c8c8U, 0xebebebebU, 0xbbbbbbbbU, 0x3c3c3c3cU, - 0x83838383U, 0x53535353U, 0x99999999U, 0x61616161U, - 0x17171717U, 0x2b2b2b2bU, 0x04040404U, 0x7e7e7e7eU, - 0xbabababaU, 0x77777777U, 0xd6d6d6d6U, 0x26262626U, - 0xe1e1e1e1U, 0x69696969U, 0x14141414U, 0x63636363U, - 0x55555555U, 0x21212121U, 0x0c0c0c0cU, 0x7d7d7d7dU, -}; -static const u32 rcon[] = { - 0x01000000, 0x02000000, 0x04000000, 0x08000000, - 0x10000000, 0x20000000, 0x40000000, 0x80000000, - 0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */ -}; - -/** - * Expand the cipher key into the encryption key schedule. - */ -int AES_set_encrypt_key(const unsigned char *userKey, const int bits, - AES_KEY *key) { - - u32 *rk; - int i = 0; - u32 temp; - - if (!userKey || !key) - return -1; - if (bits != 128 && bits != 192 && bits != 256) - return -2; - - rk = key->rd_key; - - if (bits==128) - key->rounds = 10; - else if (bits==192) - key->rounds = 12; - else - key->rounds = 14; - - rk[0] = GETU32(userKey ); - rk[1] = GETU32(userKey + 4); - rk[2] = GETU32(userKey + 8); - rk[3] = GETU32(userKey + 12); - if (bits == 128) { - while (1) { - temp = rk[3]; - rk[4] = rk[0] ^ - (Te4[(temp >> 16) & 0xff] & 0xff000000) ^ - (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^ - (Te4[(temp ) & 0xff] & 0x0000ff00) ^ - (Te4[(temp >> 24) ] & 0x000000ff) ^ - rcon[i]; - rk[5] = rk[1] ^ rk[4]; - rk[6] = rk[2] ^ rk[5]; - rk[7] = rk[3] ^ rk[6]; - if (++i == 10) { - return 0; - } - rk += 4; - } - } - rk[4] = GETU32(userKey + 16); - rk[5] = GETU32(userKey + 20); - if (bits == 192) { - while (1) { - temp = rk[ 5]; - rk[ 6] = rk[ 0] ^ - (Te4[(temp >> 16) & 0xff] & 0xff000000) ^ - (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^ - (Te4[(temp ) & 0xff] & 0x0000ff00) ^ - (Te4[(temp >> 24) ] & 0x000000ff) ^ - rcon[i]; - rk[ 7] = rk[ 1] ^ rk[ 6]; - rk[ 8] = rk[ 2] ^ rk[ 7]; - rk[ 9] = rk[ 3] ^ rk[ 8]; - if (++i == 8) { - return 0; - } - rk[10] = rk[ 4] ^ rk[ 9]; - rk[11] = rk[ 5] ^ rk[10]; - rk += 6; - } - } - rk[6] = GETU32(userKey + 24); - rk[7] = GETU32(userKey + 28); - if (bits == 256) { - while (1) { - temp = rk[ 7]; - rk[ 8] = rk[ 0] ^ - (Te4[(temp >> 16) & 0xff] & 0xff000000) ^ - (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^ - (Te4[(temp ) & 0xff] & 0x0000ff00) ^ - (Te4[(temp >> 24) ] & 0x000000ff) ^ - rcon[i]; - rk[ 9] = rk[ 1] ^ rk[ 8]; - rk[10] = rk[ 2] ^ rk[ 9]; - rk[11] = rk[ 3] ^ rk[10]; - if (++i == 7) { - return 0; - } - temp = rk[11]; - rk[12] = rk[ 4] ^ - (Te4[(temp >> 24) ] & 0xff000000) ^ - (Te4[(temp >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(temp >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(temp ) & 0xff] & 0x000000ff); - rk[13] = rk[ 5] ^ rk[12]; - rk[14] = rk[ 6] ^ rk[13]; - rk[15] = rk[ 7] ^ rk[14]; - - rk += 8; - } - } - return 0; -} - -/** - * Expand the cipher key into the decryption key schedule. - */ -int AES_set_decrypt_key(const unsigned char *userKey, const int bits, - AES_KEY *key) { - - u32 *rk; - int i, j, status; - u32 temp; - - /* first, start with an encryption schedule */ - status = AES_set_encrypt_key(userKey, bits, key); - if (status < 0) - return status; - - rk = key->rd_key; - - /* invert the order of the round keys: */ - for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) { - temp = rk[i ]; rk[i ] = rk[j ]; rk[j ] = temp; - temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp; - temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp; - temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp; - } - /* apply the inverse MixColumn transform to all round keys but the first and the last: */ - for (i = 1; i < (key->rounds); i++) { - rk += 4; - rk[0] = - Td0[Te4[(rk[0] >> 24) ] & 0xff] ^ - Td1[Te4[(rk[0] >> 16) & 0xff] & 0xff] ^ - Td2[Te4[(rk[0] >> 8) & 0xff] & 0xff] ^ - Td3[Te4[(rk[0] ) & 0xff] & 0xff]; - rk[1] = - Td0[Te4[(rk[1] >> 24) ] & 0xff] ^ - Td1[Te4[(rk[1] >> 16) & 0xff] & 0xff] ^ - Td2[Te4[(rk[1] >> 8) & 0xff] & 0xff] ^ - Td3[Te4[(rk[1] ) & 0xff] & 0xff]; - rk[2] = - Td0[Te4[(rk[2] >> 24) ] & 0xff] ^ - Td1[Te4[(rk[2] >> 16) & 0xff] & 0xff] ^ - Td2[Te4[(rk[2] >> 8) & 0xff] & 0xff] ^ - Td3[Te4[(rk[2] ) & 0xff] & 0xff]; - rk[3] = - Td0[Te4[(rk[3] >> 24) ] & 0xff] ^ - Td1[Te4[(rk[3] >> 16) & 0xff] & 0xff] ^ - Td2[Te4[(rk[3] >> 8) & 0xff] & 0xff] ^ - Td3[Te4[(rk[3] ) & 0xff] & 0xff]; - } - return 0; -} - -#ifndef AES_ASM -/* - * Encrypt a single block - * in and out can overlap - */ -void AES_encrypt(const unsigned char *in, unsigned char *out, - const AES_KEY *key) { - - const u32 *rk; - u32 s0, s1, s2, s3, t0, t1, t2, t3; -#ifndef FULL_UNROLL - int r; -#endif /* ?FULL_UNROLL */ - - assert(in && out && key); - rk = key->rd_key; - - /* - * map byte array block to cipher state - * and add initial round key: - */ - s0 = GETU32(in ) ^ rk[0]; - s1 = GETU32(in + 4) ^ rk[1]; - s2 = GETU32(in + 8) ^ rk[2]; - s3 = GETU32(in + 12) ^ rk[3]; -#ifdef FULL_UNROLL - /* round 1: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[ 6]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[ 7]; - /* round 2: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[ 8]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[ 9]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11]; - /* round 3: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15]; - /* round 4: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19]; - /* round 5: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23]; - /* round 6: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27]; - /* round 7: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31]; - /* round 8: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35]; - /* round 9: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39]; - if (key->rounds > 10) { - /* round 10: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43]; - /* round 11: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47]; - if (key->rounds > 12) { - /* round 12: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51]; - /* round 13: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55]; - } - } - rk += key->rounds << 2; -#else /* !FULL_UNROLL */ - /* - * Nr - 1 full rounds: - */ - r = key->rounds >> 1; - for (;;) { - t0 = - Te0[(s0 >> 24) ] ^ - Te1[(s1 >> 16) & 0xff] ^ - Te2[(s2 >> 8) & 0xff] ^ - Te3[(s3 ) & 0xff] ^ - rk[4]; - t1 = - Te0[(s1 >> 24) ] ^ - Te1[(s2 >> 16) & 0xff] ^ - Te2[(s3 >> 8) & 0xff] ^ - Te3[(s0 ) & 0xff] ^ - rk[5]; - t2 = - Te0[(s2 >> 24) ] ^ - Te1[(s3 >> 16) & 0xff] ^ - Te2[(s0 >> 8) & 0xff] ^ - Te3[(s1 ) & 0xff] ^ - rk[6]; - t3 = - Te0[(s3 >> 24) ] ^ - Te1[(s0 >> 16) & 0xff] ^ - Te2[(s1 >> 8) & 0xff] ^ - Te3[(s2 ) & 0xff] ^ - rk[7]; - - rk += 8; - if (--r == 0) { - break; - } - - s0 = - Te0[(t0 >> 24) ] ^ - Te1[(t1 >> 16) & 0xff] ^ - Te2[(t2 >> 8) & 0xff] ^ - Te3[(t3 ) & 0xff] ^ - rk[0]; - s1 = - Te0[(t1 >> 24) ] ^ - Te1[(t2 >> 16) & 0xff] ^ - Te2[(t3 >> 8) & 0xff] ^ - Te3[(t0 ) & 0xff] ^ - rk[1]; - s2 = - Te0[(t2 >> 24) ] ^ - Te1[(t3 >> 16) & 0xff] ^ - Te2[(t0 >> 8) & 0xff] ^ - Te3[(t1 ) & 0xff] ^ - rk[2]; - s3 = - Te0[(t3 >> 24) ] ^ - Te1[(t0 >> 16) & 0xff] ^ - Te2[(t1 >> 8) & 0xff] ^ - Te3[(t2 ) & 0xff] ^ - rk[3]; - } -#endif /* ?FULL_UNROLL */ - /* - * apply last round and - * map cipher state to byte array block: - */ - s0 = - (Te4[(t0 >> 24) ] & 0xff000000) ^ - (Te4[(t1 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(t2 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(t3 ) & 0xff] & 0x000000ff) ^ - rk[0]; - PUTU32(out , s0); - s1 = - (Te4[(t1 >> 24) ] & 0xff000000) ^ - (Te4[(t2 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(t3 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(t0 ) & 0xff] & 0x000000ff) ^ - rk[1]; - PUTU32(out + 4, s1); - s2 = - (Te4[(t2 >> 24) ] & 0xff000000) ^ - (Te4[(t3 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(t0 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(t1 ) & 0xff] & 0x000000ff) ^ - rk[2]; - PUTU32(out + 8, s2); - s3 = - (Te4[(t3 >> 24) ] & 0xff000000) ^ - (Te4[(t0 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(t1 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(t2 ) & 0xff] & 0x000000ff) ^ - rk[3]; - PUTU32(out + 12, s3); -} - -/* - * Decrypt a single block - * in and out can overlap - */ -void AES_decrypt(const unsigned char *in, unsigned char *out, - const AES_KEY *key) { - - const u32 *rk; - u32 s0, s1, s2, s3, t0, t1, t2, t3; -#ifndef FULL_UNROLL - int r; -#endif /* ?FULL_UNROLL */ - - assert(in && out && key); - rk = key->rd_key; - - /* - * map byte array block to cipher state - * and add initial round key: - */ - s0 = GETU32(in ) ^ rk[0]; - s1 = GETU32(in + 4) ^ rk[1]; - s2 = GETU32(in + 8) ^ rk[2]; - s3 = GETU32(in + 12) ^ rk[3]; -#ifdef FULL_UNROLL - /* round 1: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[ 4]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[ 5]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[ 6]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[ 7]; - /* round 2: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[ 8]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[ 9]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[10]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[11]; - /* round 3: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[12]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[13]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[14]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[15]; - /* round 4: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[16]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[17]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[18]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[19]; - /* round 5: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[20]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[21]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[22]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[23]; - /* round 6: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[24]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[25]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[26]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[27]; - /* round 7: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[28]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[29]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[30]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[31]; - /* round 8: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[32]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[33]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[34]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[35]; - /* round 9: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[36]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[37]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39]; - if (key->rounds > 10) { - /* round 10: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43]; - /* round 11: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47]; - if (key->rounds > 12) { - /* round 12: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51]; - /* round 13: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55]; - } - } - rk += key->rounds << 2; -#else /* !FULL_UNROLL */ - /* - * Nr - 1 full rounds: - */ - r = key->rounds >> 1; - for (;;) { - t0 = - Td0[(s0 >> 24) ] ^ - Td1[(s3 >> 16) & 0xff] ^ - Td2[(s2 >> 8) & 0xff] ^ - Td3[(s1 ) & 0xff] ^ - rk[4]; - t1 = - Td0[(s1 >> 24) ] ^ - Td1[(s0 >> 16) & 0xff] ^ - Td2[(s3 >> 8) & 0xff] ^ - Td3[(s2 ) & 0xff] ^ - rk[5]; - t2 = - Td0[(s2 >> 24) ] ^ - Td1[(s1 >> 16) & 0xff] ^ - Td2[(s0 >> 8) & 0xff] ^ - Td3[(s3 ) & 0xff] ^ - rk[6]; - t3 = - Td0[(s3 >> 24) ] ^ - Td1[(s2 >> 16) & 0xff] ^ - Td2[(s1 >> 8) & 0xff] ^ - Td3[(s0 ) & 0xff] ^ - rk[7]; - - rk += 8; - if (--r == 0) { - break; - } - - s0 = - Td0[(t0 >> 24) ] ^ - Td1[(t3 >> 16) & 0xff] ^ - Td2[(t2 >> 8) & 0xff] ^ - Td3[(t1 ) & 0xff] ^ - rk[0]; - s1 = - Td0[(t1 >> 24) ] ^ - Td1[(t0 >> 16) & 0xff] ^ - Td2[(t3 >> 8) & 0xff] ^ - Td3[(t2 ) & 0xff] ^ - rk[1]; - s2 = - Td0[(t2 >> 24) ] ^ - Td1[(t1 >> 16) & 0xff] ^ - Td2[(t0 >> 8) & 0xff] ^ - Td3[(t3 ) & 0xff] ^ - rk[2]; - s3 = - Td0[(t3 >> 24) ] ^ - Td1[(t2 >> 16) & 0xff] ^ - Td2[(t1 >> 8) & 0xff] ^ - Td3[(t0 ) & 0xff] ^ - rk[3]; - } -#endif /* ?FULL_UNROLL */ - /* - * apply last round and - * map cipher state to byte array block: - */ - s0 = - (Td4[(t0 >> 24) ] & 0xff000000) ^ - (Td4[(t3 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(t2 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(t1 ) & 0xff] & 0x000000ff) ^ - rk[0]; - PUTU32(out , s0); - s1 = - (Td4[(t1 >> 24) ] & 0xff000000) ^ - (Td4[(t0 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(t3 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(t2 ) & 0xff] & 0x000000ff) ^ - rk[1]; - PUTU32(out + 4, s1); - s2 = - (Td4[(t2 >> 24) ] & 0xff000000) ^ - (Td4[(t1 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(t0 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(t3 ) & 0xff] & 0x000000ff) ^ - rk[2]; - PUTU32(out + 8, s2); - s3 = - (Td4[(t3 >> 24) ] & 0xff000000) ^ - (Td4[(t2 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(t1 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(t0 ) & 0xff] & 0x000000ff) ^ - rk[3]; - PUTU32(out + 12, s3); -} - -#endif /* AES_ASM */ - -void AES_cbc_encrypt(const unsigned char *in, unsigned char *out, - const unsigned long length, const AES_KEY *key, - unsigned char *ivec, const int enc) -{ - - unsigned long n; - unsigned long len = length; - unsigned char tmp[AES_BLOCK_SIZE]; - - assert(in && out && key && ivec); - - if (enc) { - while (len >= AES_BLOCK_SIZE) { - for(n=0; n < AES_BLOCK_SIZE; ++n) - tmp[n] = in[n] ^ ivec[n]; - AES_encrypt(tmp, out, key); - memcpy(ivec, out, AES_BLOCK_SIZE); - len -= AES_BLOCK_SIZE; - in += AES_BLOCK_SIZE; - out += AES_BLOCK_SIZE; - } - if (len) { - for(n=0; n < len; ++n) - tmp[n] = in[n] ^ ivec[n]; - for(n=len; n < AES_BLOCK_SIZE; ++n) - tmp[n] = ivec[n]; - AES_encrypt(tmp, tmp, key); - memcpy(out, tmp, AES_BLOCK_SIZE); - memcpy(ivec, tmp, AES_BLOCK_SIZE); - } - } else { - while (len >= AES_BLOCK_SIZE) { - memcpy(tmp, in, AES_BLOCK_SIZE); - AES_decrypt(in, out, key); - for(n=0; n < AES_BLOCK_SIZE; ++n) - out[n] ^= ivec[n]; - memcpy(ivec, tmp, AES_BLOCK_SIZE); - len -= AES_BLOCK_SIZE; - in += AES_BLOCK_SIZE; - out += AES_BLOCK_SIZE; - } - if (len) { - memcpy(tmp, in, AES_BLOCK_SIZE); - AES_decrypt(tmp, tmp, key); - for(n=0; n < len; ++n) - out[n] = tmp[n] ^ ivec[n]; - memcpy(ivec, tmp, AES_BLOCK_SIZE); - } - } -} diff --git a/tools/blktap/drivers/aes.h b/tools/blktap/drivers/aes.h deleted file mode 100644 index 9fb54a9..0000000 --- a/tools/blktap/drivers/aes.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef QEMU_AES_H -#define QEMU_AES_H - -#include - -#define AES_MAXNR 14 -#define AES_BLOCK_SIZE 16 - -struct aes_key_st { - uint32_t rd_key[4 *(AES_MAXNR + 1)]; - int rounds; -}; -typedef struct aes_key_st AES_KEY; - -int AES_set_encrypt_key(const unsigned char *userKey, const int bits, - AES_KEY *key); -int AES_set_decrypt_key(const unsigned char *userKey, const int bits, - AES_KEY *key); - -void AES_encrypt(const unsigned char *in, unsigned char *out, - const AES_KEY *key); -void AES_decrypt(const unsigned char *in, unsigned char *out, - const AES_KEY *key); -void AES_cbc_encrypt(const unsigned char *in, unsigned char *out, - const unsigned long length, const AES_KEY *key, - unsigned char *ivec, const int enc); - -#endif diff --git a/tools/blktap/drivers/blk.h b/tools/blktap/drivers/blk.h deleted file mode 100644 index 1cdc980..0000000 --- a/tools/blktap/drivers/blk.h +++ /dev/null @@ -1,3 +0,0 @@ - -int blk_getimagesize(int fd, uint64_t *size); -int blk_getsectorsize(int fd, uint64_t *sector_size); diff --git a/tools/blktap/drivers/blk_linux.c b/tools/blktap/drivers/blk_linux.c deleted file mode 100644 index bb52717..0000000 --- a/tools/blktap/drivers/blk_linux.c +++ /dev/null @@ -1,42 +0,0 @@ -#include -#include -#include -#include "tapdisk.h" -#include "blk.h" - -int blk_getimagesize(int fd, uint64_t *size) -{ - int rc; - - *size = 0; - rc = ioctl(fd, BLKGETSIZE, size); - if (rc) { - DPRINTF("ERR: BLKGETSIZE failed, couldn't stat image"); - return -EINVAL; - } - - return 0; -} - -int blk_getsectorsize(int fd, uint64_t *sector_size) -{ -#if defined(BLKSSZGET) - int rc; - - *sector_size = DEFAULT_SECTOR_SIZE; - rc = ioctl(fd, BLKSSZGET, sector_size); - if (rc) { - DPRINTF("ERR: BLKSSZGET failed. Falling back to use default sector size"); - *sector_size = DEFAULT_SECTOR_SIZE; - } - - if (*sector_size != DEFAULT_SECTOR_SIZE) - DPRINTF("Note: sector size is %"PRIu64" (not %u)\n", - *sector_size, DEFAULT_SECTOR_SIZE); -#else - *sector_size = DEFAULT_SECTOR_SIZE; -#endif - - return 0; -} - diff --git a/tools/blktap/drivers/blktapctrl.c b/tools/blktap/drivers/blktapctrl.c deleted file mode 100644 index 0a8b880..0000000 --- a/tools/blktap/drivers/blktapctrl.c +++ /dev/null @@ -1,937 +0,0 @@ -/* - * blktapctrl.c - * - * userspace controller for the blktap disks. - * As requests for new block devices arrive, - * the controller spawns off a separate process - * per-disk. - * - * - * Copyright (c) 2005 Julian Chesterfield and Andrew Warfield. - * - * 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef MEMSHR -#include -#endif -#include - -#include "blktaplib.h" -#include "blktapctrl.h" -#include "tapdisk.h" -#include "list.h" -#include "xs_api.h" /* for xs_fire_next_watch() */ - -#define PIDFILE "/var/run/blktapctrl.pid" - -#define NUM_POLL_FDS 2 -#define MSG_SIZE 4096 -#define MAX_TIMEOUT 10 -#define MAX_RAND_VAL 0xFFFF -#define MAX_ATTEMPTS 10 - -int run = 1; -int max_timeout = MAX_TIMEOUT; -int ctlfd = 0; - -int blktap_major; - -static int open_ctrl_socket(char *devname); -static int write_msg(int fd, int msgtype, void *ptr, void *ptr2); -static int read_msg(int fd, int msgtype, void *ptr); -static driver_list_entry_t *active_disks[MAX_DISK_TYPES]; - - -static unsigned long long tapdisk_get_size(blkif_t *blkif) -{ - image_t *img = (image_t *)blkif->prv; - return img->size; -} - -static unsigned long tapdisk_get_secsize(blkif_t *blkif) -{ - image_t *img = (image_t *)blkif->prv; - return img->secsize; -} - -static unsigned int tapdisk_get_info(blkif_t *blkif) -{ - image_t *img = (image_t *)blkif->prv; - return img->info; -} - -struct blkif_ops tapdisk_ops = { - .get_size = tapdisk_get_size, - .get_secsize = tapdisk_get_secsize, - .get_info = tapdisk_get_info, -}; - - -static void init_driver_list(void) -{ - int i; - - for (i = 0; i < MAX_DISK_TYPES; i++) - active_disks[i] = NULL; - return; -} - -static void init_rng(void) -{ - static uint32_t seed; - struct timeval tv; - - gettimeofday(&tv, NULL); - seed = tv.tv_usec; - srand48(seed); - return; -} - -static int get_tapdisk_pid(blkif_t *blkif) -{ - int ret; - - if ((ret = write_msg(blkif->fds[WRITE], CTLMSG_PID, blkif, NULL)) - <= 0) { - DPRINTF("Write_msg failed - CTLMSG_PID(%d)\n", ret); - return -EINVAL; - } - - if ((ret = read_msg(blkif->fds[READ], CTLMSG_PID_RSP, blkif)) - <= 0) { - DPRINTF("Read_msg failure - CTLMSG_PID(%d)\n", ret); - return -EINVAL; - } - return 1; -} - -/* Look up the disk specified by path: - * if found, dev points to the device string in the path - * type is the tapdisk driver type id - * blkif is the existing interface if this is a shared driver - * and NULL otherwise. - * return 0 on success, -1 on error. - */ - -static int test_path(char *path, char **dev, int *type, blkif_t **blkif, - int* use_ioemu) -{ - char *ptr, handle[10]; - int i, size, found = 0; - size_t handle_len; - - size = sizeof(dtypes)/sizeof(disk_info_t *); - *type = MAX_DISK_TYPES + 1; - *blkif = NULL; - - if (!strncmp(path, "tapdisk:", strlen("tapdisk:"))) { - *use_ioemu = 0; - path += strlen("tapdisk:"); - } else if (!strncmp(path, "ioemu:", strlen("ioemu:"))) { - *use_ioemu = 1; - path += strlen("ioemu:"); - } else { - // Use the default for the image type - *use_ioemu = -1; - } - - if ( (ptr = strstr(path, ":"))!=NULL) { - handle_len = (ptr - path); - memcpy(handle, path, handle_len); - *dev = ptr + 1; - ptr = handle + handle_len; - *ptr = '\0'; - DPRINTF("Detected handle: [%s]\n",handle); - - for (i = 0; i < size; i++) { - if ((strlen(dtypes[i]->handle) == handle_len) && - strncmp(handle, dtypes[i]->handle, - handle_len) == 0) { - found = 1; - } - - if (found) { - if (*use_ioemu == -1) - *use_ioemu = dtypes[i]->use_ioemu; - *type = dtypes[i]->idnum; - - if (dtypes[i]->single_handler == 1) { - /* Check whether tapdisk process - already exists */ - if (active_disks[dtypes[i]->idnum] == NULL) - *blkif = NULL; - else - *blkif = active_disks[dtypes[i] - ->idnum]->blkif; - } - - return 0; - } - } - } - - /* Fall-through case, we didn't find a disk driver. */ - DPRINTF("Unknown blktap disk type [%s]!\n",handle); - *dev = NULL; - return -1; -} - - -static void add_disktype(blkif_t *blkif, int type) -{ - driver_list_entry_t *entry, **pprev; - - if (type > MAX_DISK_TYPES) - return; - - entry = malloc(sizeof(driver_list_entry_t)); - entry->blkif = blkif; - entry->next = NULL; - - pprev = &active_disks[type]; - while (*pprev != NULL) - pprev = &(*pprev)->next; - - *pprev = entry; - entry->pprev = pprev; -} - -static int qemu_instance_has_disks(pid_t pid) -{ - int i; - int count = 0; - driver_list_entry_t *entry; - - for (i = 0; i < MAX_DISK_TYPES; i++) { - entry = active_disks[i]; - while (entry) { - if ((entry->blkif->tappid == pid) && dtypes[i]->use_ioemu) - count++; - entry = entry->next; - } - } - - return (count != 0); -} - -static int del_disktype(blkif_t *blkif) -{ - driver_list_entry_t *entry, **pprev; - int type = blkif->drivertype, count = 0, close = 0; - - if (type > MAX_DISK_TYPES) - return 1; - - pprev = &active_disks[type]; - while ((*pprev != NULL) && ((*pprev)->blkif != blkif)) - pprev = &(*pprev)->next; - - if ((entry = *pprev) == NULL) { - DPRINTF("DEL_DISKTYPE: No match\n"); - return 1; - } - - *pprev = entry->next; - if (entry->next) - entry->next->pprev = pprev; - - DPRINTF("DEL_DISKTYPE: Freeing entry\n"); - free(entry); - - /* - * When using ioemu, all disks of one VM are connected to the same - * qemu-dm instance. We may close the file handle only if there is - * no other disk left for this domain. - */ - if (dtypes[type]->use_ioemu) - return !qemu_instance_has_disks(blkif->tappid); - - /* Caller should close() if no single controller, or list is empty. */ - return (!dtypes[type]->single_handler || (active_disks[type] == NULL)); -} - -static int write_msg(int fd, int msgtype, void *ptr, void *ptr2) -{ - blkif_t *blkif; - blkif_info_t *blk; - msg_hdr_t *msg; - msg_newdev_t *msg_dev; - char *p, *buf, *path; - int msglen, len, ret; - fd_set writefds; - struct timeval timeout; - image_t *image, *img; - uint32_t seed; - - blkif = (blkif_t *)ptr; - blk = blkif->info; - image = blkif->prv; - len = 0; - - switch (msgtype) - { - case CTLMSG_PARAMS: - path = (char *)ptr2; - DPRINTF("Write_msg called: CTLMSG_PARAMS, sending [%s, %s]\n", - blk->params, path); - - msglen = sizeof(msg_hdr_t) + strlen(path) + 1; - buf = malloc(msglen); - - /*Assign header fields*/ - msg = (msg_hdr_t *)buf; - msg->type = CTLMSG_PARAMS; - msg->len = msglen; - msg->drivertype = blkif->drivertype; - msg->readonly = blkif->readonly; - - gettimeofday(&timeout, NULL); - msg->cookie = blkif->cookie; - DPRINTF("Generated cookie, %d\n",blkif->cookie); - - /*Copy blk->params to msg*/ - p = buf + sizeof(msg_hdr_t); - memcpy(p, path, strlen(path) + 1); - - break; - - case CTLMSG_NEWDEV: - DPRINTF("Write_msg called: CTLMSG_NEWDEV\n"); - - msglen = sizeof(msg_hdr_t) + sizeof(msg_newdev_t); - buf = malloc(msglen); - - /*Assign header fields*/ - msg = (msg_hdr_t *)buf; - msg->type = CTLMSG_NEWDEV; - msg->len = msglen; - msg->drivertype = blkif->drivertype; - msg->cookie = blkif->cookie; - - msg_dev = (msg_newdev_t *)(buf + sizeof(msg_hdr_t)); - msg_dev->devnum = blkif->minor; - msg_dev->domid = blkif->domid; - - break; - - case CTLMSG_CLOSE: - DPRINTF("Write_msg called: CTLMSG_CLOSE\n"); - - msglen = sizeof(msg_hdr_t); - buf = malloc(msglen); - - /*Assign header fields*/ - msg = (msg_hdr_t *)buf; - msg->type = CTLMSG_CLOSE; - msg->len = msglen; - msg->drivertype = blkif->drivertype; - msg->cookie = blkif->cookie; - - break; - - case CTLMSG_PID: - DPRINTF("Write_msg called: CTLMSG_PID\n"); - - msglen = sizeof(msg_hdr_t); - buf = malloc(msglen); - - /*Assign header fields*/ - msg = (msg_hdr_t *)buf; - msg->type = CTLMSG_PID; - msg->len = msglen; - msg->drivertype = blkif->drivertype; - msg->cookie = blkif->cookie; - - break; - - default: - return -1; - } - - /*Now send the message*/ - ret = 0; - FD_ZERO(&writefds); - FD_SET(fd,&writefds); - timeout.tv_sec = max_timeout; /*Wait for up to max_timeout seconds*/ - timeout.tv_usec = 0; - if (select(fd+1, (fd_set *) 0, &writefds, - (fd_set *) 0, &timeout) > 0) { - len = write(fd, buf, msglen); - if (len == -1) DPRINTF("Write failed: (%d)\n",errno); - } - free(buf); - - return len; -} - -static int read_msg(int fd, int msgtype, void *ptr) -{ - blkif_t *blkif; - blkif_info_t *blk; - msg_hdr_t *msg; - msg_pid_t *msg_pid; - char *p, *buf; - int msglen = MSG_SIZE, len, ret; - fd_set readfds; - struct timeval timeout; - image_t *image, *img; - - - blkif = (blkif_t *)ptr; - blk = blkif->info; - image = blkif->prv; - - buf = malloc(MSG_SIZE); - - ret = 0; - FD_ZERO(&readfds); - FD_SET(fd,&readfds); - timeout.tv_sec = max_timeout; /*Wait for up to max_timeout seconds*/ - timeout.tv_usec = 0; - if (select(fd+1, &readfds, (fd_set *) 0, - (fd_set *) 0, &timeout) > 0) { - ret = read(fd, buf, msglen); - } - if (ret > 0) { - msg = (msg_hdr_t *)buf; - switch (msg->type) - { - case CTLMSG_IMG: - img = (image_t *)(buf + sizeof(msg_hdr_t)); - image->size = img->size; - image->secsize = img->secsize; - image->info = img->info; - - DPRINTF("Received CTLMSG_IMG: %llu, %lu, %u\n", - image->size, image->secsize, image->info); - if(msgtype != CTLMSG_IMG) ret = 0; - break; - - case CTLMSG_IMG_FAIL: - DPRINTF("Received CTLMSG_IMG_FAIL, " - "unable to open image\n"); - ret = 0; - break; - - case CTLMSG_NEWDEV_RSP: - DPRINTF("Received CTLMSG_NEWDEV_RSP\n"); - if(msgtype != CTLMSG_NEWDEV_RSP) ret = 0; - break; - - case CTLMSG_NEWDEV_FAIL: - DPRINTF("Received CTLMSG_NEWDEV_FAIL\n"); - ret = 0; - break; - - case CTLMSG_CLOSE_RSP: - DPRINTF("Received CTLMSG_CLOSE_RSP\n"); - if (msgtype != CTLMSG_CLOSE_RSP) ret = 0; - break; - - case CTLMSG_PID_RSP: - DPRINTF("Received CTLMSG_PID_RSP\n"); - if (msgtype != CTLMSG_PID_RSP) ret = 0; - else { - msg_pid = (msg_pid_t *) - (buf + sizeof(msg_hdr_t)); - blkif->tappid = msg_pid->pid; - DPRINTF("\tPID: [%d]\n",blkif->tappid); - } - break; - default: - DPRINTF("UNKNOWN MESSAGE TYPE RECEIVED\n"); - ret = 0; - break; - } - } - - free(buf); - - return ret; - -} - -static int launch_tapdisk_provider(char **argv) -{ - pid_t child; - - if ((child = fork()) < 0) - return -1; - - if (!child) { - int i; - for (i = 0 ; i < sysconf(_SC_OPEN_MAX) ; i++) - if (i != STDIN_FILENO && - i != STDOUT_FILENO && - i != STDERR_FILENO) - close(i); - - execvp(argv[0], argv); - DPRINTF("execvp failed: %d (%s)\n", errno, strerror(errno)); - DPRINTF("PATH = %s\n", getenv("PATH")); - _exit(1); - } else { - pid_t got; - do { - got = waitpid(child, NULL, 0); - } while (got != child); - } - return child; -} - -static int launch_tapdisk(char *wrctldev, char *rdctldev) -{ - char *argv[] = { "tapdisk", wrctldev, rdctldev, NULL }; - - if (launch_tapdisk_provider(argv) < 0) - return -1; - - return 0; -} - -static int launch_tapdisk_ioemu(void) -{ - char *argv[] = { "tapdisk-ioemu", NULL }; - return launch_tapdisk_provider(argv); -} - -/* - * Connect to an ioemu based disk provider (qemu-dm or tapdisk-ioemu) - * - * If the domain has a device model, connect to qemu-dm through the - * domain specific pipe. Otherwise use a single tapdisk-ioemu instance - * which is represented by domid 0 and provides access for Dom0 and - * all DomUs without device model. - */ -static int connect_qemu(blkif_t *blkif, int domid) -{ - char *rdctldev, *wrctldev; - - static int tapdisk_ioemu_pid = 0; - static int dom0_readfd = 0; - static int dom0_writefd = 0; - int refresh_pid = 0; - - if (asprintf(&rdctldev, BLKTAP_CTRL_DIR "/qemu-read-%d", domid) < 0) - return -1; - - if (asprintf(&wrctldev, BLKTAP_CTRL_DIR "/qemu-write-%d", domid) < 0) { - free(rdctldev); - return -1; - } - - DPRINTF("Using qemu blktap pipe: %s\n", rdctldev); - - if (domid == 0) { - /* - * tapdisk-ioemu exits as soon as the last image is - * disconnected. Check if it is still running. - */ - if (tapdisk_ioemu_pid == 0 || kill(tapdisk_ioemu_pid, 0)) { - /* No device model and tapdisk-ioemu doesn't run yet */ - DPRINTF("Launching tapdisk-ioemu\n"); - launch_tapdisk_ioemu(); - - dom0_readfd = open_ctrl_socket(wrctldev); - dom0_writefd = open_ctrl_socket(rdctldev); - - refresh_pid = 1; - } - - DPRINTF("Using tapdisk-ioemu connection\n"); - blkif->fds[READ] = dom0_readfd; - blkif->fds[WRITE] = dom0_writefd; - - if (refresh_pid) { - get_tapdisk_pid(blkif); - tapdisk_ioemu_pid = blkif->tappid; - } - - } else if (access(rdctldev, R_OK | W_OK) == 0) { - /* Use existing pipe to the device model */ - DPRINTF("Using qemu-dm connection\n"); - blkif->fds[READ] = open_ctrl_socket(wrctldev); - blkif->fds[WRITE] = open_ctrl_socket(rdctldev); - } else { - /* No device model => try with tapdisk-ioemu */ - DPRINTF("No device model\n"); - connect_qemu(blkif, 0); - } - - free(rdctldev); - free(wrctldev); - - if (blkif->fds[READ] == -1 || blkif->fds[WRITE] == -1) - return -1; - - DPRINTF("Attached to qemu blktap pipes\n"); - return 0; -} - -/* Launch tapdisk instance */ -static int connect_tapdisk(blkif_t *blkif, int minor) -{ - char *rdctldev = NULL, *wrctldev = NULL; - int ret = -1; - - DPRINTF("tapdisk process does not exist:\n"); - - if (asprintf(&rdctldev, - "%s/tapctrlread%d", BLKTAP_CTRL_DIR, minor) == -1) - goto fail; - - if (asprintf(&wrctldev, - "%s/tapctrlwrite%d", BLKTAP_CTRL_DIR, minor) == -1) - goto fail; - - blkif->fds[READ] = open_ctrl_socket(rdctldev); - blkif->fds[WRITE] = open_ctrl_socket(wrctldev); - - if (blkif->fds[READ] == -1 || blkif->fds[WRITE] == -1) - goto fail; - - /*launch the new process*/ - DPRINTF("Launching process, CMDLINE [tapdisk %s %s]\n", - wrctldev, rdctldev); - - if (launch_tapdisk(wrctldev, rdctldev) == -1) { - DPRINTF("Unable to fork, cmdline: [tapdisk %s %s]\n", - wrctldev, rdctldev); - goto fail; - } - - ret = 0; - -fail: - if (rdctldev) - free(rdctldev); - - if (wrctldev) - free(wrctldev); - - return ret; -} - -static int blktapctrl_new_blkif(blkif_t *blkif) -{ - blkif_info_t *blk; - int major, minor, fd_read, fd_write, type, new; - char *rdctldev, *wrctldev, *ptr; - image_t *image; - blkif_t *exist = NULL; - static uint16_t next_cookie = 0; - int use_ioemu; - - DPRINTF("Received a poll for a new vbd\n"); - if ( ((blk=blkif->info) != NULL) && (blk->params != NULL) ) { - if (blktap_interface_create(ctlfd, &major, &minor, blkif) < 0) - return -1; - - if (test_path(blk->params, &ptr, &type, &exist, &use_ioemu) != 0) { - DPRINTF("Error in blktap device string(%s).\n", - blk->params); - goto fail; - } - blkif->drivertype = type; - blkif->cookie = next_cookie++; - - if (!exist) { - if (use_ioemu) { - if (connect_qemu(blkif, blkif->domid)) - goto fail; - } else { - if (connect_tapdisk(blkif, minor)) - goto fail; - } - - } else { - DPRINTF("Process exists!\n"); - blkif->fds[READ] = exist->fds[READ]; - blkif->fds[WRITE] = exist->fds[WRITE]; - } - - add_disktype(blkif, type); - blkif->major = major; - blkif->minor = minor; - - image = (image_t *)malloc(sizeof(image_t)); - blkif->prv = (void *)image; - blkif->ops = &tapdisk_ops; - - /*Retrieve the PID of the new process*/ - if (get_tapdisk_pid(blkif) <= 0) { - DPRINTF("Unable to contact disk process\n"); - goto fail; - } - - /* Both of the following read and write calls will block up to - * max_timeout val*/ - if (write_msg(blkif->fds[WRITE], CTLMSG_PARAMS, blkif, ptr) - <= 0) { - DPRINTF("Write_msg failed - CTLMSG_PARAMS\n"); - goto fail; - } - - if (read_msg(blkif->fds[READ], CTLMSG_IMG, blkif) <= 0) { - DPRINTF("Read_msg failure - CTLMSG_IMG\n"); - goto fail; - } - - } else return -1; - - return 0; -fail: - ioctl(ctlfd, BLKTAP_IOCTL_FREEINTF, minor); - return -EINVAL; -} - -static int map_new_blktapctrl(blkif_t *blkif) -{ - DPRINTF("Received a poll for a new devmap\n"); - if (write_msg(blkif->fds[WRITE], CTLMSG_NEWDEV, blkif, NULL) <= 0) { - DPRINTF("Write_msg failed - CTLMSG_NEWDEV\n"); - return -EINVAL; - } - - if (read_msg(blkif->fds[READ], CTLMSG_NEWDEV_RSP, blkif) <= 0) { - DPRINTF("Read_msg failed - CTLMSG_NEWDEV_RSP\n"); - return -EINVAL; - } - DPRINTF("Exiting map_new_blktapctrl\n"); - - return blkif->minor - 1; -} - -static int unmap_blktapctrl(blkif_t *blkif) -{ - DPRINTF("Unmapping vbd\n"); - - if (write_msg(blkif->fds[WRITE], CTLMSG_CLOSE, blkif, NULL) <= 0) { - DPRINTF("Write_msg failed - CTLMSG_CLOSE\n"); - return -EINVAL; - } - - if (del_disktype(blkif)) { - DPRINTF("Closing communication pipe to pid %d\n", blkif->tappid); - close(blkif->fds[WRITE]); - close(blkif->fds[READ]); - } - - return 0; -} - -int open_ctrl_socket(char *devname) -{ - int ret; - int ipc_fd; - fd_set socks; - struct timeval timeout; - - if (mkdir(BLKTAP_CTRL_DIR, 0755) == 0) - DPRINTF("Created %s directory\n", BLKTAP_CTRL_DIR); - ret = mkfifo(devname,S_IRWXU|S_IRWXG|S_IRWXO); - if ( (ret != 0) && (errno != EEXIST) ) { - DPRINTF("ERROR: pipe failed (%d)\n", errno); - exit(0); - } - - ipc_fd = open(devname,O_RDWR|O_NONBLOCK); - - if (ipc_fd < 0) { - DPRINTF("FD open failed\n"); - return -1; - } - - return ipc_fd; -} - -static void print_drivers(void) -{ - int i, size; - - size = sizeof(dtypes)/sizeof(disk_info_t *); - DPRINTF("blktapctrl: v1.0.0\n"); - for (i = 0; i < size; i++) - DPRINTF("Found driver: [%s]\n",dtypes[i]->name); -} - -static void write_pidfile(long pid) -{ - char buf[100]; - int len; - int fd; - int flags; - - fd = open(PIDFILE, O_RDWR | O_CREAT, 0600); - if (fd == -1) { - DPRINTF("Opening pid file failed (%d)\n", errno); - exit(1); - } - - /* We exit silently if daemon already running. */ - if (lockf(fd, F_TLOCK, 0) == -1) - exit(0); - - /* Set FD_CLOEXEC, so that tapdisk doesn't get this file - descriptor. */ - if ((flags = fcntl(fd, F_GETFD)) == -1) { - DPRINTF("F_GETFD failed (%d)\n", errno); - exit(1); - } - flags |= FD_CLOEXEC; - if (fcntl(fd, F_SETFD, flags) == -1) { - DPRINTF("F_SETFD failed (%d)\n", errno); - exit(1); - } - - len = snprintf(buf, sizeof(buf), "%ld\n", pid); - if (write(fd, buf, len) != len) { - DPRINTF("Writing pid file failed (%d)\n", errno); - exit(1); - } -} - -int main(int argc, char *argv[]) -{ - char *devname; - tapdev_info_t *ctlinfo; - int tap_pfd, store_pfd, xs_fd, ret, timeout, pfd_count, count=0; - struct xs_handle *h; - struct pollfd pfd[NUM_POLL_FDS]; - pid_t process; - char buf[128]; - - __init_blkif(); - snprintf(buf, sizeof(buf), "BLKTAPCTRL[%d]", getpid()); - openlog(buf, LOG_CONS|LOG_ODELAY, LOG_DAEMON); - if (daemon(0,0)) { - DPRINTF("daemon failed (%d)\n", errno); - goto open_failed; - } - - print_drivers(); - init_driver_list(); - init_rng(); - - register_new_blkif_hook(blktapctrl_new_blkif); - register_new_devmap_hook(map_new_blktapctrl); - register_new_unmap_hook(unmap_blktapctrl); - - ctlfd = blktap_interface_open(); - if (ctlfd < 0) { - DPRINTF("couldn't open blktap interface\n"); - goto open_failed; - } - -#ifdef MEMSHR - memshr_daemon_initialize(); -#endif - - retry: - /* Set up store connection and watch. */ - h = xs_daemon_open(); - if (h == NULL) { - DPRINTF("xs_daemon_open failed -- " - "is xenstore running?\n"); - if (count < MAX_ATTEMPTS) { - count++; - sleep(2); - goto retry; - } else goto open_failed; - } - - ret = setup_probe_watch(h); - if (ret != 0) { - DPRINTF("Failed adding device probewatch\n"); - xs_daemon_close(h); - goto open_failed; - } - - ioctl(ctlfd, BLKTAP_IOCTL_SETMODE, BLKTAP_MODE_INTERPOSE ); - - process = getpid(); - write_pidfile(process); - ret = ioctl(ctlfd, BLKTAP_IOCTL_SENDPID, process ); - - /*Static pollhooks*/ - pfd_count = 0; - tap_pfd = pfd_count++; - pfd[tap_pfd].fd = ctlfd; - pfd[tap_pfd].events = POLLIN; - - store_pfd = pfd_count++; - pfd[store_pfd].fd = xs_fileno(h); - pfd[store_pfd].events = POLLIN; - - while (run) { - timeout = 1000; /*Milliseconds*/ - ret = poll(pfd, pfd_count, timeout); - - if (ret > 0) { - if (pfd[store_pfd].revents) { - ret = xs_fire_next_watch(h); - } - } - } - - xs_daemon_close(h); - ioctl(ctlfd, BLKTAP_IOCTL_SETMODE, BLKTAP_MODE_PASSTHROUGH ); - close(ctlfd); - closelog(); - - return 0; - - open_failed: - DPRINTF("Unable to start blktapctrl\n"); - closelog(); - return -1; -} - -/* - * Local variables: - * c-file-style: "linux" - * indent-tabs-mode: t - * c-indent-level: 8 - * c-basic-offset: 8 - * tab-width: 8 - * End: - */ diff --git a/tools/blktap/drivers/blktapctrl.h b/tools/blktap/drivers/blktapctrl.h deleted file mode 100644 index 4512807..0000000 --- a/tools/blktap/drivers/blktapctrl.h +++ /dev/null @@ -1,36 +0,0 @@ -/* blktapctrl.h - * - * controller image utils. - * - * (c) 2004-6 Andrew Warfield and Julian Chesterfield - * - * 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. - */ - - -int blktap_interface_open(void); - -int blktap_interface_create(int ctlfd, int *major, int *minor, blkif_t *blkif); - diff --git a/tools/blktap/drivers/blktapctrl_linux.c b/tools/blktap/drivers/blktapctrl_linux.c deleted file mode 100644 index 6282fa6..0000000 --- a/tools/blktap/drivers/blktapctrl_linux.c +++ /dev/null @@ -1,89 +0,0 @@ - -#include -#include -#include -#include - -#include "tapdisk.h" -#include "blktaplib.h" -#include "blktapctrl.h" - -static void make_blktap_dev(char *devname, int major, int minor) -{ - struct stat st; - - if (lstat(devname, &st) != 0) { - /*Need to create device*/ - if (mkdir(BLKTAP_DEV_DIR, 0755) == 0) - DPRINTF("Created %s directory\n",BLKTAP_DEV_DIR); - if (mknod(devname, S_IFCHR|0600, - makedev(major, minor)) == 0) - DPRINTF("Created %s device\n",devname); - } else { - DPRINTF("%s device already exists\n",devname); - /* it already exists, but is it the same major number */ - if (((st.st_rdev>>8) & 0xff) != major) { - DPRINTF("%s has old major %d\n", - devname, - (unsigned int)((st.st_rdev >> 8) & 0xff)); - /* only try again if we succed in deleting it */ - if (!unlink(devname)) - make_blktap_dev(devname, major, minor); - } - } -} - -int blktap_interface_create(int ctlfd, int *major, int *minor, blkif_t *blkif) -{ - domid_translate_t tr; - domid_translate_ext_t tr_ext; - int ret; - char *devname; - - if (blkif->be_id >= (1<<28)) { - /* new-style backend-id, so use the extended structure */ - tr_ext.domid = blkif->domid; - tr_ext.busid = blkif->be_id; - ret = ioctl(ctlfd, BLKTAP_IOCTL_NEWINTF_EXT, &tr_ext); - DPRINTF("Sent domid %d and be_id %d\n", tr_ext.domid, - tr_ext.busid); - } - else { - /* old-style backend-id; use the old structure */ - tr.domid = blkif->domid; - tr.busid = (unsigned short)blkif->be_id; - ret = ioctl(ctlfd, BLKTAP_IOCTL_NEWINTF, tr); - DPRINTF("Sent domid %d and be_id %d\n", tr.domid, tr.busid); - } - - if ( (ret <= 0)||(ret > MAX_TAP_DEV) ) { - DPRINTF("Incorrect Dev ID [%d]\n",ret); - return -1; - } - - *minor = ret; - *major = ioctl(ctlfd, BLKTAP_IOCTL_MAJOR, ret ); - if (*major < 0) { - DPRINTF("Incorrect Major ID [%d]\n",*major); - return -1; - } - - if (asprintf(&devname,"%s/%s%d",BLKTAP_DEV_DIR, BLKTAP_DEV_NAME, *minor) == -1) - return -1; - make_blktap_dev(devname,*major,*minor); - DPRINTF("Received device id %d and major %d\n", - *minor, *major); - return 0; -} - - -int blktap_interface_open(void) -{ - int ctlfd; - - ctlfd = open(BLKTAP_DEV_DIR "/" BLKTAP_DEV_NAME "0", O_RDWR); - if (ctlfd == -1) - DPRINTF("blktap0 open failed\n"); - - return ctlfd; -} diff --git a/tools/blktap/drivers/block-aio.c b/tools/blktap/drivers/block-aio.c deleted file mode 100644 index 98727f4..0000000 --- a/tools/blktap/drivers/block-aio.c +++ /dev/null @@ -1,259 +0,0 @@ -/* block-aio.c - * - * libaio-based raw disk implementation. - * - * (c) 2006 Andrew Warfield and Julian Chesterfield - * - * NB: This code is not thread-safe. - * - * 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include "tapdisk.h" -#include "tapaio.h" -#include "blk.h" - -#define MAX_AIO_REQS (MAX_REQUESTS * MAX_SEGMENTS_PER_REQ) - -/* *BSD has no O_LARGEFILE */ -#ifndef O_LARGEFILE -#define O_LARGEFILE 0 -#endif - -struct tdaio_state { - int fd; - tap_aio_context_t aio; -}; - - -/*Get Image size, secsize*/ -static int get_image_info(struct td_state *s, int fd) -{ - int ret; - long size; - unsigned long total_size; - struct statvfs statBuf; - struct stat stat; - - ret = fstat(fd, &stat); - if (ret != 0) { - DPRINTF("ERROR: fstat failed, Couldn't stat image"); - return -EINVAL; - } - - if (S_ISBLK(stat.st_mode)) { - /*Accessing block device directly*/ - if (blk_getimagesize(fd, &s->size) != 0) - return -EINVAL; - - DPRINTF("Image size: \n\tpre sector_shift [%llu]\n\tpost " - "sector_shift [%llu]\n", - (long long unsigned)(s->size << SECTOR_SHIFT), - (long long unsigned)s->size); - - /*Get the sector size*/ - if (blk_getsectorsize(fd, &s->sector_size) != 0) - s->sector_size = DEFAULT_SECTOR_SIZE; - - } else { - /*Local file? try fstat instead*/ - s->size = (stat.st_size >> SECTOR_SHIFT); - s->sector_size = DEFAULT_SECTOR_SIZE; - DPRINTF("Image size: \n\tpre sector_shift [%llu]\n\tpost " - "sector_shift [%llu]\n", - (long long unsigned)(s->size << SECTOR_SHIFT), - (long long unsigned)s->size); - } - - if (s->size == 0) { - s->size =((uint64_t) 16836057); - s->sector_size = DEFAULT_SECTOR_SIZE; - } - s->info = 0; - - return 0; -} - -static inline void init_fds(struct disk_driver *dd) -{ - int i; - struct tdaio_state *prv = (struct tdaio_state *)dd->private; - - for(i = 0; i < MAX_IOFD; i++) - dd->io_fd[i] = 0; - - dd->io_fd[0] = prv->aio.aio_ctx.pollfd; -} - -/* Open the disk file and initialize aio state. */ -static int tdaio_open (struct disk_driver *dd, const char *name, td_flag_t flags) -{ - int i, fd, ret = 0, o_flags; - struct td_state *s = dd->td_state; - struct tdaio_state *prv = (struct tdaio_state *)dd->private; - - DPRINTF("block-aio open('%s')", name); - - /* Initialize AIO */ - ret = tap_aio_init(&prv->aio, 0, MAX_AIO_REQS); - if (ret != 0) - return ret; - - /* Open the file */ - o_flags = O_DIRECT | O_LARGEFILE | - ((flags == TD_RDONLY) ? O_RDONLY : O_RDWR); - fd = open(name, o_flags); - - if ( (fd == -1) && (errno == EINVAL) ) { - - /* Maybe O_DIRECT isn't supported. */ - o_flags &= ~O_DIRECT; - fd = open(name, o_flags); - if (fd != -1) DPRINTF("WARNING: Accessing image without" - "O_DIRECT! (%s)\n", name); - - } else if (fd != -1) DPRINTF("open(%s) with O_DIRECT\n", name); - - if (fd == -1) { - DPRINTF("Unable to open [%s] (%d)!\n", name, 0 - errno); - ret = 0 - errno; - goto done; - } - - prv->fd = fd; - - init_fds(dd); - ret = get_image_info(s, fd); - -done: - return ret; -} - -static int tdaio_queue_read(struct disk_driver *dd, uint64_t sector, - int nb_sectors, char *buf, td_callback_t cb, - int id, void *private) -{ - struct td_state *s = dd->td_state; - struct tdaio_state *prv = (struct tdaio_state *)dd->private; - int size = nb_sectors * s->sector_size; - uint64_t offset = sector * (uint64_t)s->sector_size; - - return tap_aio_read(&prv->aio, prv->fd, size, offset, buf, - cb, id, sector, private); -} - -static int tdaio_queue_write(struct disk_driver *dd, uint64_t sector, - int nb_sectors, char *buf, td_callback_t cb, - int id, void *private) -{ - struct td_state *s = dd->td_state; - struct tdaio_state *prv = (struct tdaio_state *)dd->private; - int size = nb_sectors * s->sector_size; - uint64_t offset = sector * (uint64_t)s->sector_size; - - return tap_aio_write(&prv->aio, prv->fd, size, offset, buf, - cb, id, sector, private); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:09:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:09: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 1YCx6b-0002K3-EU; Sun, 18 Jan 2015 21:09:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6a-0002Jq-1p for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:56 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id FB/B6-17735-3212CB45; Sun, 18 Jan 2015 21:09:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1421615392!20458285!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13435 invoked from network); 18 Jan 2015 21:09:53 -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 Jan 2015 21:09:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6W-0001IZ-Fu for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx6W-0004W7-FA for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:52 +0000 Date: Sun, 18 Jan 2015 21:09:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Update documentation in the public header arch-arm.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 868586fd12dea4d0f0073dcaeec9784d4b9d0acb Author: Julien Grall AuthorDate: Wed Jan 14 12:53:49 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 15 14:00:56 2015 +0000 xen/arm: Update documentation in the public header arch-arm.h Minor updates to the documentation in xen/include/public/arch-arm.h: - Comments coding style fix - Typoes - Update the list of supported hypercalls by ARM - Remove unnecessary comment about 64bit. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Jan Beulich Cc: Keir Fraser Acked-by: Ian Campbell [ ijc -- fixed spelling of unnecessary, corrected aarch into aarch32 ] --- xen/include/public/arch-arm.h | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index e711606..124fc90 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -87,15 +87,10 @@ * unavailable/unsupported. * * HYPERVISOR_memory_op - * All generic sub-operations. - * - * In addition the following arch specific sub-ops: - * * XENMEM_add_to_physmap - * * XENMEM_add_to_physmap_batch + * All generic sub-operations * * HYPERVISOR_domctl * All generic sub-operations, with the exception of: - * * XEN_DOMCTL_iomem_permission (not yet implemented) * * XEN_DOMCTL_irq_permission (not yet implemented) * * HYPERVISOR_sched_op @@ -183,8 +178,8 @@ * 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 represent a guest pointer, when passed as an - * hypercall argument. It is 4 bytes on aarch and 8 bytes on aarch64. + * 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); \ @@ -192,7 +187,6 @@ #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) -/* this is going to be changed on 64 bit */ #define XEN_GUEST_HANDLE_PARAM(name) __guest_handle_ ## name #define set_xen_guest_handle_raw(hnd, val) \ do { \ @@ -318,7 +312,7 @@ typedef uint64_t xen_callback_t; #if defined(__XEN__) || defined(__XEN_TOOLS__) -/* PSR bits (CPSR, SPSR)*/ +/* PSR bits (CPSR, SPSR) */ #define PSR_THUMB (1<<5) /* Thumb Mode enable */ #define PSR_FIQ_MASK (1<<6) /* Fast Interrupt mask */ @@ -365,7 +359,8 @@ typedef uint64_t xen_callback_t; /* Physical Address Space */ -/* vGIC mappings: Only one set of mapping is used by the guest. +/* + * vGIC mappings: Only one set of mapping is used by the guest. * Therefore they can overlap. */ @@ -385,7 +380,8 @@ typedef uint64_t xen_callback_t; #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 +/* + * 16MB == 4096 pages reserved for guest to use as a region to map its * grant table in. */ #define GUEST_GNTTAB_BASE 0x38000000ULL -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:09:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:09: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 1YCx6b-0002K3-EU; Sun, 18 Jan 2015 21:09:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6a-0002Jq-1p for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:56 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id FB/B6-17735-3212CB45; Sun, 18 Jan 2015 21:09:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1421615392!20458285!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13435 invoked from network); 18 Jan 2015 21:09:53 -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 Jan 2015 21:09:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6W-0001IZ-Fu for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx6W-0004W7-FA for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:09:52 +0000 Date: Sun, 18 Jan 2015 21:09:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Update documentation in the public header arch-arm.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 868586fd12dea4d0f0073dcaeec9784d4b9d0acb Author: Julien Grall AuthorDate: Wed Jan 14 12:53:49 2015 +0000 Commit: Ian Campbell CommitDate: Thu Jan 15 14:00:56 2015 +0000 xen/arm: Update documentation in the public header arch-arm.h Minor updates to the documentation in xen/include/public/arch-arm.h: - Comments coding style fix - Typoes - Update the list of supported hypercalls by ARM - Remove unnecessary comment about 64bit. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Jan Beulich Cc: Keir Fraser Acked-by: Ian Campbell [ ijc -- fixed spelling of unnecessary, corrected aarch into aarch32 ] --- xen/include/public/arch-arm.h | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index e711606..124fc90 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -87,15 +87,10 @@ * unavailable/unsupported. * * HYPERVISOR_memory_op - * All generic sub-operations. - * - * In addition the following arch specific sub-ops: - * * XENMEM_add_to_physmap - * * XENMEM_add_to_physmap_batch + * All generic sub-operations * * HYPERVISOR_domctl * All generic sub-operations, with the exception of: - * * XEN_DOMCTL_iomem_permission (not yet implemented) * * XEN_DOMCTL_irq_permission (not yet implemented) * * HYPERVISOR_sched_op @@ -183,8 +178,8 @@ * 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 represent a guest pointer, when passed as an - * hypercall argument. It is 4 bytes on aarch and 8 bytes on aarch64. + * 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); \ @@ -192,7 +187,6 @@ #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) -/* this is going to be changed on 64 bit */ #define XEN_GUEST_HANDLE_PARAM(name) __guest_handle_ ## name #define set_xen_guest_handle_raw(hnd, val) \ do { \ @@ -318,7 +312,7 @@ typedef uint64_t xen_callback_t; #if defined(__XEN__) || defined(__XEN_TOOLS__) -/* PSR bits (CPSR, SPSR)*/ +/* PSR bits (CPSR, SPSR) */ #define PSR_THUMB (1<<5) /* Thumb Mode enable */ #define PSR_FIQ_MASK (1<<6) /* Fast Interrupt mask */ @@ -365,7 +359,8 @@ typedef uint64_t xen_callback_t; /* Physical Address Space */ -/* vGIC mappings: Only one set of mapping is used by the guest. +/* + * vGIC mappings: Only one set of mapping is used by the guest. * Therefore they can overlap. */ @@ -385,7 +380,8 @@ typedef uint64_t xen_callback_t; #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 +/* + * 16MB == 4096 pages reserved for guest to use as a region to map its * grant table in. */ #define GUEST_GNTTAB_BASE 0x38000000ULL -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:10:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:10: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 1YCx6q-0002M0-HI; Sun, 18 Jan 2015 21:10:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6p-0002Lq-CH for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:10:11 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 48/87-27623-2312CB45; Sun, 18 Jan 2015 21:10:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1421615408!20479961!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 889 invoked from network); 18 Jan 2015 21:10:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:10:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6l-0001JB-Lc for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:10:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx6g-0004Wj-Kc for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:10:02 +0000 Date: Sun, 18 Jan 2015 21:10:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/viridian: do not leak page refs and mappings if the host tsc is unstable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8fabafd6ded8ed81eef4eb53947be13e0aa97a68 Author: Andrew Cooper AuthorDate: Thu Jan 15 17:56:25 2015 +0100 Commit: Jan Beulich CommitDate: Thu Jan 15 17:56:25 2015 +0100 x86/viridian: do not leak page refs and mappings if the host tsc is unstable Signed-off-by: Andrew Cooper Coverity-ID: 1264360 Reviewed-by: Paul Durrant --- xen/arch/x86/hvm/viridian.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index cb689f6..1e5a570 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -287,7 +287,7 @@ static void update_reference_tsc(struct domain *d, bool_t initialize) printk(XENLOG_G_INFO "d%d: VIRIDIAN REFERENCE_TSC: invalidated\n", d->domain_id); - return; + goto out; } /* @@ -306,6 +306,7 @@ static void update_reference_tsc(struct domain *d, bool_t initialize) p->TscSequence == 0 ) /* Avoid both 'invalid' values */ p->TscSequence = 1; + out: unmap_domain_page(p); put_page_and_type(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 Sun Jan 18 21:10:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:10: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 1YCx6q-0002M0-HI; Sun, 18 Jan 2015 21:10:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6p-0002Lq-CH for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:10:11 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 48/87-27623-2312CB45; Sun, 18 Jan 2015 21:10:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1421615408!20479961!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 889 invoked from network); 18 Jan 2015 21:10:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:10:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6l-0001JB-Lc for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:10:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx6g-0004Wj-Kc for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:10:02 +0000 Date: Sun, 18 Jan 2015 21:10:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/viridian: do not leak page refs and mappings if the host tsc is unstable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8fabafd6ded8ed81eef4eb53947be13e0aa97a68 Author: Andrew Cooper AuthorDate: Thu Jan 15 17:56:25 2015 +0100 Commit: Jan Beulich CommitDate: Thu Jan 15 17:56:25 2015 +0100 x86/viridian: do not leak page refs and mappings if the host tsc is unstable Signed-off-by: Andrew Cooper Coverity-ID: 1264360 Reviewed-by: Paul Durrant --- xen/arch/x86/hvm/viridian.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index cb689f6..1e5a570 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -287,7 +287,7 @@ static void update_reference_tsc(struct domain *d, bool_t initialize) printk(XENLOG_G_INFO "d%d: VIRIDIAN REFERENCE_TSC: invalidated\n", d->domain_id); - return; + goto out; } /* @@ -306,6 +306,7 @@ static void update_reference_tsc(struct domain *d, bool_t initialize) p->TscSequence == 0 ) /* Avoid both 'invalid' values */ p->TscSequence = 1; + out: unmap_domain_page(p); put_page_and_type(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 Sun Jan 18 21:10:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:10: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 1YCx71-0002NS-K1; Sun, 18 Jan 2015 21:10:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6z-0002NI-MS for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:10:21 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 19/85-09842-C312CB45; Sun, 18 Jan 2015 21:10:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1421615419!22228334!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24108 invoked from network); 18 Jan 2015 21:10:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:10:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6w-0001JH-T8 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:10:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx6w-0004XG-R7 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:10:18 +0000 Date: Sun, 18 Jan 2015 21:10:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: reunite nestedp2m_lock with its comment. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d2879062076329038860f873dcbeb6f55bd4917 Author: Tim Deegan AuthorDate: Thu Jan 15 17:49:48 2015 +0000 Commit: Tim Deegan CommitDate: Thu Jan 15 17:51:21 2015 +0000 x86/mm: reunite nestedp2m_lock with its comment. Signed-off-by: Tim Deegan --- xen/arch/x86/mm/mm-locks.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/mm/mm-locks.h b/xen/arch/x86/mm/mm-locks.h index 769f7bc..b4f035e 100644 --- a/xen/arch/x86/mm/mm-locks.h +++ b/xen/arch/x86/mm/mm-locks.h @@ -205,6 +205,14 @@ static inline void mm_enforce_order_unlock(int unlock_level, * * ************************************************************************/ +/* Nested P2M lock (per-domain) + * + * A per-domain lock that protects the mapping from nested-CR3 to + * nested-p2m. In particular it covers: + * - the array of nested-p2m tables, and all LRU activity therein; and + * - setting the "cr3" field of any p2m table to a non-P2M_BASE_EAADR value. + * (i.e. assigning a p2m table to be the shadow of that cr3 */ + declare_mm_lock(nestedp2m) #define nestedp2m_lock(d) mm_lock(nestedp2m, &(d)->arch.nested_p2m_lock) #define nestedp2m_unlock(d) mm_unlock(&(d)->arch.nested_p2m_lock) @@ -244,14 +252,6 @@ declare_mm_order_constraint(per_page_sharing) mm_enforce_order_lock_post_per_page_sharing((l), (r)) #define page_sharing_mm_unlock(l, r) mm_enforce_order_unlock((l), (r)) -/* Nested P2M lock (per-domain) - * - * A per-domain lock that protects the mapping from nested-CR3 to - * nested-p2m. In particular it covers: - * - the array of nested-p2m tables, and all LRU activity therein; and - * - setting the "cr3" field of any p2m table to a non-P2M_BASE_EAADR value. - * (i.e. assigning a p2m table to be the shadow of that cr3 */ - /* PoD lock (per-p2m-table) * * Protects private PoD data structs: entry and cache -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 18 21:10:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 18 Jan 2015 21:10: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 1YCx71-0002NS-K1; Sun, 18 Jan 2015 21:10:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6z-0002NI-MS for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:10:21 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 19/85-09842-C312CB45; Sun, 18 Jan 2015 21:10:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1421615419!22228334!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24108 invoked from network); 18 Jan 2015 21:10:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Jan 2015 21:10:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YCx6w-0001JH-T8 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:10:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YCx6w-0004XG-R7 for xen-changelog@lists.xensource.com; Sun, 18 Jan 2015 21:10:18 +0000 Date: Sun, 18 Jan 2015 21:10:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: reunite nestedp2m_lock with its comment. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d2879062076329038860f873dcbeb6f55bd4917 Author: Tim Deegan AuthorDate: Thu Jan 15 17:49:48 2015 +0000 Commit: Tim Deegan CommitDate: Thu Jan 15 17:51:21 2015 +0000 x86/mm: reunite nestedp2m_lock with its comment. Signed-off-by: Tim Deegan --- xen/arch/x86/mm/mm-locks.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/mm/mm-locks.h b/xen/arch/x86/mm/mm-locks.h index 769f7bc..b4f035e 100644 --- a/xen/arch/x86/mm/mm-locks.h +++ b/xen/arch/x86/mm/mm-locks.h @@ -205,6 +205,14 @@ static inline void mm_enforce_order_unlock(int unlock_level, * * ************************************************************************/ +/* Nested P2M lock (per-domain) + * + * A per-domain lock that protects the mapping from nested-CR3 to + * nested-p2m. In particular it covers: + * - the array of nested-p2m tables, and all LRU activity therein; and + * - setting the "cr3" field of any p2m table to a non-P2M_BASE_EAADR value. + * (i.e. assigning a p2m table to be the shadow of that cr3 */ + declare_mm_lock(nestedp2m) #define nestedp2m_lock(d) mm_lock(nestedp2m, &(d)->arch.nested_p2m_lock) #define nestedp2m_unlock(d) mm_unlock(&(d)->arch.nested_p2m_lock) @@ -244,14 +252,6 @@ declare_mm_order_constraint(per_page_sharing) mm_enforce_order_lock_post_per_page_sharing((l), (r)) #define page_sharing_mm_unlock(l, r) mm_enforce_order_unlock((l), (r)) -/* Nested P2M lock (per-domain) - * - * A per-domain lock that protects the mapping from nested-CR3 to - * nested-p2m. In particular it covers: - * - the array of nested-p2m tables, and all LRU activity therein; and - * - setting the "cr3" field of any p2m table to a non-P2M_BASE_EAADR value. - * (i.e. assigning a p2m table to be the shadow of that cr3 */ - /* PoD lock (per-p2m-table) * * Protects private PoD data structs: entry and cache -- generated by git-patchbot for /home/xen/git/xen.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 Jan 19 10:55:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 19 Jan 2015 10:55:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YD9zF-0004m4-Ge; Mon, 19 Jan 2015 10:55:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YD9zE-0004ls-EU for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 10:55:12 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id E3/CC-02697-E82ECB45; Mon, 19 Jan 2015 10:55:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-206.messagelabs.com!1421664905!18780791!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30164 invoked from network); 19 Jan 2015 10:55:06 -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 Jan 2015 10:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YD9z5-0001PU-0d for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 10:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YD9z4-0008Md-Ly for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 10:55:02 +0000 Message-Id: Date: Mon, 19 Jan 2015 10:55:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] scsifront: don't use bitfields for indicators modified under different locks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Juergen Gross # Date 1421664706 -3600 # Node ID 578e5aea3cbb6a82fa445eb7b4ff0356ff3f4d5b # Parent 3feb5ddb543433f1d1d36f8e27ce3d9c113b1704 scsifront: don't use bitfields for indicators modified under different locks It is no good idea to have bitfields in the same byte which are modified with different locks held (or, in this case, one with lock and one without). Use at least bytes for this purpose. Signed-off-by: Juergen Gross Committed-by: Jan Beulich --- diff -r 3feb5ddb5434 -r 578e5aea3cbb drivers/xen/scsifront/common.h --- a/drivers/xen/scsifront/common.h Wed Jan 14 12:05:46 2015 +0100 +++ b/drivers/xen/scsifront/common.h Mon Jan 19 11:51:46 2015 +0100 @@ -113,8 +113,8 @@ struct vscsifrnt_info { struct task_struct *kthread; wait_queue_head_t wq; wait_queue_head_t wq_sync; - unsigned int waiting_resp:1; - unsigned int waiting_sync:1; + unsigned char waiting_resp; + unsigned char waiting_sync; }; #define DPRINTK(_f, _a...) \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jan 19 10:55:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 19 Jan 2015 10:55:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YD9zF-0004m4-Ge; Mon, 19 Jan 2015 10:55:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YD9zE-0004ls-EU for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 10:55:12 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id E3/CC-02697-E82ECB45; Mon, 19 Jan 2015 10:55:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-206.messagelabs.com!1421664905!18780791!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30164 invoked from network); 19 Jan 2015 10:55:06 -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 Jan 2015 10:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YD9z5-0001PU-0d for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 10:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YD9z4-0008Md-Ly for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 10:55:02 +0000 Message-Id: Date: Mon, 19 Jan 2015 10:55:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] scsifront: don't use bitfields for indicators modified under different locks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Juergen Gross # Date 1421664706 -3600 # Node ID 578e5aea3cbb6a82fa445eb7b4ff0356ff3f4d5b # Parent 3feb5ddb543433f1d1d36f8e27ce3d9c113b1704 scsifront: don't use bitfields for indicators modified under different locks It is no good idea to have bitfields in the same byte which are modified with different locks held (or, in this case, one with lock and one without). Use at least bytes for this purpose. Signed-off-by: Juergen Gross Committed-by: Jan Beulich --- diff -r 3feb5ddb5434 -r 578e5aea3cbb drivers/xen/scsifront/common.h --- a/drivers/xen/scsifront/common.h Wed Jan 14 12:05:46 2015 +0100 +++ b/drivers/xen/scsifront/common.h Mon Jan 19 11:51:46 2015 +0100 @@ -113,8 +113,8 @@ struct vscsifrnt_info { struct task_struct *kthread; wait_queue_head_t wq; wait_queue_head_t wq_sync; - unsigned int waiting_resp:1; - unsigned int waiting_sync:1; + unsigned char waiting_resp; + unsigned char waiting_sync; }; #define DPRINTK(_f, _a...) \ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jan 19 11:55:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 19 Jan 2015 11: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 1YDAvF-000441-UG; Mon, 19 Jan 2015 11:55:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YDAvE-00043h-Ht for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:08 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id F4/BC-11608-B90FCB45; Mon, 19 Jan 2015 11:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1421668505!16159394!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3534 invoked from network); 19 Jan 2015 11:55: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; 19 Jan 2015 11:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YDAv9-00027I-0o for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YDAv8-0001oG-TU for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:02 +0000 Date: Mon, 19 Jan 2015 11:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxc: check return values on mmap() and madvise() on xc_alloc_hypercall_buffer() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b12283059bf07c7833f26552d45509b05ea83b30 Author: Luis R. Rodriguez AuthorDate: Tue May 20 05:37:35 2014 -0700 Commit: Ian Jackson CommitDate: Mon Jan 12 15:39:37 2015 +0000 libxc: check return values on mmap() and madvise() on xc_alloc_hypercall_buffer() On a Thinkpad T4440p with OpenSUSE tumbleweed with v3.15-rc4 and today's latest xen tip from the git tree strace -f reveals we end up on a never ending wait shortly after write(20, "backend/console/5\0", 18 This is right before we just wait on the qemu process which we had mmap'd for. Without this you'll end up getting stuck on a loop if mmap() worked but madvise() did not. While at it I noticed even the mmap() error fail was not being checked, fix that too. Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell (cherry picked from commit e86539a388314cd3dca88f5e69d7873343197cd8) --- tools/libxc/xc_linux_osdep.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_linux_osdep.c b/tools/libxc/xc_linux_osdep.c index 73860a2..86bff3e 100644 --- a/tools/libxc/xc_linux_osdep.c +++ b/tools/libxc/xc_linux_osdep.c @@ -92,14 +92,32 @@ static void *linux_privcmd_alloc_hypercall_buffer(xc_interface *xch, xc_osdep_ha { size_t size = npages * XC_PAGE_SIZE; void *p; + int rc, saved_errno; /* Address returned by mmap is page aligned. */ p = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_LOCKED, -1, 0); + if ( p == MAP_FAILED ) + { + PERROR("xc_alloc_hypercall_buffer: mmap failed"); + return NULL; + } /* Do not copy the VMA to child process on fork. Avoid the page being COW on hypercall. */ - madvise(p, npages * XC_PAGE_SIZE, MADV_DONTFORK); + rc = madvise(p, npages * XC_PAGE_SIZE, MADV_DONTFORK); + if ( rc < 0 ) + { + PERROR("xc_alloc_hypercall_buffer: madvise failed"); + goto out; + } + return p; + +out: + saved_errno = errno; + (void)munmap(p, size); + errno = saved_errno; + return NULL; } static void linux_privcmd_free_hypercall_buffer(xc_interface *xch, xc_osdep_handle h, void *ptr, int npages) -- 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 Jan 19 11:55:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 19 Jan 2015 11: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 1YDAvF-000441-UG; Mon, 19 Jan 2015 11:55:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YDAvE-00043h-Ht for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:08 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id F4/BC-11608-B90FCB45; Mon, 19 Jan 2015 11:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1421668505!16159394!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3534 invoked from network); 19 Jan 2015 11:55: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; 19 Jan 2015 11:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YDAv9-00027I-0o for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YDAv8-0001oG-TU for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:02 +0000 Date: Mon, 19 Jan 2015 11:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxc: check return values on mmap() and madvise() on xc_alloc_hypercall_buffer() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b12283059bf07c7833f26552d45509b05ea83b30 Author: Luis R. Rodriguez AuthorDate: Tue May 20 05:37:35 2014 -0700 Commit: Ian Jackson CommitDate: Mon Jan 12 15:39:37 2015 +0000 libxc: check return values on mmap() and madvise() on xc_alloc_hypercall_buffer() On a Thinkpad T4440p with OpenSUSE tumbleweed with v3.15-rc4 and today's latest xen tip from the git tree strace -f reveals we end up on a never ending wait shortly after write(20, "backend/console/5\0", 18 This is right before we just wait on the qemu process which we had mmap'd for. Without this you'll end up getting stuck on a loop if mmap() worked but madvise() did not. While at it I noticed even the mmap() error fail was not being checked, fix that too. Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell (cherry picked from commit e86539a388314cd3dca88f5e69d7873343197cd8) --- tools/libxc/xc_linux_osdep.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_linux_osdep.c b/tools/libxc/xc_linux_osdep.c index 73860a2..86bff3e 100644 --- a/tools/libxc/xc_linux_osdep.c +++ b/tools/libxc/xc_linux_osdep.c @@ -92,14 +92,32 @@ static void *linux_privcmd_alloc_hypercall_buffer(xc_interface *xch, xc_osdep_ha { size_t size = npages * XC_PAGE_SIZE; void *p; + int rc, saved_errno; /* Address returned by mmap is page aligned. */ p = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_LOCKED, -1, 0); + if ( p == MAP_FAILED ) + { + PERROR("xc_alloc_hypercall_buffer: mmap failed"); + return NULL; + } /* Do not copy the VMA to child process on fork. Avoid the page being COW on hypercall. */ - madvise(p, npages * XC_PAGE_SIZE, MADV_DONTFORK); + rc = madvise(p, npages * XC_PAGE_SIZE, MADV_DONTFORK); + if ( rc < 0 ) + { + PERROR("xc_alloc_hypercall_buffer: madvise failed"); + goto out; + } + return p; + +out: + saved_errno = errno; + (void)munmap(p, size); + errno = saved_errno; + return NULL; } static void linux_privcmd_free_hypercall_buffer(xc_interface *xch, xc_osdep_handle h, void *ptr, int npages) -- 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 Jan 19 11:55:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 19 Jan 2015 11:55:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YDAvQ-00044w-10; Mon, 19 Jan 2015 11:55:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YDAvN-00044j-VA for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:18 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id D3/3F-23865-5A0FCB45; Mon, 19 Jan 2015 11:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1421668515!20622268!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17626 invoked from network); 19 Jan 2015 11:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Jan 2015 11:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YDAvL-00027M-9n for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YDAvL-0001oe-41 for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:15 +0000 Date: Mon, 19 Jan 2015 11:55:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools: libxl: do not overrun input buffer in libxl__parse_mac X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f328f0c82f88860ddcc1e443b989d46ddb61e905 Author: Ian Campbell AuthorDate: Thu Nov 6 13:59:43 2014 +0000 Commit: Ian Jackson CommitDate: Mon Jan 12 15:40:59 2015 +0000 tools: libxl: do not overrun input buffer in libxl__parse_mac Valgrind reports: ==7971== Invalid read of size 1 ==7971== at 0x40877BE: libxl__parse_mac (libxl_internal.c:288) ==7971== by 0x405C5F8: libxl__device_nic_from_xs_be (libxl.c:3405) ==7971== by 0x4065542: libxl__append_nic_list_of_type (libxl.c:3484) ==7971== by 0x4065542: libxl_device_nic_list (libxl.c:3504) ==7971== by 0x406F561: libxl_retrieve_domain_configuration (libxl.c:6661) ==7971== by 0x805671C: reload_domain_config (xl_cmdimpl.c:2037) ==7971== by 0x8057F30: handle_domain_death (xl_cmdimpl.c:2116) ==7971== by 0x8057F30: create_domain (xl_cmdimpl.c:2580) ==7971== by 0x805B4B2: main_create (xl_cmdimpl.c:4652) ==7971== by 0x804EAB2: main (xl.c:378) This is because on the final iteration the tok += 3 skips over the terminating NUL to the next byte, and then *tok reads it. Fix this by using endptr as the iterator. Signed-off-by: Ian Campbell Reviewed-by: Don Slutz Acked-by: Wei Liu (cherry picked from commit 5a430eca0b27354456d1245ed3f637d5f2e17883) --- tools/libxl/libxl_internal.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index cf17658..c0ccbd1 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -275,10 +275,12 @@ _hidden int libxl__parse_mac(const char *s, libxl_mac mac) char *endptr; int i; - for (i = 0, tok = s; *tok && (i < 6); ++i, tok += 3) { + for (i = 0, tok = s; *tok && (i < 6); ++i, tok = endptr) { mac[i] = strtol(tok, &endptr, 16); if (endptr != (tok + 2) || (*endptr != '\0' && *endptr != ':') ) return ERROR_INVAL; + if (*endptr == ':') + endptr++; } if ( i != 6 ) return ERROR_INVAL; -- 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 Jan 19 11:55:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 19 Jan 2015 11:55:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YDAvQ-00044w-10; Mon, 19 Jan 2015 11:55:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YDAvN-00044j-VA for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:18 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id D3/3F-23865-5A0FCB45; Mon, 19 Jan 2015 11:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1421668515!20622268!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17626 invoked from network); 19 Jan 2015 11:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Jan 2015 11:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YDAvL-00027M-9n for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YDAvL-0001oe-41 for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:15 +0000 Date: Mon, 19 Jan 2015 11:55:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools: libxl: do not overrun input buffer in libxl__parse_mac X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f328f0c82f88860ddcc1e443b989d46ddb61e905 Author: Ian Campbell AuthorDate: Thu Nov 6 13:59:43 2014 +0000 Commit: Ian Jackson CommitDate: Mon Jan 12 15:40:59 2015 +0000 tools: libxl: do not overrun input buffer in libxl__parse_mac Valgrind reports: ==7971== Invalid read of size 1 ==7971== at 0x40877BE: libxl__parse_mac (libxl_internal.c:288) ==7971== by 0x405C5F8: libxl__device_nic_from_xs_be (libxl.c:3405) ==7971== by 0x4065542: libxl__append_nic_list_of_type (libxl.c:3484) ==7971== by 0x4065542: libxl_device_nic_list (libxl.c:3504) ==7971== by 0x406F561: libxl_retrieve_domain_configuration (libxl.c:6661) ==7971== by 0x805671C: reload_domain_config (xl_cmdimpl.c:2037) ==7971== by 0x8057F30: handle_domain_death (xl_cmdimpl.c:2116) ==7971== by 0x8057F30: create_domain (xl_cmdimpl.c:2580) ==7971== by 0x805B4B2: main_create (xl_cmdimpl.c:4652) ==7971== by 0x804EAB2: main (xl.c:378) This is because on the final iteration the tok += 3 skips over the terminating NUL to the next byte, and then *tok reads it. Fix this by using endptr as the iterator. Signed-off-by: Ian Campbell Reviewed-by: Don Slutz Acked-by: Wei Liu (cherry picked from commit 5a430eca0b27354456d1245ed3f637d5f2e17883) --- tools/libxl/libxl_internal.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index cf17658..c0ccbd1 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -275,10 +275,12 @@ _hidden int libxl__parse_mac(const char *s, libxl_mac mac) char *endptr; int i; - for (i = 0, tok = s; *tok && (i < 6); ++i, tok += 3) { + for (i = 0, tok = s; *tok && (i < 6); ++i, tok = endptr) { mac[i] = strtol(tok, &endptr, 16); if (endptr != (tok + 2) || (*endptr != '\0' && *endptr != ':') ) return ERROR_INVAL; + if (*endptr == ':') + endptr++; } if ( i != 6 ) return ERROR_INVAL; -- 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 Jan 19 11:55:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 19 Jan 2015 11:55: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 1YDAvd-00048B-3q; Mon, 19 Jan 2015 11:55:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YDAvb-00047G-6E for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:31 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id AA/7A-17694-2B0FCB45; Mon, 19 Jan 2015 11:55:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1421668525!16159579!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8087 invoked from network); 19 Jan 2015 11:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Jan 2015 11:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YDAvV-00027U-Ds for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YDAvV-0001p0-Cm for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:25 +0000 Date: Mon, 19 Jan 2015 11:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools: libxl: do not leak diskpath during local disk attach X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 30f10d4d2b102bd7184b84c9cc3d2246f060706a Author: Ian Campbell AuthorDate: Thu Nov 6 13:00:31 2014 +0000 Commit: Ian Jackson CommitDate: Mon Jan 12 15:41:14 2015 +0000 tools: libxl: do not leak diskpath during local disk attach libxl__device_disk_local_initiate_attach is assigning dls->diskpath with a strdup of the device path. This is then passed to the callback, e.g. parse_bootloader_result but bootloader_cleanup will not free it. Since the callback is within the scope of the (e)gc and therefore doesn't need to be malloc'd, a gc'd alloc will do. All other assignments to this field use the gc. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767295 Reported-by: Gedalya Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu (cherry picked from commit 379b351889a8f02abe30a06e2ce9ba8b381b91ab) --- tools/libxl/libxl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0e41739..59e3292 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2678,7 +2678,7 @@ void libxl__device_disk_local_initiate_attach(libxl__egc *egc, } if (dev != NULL) - dls->diskpath = strdup(dev); + dls->diskpath = libxl__strdup(gc, dev); dls->callback(egc, dls, 0); return; -- 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 Jan 19 11:55:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 19 Jan 2015 11:55: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 1YDAvd-00048B-3q; Mon, 19 Jan 2015 11:55:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YDAvb-00047G-6E for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:31 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id AA/7A-17694-2B0FCB45; Mon, 19 Jan 2015 11:55:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1421668525!16159579!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8087 invoked from network); 19 Jan 2015 11:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Jan 2015 11:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YDAvV-00027U-Ds for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YDAvV-0001p0-Cm for xen-changelog@lists.xensource.com; Mon, 19 Jan 2015 11:55:25 +0000 Date: Mon, 19 Jan 2015 11:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools: libxl: do not leak diskpath during local disk attach X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 30f10d4d2b102bd7184b84c9cc3d2246f060706a Author: Ian Campbell AuthorDate: Thu Nov 6 13:00:31 2014 +0000 Commit: Ian Jackson CommitDate: Mon Jan 12 15:41:14 2015 +0000 tools: libxl: do not leak diskpath during local disk attach libxl__device_disk_local_initiate_attach is assigning dls->diskpath with a strdup of the device path. This is then passed to the callback, e.g. parse_bootloader_result but bootloader_cleanup will not free it. Since the callback is within the scope of the (e)gc and therefore doesn't need to be malloc'd, a gc'd alloc will do. All other assignments to this field use the gc. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767295 Reported-by: Gedalya Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu (cherry picked from commit 379b351889a8f02abe30a06e2ce9ba8b381b91ab) --- tools/libxl/libxl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0e41739..59e3292 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2678,7 +2678,7 @@ void libxl__device_disk_local_initiate_attach(libxl__egc *egc, } if (dev != NULL) - dls->diskpath = strdup(dev); + dls->diskpath = libxl__strdup(gc, dev); dls->callback(egc, dls, 0); return; -- 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 Jan 22 01:33:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 22 Jan 2015 01: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 1YE6dt-0007c4-Kd; Thu, 22 Jan 2015 01: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 1YE6ds-0007bw-V1 for xen-changelog@lists.xensource.com; Thu, 22 Jan 2015 01:33:05 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 68/CF-22263-05350C45; Thu, 22 Jan 2015 01:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1421890382!19435345!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14362 invoked from network); 22 Jan 2015 01:33:03 -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; 22 Jan 2015 01:33:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YE6dq-0007M0-As for xen-changelog@lists.xensource.com; Thu, 22 Jan 2015 01:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YE6dq-00036n-7f for xen-changelog@lists.xensource.com; Thu, 22 Jan 2015 01:33:02 +0000 Date: Thu, 22 Jan 2015 01:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Don't ignore error when we fail to give access to ioport/irq/iomem X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ae1853b0394ddc68bb53d6dab2326f743399fa8 Author: Julien Grall AuthorDate: Fri Jan 9 15:56:45 2015 +0000 Commit: Ian Jackson CommitDate: Mon Jan 19 17:46:17 2015 +0000 libxl: Don't ignore error when we fail to give access to ioport/irq/iomem If we fail to give the access, the domain will unlikely work correctly. So we should bail out at the first error. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Wei Liu (cherry picked from commit 7070eec417934360bf3aed434191246dfe4f8091) --- tools/libxl/libxl_create.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 1198225..6f87d1c 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1167,6 +1167,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to ioports %"PRIx32"-%"PRIx32, domid, io->first, io->first + io->number - 1); ret = ERROR_FAIL; + goto error_out; } } @@ -1182,6 +1183,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, if (ret < 0) { LOGE(ERROR, "failed give dom%d access to irq %d", domid, irq); ret = ERROR_FAIL; + goto error_out; } } @@ -1198,7 +1200,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to iomem range %"PRIx64"-%"PRIx64, domid, io->start, io->start + io->number - 1); ret = ERROR_FAIL; - continue; + goto error_out; } ret = xc_domain_memory_mapping(CTX->xch, domid, io->gfn, io->start, @@ -1209,6 +1211,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, " to guest address %"PRIx64, domid, io->start, io->start + io->number - 1, io->gfn); ret = ERROR_FAIL; + goto error_out; } } -- 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 Jan 22 01:33:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 22 Jan 2015 01: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 1YE6dt-0007c4-Kd; Thu, 22 Jan 2015 01: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 1YE6ds-0007bw-V1 for xen-changelog@lists.xensource.com; Thu, 22 Jan 2015 01:33:05 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 68/CF-22263-05350C45; Thu, 22 Jan 2015 01:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1421890382!19435345!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14362 invoked from network); 22 Jan 2015 01:33:03 -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; 22 Jan 2015 01:33:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YE6dq-0007M0-As for xen-changelog@lists.xensource.com; Thu, 22 Jan 2015 01:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YE6dq-00036n-7f for xen-changelog@lists.xensource.com; Thu, 22 Jan 2015 01:33:02 +0000 Date: Thu, 22 Jan 2015 01:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Don't ignore error when we fail to give access to ioport/irq/iomem X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ae1853b0394ddc68bb53d6dab2326f743399fa8 Author: Julien Grall AuthorDate: Fri Jan 9 15:56:45 2015 +0000 Commit: Ian Jackson CommitDate: Mon Jan 19 17:46:17 2015 +0000 libxl: Don't ignore error when we fail to give access to ioport/irq/iomem If we fail to give the access, the domain will unlikely work correctly. So we should bail out at the first error. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Wei Liu (cherry picked from commit 7070eec417934360bf3aed434191246dfe4f8091) --- tools/libxl/libxl_create.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 1198225..6f87d1c 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1167,6 +1167,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to ioports %"PRIx32"-%"PRIx32, domid, io->first, io->first + io->number - 1); ret = ERROR_FAIL; + goto error_out; } } @@ -1182,6 +1183,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, if (ret < 0) { LOGE(ERROR, "failed give dom%d access to irq %d", domid, irq); ret = ERROR_FAIL; + goto error_out; } } @@ -1198,7 +1200,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to iomem range %"PRIx64"-%"PRIx64, domid, io->start, io->start + io->number - 1); ret = ERROR_FAIL; - continue; + goto error_out; } ret = xc_domain_memory_mapping(CTX->xch, domid, io->gfn, io->start, @@ -1209,6 +1211,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, " to guest address %"PRIx64, domid, io->start, io->start + io->number - 1, io->gfn); ret = ERROR_FAIL; + goto error_out; } } -- 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 Jan 22 07:11:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 22 Jan 2015 07: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 1YEBv2-0004xJ-94; Thu, 22 Jan 2015 07:11:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YEBv1-0004x8-I4 for xen-changelog@lists.xensource.com; Thu, 22 Jan 2015 07:11:07 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id DF/93-23612-A82A0C45; Thu, 22 Jan 2015 07:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1421910665!19490835!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29801 invoked from network); 22 Jan 2015 07:11:06 -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; 22 Jan 2015 07:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YEBuw-000345-90 for xen-changelog@lists.xensource.com; Thu, 22 Jan 2015 07:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YEBuw-0007CS-5b for xen-changelog@lists.xensource.com; Thu, 22 Jan 2015 07:11:02 +0000 Date: Thu, 22 Jan 2015 07:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: Don't ignore error when we fail to give access to ioport/irq/iomem X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 027f0256806e6d10ddb26ef65ac67e58522e6ff4 Author: Julien Grall AuthorDate: Wed Jan 14 13:06:48 2015 +0000 Commit: Ian Jackson CommitDate: Mon Jan 19 17:47:30 2015 +0000 libxl: Don't ignore error when we fail to give access to ioport/irq/iomem If we fail to give the access, the domain will unlikely work correctly. So we should bail out at the first error. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu (Based on commit 7070eec417934360bf3aed434191246dfe4f8091) (cherry picked from commit 17664f0ba031344846090a482ad42d225aa911c7) --- tools/libxl/libxl_create.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index d1e2ebc..aaab584 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -970,6 +970,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to ioports %"PRIx32"-%"PRIx32, domid, io->first, io->first + io->number - 1); ret = ERROR_FAIL; + goto error_out; } } @@ -985,6 +986,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, if (ret < 0) { LOGE(ERROR, "failed give dom%d access to irq %d", domid, irq); ret = ERROR_FAIL; + goto error_out; } } @@ -1001,6 +1003,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to iomem range %"PRIx64"-%"PRIx64, domid, io->start, io->start + io->number - 1); ret = ERROR_FAIL; + goto error_out; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jan 22 07:11:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 22 Jan 2015 07: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 1YEBv2-0004xJ-94; Thu, 22 Jan 2015 07:11:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YEBv1-0004x8-I4 for xen-changelog@lists.xensource.com; Thu, 22 Jan 2015 07:11:07 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id DF/93-23612-A82A0C45; Thu, 22 Jan 2015 07:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1421910665!19490835!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29801 invoked from network); 22 Jan 2015 07:11:06 -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; 22 Jan 2015 07:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YEBuw-000345-90 for xen-changelog@lists.xensource.com; Thu, 22 Jan 2015 07:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YEBuw-0007CS-5b for xen-changelog@lists.xensource.com; Thu, 22 Jan 2015 07:11:02 +0000 Date: Thu, 22 Jan 2015 07:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: Don't ignore error when we fail to give access to ioport/irq/iomem X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 027f0256806e6d10ddb26ef65ac67e58522e6ff4 Author: Julien Grall AuthorDate: Wed Jan 14 13:06:48 2015 +0000 Commit: Ian Jackson CommitDate: Mon Jan 19 17:47:30 2015 +0000 libxl: Don't ignore error when we fail to give access to ioport/irq/iomem If we fail to give the access, the domain will unlikely work correctly. So we should bail out at the first error. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu (Based on commit 7070eec417934360bf3aed434191246dfe4f8091) (cherry picked from commit 17664f0ba031344846090a482ad42d225aa911c7) --- tools/libxl/libxl_create.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index d1e2ebc..aaab584 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -970,6 +970,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to ioports %"PRIx32"-%"PRIx32, domid, io->first, io->first + io->number - 1); ret = ERROR_FAIL; + goto error_out; } } @@ -985,6 +986,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, if (ret < 0) { LOGE(ERROR, "failed give dom%d access to irq %d", domid, irq); ret = ERROR_FAIL; + goto error_out; } } @@ -1001,6 +1003,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to iomem range %"PRIx64"-%"PRIx64, domid, io->start, io->start + io->number - 1); ret = ERROR_FAIL; + goto error_out; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jan 23 00:44:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:44: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 1YESM3-0005Xw-6U; Fri, 23 Jan 2015 00:44:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESM2-0005Xl-HB for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:06 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id DE/57-24940-55991C45; Fri, 23 Jan 2015 00:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1421973844!19665352!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2190 invoked from network); 23 Jan 2015 00:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jan 2015 00:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESLz-0007YY-TF for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESLz-0003bU-Ni for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:03 +0000 Date: Fri, 23 Jan 2015 00:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common/memory: fix an XSM error path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 76d4ff26d9647088353acaf4a56388a354a5d6e9 Author: Jan Beulich AuthorDate: Mon Jan 19 11:59:05 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 19 11:59:05 2015 +0100 common/memory: fix an XSM error path XENMEM_{in,de}crease_reservation as well as XENMEM_populate_physmap return the extent at which failure was detected, not error indicators. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf Acked-by: Tim Deegan --- xen/common/memory.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 234dae6..e84ace9 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -747,11 +747,10 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) return start_extent; args.domain = d; - rc = xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d); - if ( rc ) + if ( xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d) ) { rcu_unlock_domain(d); - return rc; + return start_extent; } switch ( op ) -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:44:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:44: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 1YESM3-0005Xw-6U; Fri, 23 Jan 2015 00:44:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESM2-0005Xl-HB for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:06 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id DE/57-24940-55991C45; Fri, 23 Jan 2015 00:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1421973844!19665352!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2190 invoked from network); 23 Jan 2015 00:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jan 2015 00:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESLz-0007YY-TF for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESLz-0003bU-Ni for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:03 +0000 Date: Fri, 23 Jan 2015 00:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common/memory: fix an XSM error path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 76d4ff26d9647088353acaf4a56388a354a5d6e9 Author: Jan Beulich AuthorDate: Mon Jan 19 11:59:05 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 19 11:59:05 2015 +0100 common/memory: fix an XSM error path XENMEM_{in,de}crease_reservation as well as XENMEM_populate_physmap return the extent at which failure was detected, not error indicators. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf Acked-by: Tim Deegan --- xen/common/memory.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 234dae6..e84ace9 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -747,11 +747,10 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) return start_extent; args.domain = d; - rc = xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d); - if ( rc ) + if ( xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d) ) { rcu_unlock_domain(d); - return rc; + return start_extent; } switch ( op ) -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESME-0005ZL-AH; Fri, 23 Jan 2015 00:44:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMD-0005Z6-9n for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:17 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 12/87-24940-06991C45; Fri, 23 Jan 2015 00:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1421973854!19692511!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7458 invoked from network); 23 Jan 2015 00:44:15 -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; 23 Jan 2015 00:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMA-0007Ye-4l for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESMA-0003cc-2L for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:14 +0000 Date: Fri, 23 Jan 2015 00:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: simplify sending of notifications X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad34d0656fccda70de96f011c18e7a865b858e28 Author: Jan Beulich AuthorDate: Mon Jan 19 12:00:08 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 19 12:00:08 2015 +0100 evtchn: simplify sending of notifications The trivial wrapper evtchn_set_pending() is pretty pointless, as it only serves to invoke another wrapper evtchn_port_set_pending(). In turn, the latter is kind of inconsistent with its siblings in that is takes a struct vcpu * rather than a struct domain * - adjusting this allows for more efficient code in the majority of cases. Signed-off-by: Jan Beulich Reviewed-by: David Vrabel Reviewed-by: Andrew Cooper Acked-by: Tim Deegan --- xen/common/event_channel.c | 35 +++++++++++++---------------------- xen/include/xen/event.h | 5 +++-- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 7d6de54..18a76af 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -95,8 +95,6 @@ static uint8_t get_xen_consumer(xen_event_channel_notification_t fn) /* Get the notification function for a given Xen-bound event channel. */ #define xen_notification_fn(e) (xen_consumers[(e)->xen_consumer-1]) -static void evtchn_set_pending(struct vcpu *v, int port); - static int virq_is_global(uint32_t virq) { int rc; @@ -287,7 +285,7 @@ static long evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind) * We may have lost notifications on the remote unbound port. Fix that up * here by conservatively always setting a notification on the local port. */ - evtchn_set_pending(ld->vcpu[lchn->notify_vcpu_id], lport); + evtchn_port_set_pending(ld, lchn->notify_vcpu_id, lchn); bind->local_port = lport; @@ -599,11 +597,10 @@ static long evtchn_close(evtchn_close_t *close) return __evtchn_close(current->domain, close->port); } -int evtchn_send(struct domain *d, unsigned int lport) +int evtchn_send(struct domain *ld, unsigned int lport) { struct evtchn *lchn, *rchn; - struct domain *ld = d, *rd; - struct vcpu *rvcpu; + struct domain *rd; int rport, ret = 0; spin_lock(&ld->event_lock); @@ -633,14 +630,13 @@ int evtchn_send(struct domain *d, unsigned int lport) rd = lchn->u.interdomain.remote_dom; rport = lchn->u.interdomain.remote_port; rchn = evtchn_from_port(rd, rport); - rvcpu = rd->vcpu[rchn->notify_vcpu_id]; if ( consumer_is_xen(rchn) ) - (*xen_notification_fn(rchn))(rvcpu, rport); + xen_notification_fn(rchn)(rd->vcpu[rchn->notify_vcpu_id], rport); else - evtchn_set_pending(rvcpu, rport); + evtchn_port_set_pending(rd, rchn->notify_vcpu_id, rchn); break; case ECS_IPI: - evtchn_set_pending(ld->vcpu[lchn->notify_vcpu_id], lport); + evtchn_port_set_pending(ld, lchn->notify_vcpu_id, lchn); break; case ECS_UNBOUND: /* silently drop the notification */ @@ -655,11 +651,6 @@ out: return ret; } -static void evtchn_set_pending(struct vcpu *v, int port) -{ - evtchn_port_set_pending(v, evtchn_from_port(v->domain, port)); -} - int guest_enabled_event(struct vcpu *v, uint32_t virq) { return ((v != NULL) && (v->virq_to_evtchn[virq] != 0)); @@ -669,6 +660,7 @@ void send_guest_vcpu_virq(struct vcpu *v, uint32_t virq) { unsigned long flags; int port; + struct domain *d; ASSERT(!virq_is_global(virq)); @@ -678,7 +670,8 @@ void send_guest_vcpu_virq(struct vcpu *v, uint32_t virq) if ( unlikely(port == 0) ) goto out; - evtchn_set_pending(v, port); + d = v->domain; + evtchn_port_set_pending(d, v->vcpu_id, evtchn_from_port(d, port)); out: spin_unlock_irqrestore(&v->virq_lock, flags); @@ -707,7 +700,7 @@ static void send_guest_global_virq(struct domain *d, uint32_t virq) goto out; chn = evtchn_from_port(d, port); - evtchn_set_pending(d->vcpu[chn->notify_vcpu_id], port); + evtchn_port_set_pending(d, chn->notify_vcpu_id, chn); out: spin_unlock_irqrestore(&v->virq_lock, flags); @@ -731,7 +724,7 @@ void send_guest_pirq(struct domain *d, const struct pirq *pirq) } chn = evtchn_from_port(d, port); - evtchn_set_pending(d->vcpu[chn->notify_vcpu_id], port); + evtchn_port_set_pending(d, chn->notify_vcpu_id, chn); } static struct domain *global_virq_handlers[NR_VIRQS] __read_mostly; @@ -1202,7 +1195,6 @@ void notify_via_xen_event_channel(struct domain *ld, int lport) { struct evtchn *lchn, *rchn; struct domain *rd; - int rport; spin_lock(&ld->event_lock); @@ -1219,9 +1211,8 @@ void notify_via_xen_event_channel(struct domain *ld, int lport) if ( likely(lchn->state == ECS_INTERDOMAIN) ) { rd = lchn->u.interdomain.remote_dom; - rport = lchn->u.interdomain.remote_port; - rchn = evtchn_from_port(rd, rport); - evtchn_set_pending(rd->vcpu[rchn->notify_vcpu_id], rport); + rchn = evtchn_from_port(rd, lchn->u.interdomain.remote_port); + evtchn_port_set_pending(rd, rchn->notify_vcpu_id, rchn); } spin_unlock(&ld->event_lock); diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 88526f8..2b63f9a 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -152,10 +152,11 @@ static inline void evtchn_port_init(struct domain *d, struct evtchn *evtchn) d->evtchn_port_ops->init(d, evtchn); } -static inline void evtchn_port_set_pending(struct vcpu *v, +static inline void evtchn_port_set_pending(struct domain *d, + unsigned int vcpu_id, struct evtchn *evtchn) { - v->domain->evtchn_port_ops->set_pending(v, evtchn); + d->evtchn_port_ops->set_pending(d->vcpu[vcpu_id], evtchn); } static inline void evtchn_port_clear_pending(struct domain *d, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jan 23 00:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESME-0005ZL-AH; Fri, 23 Jan 2015 00:44:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMD-0005Z6-9n for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:17 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 12/87-24940-06991C45; Fri, 23 Jan 2015 00:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1421973854!19692511!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7458 invoked from network); 23 Jan 2015 00:44:15 -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; 23 Jan 2015 00:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMA-0007Ye-4l for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESMA-0003cc-2L for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:14 +0000 Date: Fri, 23 Jan 2015 00:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: simplify sending of notifications X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad34d0656fccda70de96f011c18e7a865b858e28 Author: Jan Beulich AuthorDate: Mon Jan 19 12:00:08 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 19 12:00:08 2015 +0100 evtchn: simplify sending of notifications The trivial wrapper evtchn_set_pending() is pretty pointless, as it only serves to invoke another wrapper evtchn_port_set_pending(). In turn, the latter is kind of inconsistent with its siblings in that is takes a struct vcpu * rather than a struct domain * - adjusting this allows for more efficient code in the majority of cases. Signed-off-by: Jan Beulich Reviewed-by: David Vrabel Reviewed-by: Andrew Cooper Acked-by: Tim Deegan --- xen/common/event_channel.c | 35 +++++++++++++---------------------- xen/include/xen/event.h | 5 +++-- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 7d6de54..18a76af 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -95,8 +95,6 @@ static uint8_t get_xen_consumer(xen_event_channel_notification_t fn) /* Get the notification function for a given Xen-bound event channel. */ #define xen_notification_fn(e) (xen_consumers[(e)->xen_consumer-1]) -static void evtchn_set_pending(struct vcpu *v, int port); - static int virq_is_global(uint32_t virq) { int rc; @@ -287,7 +285,7 @@ static long evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind) * We may have lost notifications on the remote unbound port. Fix that up * here by conservatively always setting a notification on the local port. */ - evtchn_set_pending(ld->vcpu[lchn->notify_vcpu_id], lport); + evtchn_port_set_pending(ld, lchn->notify_vcpu_id, lchn); bind->local_port = lport; @@ -599,11 +597,10 @@ static long evtchn_close(evtchn_close_t *close) return __evtchn_close(current->domain, close->port); } -int evtchn_send(struct domain *d, unsigned int lport) +int evtchn_send(struct domain *ld, unsigned int lport) { struct evtchn *lchn, *rchn; - struct domain *ld = d, *rd; - struct vcpu *rvcpu; + struct domain *rd; int rport, ret = 0; spin_lock(&ld->event_lock); @@ -633,14 +630,13 @@ int evtchn_send(struct domain *d, unsigned int lport) rd = lchn->u.interdomain.remote_dom; rport = lchn->u.interdomain.remote_port; rchn = evtchn_from_port(rd, rport); - rvcpu = rd->vcpu[rchn->notify_vcpu_id]; if ( consumer_is_xen(rchn) ) - (*xen_notification_fn(rchn))(rvcpu, rport); + xen_notification_fn(rchn)(rd->vcpu[rchn->notify_vcpu_id], rport); else - evtchn_set_pending(rvcpu, rport); + evtchn_port_set_pending(rd, rchn->notify_vcpu_id, rchn); break; case ECS_IPI: - evtchn_set_pending(ld->vcpu[lchn->notify_vcpu_id], lport); + evtchn_port_set_pending(ld, lchn->notify_vcpu_id, lchn); break; case ECS_UNBOUND: /* silently drop the notification */ @@ -655,11 +651,6 @@ out: return ret; } -static void evtchn_set_pending(struct vcpu *v, int port) -{ - evtchn_port_set_pending(v, evtchn_from_port(v->domain, port)); -} - int guest_enabled_event(struct vcpu *v, uint32_t virq) { return ((v != NULL) && (v->virq_to_evtchn[virq] != 0)); @@ -669,6 +660,7 @@ void send_guest_vcpu_virq(struct vcpu *v, uint32_t virq) { unsigned long flags; int port; + struct domain *d; ASSERT(!virq_is_global(virq)); @@ -678,7 +670,8 @@ void send_guest_vcpu_virq(struct vcpu *v, uint32_t virq) if ( unlikely(port == 0) ) goto out; - evtchn_set_pending(v, port); + d = v->domain; + evtchn_port_set_pending(d, v->vcpu_id, evtchn_from_port(d, port)); out: spin_unlock_irqrestore(&v->virq_lock, flags); @@ -707,7 +700,7 @@ static void send_guest_global_virq(struct domain *d, uint32_t virq) goto out; chn = evtchn_from_port(d, port); - evtchn_set_pending(d->vcpu[chn->notify_vcpu_id], port); + evtchn_port_set_pending(d, chn->notify_vcpu_id, chn); out: spin_unlock_irqrestore(&v->virq_lock, flags); @@ -731,7 +724,7 @@ void send_guest_pirq(struct domain *d, const struct pirq *pirq) } chn = evtchn_from_port(d, port); - evtchn_set_pending(d->vcpu[chn->notify_vcpu_id], port); + evtchn_port_set_pending(d, chn->notify_vcpu_id, chn); } static struct domain *global_virq_handlers[NR_VIRQS] __read_mostly; @@ -1202,7 +1195,6 @@ void notify_via_xen_event_channel(struct domain *ld, int lport) { struct evtchn *lchn, *rchn; struct domain *rd; - int rport; spin_lock(&ld->event_lock); @@ -1219,9 +1211,8 @@ void notify_via_xen_event_channel(struct domain *ld, int lport) if ( likely(lchn->state == ECS_INTERDOMAIN) ) { rd = lchn->u.interdomain.remote_dom; - rport = lchn->u.interdomain.remote_port; - rchn = evtchn_from_port(rd, rport); - evtchn_set_pending(rd->vcpu[rchn->notify_vcpu_id], rport); + rchn = evtchn_from_port(rd, lchn->u.interdomain.remote_port); + evtchn_port_set_pending(rd, rchn->notify_vcpu_id, rchn); } spin_unlock(&ld->event_lock); diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 88526f8..2b63f9a 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -152,10 +152,11 @@ static inline void evtchn_port_init(struct domain *d, struct evtchn *evtchn) d->evtchn_port_ops->init(d, evtchn); } -static inline void evtchn_port_set_pending(struct vcpu *v, +static inline void evtchn_port_set_pending(struct domain *d, + unsigned int vcpu_id, struct evtchn *evtchn) { - v->domain->evtchn_port_ops->set_pending(v, evtchn); + d->evtchn_port_ops->set_pending(d->vcpu[vcpu_id], evtchn); } static inline void evtchn_port_clear_pending(struct domain *d, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jan 23 00:44:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMO-0005bH-D1; Fri, 23 Jan 2015 00: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 1YESMN-0005b4-D6 for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:27 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 0D/0B-05618-A6991C45; Fri, 23 Jan 2015 00:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1421973864!21629587!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7001 invoked from network); 23 Jan 2015 00:44:25 -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; 23 Jan 2015 00:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMK-0007Yk-KP for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESMK-0003cy-JS for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:24 +0000 Date: Fri, 23 Jan 2015 00:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec: fix some types X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 66500abc8dd66ec5df71dbf4ac3fd64b2d0cdcf8 Author: Jan Beulich AuthorDate: Mon Jan 19 12:01:18 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 19 12:01:18 2015 +0100 kexec: fix some types crashinfo_maxaddr can/will be a 64-bit type, hence passing it to fls() is wrong. crashinfo_maxaddr_bits, otoh, doesn't need to be a paddr_t, and can additionally be __initdata. struct xen_kexec_reserve's start field - representing a physical address - ought to have respective type. Signed-off-by: Jan Beulich Reviewed-by: David Vrabel --- xen/common/kexec.c | 4 ++-- xen/include/asm-x86/bitops.h | 3 +++ xen/include/xen/kexec.h | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 2239ee8..c579ac8 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -78,7 +78,7 @@ static paddr_t __initdata crashinfo_maxaddr = 4ULL << 30; /* = log base 2 of crashinfo_maxaddr after checking for sanity. Default to * larger than the entire physical address space. */ -paddr_t crashinfo_maxaddr_bits = 64; +unsigned int __initdata crashinfo_maxaddr_bits = 64; /* Pointers to keep track of the crash heap region. */ static void *crash_heap_current = NULL, *crash_heap_end = NULL; @@ -532,7 +532,7 @@ void __init kexec_early_calculations(void) low_crashinfo_mode = LOW_CRASHINFO_NONE; if ( low_crashinfo_mode > LOW_CRASHINFO_NONE ) - crashinfo_maxaddr_bits = fls(crashinfo_maxaddr) - 1; + crashinfo_maxaddr_bits = fls64(crashinfo_maxaddr) - 1; } static int __init kexec_init(void) diff --git a/xen/include/asm-x86/bitops.h b/xen/include/asm-x86/bitops.h index 82a08ee..3e9ca00 100644 --- a/xen/include/asm-x86/bitops.h +++ b/xen/include/asm-x86/bitops.h @@ -429,6 +429,9 @@ static inline int fls(unsigned long x) return (int)r+1; } +#define ffs64 ffs +#define fls64 fls + /** * hweightN - returns the hamming weight of a N-bit word * @x: the word to weigh diff --git a/xen/include/xen/kexec.h b/xen/include/xen/kexec.h index bd17747..b7d121d 100644 --- a/xen/include/xen/kexec.h +++ b/xen/include/xen/kexec.h @@ -10,7 +10,7 @@ typedef struct xen_kexec_reserve { unsigned long size; - unsigned long start; + paddr_t start; } xen_kexec_reserve_t; extern xen_kexec_reserve_t kexec_crash_area; @@ -38,7 +38,7 @@ enum low_crashinfo { /* Low crashinfo mode. Start as INVALID so serveral codepaths can set up * defaults without needing to know the state of the others. */ extern enum low_crashinfo low_crashinfo_mode; -extern paddr_t crashinfo_maxaddr_bits; +extern unsigned int crashinfo_maxaddr_bits; void kexec_early_calculations(void); int machine_kexec_add_page(struct kexec_image *image, unsigned long vaddr, -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:44:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMO-0005bH-D1; Fri, 23 Jan 2015 00: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 1YESMN-0005b4-D6 for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:27 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 0D/0B-05618-A6991C45; Fri, 23 Jan 2015 00:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1421973864!21629587!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7001 invoked from network); 23 Jan 2015 00:44:25 -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; 23 Jan 2015 00:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMK-0007Yk-KP for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESMK-0003cy-JS for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:24 +0000 Date: Fri, 23 Jan 2015 00:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec: fix some types X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 66500abc8dd66ec5df71dbf4ac3fd64b2d0cdcf8 Author: Jan Beulich AuthorDate: Mon Jan 19 12:01:18 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 19 12:01:18 2015 +0100 kexec: fix some types crashinfo_maxaddr can/will be a 64-bit type, hence passing it to fls() is wrong. crashinfo_maxaddr_bits, otoh, doesn't need to be a paddr_t, and can additionally be __initdata. struct xen_kexec_reserve's start field - representing a physical address - ought to have respective type. Signed-off-by: Jan Beulich Reviewed-by: David Vrabel --- xen/common/kexec.c | 4 ++-- xen/include/asm-x86/bitops.h | 3 +++ xen/include/xen/kexec.h | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 2239ee8..c579ac8 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -78,7 +78,7 @@ static paddr_t __initdata crashinfo_maxaddr = 4ULL << 30; /* = log base 2 of crashinfo_maxaddr after checking for sanity. Default to * larger than the entire physical address space. */ -paddr_t crashinfo_maxaddr_bits = 64; +unsigned int __initdata crashinfo_maxaddr_bits = 64; /* Pointers to keep track of the crash heap region. */ static void *crash_heap_current = NULL, *crash_heap_end = NULL; @@ -532,7 +532,7 @@ void __init kexec_early_calculations(void) low_crashinfo_mode = LOW_CRASHINFO_NONE; if ( low_crashinfo_mode > LOW_CRASHINFO_NONE ) - crashinfo_maxaddr_bits = fls(crashinfo_maxaddr) - 1; + crashinfo_maxaddr_bits = fls64(crashinfo_maxaddr) - 1; } static int __init kexec_init(void) diff --git a/xen/include/asm-x86/bitops.h b/xen/include/asm-x86/bitops.h index 82a08ee..3e9ca00 100644 --- a/xen/include/asm-x86/bitops.h +++ b/xen/include/asm-x86/bitops.h @@ -429,6 +429,9 @@ static inline int fls(unsigned long x) return (int)r+1; } +#define ffs64 ffs +#define fls64 fls + /** * hweightN - returns the hamming weight of a N-bit word * @x: the word to weigh diff --git a/xen/include/xen/kexec.h b/xen/include/xen/kexec.h index bd17747..b7d121d 100644 --- a/xen/include/xen/kexec.h +++ b/xen/include/xen/kexec.h @@ -10,7 +10,7 @@ typedef struct xen_kexec_reserve { unsigned long size; - unsigned long start; + paddr_t start; } xen_kexec_reserve_t; extern xen_kexec_reserve_t kexec_crash_area; @@ -38,7 +38,7 @@ enum low_crashinfo { /* Low crashinfo mode. Start as INVALID so serveral codepaths can set up * defaults without needing to know the state of the others. */ extern enum low_crashinfo low_crashinfo_mode; -extern paddr_t crashinfo_maxaddr_bits; +extern unsigned int crashinfo_maxaddr_bits; void kexec_early_calculations(void); int machine_kexec_add_page(struct kexec_image *image, unsigned long vaddr, -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:44:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00: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 1YESMY-0005dJ-Fu; Fri, 23 Jan 2015 00:44:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMX-0005d0-FU for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:37 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 33/73-13312-47991C45; Fri, 23 Jan 2015 00:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1421973875!19650438!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14858 invoked from network); 23 Jan 2015 00:44:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jan 2015 00:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMU-0007Ys-Qn for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESMU-0003dR-Pi for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:34 +0000 Date: Fri, 23 Jan 2015 00:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvm/hpet: correctly gate the virtual HPET on HVM_PARAM_HPET_ENABLE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 433468d3b025fdb5b612df27a3b4347ae53ffb77 Author: Andrew Cooper AuthorDate: Mon Jan 19 12:16:44 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 19 12:16:44 2015 +0100 hvm/hpet: correctly gate the virtual HPET on HVM_PARAM_HPET_ENABLE c/s 3f8e22de7 "x86 hvm: Allow HPET to be configured as a per-domain config option" introduced the parameter to conditionally enable the HPET. However, having the check in hpet_range() does not have the intended effect. As currently implemented, when the HPET is disabled, the range is not claimed and an ioreq is forwarded to qemu, which implements an HPET itself. Properly disable the HPET by always claiming the range, dropping writes and reading ~0. Signed-off-by: Andrew Cooper --- xen/arch/x86/hvm/hpet.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index bdfc6fc..d898169 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -173,6 +173,12 @@ static int hpet_read( unsigned long result; uint64_t val; + if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_HPET_ENABLED] ) + { + result = ~0ul; + goto out; + } + addr &= HPET_MMAP_SIZE-1; if ( hpet_check_access_length(addr, length) != 0 ) @@ -309,6 +315,9 @@ static int hpet_write( #define set_start_timer(n) (__set_bit((n), &start_timers)) #define set_restart_timer(n) (set_stop_timer(n),set_start_timer(n)) + if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_HPET_ENABLED] ) + goto out; + addr &= HPET_MMAP_SIZE-1; if ( hpet_check_access_length(addr, length) != 0 ) @@ -491,9 +500,8 @@ static int hpet_write( static int hpet_range(struct vcpu *v, unsigned long addr) { - return (v->domain->arch.hvm_domain.params[HVM_PARAM_HPET_ENABLED] && - (addr >= HPET_BASE_ADDRESS) && - (addr < (HPET_BASE_ADDRESS + HPET_MMAP_SIZE))); + return ( (addr >= HPET_BASE_ADDRESS) && + (addr < (HPET_BASE_ADDRESS + HPET_MMAP_SIZE)) ); } const struct hvm_mmio_handler hpet_mmio_handler = { -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:44:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00: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 1YESMY-0005dJ-Fu; Fri, 23 Jan 2015 00:44:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMX-0005d0-FU for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:37 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 33/73-13312-47991C45; Fri, 23 Jan 2015 00:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1421973875!19650438!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14858 invoked from network); 23 Jan 2015 00:44:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jan 2015 00:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMU-0007Ys-Qn for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESMU-0003dR-Pi for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:34 +0000 Date: Fri, 23 Jan 2015 00:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvm/hpet: correctly gate the virtual HPET on HVM_PARAM_HPET_ENABLE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 433468d3b025fdb5b612df27a3b4347ae53ffb77 Author: Andrew Cooper AuthorDate: Mon Jan 19 12:16:44 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 19 12:16:44 2015 +0100 hvm/hpet: correctly gate the virtual HPET on HVM_PARAM_HPET_ENABLE c/s 3f8e22de7 "x86 hvm: Allow HPET to be configured as a per-domain config option" introduced the parameter to conditionally enable the HPET. However, having the check in hpet_range() does not have the intended effect. As currently implemented, when the HPET is disabled, the range is not claimed and an ioreq is forwarded to qemu, which implements an HPET itself. Properly disable the HPET by always claiming the range, dropping writes and reading ~0. Signed-off-by: Andrew Cooper --- xen/arch/x86/hvm/hpet.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index bdfc6fc..d898169 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -173,6 +173,12 @@ static int hpet_read( unsigned long result; uint64_t val; + if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_HPET_ENABLED] ) + { + result = ~0ul; + goto out; + } + addr &= HPET_MMAP_SIZE-1; if ( hpet_check_access_length(addr, length) != 0 ) @@ -309,6 +315,9 @@ static int hpet_write( #define set_start_timer(n) (__set_bit((n), &start_timers)) #define set_restart_timer(n) (set_stop_timer(n),set_start_timer(n)) + if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_HPET_ENABLED] ) + goto out; + addr &= HPET_MMAP_SIZE-1; if ( hpet_check_access_length(addr, length) != 0 ) @@ -491,9 +500,8 @@ static int hpet_write( static int hpet_range(struct vcpu *v, unsigned long addr) { - return (v->domain->arch.hvm_domain.params[HVM_PARAM_HPET_ENABLED] && - (addr >= HPET_BASE_ADDRESS) && - (addr < (HPET_BASE_ADDRESS + HPET_MMAP_SIZE))); + return ( (addr >= HPET_BASE_ADDRESS) && + (addr < (HPET_BASE_ADDRESS + HPET_MMAP_SIZE)) ); } const struct hvm_mmio_handler hpet_mmio_handler = { -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:44:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00: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 1YESMi-0005fW-IP; Fri, 23 Jan 2015 00:44:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMh-0005fI-RX for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:47 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 9B/76-01254-F7991C45; Fri, 23 Jan 2015 00:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1421973885!21670441!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31039 invoked from network); 23 Jan 2015 00:44:46 -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; 23 Jan 2015 00:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMf-0007Yy-8y for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESMf-0003dt-4V for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:45 +0000 Date: Fri, 23 Jan 2015 00:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/minios: remove more vestigial remnants of SUPERVISOR_MODE_KERNEL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2eddc5d2dc18dfc161de7cd578a4be0d3479d9af Author: Andrew Cooper AuthorDate: Mon Jan 19 12:17:24 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 19 12:17:24 2015 +0100 x86/minios: remove more vestigial remnants of SUPERVISOR_MODE_KERNEL MiniOS has never advertised support for supervisor_mode_kernel, and the feature was only ever implemented for 32bit Xen. Signed-off-by: Andrew Cooper Acked-by: Samuel Thibault --- extras/mini-os/arch/x86/x86_64.S | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/extras/mini-os/arch/x86/x86_64.S b/extras/mini-os/arch/x86/x86_64.S index df3469e..72921b1 100644 --- a/extras/mini-os/arch/x86/x86_64.S +++ b/extras/mini-os/arch/x86/x86_64.S @@ -125,13 +125,10 @@ KERNEL_CS_MASK = 0xfc testl $NMI_MASK,2*8(%rsp) jnz 2f - testb $1,(xen_features+XENFEAT_supervisor_mode_kernel) - jnz 1f - /* Direct iret to kernel space. Correct CS and SS. */ orb $3,1*8(%rsp) orb $3,4*8(%rsp) -1: iretq + iretq 2: /* Slow iret via hypervisor. */ andl $~NMI_MASK, 16(%rsp) -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:44:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00: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 1YESMi-0005fW-IP; Fri, 23 Jan 2015 00:44:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMh-0005fI-RX for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:47 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 9B/76-01254-F7991C45; Fri, 23 Jan 2015 00:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1421973885!21670441!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31039 invoked from network); 23 Jan 2015 00:44:46 -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; 23 Jan 2015 00:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMf-0007Yy-8y for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESMf-0003dt-4V for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:45 +0000 Date: Fri, 23 Jan 2015 00:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/minios: remove more vestigial remnants of SUPERVISOR_MODE_KERNEL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2eddc5d2dc18dfc161de7cd578a4be0d3479d9af Author: Andrew Cooper AuthorDate: Mon Jan 19 12:17:24 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 19 12:17:24 2015 +0100 x86/minios: remove more vestigial remnants of SUPERVISOR_MODE_KERNEL MiniOS has never advertised support for supervisor_mode_kernel, and the feature was only ever implemented for 32bit Xen. Signed-off-by: Andrew Cooper Acked-by: Samuel Thibault --- extras/mini-os/arch/x86/x86_64.S | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/extras/mini-os/arch/x86/x86_64.S b/extras/mini-os/arch/x86/x86_64.S index df3469e..72921b1 100644 --- a/extras/mini-os/arch/x86/x86_64.S +++ b/extras/mini-os/arch/x86/x86_64.S @@ -125,13 +125,10 @@ KERNEL_CS_MASK = 0xfc testl $NMI_MASK,2*8(%rsp) jnz 2f - testb $1,(xen_features+XENFEAT_supervisor_mode_kernel) - jnz 1f - /* Direct iret to kernel space. Correct CS and SS. */ orb $3,1*8(%rsp) orb $3,4*8(%rsp) -1: iretq + iretq 2: /* Slow iret via hypervisor. */ andl $~NMI_MASK, 16(%rsp) -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:44:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00: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 1YESMt-0005hS-LG; Fri, 23 Jan 2015 00:44:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMs-0005hB-69 for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:58 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 74/CF-16320-98991C45; Fri, 23 Jan 2015 00:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1421973895!22365897!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11236 invoked from network); 23 Jan 2015 00:44:56 -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; 23 Jan 2015 00:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMp-0007Z7-IG for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESMp-0003eF-E8 for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:55 +0000 Date: Fri, 23 Jan 2015 00:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: add per-vcpu evtchn upcalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 04447f4453c008b36c3e3443f0fc44e66ddd821d Author: Paul Durrant AuthorDate: Mon Jan 19 12:18:03 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 19 12:18:03 2015 +0100 x86/hvm: add per-vcpu evtchn upcalls HVM guests have always been confined to using the domain callback via (see HVM_PARAM_CALLBACK_IRQ) to receive event notifications. This is usually an IOAPIC vector and is only used if the event channel is bound to vcpu 0. PVHVM Linux uses a pre-defined interrupt vector for the event channel upcall, set using HVM_PARAM_CALLBACK_IRQ by ORing in a special bit (bit 57) into the value (see params.h). However, it does not assert the interrupt via the emulated local APIC. This mechanism is not suitable in the general case since Windows (and potentially other OSes) because they: - cannot guarantee the same vector for all VCPUs - do require the upcall to be asserted via the local APIC This patch adds a new HVM op allowing a guest to specify a local APIC vector to use as an upcall notification for a specific vcpu therefore coping with the case of differing vector numbers. Signed-off-by: Paul Durrant Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 30 ++++++++++++++++++++++++++++++ xen/arch/x86/hvm/irq.c | 8 +++++++- xen/include/asm-x86/hvm/vcpu.h | 2 ++ xen/include/public/hvm/hvm_op.h | 19 +++++++++++++++++++ 4 files changed, 58 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8b06bfd..b03bb10 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -5514,6 +5514,31 @@ static int hvmop_destroy_ioreq_server( return rc; } +static int hvmop_set_evtchn_upcall_vector( + XEN_GUEST_HANDLE_PARAM(xen_hvm_evtchn_upcall_vector_t) uop) +{ + xen_hvm_evtchn_upcall_vector_t op; + struct domain *d = current->domain; + struct vcpu *v; + + if ( copy_from_guest(&op, uop, 1) ) + return -EFAULT; + + if ( !is_hvm_domain(d) ) + return -EINVAL; + + if ( op.vector < 0x10 ) + return -EINVAL; + + if ( op.vcpu >= d->max_vcpus || (v = d->vcpu[op.vcpu]) == NULL ) + return -ENOENT; + + printk(XENLOG_G_INFO "%pv: upcall vector %02x\n", v, op.vector); + + v->arch.hvm_vcpu.evtchn_upcall_vector = op.vector; + return 0; +} + /* * Note that this value is effectively part of the ABI, even if we don't need * to make it a formal part of it: A guest suspended for migration in the @@ -5573,6 +5598,11 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) guest_handle_cast(arg, xen_hvm_destroy_ioreq_server_t)); break; + case HVMOP_set_evtchn_upcall_vector: + rc = hvmop_set_evtchn_upcall_vector( + guest_handle_cast(arg, xen_hvm_evtchn_upcall_vector_t)); + break; + case HVMOP_set_param: case HVMOP_get_param: { diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index 35f4f94..743429e 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -218,7 +218,13 @@ void hvm_assert_evtchn_irq(struct vcpu *v) return; } - if ( is_hvm_pv_evtchn_vcpu(v) ) + if ( v->arch.hvm_vcpu.evtchn_upcall_vector != 0 ) + { + uint8_t vector = v->arch.hvm_vcpu.evtchn_upcall_vector; + + vlapic_set_irq(vcpu_vlapic(v), vector, 0); + } + else if ( is_hvm_pv_evtchn_vcpu(v) ) vcpu_kick(v); else if ( v->vcpu_id == 0 ) hvm_set_callback_irq_level(v); diff --git a/xen/include/asm-x86/hvm/vcpu.h b/xen/include/asm-x86/hvm/vcpu.h index 01e0665..3d8f4dc 100644 --- a/xen/include/asm-x86/hvm/vcpu.h +++ b/xen/include/asm-x86/hvm/vcpu.h @@ -169,6 +169,8 @@ struct hvm_vcpu { /* In mode delay_for_missed_ticks, VCPUs have differing guest times. */ int64_t stime_offset; + u8 evtchn_upcall_vector; + /* Which cache mode is this VCPU in (CR0:CD/NW)? */ u8 cache_mode; diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h index a4e5345..cde3571 100644 --- a/xen/include/public/hvm/hvm_op.h +++ b/xen/include/public/hvm/hvm_op.h @@ -370,6 +370,25 @@ DEFINE_XEN_GUEST_HANDLE(xen_hvm_set_ioreq_server_state_t); #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ +#if defined(__i386__) || defined(__x86_64__) + +/* + * HVMOP_set_evtchn_upcall_vector: Set a that should be used for event + * channel upcalls on the specified . If set, + * this vector will be used in preference to the + * domain global callback via (see + * HVM_PARAM_CALLBACK_IRQ). + */ +#define HVMOP_set_evtchn_upcall_vector 23 +struct xen_hvm_evtchn_upcall_vector { + uint32_t vcpu; + uint8_t vector; +}; +typedef struct xen_hvm_evtchn_upcall_vector xen_hvm_evtchn_upcall_vector_t; +DEFINE_XEN_GUEST_HANDLE(xen_hvm_evtchn_upcall_vector_t); + +#endif /* defined(__i386__) || defined(__x86_64__) */ + #endif /* __XEN_PUBLIC_HVM_HVM_OP_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 Jan 23 00:44:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00: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 1YESMt-0005hS-LG; Fri, 23 Jan 2015 00:44:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMs-0005hB-69 for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:58 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 74/CF-16320-98991C45; Fri, 23 Jan 2015 00:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1421973895!22365897!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11236 invoked from network); 23 Jan 2015 00:44:56 -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; 23 Jan 2015 00:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMp-0007Z7-IG for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESMp-0003eF-E8 for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:44:55 +0000 Date: Fri, 23 Jan 2015 00:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: add per-vcpu evtchn upcalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 04447f4453c008b36c3e3443f0fc44e66ddd821d Author: Paul Durrant AuthorDate: Mon Jan 19 12:18:03 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 19 12:18:03 2015 +0100 x86/hvm: add per-vcpu evtchn upcalls HVM guests have always been confined to using the domain callback via (see HVM_PARAM_CALLBACK_IRQ) to receive event notifications. This is usually an IOAPIC vector and is only used if the event channel is bound to vcpu 0. PVHVM Linux uses a pre-defined interrupt vector for the event channel upcall, set using HVM_PARAM_CALLBACK_IRQ by ORing in a special bit (bit 57) into the value (see params.h). However, it does not assert the interrupt via the emulated local APIC. This mechanism is not suitable in the general case since Windows (and potentially other OSes) because they: - cannot guarantee the same vector for all VCPUs - do require the upcall to be asserted via the local APIC This patch adds a new HVM op allowing a guest to specify a local APIC vector to use as an upcall notification for a specific vcpu therefore coping with the case of differing vector numbers. Signed-off-by: Paul Durrant Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 30 ++++++++++++++++++++++++++++++ xen/arch/x86/hvm/irq.c | 8 +++++++- xen/include/asm-x86/hvm/vcpu.h | 2 ++ xen/include/public/hvm/hvm_op.h | 19 +++++++++++++++++++ 4 files changed, 58 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8b06bfd..b03bb10 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -5514,6 +5514,31 @@ static int hvmop_destroy_ioreq_server( return rc; } +static int hvmop_set_evtchn_upcall_vector( + XEN_GUEST_HANDLE_PARAM(xen_hvm_evtchn_upcall_vector_t) uop) +{ + xen_hvm_evtchn_upcall_vector_t op; + struct domain *d = current->domain; + struct vcpu *v; + + if ( copy_from_guest(&op, uop, 1) ) + return -EFAULT; + + if ( !is_hvm_domain(d) ) + return -EINVAL; + + if ( op.vector < 0x10 ) + return -EINVAL; + + if ( op.vcpu >= d->max_vcpus || (v = d->vcpu[op.vcpu]) == NULL ) + return -ENOENT; + + printk(XENLOG_G_INFO "%pv: upcall vector %02x\n", v, op.vector); + + v->arch.hvm_vcpu.evtchn_upcall_vector = op.vector; + return 0; +} + /* * Note that this value is effectively part of the ABI, even if we don't need * to make it a formal part of it: A guest suspended for migration in the @@ -5573,6 +5598,11 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) guest_handle_cast(arg, xen_hvm_destroy_ioreq_server_t)); break; + case HVMOP_set_evtchn_upcall_vector: + rc = hvmop_set_evtchn_upcall_vector( + guest_handle_cast(arg, xen_hvm_evtchn_upcall_vector_t)); + break; + case HVMOP_set_param: case HVMOP_get_param: { diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index 35f4f94..743429e 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -218,7 +218,13 @@ void hvm_assert_evtchn_irq(struct vcpu *v) return; } - if ( is_hvm_pv_evtchn_vcpu(v) ) + if ( v->arch.hvm_vcpu.evtchn_upcall_vector != 0 ) + { + uint8_t vector = v->arch.hvm_vcpu.evtchn_upcall_vector; + + vlapic_set_irq(vcpu_vlapic(v), vector, 0); + } + else if ( is_hvm_pv_evtchn_vcpu(v) ) vcpu_kick(v); else if ( v->vcpu_id == 0 ) hvm_set_callback_irq_level(v); diff --git a/xen/include/asm-x86/hvm/vcpu.h b/xen/include/asm-x86/hvm/vcpu.h index 01e0665..3d8f4dc 100644 --- a/xen/include/asm-x86/hvm/vcpu.h +++ b/xen/include/asm-x86/hvm/vcpu.h @@ -169,6 +169,8 @@ struct hvm_vcpu { /* In mode delay_for_missed_ticks, VCPUs have differing guest times. */ int64_t stime_offset; + u8 evtchn_upcall_vector; + /* Which cache mode is this VCPU in (CR0:CD/NW)? */ u8 cache_mode; diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h index a4e5345..cde3571 100644 --- a/xen/include/public/hvm/hvm_op.h +++ b/xen/include/public/hvm/hvm_op.h @@ -370,6 +370,25 @@ DEFINE_XEN_GUEST_HANDLE(xen_hvm_set_ioreq_server_state_t); #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ +#if defined(__i386__) || defined(__x86_64__) + +/* + * HVMOP_set_evtchn_upcall_vector: Set a that should be used for event + * channel upcalls on the specified . If set, + * this vector will be used in preference to the + * domain global callback via (see + * HVM_PARAM_CALLBACK_IRQ). + */ +#define HVMOP_set_evtchn_upcall_vector 23 +struct xen_hvm_evtchn_upcall_vector { + uint32_t vcpu; + uint8_t vector; +}; +typedef struct xen_hvm_evtchn_upcall_vector xen_hvm_evtchn_upcall_vector_t; +DEFINE_XEN_GUEST_HANDLE(xen_hvm_evtchn_upcall_vector_t); + +#endif /* defined(__i386__) || defined(__x86_64__) */ + #endif /* __XEN_PUBLIC_HVM_HVM_OP_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 Jan 23 00:45:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00: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 1YESN5-0005ju-Qi; Fri, 23 Jan 2015 00:45:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESN4-0005jb-Fq for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:10 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id C9/6C-19804-59991C45; Fri, 23 Jan 2015 00:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1421973908!16055102!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11374 invoked from network); 23 Jan 2015 00:45:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jan 2015 00:45:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMz-0007a6-Oh for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESMz-0003er-MJ for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:05 +0000 Date: Fri, 23 Jan 2015 00:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hypercall: update vcpu_op to take an unsigned vcpuid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1d4290342fa541effa93cd517a7f6eadf5adc515 Author: Andrew Cooper AuthorDate: Mon Jan 19 12:19:11 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 19 12:19:11 2015 +0100 hypercall: update vcpu_op to take an unsigned vcpuid This has no guest-visible change, but makes the Hypervisor side bounds checking more simple. Signed-off-by: Andrew Cooper Acked-by: Stefano Stabellini --- xen/arch/arm/domain.c | 2 +- xen/arch/x86/hvm/hvm.c | 4 ++-- xen/common/compat/domain.c | 6 +++--- xen/common/domain.c | 6 +++--- xen/include/asm-arm/hypercall.h | 2 +- xen/include/public/vcpu.h | 2 +- xen/include/xen/hypercall.h | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 7221bc8..cfc7ab4 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -777,7 +777,7 @@ void arch_dump_domain_info(struct domain *d) } -long do_arm_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) +long do_arm_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) { switch ( cmd ) { diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index b03bb10..c7984d1 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4659,7 +4659,7 @@ static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) } static long hvm_vcpu_op( - int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) + int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) { long rc; @@ -4718,7 +4718,7 @@ static long hvm_memory_op_compat32(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) } static long hvm_vcpu_op_compat32( - int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) + int cmd, unsigned vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) { long rc; diff --git a/xen/common/compat/domain.c b/xen/common/compat/domain.c index b4be3b3..510843d 100644 --- a/xen/common/compat/domain.c +++ b/xen/common/compat/domain.c @@ -23,13 +23,13 @@ CHECK_SIZE_(struct, vcpu_info); CHECK_vcpu_register_vcpu_info; #undef xen_vcpu_register_vcpu_info -int compat_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) +int compat_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) { struct domain *d = current->domain; struct vcpu *v; int rc = 0; - if ( (vcpuid < 0) || (vcpuid >= MAX_VIRT_CPUS) ) + if ( vcpuid >= MAX_VIRT_CPUS ) return -EINVAL; if ( vcpuid >= d->max_vcpus || (v = d->vcpu[vcpuid]) == NULL ) @@ -59,7 +59,7 @@ int compat_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) domain_unlock(d); if ( rc == -ERESTART ) - rc = hypercall_create_continuation(__HYPERVISOR_vcpu_op, "iih", + rc = hypercall_create_continuation(__HYPERVISOR_vcpu_op, "iuh", cmd, vcpuid, arg); xfree(cmp_ctxt); diff --git a/xen/common/domain.c b/xen/common/domain.c index 336e9ea..e02823e 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1139,14 +1139,14 @@ void unmap_vcpu_info(struct vcpu *v) put_page_and_type(mfn_to_page(mfn)); } -long do_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) +long do_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) { struct domain *d = current->domain; struct vcpu *v; struct vcpu_guest_context *ctxt; long rc = 0; - if ( (vcpuid < 0) || (vcpuid >= MAX_VIRT_CPUS) ) + if ( vcpuid >= MAX_VIRT_CPUS ) return -EINVAL; if ( vcpuid >= d->max_vcpus || (v = d->vcpu[vcpuid]) == NULL ) @@ -1174,7 +1174,7 @@ long do_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) free_vcpu_guest_context(ctxt); if ( rc == -ERESTART ) - rc = hypercall_create_continuation(__HYPERVISOR_vcpu_op, "iih", + rc = hypercall_create_continuation(__HYPERVISOR_vcpu_op, "iuh", cmd, vcpuid, arg); break; diff --git a/xen/include/asm-arm/hypercall.h b/xen/include/asm-arm/hypercall.h index 94a92d4..a0c5a31 100644 --- a/xen/include/asm-arm/hypercall.h +++ b/xen/include/asm-arm/hypercall.h @@ -4,7 +4,7 @@ #include /* for arch_do_domctl */ int do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg); -long do_arm_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg); +long do_arm_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg); long subarch_do_domctl(struct xen_domctl *domctl, struct domain *d, XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl); diff --git a/xen/include/public/vcpu.h b/xen/include/public/vcpu.h index e888daf..898b89f 100644 --- a/xen/include/public/vcpu.h +++ b/xen/include/public/vcpu.h @@ -31,7 +31,7 @@ /* * Prototype for this hypercall is: - * int vcpu_op(int cmd, int vcpuid, void *extra_args) + * long vcpu_op(int cmd, unsigned int vcpuid, void *extra_args) * @cmd == VCPUOP_??? (VCPU operation). * @vcpuid == VCPU to operate on. * @extra_args == Operation-specific extra arguments (NULL if none). diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index 8c55779..eda8a36 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -109,7 +109,7 @@ do_vm_assist( extern long do_vcpu_op( int cmd, - int vcpuid, + unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg); struct vcpu; @@ -160,7 +160,7 @@ compat_grant_table_op( extern int compat_vcpu_op( int cmd, - int vcpuid, + unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg); extern 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 Fri Jan 23 00:45:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00: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 1YESN5-0005ju-Qi; Fri, 23 Jan 2015 00:45:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESN4-0005jb-Fq for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:10 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id C9/6C-19804-59991C45; Fri, 23 Jan 2015 00:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1421973908!16055102!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11374 invoked from network); 23 Jan 2015 00:45:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jan 2015 00:45:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESMz-0007a6-Oh for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESMz-0003er-MJ for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:05 +0000 Date: Fri, 23 Jan 2015 00:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hypercall: update vcpu_op to take an unsigned vcpuid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1d4290342fa541effa93cd517a7f6eadf5adc515 Author: Andrew Cooper AuthorDate: Mon Jan 19 12:19:11 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 19 12:19:11 2015 +0100 hypercall: update vcpu_op to take an unsigned vcpuid This has no guest-visible change, but makes the Hypervisor side bounds checking more simple. Signed-off-by: Andrew Cooper Acked-by: Stefano Stabellini --- xen/arch/arm/domain.c | 2 +- xen/arch/x86/hvm/hvm.c | 4 ++-- xen/common/compat/domain.c | 6 +++--- xen/common/domain.c | 6 +++--- xen/include/asm-arm/hypercall.h | 2 +- xen/include/public/vcpu.h | 2 +- xen/include/xen/hypercall.h | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 7221bc8..cfc7ab4 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -777,7 +777,7 @@ void arch_dump_domain_info(struct domain *d) } -long do_arm_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) +long do_arm_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) { switch ( cmd ) { diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index b03bb10..c7984d1 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4659,7 +4659,7 @@ static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) } static long hvm_vcpu_op( - int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) + int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) { long rc; @@ -4718,7 +4718,7 @@ static long hvm_memory_op_compat32(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) } static long hvm_vcpu_op_compat32( - int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) + int cmd, unsigned vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) { long rc; diff --git a/xen/common/compat/domain.c b/xen/common/compat/domain.c index b4be3b3..510843d 100644 --- a/xen/common/compat/domain.c +++ b/xen/common/compat/domain.c @@ -23,13 +23,13 @@ CHECK_SIZE_(struct, vcpu_info); CHECK_vcpu_register_vcpu_info; #undef xen_vcpu_register_vcpu_info -int compat_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) +int compat_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) { struct domain *d = current->domain; struct vcpu *v; int rc = 0; - if ( (vcpuid < 0) || (vcpuid >= MAX_VIRT_CPUS) ) + if ( vcpuid >= MAX_VIRT_CPUS ) return -EINVAL; if ( vcpuid >= d->max_vcpus || (v = d->vcpu[vcpuid]) == NULL ) @@ -59,7 +59,7 @@ int compat_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) domain_unlock(d); if ( rc == -ERESTART ) - rc = hypercall_create_continuation(__HYPERVISOR_vcpu_op, "iih", + rc = hypercall_create_continuation(__HYPERVISOR_vcpu_op, "iuh", cmd, vcpuid, arg); xfree(cmp_ctxt); diff --git a/xen/common/domain.c b/xen/common/domain.c index 336e9ea..e02823e 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1139,14 +1139,14 @@ void unmap_vcpu_info(struct vcpu *v) put_page_and_type(mfn_to_page(mfn)); } -long do_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) +long do_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) { struct domain *d = current->domain; struct vcpu *v; struct vcpu_guest_context *ctxt; long rc = 0; - if ( (vcpuid < 0) || (vcpuid >= MAX_VIRT_CPUS) ) + if ( vcpuid >= MAX_VIRT_CPUS ) return -EINVAL; if ( vcpuid >= d->max_vcpus || (v = d->vcpu[vcpuid]) == NULL ) @@ -1174,7 +1174,7 @@ long do_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) free_vcpu_guest_context(ctxt); if ( rc == -ERESTART ) - rc = hypercall_create_continuation(__HYPERVISOR_vcpu_op, "iih", + rc = hypercall_create_continuation(__HYPERVISOR_vcpu_op, "iuh", cmd, vcpuid, arg); break; diff --git a/xen/include/asm-arm/hypercall.h b/xen/include/asm-arm/hypercall.h index 94a92d4..a0c5a31 100644 --- a/xen/include/asm-arm/hypercall.h +++ b/xen/include/asm-arm/hypercall.h @@ -4,7 +4,7 @@ #include /* for arch_do_domctl */ int do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg); -long do_arm_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg); +long do_arm_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg); long subarch_do_domctl(struct xen_domctl *domctl, struct domain *d, XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl); diff --git a/xen/include/public/vcpu.h b/xen/include/public/vcpu.h index e888daf..898b89f 100644 --- a/xen/include/public/vcpu.h +++ b/xen/include/public/vcpu.h @@ -31,7 +31,7 @@ /* * Prototype for this hypercall is: - * int vcpu_op(int cmd, int vcpuid, void *extra_args) + * long vcpu_op(int cmd, unsigned int vcpuid, void *extra_args) * @cmd == VCPUOP_??? (VCPU operation). * @vcpuid == VCPU to operate on. * @extra_args == Operation-specific extra arguments (NULL if none). diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index 8c55779..eda8a36 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -109,7 +109,7 @@ do_vm_assist( extern long do_vcpu_op( int cmd, - int vcpuid, + unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg); struct vcpu; @@ -160,7 +160,7 @@ compat_grant_table_op( extern int compat_vcpu_op( int cmd, - int vcpuid, + unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg); extern 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 Fri Jan 23 00:45:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:45:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNG-0005lX-Tb; Fri, 23 Jan 2015 00:45:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNF-0005lA-Er for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:21 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id D1/E6-01254-0A991C45; Fri, 23 Jan 2015 00:45:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1421973919!21670515!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32679 invoked from network); 23 Jan 2015 00:45:20 -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; 23 Jan 2015 00:45:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNC-0007aE-OL for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESNC-0003fn-Mp for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:18 +0000 Date: Fri, 23 Jan 2015 00:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] correct hypervisor 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 cc46f2a679a212f69f6abec2314b64f7f47d1619 Author: Jan Beulich AuthorDate: Mon Jan 19 16:08:41 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 19 16:08:41 2015 +0100 correct hypervisor version -unstable doesn't use the .0 part added by commit 0082626f35. --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 98ae2d0..b51dd36 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 6 -export XEN_EXTRAVERSION ?= .0-unstable$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jan 23 00:45:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:45:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNG-0005lX-Tb; Fri, 23 Jan 2015 00:45:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNF-0005lA-Er for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:21 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id D1/E6-01254-0A991C45; Fri, 23 Jan 2015 00:45:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1421973919!21670515!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32679 invoked from network); 23 Jan 2015 00:45:20 -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; 23 Jan 2015 00:45:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNC-0007aE-OL for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESNC-0003fn-Mp for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:18 +0000 Date: Fri, 23 Jan 2015 00:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] correct hypervisor 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 cc46f2a679a212f69f6abec2314b64f7f47d1619 Author: Jan Beulich AuthorDate: Mon Jan 19 16:08:41 2015 +0100 Commit: Jan Beulich CommitDate: Mon Jan 19 16:08:41 2015 +0100 correct hypervisor version -unstable doesn't use the .0 part added by commit 0082626f35. --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 98ae2d0..b51dd36 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 6 -export XEN_EXTRAVERSION ?= .0-unstable$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jan 23 00:45:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:45:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNR-0005nN-09; Fri, 23 Jan 2015 00:45:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNP-0005n0-DQ for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:31 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 82/52-00776-AA991C45; Fri, 23 Jan 2015 00:45:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1421973929!16292707!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10655 invoked from network); 23 Jan 2015 00:45: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; 23 Jan 2015 00:45:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNM-0007aM-Vq for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESNM-0003gA-Tu for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:28 +0000 Date: Fri, 23 Jan 2015 00:45:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Install libxlutil.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 8ff079803677b82195addebc0e88f1630cb7354b Author: Jim Fehlig AuthorDate: Thu Jan 8 14:43:28 2015 -0700 Commit: Ian Campbell CommitDate: Mon Jan 19 15:26:49 2015 +0000 Install libxlutil.h libxlutil.{a,so} are installed, but not the corresponding header file. Signed-off-by: Jim Fehlig Acked-by: Ian Campbell Reviewed-by: Dario Faggioli --- tools/libxl/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index b417372..6a8575b 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -266,7 +266,7 @@ install: all $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR) $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh .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 Fri Jan 23 00:45:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:45:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNR-0005nN-09; Fri, 23 Jan 2015 00:45:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNP-0005n0-DQ for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:31 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 82/52-00776-AA991C45; Fri, 23 Jan 2015 00:45:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1421973929!16292707!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10655 invoked from network); 23 Jan 2015 00:45: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; 23 Jan 2015 00:45:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNM-0007aM-Vq for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESNM-0003gA-Tu for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:28 +0000 Date: Fri, 23 Jan 2015 00:45:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Install libxlutil.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 8ff079803677b82195addebc0e88f1630cb7354b Author: Jim Fehlig AuthorDate: Thu Jan 8 14:43:28 2015 -0700 Commit: Ian Campbell CommitDate: Mon Jan 19 15:26:49 2015 +0000 Install libxlutil.h libxlutil.{a,so} are installed, but not the corresponding header file. Signed-off-by: Jim Fehlig Acked-by: Ian Campbell Reviewed-by: Dario Faggioli --- tools/libxl/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index b417372..6a8575b 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -266,7 +266,7 @@ install: all $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR) $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh .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 Fri Jan 23 00:45:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00: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 1YESNc-0005p6-30; Fri, 23 Jan 2015 00:45:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNa-0005op-5k for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:42 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 68/07-10078-5B991C45; Fri, 23 Jan 2015 00:45:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1421973939!23001194!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10384 invoked from network); 23 Jan 2015 00:45:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jan 2015 00:45:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNX-0007aS-7M for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESNX-0003ga-55 for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:39 +0000 Date: Fri, 23 Jan 2015 00:45:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: provide xenlight.pc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit babeca328413baebfdca366a5b17c06acf4295e8 Author: Wei Liu AuthorDate: Fri Jan 9 14:32:18 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 19 15:32:17 2015 +0000 libxl: provide xenlight.pc A pkg-config file for libxl. It also contains two variables (xenfirmwaredir and libexec_bin) so that tools that are very keen on knowing the locations of Xen binaries (say, libvirt) can use them to determine the location of the binaries. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell [ ijc -- ran autogen.sh ] --- .gitignore | 2 ++ config/Paths.mk.in | 2 +- configure | 4 ++++ m4/paths.m4 | 3 +++ tools/configure | 7 ++++++- tools/configure.ac | 1 + tools/libxl/Makefile | 11 ++++++++++- tools/libxl/xenlight.pc.in.in | 11 +++++++++++ 8 files changed, 38 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a8f15d5..33c2ca0 100644 --- a/.gitignore +++ b/.gitignore @@ -153,6 +153,8 @@ tools/include/xen/* tools/include/xen-foreign/*.(c|h|size) tools/include/xen-foreign/checker tools/libxl/libxlu_cfg_y.output +tools/libxl/xenlight.pc +tools/libxl/xenlight.pc.in tools/libxl/xl tools/libxl/testenum tools/libxl/testenum.c diff --git a/config/Paths.mk.in b/config/Paths.mk.in index fe10f76..150bae7 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -57,7 +57,7 @@ BASH_COMPLETION_DIR := $(CONFIG_DIR)/bash_completion.d XEN_LOCK_DIR := @XEN_LOCK_DIR@ XEN_PAGING_DIR := @XEN_PAGING_DIR@ -XENFIRMWAREDIR := $(LIBEXEC)/boot +XENFIRMWAREDIR := @XENFIRMWAREDIR@ XEN_CONFIG_DIR := @XEN_CONFIG_DIR@ XEN_SCRIPT_DIR := @XEN_SCRIPT_DIR@ diff --git a/configure b/configure index 718e92f..8a084c8 100755 --- a/configure +++ b/configure @@ -604,6 +604,7 @@ SHAREDIR XEN_LIB_STORED XEN_LOG_DIR XEN_RUN_DIR +XENFIRMWAREDIR LIBEXEC_BIN CONFIG_LEAF_DIR host_os @@ -1930,6 +1931,9 @@ libexecdir=`eval echo $libexecdir` LIBEXEC_BIN=`eval echo $libexecdir/$PACKAGE_TARNAME/bin` +XENFIRMWAREDIR=`eval echo $libexecdir/$PACKAGE_TARNAME/boot` + + XEN_RUN_DIR=$localstatedir/run/xen diff --git a/m4/paths.m4 b/m4/paths.m4 index 7ede5bd..db74f55 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -77,6 +77,9 @@ dnl This variable will be substituted in various .in files LIBEXEC_BIN=`eval echo $libexecdir/$PACKAGE_TARNAME/bin` AC_SUBST(LIBEXEC_BIN) +XENFIRMWAREDIR=`eval echo $libexecdir/$PACKAGE_TARNAME/boot` +AC_SUBST(XENFIRMWAREDIR) + XEN_RUN_DIR=$localstatedir/run/xen AC_SUBST(XEN_RUN_DIR) diff --git a/tools/configure b/tools/configure index 4117c83..1cab804 100755 --- a/tools/configure +++ b/tools/configure @@ -718,6 +718,7 @@ SHAREDIR XEN_LIB_STORED XEN_LOG_DIR XEN_RUN_DIR +XENFIRMWAREDIR LIBEXEC_BIN CONFIG_LEAF_DIR FILE_OFFSET_BITS @@ -2273,7 +2274,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_files="$ac_config_files ../config/Tools.mk hotplug/FreeBSD/rc.d/xencommons hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains hotplug/Linux/systemd/proc-xen.mount hotplug/Linux/systemd/var-lib-xenstored.mount hotplug/Linux/systemd/xen-init-dom0.service hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service hotplug/Linux/systemd/xen-watchdog.service hotplug/Linux/systemd/xenconsoled.service hotplug/Linux/systemd/xendomains.service hotplug/Linux/systemd/xenstored.service hotplug/Linux/systemd/xenstored.socket hotplug/Linux/systemd/xenstored_ro.socket hotplug/Linux/vif-setup hotplug/Linux/xen-backend.rules hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons" +ac_config_files="$ac_config_files ../config/Tools.mk hotplug/FreeBSD/rc.d/xencommons hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains hotplug/Linux/systemd/proc-xen.mount hotplug/Linux/systemd/var-lib-xenstored.mount hotplug/Linux/systemd/xen-init-dom0.service hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service hotplug/Linux/systemd/xen-watchdog.service hotplug/Linux/systemd/xenconsoled.service hotplug/Linux/systemd/xendomains.service hotplug/Linux/systemd/xenstored.service hotplug/Linux/systemd/xenstored.socket hotplug/Linux/systemd/xenstored_ro.socket hotplug/Linux/vif-setup hotplug/Linux/xen-backend.rules hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons libxl/xenlight.pc.in" ac_config_headers="$ac_config_headers config.h" @@ -3767,6 +3768,9 @@ libexecdir=`eval echo $libexecdir` LIBEXEC_BIN=`eval echo $libexecdir/$PACKAGE_TARNAME/bin` +XENFIRMWAREDIR=`eval echo $libexecdir/$PACKAGE_TARNAME/boot` + + XEN_RUN_DIR=$localstatedir/run/xen @@ -9559,6 +9563,7 @@ do "hotplug/Linux/xen-hotplug-common.sh") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/xen-hotplug-common.sh" ;; "hotplug/Linux/xendomains") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/xendomains" ;; "hotplug/NetBSD/rc.d/xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/NetBSD/rc.d/xencommons" ;; + "libxl/xenlight.pc.in") CONFIG_FILES="$CONFIG_FILES libxl/xenlight.pc.in" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/tools/configure.ac b/tools/configure.ac index 72e2465..24fdfc3 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -27,6 +27,7 @@ hotplug/Linux/xen-backend.rules hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons +libxl/xenlight.pc.in ]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([../]) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 6a8575b..08fe814 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -143,13 +143,15 @@ $(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenstore) SAVE_HELPER_OBJS = libxl_save_helper.o _libxl_save_msgs_helper.o $(SAVE_HELPER_OBJS): CFLAGS += $(CFLAGS_libxenctrl) +PKG_CONFIG = xenlight.pc + testidl.o: CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenlight) testidl.c: libxl_types.idl gentest.py libxl.h $(AUTOINCS) $(PYTHON) gentest.py libxl_types.idl testidl.c.new mv testidl.c.new testidl.c .PHONY: all -all: $(CLIENTS) $(TEST_PROGS) \ +all: $(CLIENTS) $(TEST_PROGS) $(PKG_CONFIG) \ libxenlight.so libxenlight.a libxlutil.so libxlutil.a \ $(AUTOSRCS) $(AUTOINCS) @@ -248,6 +250,10 @@ libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so testidl: testidl.o libxlutil.so libxenlight.so $(CC) $(LDFLAGS) -o $@ testidl.o libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) +xenlight.pc: xenlight.pc.in Makefile + @sed -e 's/@@version@@/$(MAJOR).$(MINOR)/g' < xenlight.pc.in > $@.new + @mv -f $@.new $@ + .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) @@ -255,6 +261,7 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/pkgconfig $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR) $(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN) @@ -268,12 +275,14 @@ install: all $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh + $(INSTALL_DATA) xenlight.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/ .PHONY: clean clean: $(RM) -f _*.h *.o *.so* *.a $(CLIENTS) $(DEPS) $(RM) -f _*.c *.pyc _paths.*.tmp _*.api-for-check $(RM) -f testidl.c.new testidl.c *.api-ok + $(RM) -f xenlight.pc xenlight.pc.in distclean: clean diff --git a/tools/libxl/xenlight.pc.in.in b/tools/libxl/xenlight.pc.in.in new file mode 100644 index 0000000..c27872e --- /dev/null +++ b/tools/libxl/xenlight.pc.in.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +includedir=@includedir@ +libdir=@libdir@ +xenfirmwaredir=@XENFIRMWAREDIR@ +libexec_bin=@LIBEXEC_BIN@ + +Name: Xenlight +Description: The Xenlight library for Xen hypervisor +Version: @@version@@ +Cflags: -I${includedir} +Libs: -L${libdir} -lxenlight -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:45:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00: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 1YESNc-0005p6-30; Fri, 23 Jan 2015 00:45:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNa-0005op-5k for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:42 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 68/07-10078-5B991C45; Fri, 23 Jan 2015 00:45:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1421973939!23001194!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10384 invoked from network); 23 Jan 2015 00:45:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jan 2015 00:45:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNX-0007aS-7M for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESNX-0003ga-55 for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:39 +0000 Date: Fri, 23 Jan 2015 00:45:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: provide xenlight.pc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit babeca328413baebfdca366a5b17c06acf4295e8 Author: Wei Liu AuthorDate: Fri Jan 9 14:32:18 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 19 15:32:17 2015 +0000 libxl: provide xenlight.pc A pkg-config file for libxl. It also contains two variables (xenfirmwaredir and libexec_bin) so that tools that are very keen on knowing the locations of Xen binaries (say, libvirt) can use them to determine the location of the binaries. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell [ ijc -- ran autogen.sh ] --- .gitignore | 2 ++ config/Paths.mk.in | 2 +- configure | 4 ++++ m4/paths.m4 | 3 +++ tools/configure | 7 ++++++- tools/configure.ac | 1 + tools/libxl/Makefile | 11 ++++++++++- tools/libxl/xenlight.pc.in.in | 11 +++++++++++ 8 files changed, 38 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a8f15d5..33c2ca0 100644 --- a/.gitignore +++ b/.gitignore @@ -153,6 +153,8 @@ tools/include/xen/* tools/include/xen-foreign/*.(c|h|size) tools/include/xen-foreign/checker tools/libxl/libxlu_cfg_y.output +tools/libxl/xenlight.pc +tools/libxl/xenlight.pc.in tools/libxl/xl tools/libxl/testenum tools/libxl/testenum.c diff --git a/config/Paths.mk.in b/config/Paths.mk.in index fe10f76..150bae7 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -57,7 +57,7 @@ BASH_COMPLETION_DIR := $(CONFIG_DIR)/bash_completion.d XEN_LOCK_DIR := @XEN_LOCK_DIR@ XEN_PAGING_DIR := @XEN_PAGING_DIR@ -XENFIRMWAREDIR := $(LIBEXEC)/boot +XENFIRMWAREDIR := @XENFIRMWAREDIR@ XEN_CONFIG_DIR := @XEN_CONFIG_DIR@ XEN_SCRIPT_DIR := @XEN_SCRIPT_DIR@ diff --git a/configure b/configure index 718e92f..8a084c8 100755 --- a/configure +++ b/configure @@ -604,6 +604,7 @@ SHAREDIR XEN_LIB_STORED XEN_LOG_DIR XEN_RUN_DIR +XENFIRMWAREDIR LIBEXEC_BIN CONFIG_LEAF_DIR host_os @@ -1930,6 +1931,9 @@ libexecdir=`eval echo $libexecdir` LIBEXEC_BIN=`eval echo $libexecdir/$PACKAGE_TARNAME/bin` +XENFIRMWAREDIR=`eval echo $libexecdir/$PACKAGE_TARNAME/boot` + + XEN_RUN_DIR=$localstatedir/run/xen diff --git a/m4/paths.m4 b/m4/paths.m4 index 7ede5bd..db74f55 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -77,6 +77,9 @@ dnl This variable will be substituted in various .in files LIBEXEC_BIN=`eval echo $libexecdir/$PACKAGE_TARNAME/bin` AC_SUBST(LIBEXEC_BIN) +XENFIRMWAREDIR=`eval echo $libexecdir/$PACKAGE_TARNAME/boot` +AC_SUBST(XENFIRMWAREDIR) + XEN_RUN_DIR=$localstatedir/run/xen AC_SUBST(XEN_RUN_DIR) diff --git a/tools/configure b/tools/configure index 4117c83..1cab804 100755 --- a/tools/configure +++ b/tools/configure @@ -718,6 +718,7 @@ SHAREDIR XEN_LIB_STORED XEN_LOG_DIR XEN_RUN_DIR +XENFIRMWAREDIR LIBEXEC_BIN CONFIG_LEAF_DIR FILE_OFFSET_BITS @@ -2273,7 +2274,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_files="$ac_config_files ../config/Tools.mk hotplug/FreeBSD/rc.d/xencommons hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains hotplug/Linux/systemd/proc-xen.mount hotplug/Linux/systemd/var-lib-xenstored.mount hotplug/Linux/systemd/xen-init-dom0.service hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service hotplug/Linux/systemd/xen-watchdog.service hotplug/Linux/systemd/xenconsoled.service hotplug/Linux/systemd/xendomains.service hotplug/Linux/systemd/xenstored.service hotplug/Linux/systemd/xenstored.socket hotplug/Linux/systemd/xenstored_ro.socket hotplug/Linux/vif-setup hotplug/Linux/xen-backend.rules hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons" +ac_config_files="$ac_config_files ../config/Tools.mk hotplug/FreeBSD/rc.d/xencommons hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains hotplug/Linux/systemd/proc-xen.mount hotplug/Linux/systemd/var-lib-xenstored.mount hotplug/Linux/systemd/xen-init-dom0.service hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service hotplug/Linux/systemd/xen-watchdog.service hotplug/Linux/systemd/xenconsoled.service hotplug/Linux/systemd/xendomains.service hotplug/Linux/systemd/xenstored.service hotplug/Linux/systemd/xenstored.socket hotplug/Linux/systemd/xenstored_ro.socket hotplug/Linux/vif-setup hotplug/Linux/xen-backend.rules hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons libxl/xenlight.pc.in" ac_config_headers="$ac_config_headers config.h" @@ -3767,6 +3768,9 @@ libexecdir=`eval echo $libexecdir` LIBEXEC_BIN=`eval echo $libexecdir/$PACKAGE_TARNAME/bin` +XENFIRMWAREDIR=`eval echo $libexecdir/$PACKAGE_TARNAME/boot` + + XEN_RUN_DIR=$localstatedir/run/xen @@ -9559,6 +9563,7 @@ do "hotplug/Linux/xen-hotplug-common.sh") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/xen-hotplug-common.sh" ;; "hotplug/Linux/xendomains") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/xendomains" ;; "hotplug/NetBSD/rc.d/xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/NetBSD/rc.d/xencommons" ;; + "libxl/xenlight.pc.in") CONFIG_FILES="$CONFIG_FILES libxl/xenlight.pc.in" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/tools/configure.ac b/tools/configure.ac index 72e2465..24fdfc3 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -27,6 +27,7 @@ hotplug/Linux/xen-backend.rules hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons +libxl/xenlight.pc.in ]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([../]) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 6a8575b..08fe814 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -143,13 +143,15 @@ $(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenstore) SAVE_HELPER_OBJS = libxl_save_helper.o _libxl_save_msgs_helper.o $(SAVE_HELPER_OBJS): CFLAGS += $(CFLAGS_libxenctrl) +PKG_CONFIG = xenlight.pc + testidl.o: CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenlight) testidl.c: libxl_types.idl gentest.py libxl.h $(AUTOINCS) $(PYTHON) gentest.py libxl_types.idl testidl.c.new mv testidl.c.new testidl.c .PHONY: all -all: $(CLIENTS) $(TEST_PROGS) \ +all: $(CLIENTS) $(TEST_PROGS) $(PKG_CONFIG) \ libxenlight.so libxenlight.a libxlutil.so libxlutil.a \ $(AUTOSRCS) $(AUTOINCS) @@ -248,6 +250,10 @@ libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so testidl: testidl.o libxlutil.so libxenlight.so $(CC) $(LDFLAGS) -o $@ testidl.o libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) +xenlight.pc: xenlight.pc.in Makefile + @sed -e 's/@@version@@/$(MAJOR).$(MINOR)/g' < xenlight.pc.in > $@.new + @mv -f $@.new $@ + .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) @@ -255,6 +261,7 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/pkgconfig $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR) $(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN) @@ -268,12 +275,14 @@ install: all $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh + $(INSTALL_DATA) xenlight.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/ .PHONY: clean clean: $(RM) -f _*.h *.o *.so* *.a $(CLIENTS) $(DEPS) $(RM) -f _*.c *.pyc _paths.*.tmp _*.api-for-check $(RM) -f testidl.c.new testidl.c *.api-ok + $(RM) -f xenlight.pc xenlight.pc.in distclean: clean diff --git a/tools/libxl/xenlight.pc.in.in b/tools/libxl/xenlight.pc.in.in new file mode 100644 index 0000000..c27872e --- /dev/null +++ b/tools/libxl/xenlight.pc.in.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +includedir=@includedir@ +libdir=@libdir@ +xenfirmwaredir=@XENFIRMWAREDIR@ +libexec_bin=@LIBEXEC_BIN@ + +Name: Xenlight +Description: The Xenlight library for Xen hypervisor +Version: @@version@@ +Cflags: -I${includedir} +Libs: -L${libdir} -lxenlight -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:45:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:45: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 1YESNm-0005qc-5f; Fri, 23 Jan 2015 00:45:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNk-0005qG-Cz for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:52 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id C7/73-31115-FB991C45; Fri, 23 Jan 2015 00:45:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1421973949!16951582!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24979 invoked from network); 23 Jan 2015 00:45:50 -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; 23 Jan 2015 00:45:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNh-0007aY-FV for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESNh-0003gw-ER for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:49 +0000 Date: Fri, 23 Jan 2015 00:45:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic: Rename nr_lines into nr_spis X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 96fcbd0599b74b4b2629447a6ee90580f43e3aa4 Author: Julien Grall AuthorDate: Thu Jan 15 20:23:40 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 19 15:41:23 2015 +0000 xen/arm: vgic: Rename nr_lines into nr_spis The field nr_lines in the arch_domain vgic structure contains the number of SPIs for the emulated GIC. Using the nr_lines make confusion with the GIC code, where it means the number of IRQs. This can lead to coding error. Also introduce vgic_num_irqs to get the number of IRQ handled by the emulated GIC. Finally drop the initialization of nr_spis in both gicv2v_init and gicv3_init as it's already initialized in vgic common code. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/gic-v2.c | 2 -- xen/arch/arm/gic-v3.c | 2 -- xen/arch/arm/vgic-v2.c | 2 +- xen/arch/arm/vgic-v3.c | 2 +- xen/arch/arm/vgic.c | 15 ++++++--------- xen/include/asm-arm/domain.h | 2 +- xen/include/asm-arm/vgic.h | 4 +++- 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index faad1ff..31fb81a 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -432,8 +432,6 @@ static int gicv2v_setup(struct domain *d) d->arch.vgic.cbase = GUEST_GICC_BASE; } - d->arch.vgic.nr_lines = 0; - /* * Map the gic virtual cpu interface in the gic cpu interface * region of the guest. diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 076aa62..47452ca 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -922,8 +922,6 @@ static int gicv_v3_init(struct domain *d) d->arch.vgic.rbase_size[0] = GUEST_GICV3_GICR0_SIZE; } - d->arch.vgic.nr_lines = 0; - return 0; } diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 4dc2267..598bf06 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -56,7 +56,7 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) /* No secure world support for guests. */ vgic_lock(v); *r = ( (v->domain->max_vcpus << 5) & GICD_TYPE_CPUS ) - |( ((v->domain->arch.vgic.nr_lines / 32)) & GICD_TYPE_LINES ); + |( ((v->domain->arch.vgic.nr_spis / 32)) & GICD_TYPE_LINES ); vgic_unlock(v); return 1; case GICD_IIDR: diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index c738ca9..ae4482c 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -674,7 +674,7 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) 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_lines / 32) & GICD_TYPE_LINES)); + ((v->domain->arch.vgic.nr_spis / 32) & GICD_TYPE_LINES)); return 1; case GICD_STATUSR: /* diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 8938a69..b272d86 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -67,13 +67,10 @@ int domain_vgic_init(struct domain *d) d->arch.vgic.ctlr = 0; - /* Currently nr_lines in vgic and gic doesn't have the same meanings - * Here nr_lines = number of SPIs - */ if ( is_hardware_domain(d) ) - d->arch.vgic.nr_lines = gic_number_lines() - 32; + d->arch.vgic.nr_spis = gic_number_lines() - 32; else - d->arch.vgic.nr_lines = 0; /* We don't need SPIs for the guest */ + d->arch.vgic.nr_spis = 0; /* We don't need SPIs for the guest */ switch ( gic_hw_version() ) { @@ -99,11 +96,11 @@ int domain_vgic_init(struct domain *d) return -ENOMEM; d->arch.vgic.pending_irqs = - xzalloc_array(struct pending_irq, d->arch.vgic.nr_lines); + xzalloc_array(struct pending_irq, d->arch.vgic.nr_spis); if ( d->arch.vgic.pending_irqs == NULL ) return -ENOMEM; - for (i=0; iarch.vgic.nr_lines; i++) + for (i=0; iarch.vgic.nr_spis; i++) { INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].inflight); INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].lr_queue); @@ -223,7 +220,7 @@ void arch_move_irqs(struct vcpu *v) struct vcpu *v_target; int i; - for ( i = 32; i < (d->arch.vgic.nr_lines + 32); i++ ) + for ( i = 32; i < vgic_num_irqs(d); i++ ) { v_target = vgic_get_target_vcpu(v, i); p = irq_to_pending(v_target, i); @@ -352,7 +349,7 @@ int vgic_to_sgi(struct vcpu *v, register_t sgir, enum gic_sgi_mode irqmode, int struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq) { struct pending_irq *n; - /* Pending irqs allocation strategy: the first vgic.nr_lines irqs + /* Pending irqs allocation strategy: the first vgic.nr_spis irqs * are used for SPIs; the rests are used for per cpu irqs */ if ( irq < 32 ) n = &v->arch.vgic.pending_irqs[irq]; diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 787e93c..8b7dd85 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -89,7 +89,7 @@ struct arch_domain */ spinlock_t lock; int ctlr; - int nr_lines; /* Number of SPIs */ + int nr_spis; /* Number of SPIs */ 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 5160f17..74d5a4e 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -113,7 +113,7 @@ struct vgic_ops { }; /* Number of ranks of interrupt registers for a domain */ -#define DOMAIN_NR_RANKS(d) (((d)->arch.vgic.nr_lines+31)/32) +#define DOMAIN_NR_RANKS(d) (((d)->arch.vgic.nr_spis+31)/32) #define vgic_lock(v) spin_lock_irq(&(v)->domain->arch.vgic.lock) #define vgic_unlock(v) spin_unlock_irq(&(v)->domain->arch.vgic.lock) @@ -175,6 +175,8 @@ enum gic_sgi_mode; */ #define REG_RANK_INDEX(b, n, s) ((((n) >> s) & ((b)-1)) % 32) +#define vgic_num_irqs(d) ((d)->arch.vgic.nr_spis + 32) + extern int domain_vgic_init(struct domain *d); extern void domain_vgic_free(struct domain *d); extern int vcpu_vgic_init(struct vcpu *v); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jan 23 00:45:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:45: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 1YESNm-0005qc-5f; Fri, 23 Jan 2015 00:45:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNk-0005qG-Cz for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:52 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id C7/73-31115-FB991C45; Fri, 23 Jan 2015 00:45:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1421973949!16951582!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24979 invoked from network); 23 Jan 2015 00:45:50 -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; 23 Jan 2015 00:45:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNh-0007aY-FV for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESNh-0003gw-ER for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:49 +0000 Date: Fri, 23 Jan 2015 00:45:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic: Rename nr_lines into nr_spis X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 96fcbd0599b74b4b2629447a6ee90580f43e3aa4 Author: Julien Grall AuthorDate: Thu Jan 15 20:23:40 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 19 15:41:23 2015 +0000 xen/arm: vgic: Rename nr_lines into nr_spis The field nr_lines in the arch_domain vgic structure contains the number of SPIs for the emulated GIC. Using the nr_lines make confusion with the GIC code, where it means the number of IRQs. This can lead to coding error. Also introduce vgic_num_irqs to get the number of IRQ handled by the emulated GIC. Finally drop the initialization of nr_spis in both gicv2v_init and gicv3_init as it's already initialized in vgic common code. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/gic-v2.c | 2 -- xen/arch/arm/gic-v3.c | 2 -- xen/arch/arm/vgic-v2.c | 2 +- xen/arch/arm/vgic-v3.c | 2 +- xen/arch/arm/vgic.c | 15 ++++++--------- xen/include/asm-arm/domain.h | 2 +- xen/include/asm-arm/vgic.h | 4 +++- 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index faad1ff..31fb81a 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -432,8 +432,6 @@ static int gicv2v_setup(struct domain *d) d->arch.vgic.cbase = GUEST_GICC_BASE; } - d->arch.vgic.nr_lines = 0; - /* * Map the gic virtual cpu interface in the gic cpu interface * region of the guest. diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 076aa62..47452ca 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -922,8 +922,6 @@ static int gicv_v3_init(struct domain *d) d->arch.vgic.rbase_size[0] = GUEST_GICV3_GICR0_SIZE; } - d->arch.vgic.nr_lines = 0; - return 0; } diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 4dc2267..598bf06 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -56,7 +56,7 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) /* No secure world support for guests. */ vgic_lock(v); *r = ( (v->domain->max_vcpus << 5) & GICD_TYPE_CPUS ) - |( ((v->domain->arch.vgic.nr_lines / 32)) & GICD_TYPE_LINES ); + |( ((v->domain->arch.vgic.nr_spis / 32)) & GICD_TYPE_LINES ); vgic_unlock(v); return 1; case GICD_IIDR: diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index c738ca9..ae4482c 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -674,7 +674,7 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) 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_lines / 32) & GICD_TYPE_LINES)); + ((v->domain->arch.vgic.nr_spis / 32) & GICD_TYPE_LINES)); return 1; case GICD_STATUSR: /* diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 8938a69..b272d86 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -67,13 +67,10 @@ int domain_vgic_init(struct domain *d) d->arch.vgic.ctlr = 0; - /* Currently nr_lines in vgic and gic doesn't have the same meanings - * Here nr_lines = number of SPIs - */ if ( is_hardware_domain(d) ) - d->arch.vgic.nr_lines = gic_number_lines() - 32; + d->arch.vgic.nr_spis = gic_number_lines() - 32; else - d->arch.vgic.nr_lines = 0; /* We don't need SPIs for the guest */ + d->arch.vgic.nr_spis = 0; /* We don't need SPIs for the guest */ switch ( gic_hw_version() ) { @@ -99,11 +96,11 @@ int domain_vgic_init(struct domain *d) return -ENOMEM; d->arch.vgic.pending_irqs = - xzalloc_array(struct pending_irq, d->arch.vgic.nr_lines); + xzalloc_array(struct pending_irq, d->arch.vgic.nr_spis); if ( d->arch.vgic.pending_irqs == NULL ) return -ENOMEM; - for (i=0; iarch.vgic.nr_lines; i++) + for (i=0; iarch.vgic.nr_spis; i++) { INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].inflight); INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].lr_queue); @@ -223,7 +220,7 @@ void arch_move_irqs(struct vcpu *v) struct vcpu *v_target; int i; - for ( i = 32; i < (d->arch.vgic.nr_lines + 32); i++ ) + for ( i = 32; i < vgic_num_irqs(d); i++ ) { v_target = vgic_get_target_vcpu(v, i); p = irq_to_pending(v_target, i); @@ -352,7 +349,7 @@ int vgic_to_sgi(struct vcpu *v, register_t sgir, enum gic_sgi_mode irqmode, int struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq) { struct pending_irq *n; - /* Pending irqs allocation strategy: the first vgic.nr_lines irqs + /* Pending irqs allocation strategy: the first vgic.nr_spis irqs * are used for SPIs; the rests are used for per cpu irqs */ if ( irq < 32 ) n = &v->arch.vgic.pending_irqs[irq]; diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 787e93c..8b7dd85 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -89,7 +89,7 @@ struct arch_domain */ spinlock_t lock; int ctlr; - int nr_lines; /* Number of SPIs */ + int nr_spis; /* Number of SPIs */ 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 5160f17..74d5a4e 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -113,7 +113,7 @@ struct vgic_ops { }; /* Number of ranks of interrupt registers for a domain */ -#define DOMAIN_NR_RANKS(d) (((d)->arch.vgic.nr_lines+31)/32) +#define DOMAIN_NR_RANKS(d) (((d)->arch.vgic.nr_spis+31)/32) #define vgic_lock(v) spin_lock_irq(&(v)->domain->arch.vgic.lock) #define vgic_unlock(v) spin_unlock_irq(&(v)->domain->arch.vgic.lock) @@ -175,6 +175,8 @@ enum gic_sgi_mode; */ #define REG_RANK_INDEX(b, n, s) ((((n) >> s) & ((b)-1)) % 32) +#define vgic_num_irqs(d) ((d)->arch.vgic.nr_spis + 32) + extern int domain_vgic_init(struct domain *d); extern void domain_vgic_free(struct domain *d); extern int vcpu_vgic_init(struct vcpu *v); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jan 23 00:46:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:46:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNv-0005sN-DK; Fri, 23 Jan 2015 00:46:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNu-0005s5-0w for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:02 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 9B/88-28786-9C991C45; Fri, 23 Jan 2015 00:46:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1421973959!22349544!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14475 invoked from network); 23 Jan 2015 00:46:00 -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; 23 Jan 2015 00:46:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNr-0007ah-ND for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESNr-0003hS-Ld for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:59 +0000 Date: Fri, 23 Jan 2015 00:45:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/configure: Check if Glib is present only when building QEMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 499cb19b120a6ed4a2a4917b7c9e04170bf7c347 Author: Julien Grall AuthorDate: Thu Jan 15 21:06:17 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 19 16:07:41 2015 +0000 tools/configure: Check if Glib is present only when building QEMU Signed-off-by: Julien Grall Acked-by: Ian Campbell Acked-by: Ian Jackson [ ijc -- reran autogen.sh ] --- tools/configure | 5 +++++ tools/configure.ac | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/configure b/tools/configure index 1cab804..7131d63 100755 --- a/tools/configure +++ b/tools/configure @@ -7462,6 +7462,7 @@ fi + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -7575,6 +7576,8 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi fi +if test "x$qemu_xen" = "xy"; then : + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib" >&5 @@ -7667,6 +7670,8 @@ $as_echo "yes" >&6; } fi +fi + # Extract the first word of "wget", so it can be a program name with args. set dummy wget; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff --git a/tools/configure.ac b/tools/configure.ac index 24fdfc3..fd405c5 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -323,7 +323,11 @@ i[[3456]]86|x86_64) esac AX_CHECK_UUID AX_CHECK_CURSES + +dnl Glib 2.0 is only required when QEMU is built +AS_IF([test "x$qemu_xen" = "xy"], [ PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12]) +]) AX_CHECK_FETCHER # Checks for libraries. -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:46:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:46:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNv-0005sN-DK; Fri, 23 Jan 2015 00:46:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNu-0005s5-0w for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:02 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 9B/88-28786-9C991C45; Fri, 23 Jan 2015 00:46:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1421973959!22349544!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14475 invoked from network); 23 Jan 2015 00:46:00 -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; 23 Jan 2015 00:46:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESNr-0007ah-ND for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESNr-0003hS-Ld for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:45:59 +0000 Date: Fri, 23 Jan 2015 00:45:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/configure: Check if Glib is present only when building QEMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 499cb19b120a6ed4a2a4917b7c9e04170bf7c347 Author: Julien Grall AuthorDate: Thu Jan 15 21:06:17 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 19 16:07:41 2015 +0000 tools/configure: Check if Glib is present only when building QEMU Signed-off-by: Julien Grall Acked-by: Ian Campbell Acked-by: Ian Jackson [ ijc -- reran autogen.sh ] --- tools/configure | 5 +++++ tools/configure.ac | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/configure b/tools/configure index 1cab804..7131d63 100755 --- a/tools/configure +++ b/tools/configure @@ -7462,6 +7462,7 @@ fi + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -7575,6 +7576,8 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi fi +if test "x$qemu_xen" = "xy"; then : + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib" >&5 @@ -7667,6 +7670,8 @@ $as_echo "yes" >&6; } fi +fi + # Extract the first word of "wget", so it can be a program name with args. set dummy wget; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff --git a/tools/configure.ac b/tools/configure.ac index 24fdfc3..fd405c5 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -323,7 +323,11 @@ i[[3456]]86|x86_64) esac AX_CHECK_UUID AX_CHECK_CURSES + +dnl Glib 2.0 is only required when QEMU is built +AS_IF([test "x$qemu_xen" = "xy"], [ PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12]) +]) AX_CHECK_FETCHER # Checks for libraries. -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:46:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:46:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESO6-0005uU-Ft; Fri, 23 Jan 2015 00:46:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESO4-0005uE-Jk for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:12 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 91/6D-21543-4D991C45; Fri, 23 Jan 2015 00:46:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1421973970!23365991!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19049 invoked from network); 23 Jan 2015 00:46:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jan 2015 00:46:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESO1-0007bG-T1 for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESO1-0003hz-Rc for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:09 +0000 Date: Fri, 23 Jan 2015 00:46:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/configure: Check if pixman is present on the system when building QEMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be03989599dcaa75c781e9955b7663f0097a6f60 Author: Julien Grall AuthorDate: Thu Jan 15 21:06:18 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 19 16:09:57 2015 +0000 tools/configure: Check if pixman is present on the system when building QEMU QEMU upstream requires the use of pixman. When pixman is not present the system, the configure of QEMU will fail with: ERROR: pixman not present. Your options: (1) Preferred: Install the pixman devel package (any recent distro should have packages as Xorg needs pixman too). (2) Fetch the pixman submodule, using: git submodule update --init pixman I think we can use by default the version on the system. So check it a Xen configuration time to avoid a build issue later. Signed-off-by: Julien Grall Acked-by: Ian Campbell Acked-by: Ian Jackson [ ijc -- reran autogen.sh, adjusted comment ] --- tools/configure | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/configure.ac | 3 +- 2 files changed, 100 insertions(+), 1 deletions(-) diff --git a/tools/configure b/tools/configure index 7131d63..f9f560a 100755 --- a/tools/configure +++ b/tools/configure @@ -644,6 +644,8 @@ zlib FETCHER FTP WGET +pixman_LIBS +pixman_CFLAGS glib_LIBS glib_CFLAGS PKG_CONFIG_LIBDIR @@ -833,6 +835,8 @@ PKG_CONFIG_PATH PKG_CONFIG_LIBDIR glib_CFLAGS glib_LIBS +pixman_CFLAGS +pixman_LIBS LIBNL3_CFLAGS LIBNL3_LIBS SYSTEMD_CFLAGS @@ -1548,6 +1552,9 @@ Some influential environment variables: path overriding pkg-config's built-in search path glib_CFLAGS C compiler flags for glib, overriding pkg-config glib_LIBS linker flags for glib, overriding pkg-config + pixman_CFLAGS + C compiler flags for pixman, overriding pkg-config + pixman_LIBS linker flags for pixman, overriding pkg-config LIBNL3_CFLAGS C compiler flags for LIBNL3, overriding pkg-config LIBNL3_LIBS linker flags for LIBNL3, overriding pkg-config @@ -7670,6 +7677,97 @@ $as_echo "yes" >&6; } fi +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pixman" >&5 +$as_echo_n "checking for pixman... " >&6; } + +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 + 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` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +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 + 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` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +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` + else + pixman_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pixman-1" 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: + +$pixman_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables pixman_CFLAGS +and pixman_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables pixman_CFLAGS +and pixman_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + pixman_CFLAGS=$pkg_cv_pixman_CFLAGS + pixman_LIBS=$pkg_cv_pixman_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + fi # Extract the first word of "wget", so it can be a program name with args. diff --git a/tools/configure.ac b/tools/configure.ac index fd405c5..113285d 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -324,9 +324,10 @@ esac AX_CHECK_UUID AX_CHECK_CURSES -dnl Glib 2.0 is only required when QEMU is built +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) ]) 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 Fri Jan 23 00:46:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:46:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESO6-0005uU-Ft; Fri, 23 Jan 2015 00:46:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESO4-0005uE-Jk for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:12 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 91/6D-21543-4D991C45; Fri, 23 Jan 2015 00:46:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1421973970!23365991!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19049 invoked from network); 23 Jan 2015 00:46:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jan 2015 00:46:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESO1-0007bG-T1 for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESO1-0003hz-Rc for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:09 +0000 Date: Fri, 23 Jan 2015 00:46:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/configure: Check if pixman is present on the system when building QEMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be03989599dcaa75c781e9955b7663f0097a6f60 Author: Julien Grall AuthorDate: Thu Jan 15 21:06:18 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 19 16:09:57 2015 +0000 tools/configure: Check if pixman is present on the system when building QEMU QEMU upstream requires the use of pixman. When pixman is not present the system, the configure of QEMU will fail with: ERROR: pixman not present. Your options: (1) Preferred: Install the pixman devel package (any recent distro should have packages as Xorg needs pixman too). (2) Fetch the pixman submodule, using: git submodule update --init pixman I think we can use by default the version on the system. So check it a Xen configuration time to avoid a build issue later. Signed-off-by: Julien Grall Acked-by: Ian Campbell Acked-by: Ian Jackson [ ijc -- reran autogen.sh, adjusted comment ] --- tools/configure | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/configure.ac | 3 +- 2 files changed, 100 insertions(+), 1 deletions(-) diff --git a/tools/configure b/tools/configure index 7131d63..f9f560a 100755 --- a/tools/configure +++ b/tools/configure @@ -644,6 +644,8 @@ zlib FETCHER FTP WGET +pixman_LIBS +pixman_CFLAGS glib_LIBS glib_CFLAGS PKG_CONFIG_LIBDIR @@ -833,6 +835,8 @@ PKG_CONFIG_PATH PKG_CONFIG_LIBDIR glib_CFLAGS glib_LIBS +pixman_CFLAGS +pixman_LIBS LIBNL3_CFLAGS LIBNL3_LIBS SYSTEMD_CFLAGS @@ -1548,6 +1552,9 @@ Some influential environment variables: path overriding pkg-config's built-in search path glib_CFLAGS C compiler flags for glib, overriding pkg-config glib_LIBS linker flags for glib, overriding pkg-config + pixman_CFLAGS + C compiler flags for pixman, overriding pkg-config + pixman_LIBS linker flags for pixman, overriding pkg-config LIBNL3_CFLAGS C compiler flags for LIBNL3, overriding pkg-config LIBNL3_LIBS linker flags for LIBNL3, overriding pkg-config @@ -7670,6 +7677,97 @@ $as_echo "yes" >&6; } fi +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pixman" >&5 +$as_echo_n "checking for pixman... " >&6; } + +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 + 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` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +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 + 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` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +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` + else + pixman_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pixman-1" 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: + +$pixman_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables pixman_CFLAGS +and pixman_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables pixman_CFLAGS +and pixman_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + pixman_CFLAGS=$pkg_cv_pixman_CFLAGS + pixman_LIBS=$pkg_cv_pixman_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + fi # Extract the first word of "wget", so it can be a program name with args. diff --git a/tools/configure.ac b/tools/configure.ac index fd405c5..113285d 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -324,9 +324,10 @@ esac AX_CHECK_UUID AX_CHECK_CURSES -dnl Glib 2.0 is only required when QEMU is built +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) ]) 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 Fri Jan 23 00:46:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:46: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 1YESOF-0005wB-IR; Fri, 23 Jan 2015 00:46:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOE-0005vy-K1 for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:22 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 87/87-05177-ED991C45; Fri, 23 Jan 2015 00:46:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1421973980!22366040!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14134 invoked from network); 23 Jan 2015 00:46:21 -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; 23 Jan 2015 00:46:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOC-0007bQ-4h for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESOC-0003j5-2V for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:20 +0000 Date: Fri, 23 Jan 2015 00:46:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: check HVM direct boot parameters X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0e560dfc48e7df189742525dd12a1ef691188a3b Author: Wei Liu AuthorDate: Mon Jan 19 16:13:59 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 19 17:21:27 2015 +0000 libxl: check HVM direct boot parameters We should honour -initrd and -append iff -kernel is specified, because that's how QEMU works. Check direct boot parameters in libxl__domain_build_info_setdefault. Return failure if kernel is missing while ramdisk (-initrd) and / or cmdline (-append) is present. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Stefano Stabellini Cc: Chunyan Liu Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 6f87d1c..98687bd 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -170,6 +170,14 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, break; default:abort(); } + + /* Check HVM direct boot parameters, we should honour ->ramdisk and + * ->cmdline iff ->kernel is set. + */ + if (!b_info->kernel && (b_info->ramdisk || b_info->cmdline)) { + LOG(ERROR, "direct boot parameters specified but kernel missing"); + return ERROR_INVAL; + } } if (b_info->type == LIBXL_DOMAIN_TYPE_HVM && -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:46:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:46: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 1YESOF-0005wB-IR; Fri, 23 Jan 2015 00:46:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOE-0005vy-K1 for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:22 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 87/87-05177-ED991C45; Fri, 23 Jan 2015 00:46:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1421973980!22366040!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14134 invoked from network); 23 Jan 2015 00:46:21 -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; 23 Jan 2015 00:46:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOC-0007bQ-4h for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESOC-0003j5-2V for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:20 +0000 Date: Fri, 23 Jan 2015 00:46:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: check HVM direct boot parameters X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0e560dfc48e7df189742525dd12a1ef691188a3b Author: Wei Liu AuthorDate: Mon Jan 19 16:13:59 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 19 17:21:27 2015 +0000 libxl: check HVM direct boot parameters We should honour -initrd and -append iff -kernel is specified, because that's how QEMU works. Check direct boot parameters in libxl__domain_build_info_setdefault. Return failure if kernel is missing while ramdisk (-initrd) and / or cmdline (-append) is present. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Stefano Stabellini Cc: Chunyan Liu Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 6f87d1c..98687bd 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -170,6 +170,14 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, break; default:abort(); } + + /* Check HVM direct boot parameters, we should honour ->ramdisk and + * ->cmdline iff ->kernel is set. + */ + if (!b_info->kernel && (b_info->ramdisk || b_info->cmdline)) { + LOG(ERROR, "direct boot parameters specified but kernel missing"); + return ERROR_INVAL; + } } if (b_info->type == LIBXL_DOMAIN_TYPE_HVM && -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:46:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:46:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOP-0005xr-L3; Fri, 23 Jan 2015 00:46:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOO-0005xd-OP for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:32 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 67/D1-15499-8E991C45; Fri, 23 Jan 2015 00:46:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1421973990!17751100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27567 invoked from network); 23 Jan 2015 00:46: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; 23 Jan 2015 00:46:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOM-0007bY-ED for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESOM-0003jS-C6 for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:30 +0000 Date: Fri, 23 Jan 2015 00:46:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Avoid returning empty path from libxl_console_get_tty X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 260dfd39681b4e9b236e1e211b09dce8c5408e91 Author: Anthony PERARD AuthorDate: Thu Jan 15 17:55:56 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 19 17:21:31 2015 +0000 libxl: Avoid returning empty path from libxl_console_get_tty This could happen if xenconsoled have not populate the xenstore key yet. Signed-off-by: Anthony PERARD Acked-by: Ian Campbell --- tools/libxl/libxl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 11cf0e1..82227e8 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1734,7 +1734,7 @@ int libxl_console_get_tty(libxl_ctx *ctx, uint32_t domid, int cons_num, } tty = libxl__xs_read(gc, XBT_NULL, tty_path); - if (!tty) { + if (!tty || tty[0] == '\0') { LOGE(ERROR,"unable to read console tty path `%s'",tty_path); rc = ERROR_FAIL; 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 Jan 23 00:46:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:46:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOP-0005xr-L3; Fri, 23 Jan 2015 00:46:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOO-0005xd-OP for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:32 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 67/D1-15499-8E991C45; Fri, 23 Jan 2015 00:46:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1421973990!17751100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27567 invoked from network); 23 Jan 2015 00:46: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; 23 Jan 2015 00:46:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOM-0007bY-ED for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESOM-0003jS-C6 for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:30 +0000 Date: Fri, 23 Jan 2015 00:46:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Avoid returning empty path from libxl_console_get_tty X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 260dfd39681b4e9b236e1e211b09dce8c5408e91 Author: Anthony PERARD AuthorDate: Thu Jan 15 17:55:56 2015 +0000 Commit: Ian Campbell CommitDate: Mon Jan 19 17:21:31 2015 +0000 libxl: Avoid returning empty path from libxl_console_get_tty This could happen if xenconsoled have not populate the xenstore key yet. Signed-off-by: Anthony PERARD Acked-by: Ian Campbell --- tools/libxl/libxl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 11cf0e1..82227e8 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1734,7 +1734,7 @@ int libxl_console_get_tty(libxl_ctx *ctx, uint32_t domid, int cons_num, } tty = libxl__xs_read(gc, XBT_NULL, tty_path); - if (!tty) { + if (!tty || tty[0] == '\0') { LOGE(ERROR,"unable to read console tty path `%s'",tty_path); rc = ERROR_FAIL; 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 Jan 23 00:46:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:46: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 1YESOZ-0005zO-No; Fri, 23 Jan 2015 00:46:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOY-0005zD-SJ for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:43 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 03/D7-10078-2F991C45; Fri, 23 Jan 2015 00:46:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1421974000!23302691!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32554 invoked from network); 23 Jan 2015 00:46:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jan 2015 00:46:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOW-0007be-Lj for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESOW-0003jr-Ku for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:40 +0000 Date: Fri, 23 Jan 2015 00:46:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xfree() can tolerate NULL pointers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a19ffcaf9e768c7b1f8303b6bca0bb0d8c4609d9 Author: Andrew Cooper AuthorDate: Tue Jan 20 10:40:32 2015 +0100 Commit: Jan Beulich CommitDate: Tue Jan 20 10:40:32 2015 +0100 xfree() can tolerate NULL pointers Replace instances of "if ( p ) xfree(p)" with just "xfree(p)" Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- xen/arch/x86/cpu/mcheck/mctelem.c | 3 +-- xen/arch/x86/mm/hap/hap.c | 3 +-- xen/common/kexec.c | 3 +-- xen/common/sched_credit2.c | 3 +-- xen/common/sched_sedf.c | 3 +-- xen/common/schedule.c | 5 +---- xen/xsm/flask/ss/policydb.c | 8 ++++---- 7 files changed, 10 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c b/xen/arch/x86/cpu/mcheck/mctelem.c index b8da465..95e83c5 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.c +++ b/xen/arch/x86/cpu/mcheck/mctelem.c @@ -260,8 +260,7 @@ void __init mctelem_init(unsigned int datasz) if ((mctctl.mctc_elems = xmalloc_array(struct mctelem_ent, MC_NENT)) == NULL || (datarr = xmalloc_bytes(MC_NENT * datasz)) == NULL) { - if (mctctl.mctc_elems) - xfree(mctctl.mctc_elems); + xfree(mctctl.mctc_elems); printk("Allocations for MCA telemetry failed\n"); return; } diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index abf3d7a..97f5168 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -168,8 +168,7 @@ int hap_track_dirty_vram(struct domain *d, p2m_ram_logdirty, p2m_ram_rw); } out: - if ( dirty_bitmap ) - xfree(dirty_bitmap); + xfree(dirty_bitmap); return rc; } diff --git a/xen/common/kexec.c b/xen/common/kexec.c index c579ac8..05d5de7 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -454,8 +454,7 @@ static int kexec_init_cpu_notes(const unsigned long cpu) spin_unlock(&crash_notes_lock); /* Always return ok, because whether we successfully allocated or not, * another CPU has successfully allocated. */ - if ( note ) - xfree(note); + xfree(note); } else { diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 1ca521b..ad0a5d4 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -2138,8 +2138,7 @@ csched2_deinit(const struct scheduler *ops) struct csched2_private *prv; prv = CSCHED2_PRIV(ops); - if ( prv != NULL ) - xfree(prv); + xfree(prv); } diff --git a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c index 7c80bad..c4f4b60 100644 --- a/xen/common/sched_sedf.c +++ b/xen/common/sched_sedf.c @@ -729,8 +729,7 @@ static void sedf_deinit(const struct scheduler *ops) struct sedf_priv_info *prv; prv = SEDF_PRIV(ops); - if ( prv != NULL ) - xfree(prv); + xfree(prv); } diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 6285a6e..b73177f 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -260,10 +260,7 @@ int sched_move_domain(struct domain *d, struct cpupool *c) if ( vcpu_priv[v->vcpu_id] == NULL ) { for_each_vcpu ( d, v ) - { - if ( vcpu_priv[v->vcpu_id] != NULL ) - xfree(vcpu_priv[v->vcpu_id]); - } + xfree(vcpu_priv[v->vcpu_id]); xfree(vcpu_priv); SCHED_OP(c->sched, free_domdata, domdata); return -ENOMEM; diff --git a/xen/xsm/flask/ss/policydb.c b/xen/xsm/flask/ss/policydb.c index 50b2c78..b88ea56 100644 --- a/xen/xsm/flask/ss/policydb.c +++ b/xen/xsm/flask/ss/policydb.c @@ -682,17 +682,17 @@ void policydb_destroy(struct policydb *p) for ( tr = p->role_tr; tr; tr = tr->next ) { - if ( ltr ) xfree(ltr); + xfree(ltr); ltr = tr; } - if ( ltr ) xfree(ltr); + xfree(ltr); for ( ra = p->role_allow; ra; ra = ra -> next ) { - if ( lra ) xfree(lra); + xfree(lra); lra = ra; } - if ( lra ) xfree(lra); + xfree(lra); for ( rt = p->range_tr; rt; rt = rt -> next ) { -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:46:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:46: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 1YESOZ-0005zO-No; Fri, 23 Jan 2015 00:46:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOY-0005zD-SJ for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:43 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 03/D7-10078-2F991C45; Fri, 23 Jan 2015 00:46:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1421974000!23302691!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32554 invoked from network); 23 Jan 2015 00:46:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jan 2015 00:46:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOW-0007be-Lj for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESOW-0003jr-Ku for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:40 +0000 Date: Fri, 23 Jan 2015 00:46:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xfree() can tolerate NULL pointers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a19ffcaf9e768c7b1f8303b6bca0bb0d8c4609d9 Author: Andrew Cooper AuthorDate: Tue Jan 20 10:40:32 2015 +0100 Commit: Jan Beulich CommitDate: Tue Jan 20 10:40:32 2015 +0100 xfree() can tolerate NULL pointers Replace instances of "if ( p ) xfree(p)" with just "xfree(p)" Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- xen/arch/x86/cpu/mcheck/mctelem.c | 3 +-- xen/arch/x86/mm/hap/hap.c | 3 +-- xen/common/kexec.c | 3 +-- xen/common/sched_credit2.c | 3 +-- xen/common/sched_sedf.c | 3 +-- xen/common/schedule.c | 5 +---- xen/xsm/flask/ss/policydb.c | 8 ++++---- 7 files changed, 10 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c b/xen/arch/x86/cpu/mcheck/mctelem.c index b8da465..95e83c5 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.c +++ b/xen/arch/x86/cpu/mcheck/mctelem.c @@ -260,8 +260,7 @@ void __init mctelem_init(unsigned int datasz) if ((mctctl.mctc_elems = xmalloc_array(struct mctelem_ent, MC_NENT)) == NULL || (datarr = xmalloc_bytes(MC_NENT * datasz)) == NULL) { - if (mctctl.mctc_elems) - xfree(mctctl.mctc_elems); + xfree(mctctl.mctc_elems); printk("Allocations for MCA telemetry failed\n"); return; } diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index abf3d7a..97f5168 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -168,8 +168,7 @@ int hap_track_dirty_vram(struct domain *d, p2m_ram_logdirty, p2m_ram_rw); } out: - if ( dirty_bitmap ) - xfree(dirty_bitmap); + xfree(dirty_bitmap); return rc; } diff --git a/xen/common/kexec.c b/xen/common/kexec.c index c579ac8..05d5de7 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -454,8 +454,7 @@ static int kexec_init_cpu_notes(const unsigned long cpu) spin_unlock(&crash_notes_lock); /* Always return ok, because whether we successfully allocated or not, * another CPU has successfully allocated. */ - if ( note ) - xfree(note); + xfree(note); } else { diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 1ca521b..ad0a5d4 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -2138,8 +2138,7 @@ csched2_deinit(const struct scheduler *ops) struct csched2_private *prv; prv = CSCHED2_PRIV(ops); - if ( prv != NULL ) - xfree(prv); + xfree(prv); } diff --git a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c index 7c80bad..c4f4b60 100644 --- a/xen/common/sched_sedf.c +++ b/xen/common/sched_sedf.c @@ -729,8 +729,7 @@ static void sedf_deinit(const struct scheduler *ops) struct sedf_priv_info *prv; prv = SEDF_PRIV(ops); - if ( prv != NULL ) - xfree(prv); + xfree(prv); } diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 6285a6e..b73177f 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -260,10 +260,7 @@ int sched_move_domain(struct domain *d, struct cpupool *c) if ( vcpu_priv[v->vcpu_id] == NULL ) { for_each_vcpu ( d, v ) - { - if ( vcpu_priv[v->vcpu_id] != NULL ) - xfree(vcpu_priv[v->vcpu_id]); - } + xfree(vcpu_priv[v->vcpu_id]); xfree(vcpu_priv); SCHED_OP(c->sched, free_domdata, domdata); return -ENOMEM; diff --git a/xen/xsm/flask/ss/policydb.c b/xen/xsm/flask/ss/policydb.c index 50b2c78..b88ea56 100644 --- a/xen/xsm/flask/ss/policydb.c +++ b/xen/xsm/flask/ss/policydb.c @@ -682,17 +682,17 @@ void policydb_destroy(struct policydb *p) for ( tr = p->role_tr; tr; tr = tr->next ) { - if ( ltr ) xfree(ltr); + xfree(ltr); ltr = tr; } - if ( ltr ) xfree(ltr); + xfree(ltr); for ( ra = p->role_allow; ra; ra = ra -> next ) { - if ( lra ) xfree(lra); + xfree(lra); lra = ra; } - if ( lra ) xfree(lra); + xfree(lra); for ( rt = p->range_tr; rt; rt = rt -> next ) { -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:46:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:46:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOk-000613-RV; Fri, 23 Jan 2015 00:46:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOj-00060o-DO for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:53 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 8F/6A-18244-CF991C45; Fri, 23 Jan 2015 00:46:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1421974011!22366086!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14857 invoked from network); 23 Jan 2015 00:46:51 -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; 23 Jan 2015 00:46:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOg-0007bk-Rv for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESOg-0003kJ-Pw for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:50 +0000 Date: Fri, 23 Jan 2015 00:46:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/cpuid: correct parameter types for cpuid_count() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit edfd64ea799cd4d29c2efc2d5961ee68ca5fc022 Author: Andrew Cooper AuthorDate: Tue Jan 20 10:41:18 2015 +0100 Commit: Jan Beulich CommitDate: Tue Jan 20 10:41:18 2015 +0100 x86/cpuid: correct parameter types for cpuid_count() About half of the cpuid space has the top bit of op set, and op it always specified with unsigned integers. There are no problematic uses in tree at the moment. Signed-off-by: Andrew Cooper --- xen/include/asm-x86/processor.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index f98eaf5..20eade6 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -234,8 +234,8 @@ unsigned int apicid_to_socket(unsigned int); /* Some CPUID calls want 'count' to be placed in ecx */ static inline void cpuid_count( - int op, - int count, + unsigned int op, + unsigned int count, unsigned int *eax, unsigned int *ebx, unsigned int *ecx, -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:46:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:46:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOk-000613-RV; Fri, 23 Jan 2015 00:46:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOj-00060o-DO for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:53 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 8F/6A-18244-CF991C45; Fri, 23 Jan 2015 00:46:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1421974011!22366086!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14857 invoked from network); 23 Jan 2015 00:46:51 -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; 23 Jan 2015 00:46:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOg-0007bk-Rv for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESOg-0003kJ-Pw for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:46:50 +0000 Date: Fri, 23 Jan 2015 00:46:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/cpuid: correct parameter types for cpuid_count() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit edfd64ea799cd4d29c2efc2d5961ee68ca5fc022 Author: Andrew Cooper AuthorDate: Tue Jan 20 10:41:18 2015 +0100 Commit: Jan Beulich CommitDate: Tue Jan 20 10:41:18 2015 +0100 x86/cpuid: correct parameter types for cpuid_count() About half of the cpuid space has the top bit of op set, and op it always specified with unsigned integers. There are no problematic uses in tree at the moment. Signed-off-by: Andrew Cooper --- xen/include/asm-x86/processor.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index f98eaf5..20eade6 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -234,8 +234,8 @@ unsigned int apicid_to_socket(unsigned int); /* Some CPUID calls want 'count' to be placed in ecx */ static inline void cpuid_count( - int op, - int count, + unsigned int op, + unsigned int count, unsigned int *eax, unsigned int *ebx, unsigned int *ecx, -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:47:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:47: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 1YESOt-00062W-U0; Fri, 23 Jan 2015 00:47:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOt-00062F-BD for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:03 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id DA/0E-21543-60A91C45; Fri, 23 Jan 2015 00:47:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1421974021!23359064!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6320 invoked from network); 23 Jan 2015 00:47:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jan 2015 00:47:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOr-0007bt-2Z for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESOr-0003kg-1X for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:01 +0000 Date: Fri, 23 Jan 2015 00:47:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm/evtchn: never pretend to have successfully created a Xen event channel X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09aa4759faa29c1fe735266de4c79f17329bd67b Author: Andrew Cooper AuthorDate: Tue Jan 20 10:42:26 2015 +0100 Commit: Jan Beulich CommitDate: Tue Jan 20 10:42:26 2015 +0100 xsm/evtchn: never pretend to have successfully created a Xen event channel Xen event channels are not internal resources. They still have one end in a domain, and are created at the request of privileged domains. This logic which "successfully" creates a Xen event channel opens up undesirable failure cases with ill-specified XSM policies. If a domain is permitted to create ioreq servers or memevent listeners, but not to create event channels, the ioreq/memevent creation will succeed but attempting to bind the returned event channel will fail without any indication of a permission error. Signed-off-by: Andrew Cooper Acked-by: Daniel De Graaf --- xen/common/event_channel.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 18a76af..c0fbcea 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -1148,21 +1148,25 @@ int alloc_unbound_xen_event_channel( spin_lock(&d->event_lock); - if ( (port = get_free_port(d)) < 0 ) + rc = get_free_port(d); + if ( rc < 0 ) goto out; + port = rc; chn = evtchn_from_port(d, port); rc = xsm_evtchn_unbound(XSM_TARGET, d, chn, remote_domid); + if ( rc ) + goto out; chn->state = ECS_UNBOUND; chn->xen_consumer = get_xen_consumer(notification_fn); chn->notify_vcpu_id = local_vcpu->vcpu_id; - chn->u.unbound.remote_domid = !rc ? remote_domid : DOMID_INVALID; + chn->u.unbound.remote_domid = remote_domid; out: spin_unlock(&d->event_lock); - return port; + return rc < 0 ? rc : port; } -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:47:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:47: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 1YESOt-00062W-U0; Fri, 23 Jan 2015 00:47:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOt-00062F-BD for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:03 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id DA/0E-21543-60A91C45; Fri, 23 Jan 2015 00:47:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1421974021!23359064!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6320 invoked from network); 23 Jan 2015 00:47:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jan 2015 00:47:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESOr-0007bt-2Z for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESOr-0003kg-1X for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:01 +0000 Date: Fri, 23 Jan 2015 00:47:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm/evtchn: never pretend to have successfully created a Xen event channel X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09aa4759faa29c1fe735266de4c79f17329bd67b Author: Andrew Cooper AuthorDate: Tue Jan 20 10:42:26 2015 +0100 Commit: Jan Beulich CommitDate: Tue Jan 20 10:42:26 2015 +0100 xsm/evtchn: never pretend to have successfully created a Xen event channel Xen event channels are not internal resources. They still have one end in a domain, and are created at the request of privileged domains. This logic which "successfully" creates a Xen event channel opens up undesirable failure cases with ill-specified XSM policies. If a domain is permitted to create ioreq servers or memevent listeners, but not to create event channels, the ioreq/memevent creation will succeed but attempting to bind the returned event channel will fail without any indication of a permission error. Signed-off-by: Andrew Cooper Acked-by: Daniel De Graaf --- xen/common/event_channel.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 18a76af..c0fbcea 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -1148,21 +1148,25 @@ int alloc_unbound_xen_event_channel( spin_lock(&d->event_lock); - if ( (port = get_free_port(d)) < 0 ) + rc = get_free_port(d); + if ( rc < 0 ) goto out; + port = rc; chn = evtchn_from_port(d, port); rc = xsm_evtchn_unbound(XSM_TARGET, d, chn, remote_domid); + if ( rc ) + goto out; chn->state = ECS_UNBOUND; chn->xen_consumer = get_xen_consumer(notification_fn); chn->notify_vcpu_id = local_vcpu->vcpu_id; - chn->u.unbound.remote_domid = !rc ? remote_domid : DOMID_INVALID; + chn->u.unbound.remote_domid = remote_domid; out: spin_unlock(&d->event_lock); - return port; + return rc < 0 ? rc : port; } -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:47:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00: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 1YESP5-00064e-2r; Fri, 23 Jan 2015 00: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 1YESP4-00064V-4v for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:14 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 32/FC-05618-11A91C45; Fri, 23 Jan 2015 00:47:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1421974031!21721401!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31359 invoked from network); 23 Jan 2015 00:47:12 -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; 23 Jan 2015 00:47:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESP1-0007cR-8v for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESP1-0003lD-7P for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:11 +0000 Date: Fri, 23 Jan 2015 00:47:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] physdev: hide compatibility definitions for new enough interface version X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7991cca9b35ebf6fc6b12a64a2cf481e7c015c18 Author: Jan Beulich AuthorDate: Tue Jan 20 10:43:52 2015 +0100 Commit: Jan Beulich CommitDate: Tue Jan 20 10:43:52 2015 +0100 physdev: hide compatibility definitions for new enough interface version There's no point in continuing to expose those. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/include/public/physdev.h | 5 ++++- xen/include/public/xen-compat.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/include/public/physdev.h b/xen/include/public/physdev.h index d547928..2683719 100644 --- a/xen/include/public/physdev.h +++ b/xen/include/public/physdev.h @@ -344,9 +344,11 @@ DEFINE_XEN_GUEST_HANDLE(physdev_dbgp_op_t); */ #define PHYSDEVOP_IRQ_UNMASK_NOTIFY 4 +#if __XEN_INTERFACE_VERSION__ < 0x00040600 /* * These all-capitals physdev operation names are superceded by the new names - * (defined above) since interface version 0x00030202. + * (defined above) since interface version 0x00030202. The guard above was + * added post-4.5 only though and hence shouldn't check for 0x00030202. */ #define PHYSDEVOP_IRQ_STATUS_QUERY PHYSDEVOP_irq_status_query #define PHYSDEVOP_SET_IOPL PHYSDEVOP_set_iopl @@ -357,6 +359,7 @@ DEFINE_XEN_GUEST_HANDLE(physdev_dbgp_op_t); #define PHYSDEVOP_FREE_VECTOR PHYSDEVOP_free_irq_vector #define PHYSDEVOP_IRQ_NEEDS_UNMASK_NOTIFY XENIRQSTAT_needs_eoi #define PHYSDEVOP_IRQ_SHARED XENIRQSTAT_shared +#endif #if __XEN_INTERFACE_VERSION__ < 0x00040200 #define PHYSDEVOP_pirq_eoi_gmfn PHYSDEVOP_pirq_eoi_gmfn_v1 diff --git a/xen/include/public/xen-compat.h b/xen/include/public/xen-compat.h index 3eb80a0..1e62dc1 100644 --- a/xen/include/public/xen-compat.h +++ b/xen/include/public/xen-compat.h @@ -27,7 +27,7 @@ #ifndef __XEN_PUBLIC_XEN_COMPAT_H__ #define __XEN_PUBLIC_XEN_COMPAT_H__ -#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040400 +#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040600 #if defined(__XEN__) || defined(__XEN_TOOLS__) /* Xen is built with matching headers and implements the latest interface. */ -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:47:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00: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 1YESP5-00064e-2r; Fri, 23 Jan 2015 00: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 1YESP4-00064V-4v for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:14 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 32/FC-05618-11A91C45; Fri, 23 Jan 2015 00:47:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1421974031!21721401!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31359 invoked from network); 23 Jan 2015 00:47:12 -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; 23 Jan 2015 00:47:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESP1-0007cR-8v for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESP1-0003lD-7P for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:11 +0000 Date: Fri, 23 Jan 2015 00:47:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] physdev: hide compatibility definitions for new enough interface version X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7991cca9b35ebf6fc6b12a64a2cf481e7c015c18 Author: Jan Beulich AuthorDate: Tue Jan 20 10:43:52 2015 +0100 Commit: Jan Beulich CommitDate: Tue Jan 20 10:43:52 2015 +0100 physdev: hide compatibility definitions for new enough interface version There's no point in continuing to expose those. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/include/public/physdev.h | 5 ++++- xen/include/public/xen-compat.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/include/public/physdev.h b/xen/include/public/physdev.h index d547928..2683719 100644 --- a/xen/include/public/physdev.h +++ b/xen/include/public/physdev.h @@ -344,9 +344,11 @@ DEFINE_XEN_GUEST_HANDLE(physdev_dbgp_op_t); */ #define PHYSDEVOP_IRQ_UNMASK_NOTIFY 4 +#if __XEN_INTERFACE_VERSION__ < 0x00040600 /* * These all-capitals physdev operation names are superceded by the new names - * (defined above) since interface version 0x00030202. + * (defined above) since interface version 0x00030202. The guard above was + * added post-4.5 only though and hence shouldn't check for 0x00030202. */ #define PHYSDEVOP_IRQ_STATUS_QUERY PHYSDEVOP_irq_status_query #define PHYSDEVOP_SET_IOPL PHYSDEVOP_set_iopl @@ -357,6 +359,7 @@ DEFINE_XEN_GUEST_HANDLE(physdev_dbgp_op_t); #define PHYSDEVOP_FREE_VECTOR PHYSDEVOP_free_irq_vector #define PHYSDEVOP_IRQ_NEEDS_UNMASK_NOTIFY XENIRQSTAT_needs_eoi #define PHYSDEVOP_IRQ_SHARED XENIRQSTAT_shared +#endif #if __XEN_INTERFACE_VERSION__ < 0x00040200 #define PHYSDEVOP_pirq_eoi_gmfn PHYSDEVOP_pirq_eoi_gmfn_v1 diff --git a/xen/include/public/xen-compat.h b/xen/include/public/xen-compat.h index 3eb80a0..1e62dc1 100644 --- a/xen/include/public/xen-compat.h +++ b/xen/include/public/xen-compat.h @@ -27,7 +27,7 @@ #ifndef __XEN_PUBLIC_XEN_COMPAT_H__ #define __XEN_PUBLIC_XEN_COMPAT_H__ -#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040400 +#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040600 #if defined(__XEN__) || defined(__XEN_TOOLS__) /* Xen is built with matching headers and implements the latest interface. */ -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:47:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:47:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESPF-00069D-5W; Fri, 23 Jan 2015 00:47:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESPE-00068u-6X for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:24 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 73/CB-13952-B1A91C45; Fri, 23 Jan 2015 00:47:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1421974041!17751180!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30017 invoked from network); 23 Jan 2015 00:47:22 -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; 23 Jan 2015 00:47:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESPB-0007cX-IH for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESPB-0003m5-Gk for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:21 +0000 Date: Fri, 23 Jan 2015 00:47:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: slightly simplify PHYSDEVOP_pirq_eoi_gmfn_v* 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 0e5e324db9efcbf49635704884ecf545ee7ec84a Author: Jan Beulich AuthorDate: Tue Jan 20 10:45:01 2015 +0100 Commit: Jan Beulich CommitDate: Tue Jan 20 10:45:01 2015 +0100 x86: slightly simplify PHYSDEVOP_pirq_eoi_gmfn_v* handling We don't really need the MFN in more than one place (after dropping mfn_to_page() translations where we know the result already), so no need to have a local variable for it. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/physdev.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index 6b3201b..c8bb797 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -336,7 +336,6 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case PHYSDEVOP_pirq_eoi_gmfn_v2: case PHYSDEVOP_pirq_eoi_gmfn_v1: { struct physdev_pirq_eoi_gmfn info; - unsigned long mfn; struct page_info *page; ret = -EFAULT; @@ -352,21 +351,20 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) put_page(page); break; } - mfn = page_to_mfn(page); if ( cmpxchg(&v->domain->arch.pirq_eoi_map_mfn, - 0, mfn) != 0 ) + 0, page_to_mfn(page)) != 0 ) { - put_page_and_type(mfn_to_page(mfn)); + put_page_and_type(page); ret = -EBUSY; break; } - v->domain->arch.pirq_eoi_map = map_domain_page_global(mfn); + v->domain->arch.pirq_eoi_map = __map_domain_page_global(page); if ( v->domain->arch.pirq_eoi_map == NULL ) { v->domain->arch.pirq_eoi_map_mfn = 0; - put_page_and_type(mfn_to_page(mfn)); + put_page_and_type(page); ret = -ENOSPC; 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 Jan 23 00:47:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:47:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESPF-00069D-5W; Fri, 23 Jan 2015 00:47:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESPE-00068u-6X for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:24 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 73/CB-13952-B1A91C45; Fri, 23 Jan 2015 00:47:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1421974041!17751180!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30017 invoked from network); 23 Jan 2015 00:47:22 -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; 23 Jan 2015 00:47:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESPB-0007cX-IH for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESPB-0003m5-Gk for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:21 +0000 Date: Fri, 23 Jan 2015 00:47:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: slightly simplify PHYSDEVOP_pirq_eoi_gmfn_v* 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 0e5e324db9efcbf49635704884ecf545ee7ec84a Author: Jan Beulich AuthorDate: Tue Jan 20 10:45:01 2015 +0100 Commit: Jan Beulich CommitDate: Tue Jan 20 10:45:01 2015 +0100 x86: slightly simplify PHYSDEVOP_pirq_eoi_gmfn_v* handling We don't really need the MFN in more than one place (after dropping mfn_to_page() translations where we know the result already), so no need to have a local variable for it. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/physdev.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index 6b3201b..c8bb797 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -336,7 +336,6 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case PHYSDEVOP_pirq_eoi_gmfn_v2: case PHYSDEVOP_pirq_eoi_gmfn_v1: { struct physdev_pirq_eoi_gmfn info; - unsigned long mfn; struct page_info *page; ret = -EFAULT; @@ -352,21 +351,20 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) put_page(page); break; } - mfn = page_to_mfn(page); if ( cmpxchg(&v->domain->arch.pirq_eoi_map_mfn, - 0, mfn) != 0 ) + 0, page_to_mfn(page)) != 0 ) { - put_page_and_type(mfn_to_page(mfn)); + put_page_and_type(page); ret = -EBUSY; break; } - v->domain->arch.pirq_eoi_map = map_domain_page_global(mfn); + v->domain->arch.pirq_eoi_map = __map_domain_page_global(page); if ( v->domain->arch.pirq_eoi_map == NULL ) { v->domain->arch.pirq_eoi_map_mfn = 0; - put_page_and_type(mfn_to_page(mfn)); + put_page_and_type(page); ret = -ENOSPC; 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 Jan 23 00:47:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:47:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESPQ-0006An-8W; Fri, 23 Jan 2015 00:47:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESPP-0006Ab-44 for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:35 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 1B/68-01254-62A91C45; Fri, 23 Jan 2015 00:47:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1421974051!17956408!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21663 invoked from network); 23 Jan 2015 00:47:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jan 2015 00:47:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESPL-0007cf-PS for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESPL-0003mS-Nz for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:31 +0000 Date: Fri, 23 Jan 2015 00:47:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: latch current->domain in do_physdev_op() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 209dd7e944af5ce69906fcfb8ded95926d34559d Author: Jan Beulich AuthorDate: Tue Jan 20 10:46:19 2015 +0100 Commit: Jan Beulich CommitDate: Tue Jan 20 10:46:19 2015 +0100 x86: latch current->domain in do_physdev_op() ... and drop global latching of current, as being needed more than once only in PHYSDEVOP_set_iopl and PHYSDEVOP_set_iobitmap, and not at all in all other cases. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/physdev.c | 81 ++++++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 40 deletions(-) diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index c8bb797..1be1d50 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -291,7 +291,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { int irq; ret_t ret; - struct vcpu *v = current; + struct domain *currd = current->domain; switch ( cmd ) { @@ -303,32 +303,31 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( copy_from_guest(&eoi, arg, 1) != 0 ) break; ret = -EINVAL; - if ( eoi.irq >= v->domain->nr_pirqs ) + if ( eoi.irq >= currd->nr_pirqs ) break; - spin_lock(&v->domain->event_lock); - pirq = pirq_info(v->domain, eoi.irq); + spin_lock(&currd->event_lock); + pirq = pirq_info(currd, eoi.irq); if ( !pirq ) { - spin_unlock(&v->domain->event_lock); + spin_unlock(&currd->event_lock); break; } - if ( v->domain->arch.auto_unmask ) + if ( currd->arch.auto_unmask ) evtchn_unmask(pirq->evtchn); - if ( is_pv_domain(v->domain) || - domain_pirq_to_irq(v->domain, eoi.irq) > 0 ) + if ( is_pv_domain(currd) || domain_pirq_to_irq(currd, eoi.irq) > 0 ) pirq_guest_eoi(pirq); - if ( is_hvm_domain(v->domain) && - domain_pirq_to_emuirq(v->domain, eoi.irq) > 0 ) + if ( is_hvm_domain(currd) && + domain_pirq_to_emuirq(currd, eoi.irq) > 0 ) { - struct hvm_irq *hvm_irq = &v->domain->arch.hvm_domain.irq; - int gsi = domain_pirq_to_emuirq(v->domain, eoi.irq); + struct hvm_irq *hvm_irq = &currd->arch.hvm_domain.irq; + int gsi = domain_pirq_to_emuirq(currd, eoi.irq); /* if this is a level irq and count > 0, send another * notification */ if ( gsi >= NR_ISAIRQS /* ISA irqs are edge triggered */ && hvm_irq->gsi_assert_count[gsi] ) - send_guest_pirq(v->domain, pirq); + send_guest_pirq(currd, pirq); } - spin_unlock(&v->domain->event_lock); + spin_unlock(&currd->event_lock); ret = 0; break; } @@ -352,7 +351,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; } - if ( cmpxchg(&v->domain->arch.pirq_eoi_map_mfn, + if ( cmpxchg(&currd->arch.pirq_eoi_map_mfn, 0, page_to_mfn(page)) != 0 ) { put_page_and_type(page); @@ -360,16 +359,16 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; } - v->domain->arch.pirq_eoi_map = __map_domain_page_global(page); - if ( v->domain->arch.pirq_eoi_map == NULL ) + currd->arch.pirq_eoi_map = __map_domain_page_global(page); + if ( currd->arch.pirq_eoi_map == NULL ) { - v->domain->arch.pirq_eoi_map_mfn = 0; + currd->arch.pirq_eoi_map_mfn = 0; put_page_and_type(page); ret = -ENOSPC; break; } if ( cmd == PHYSDEVOP_pirq_eoi_gmfn_v1 ) - v->domain->arch.auto_unmask = 1; + currd->arch.auto_unmask = 1; ret = 0; break; @@ -377,7 +376,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) /* Legacy since 0x00030202. */ case PHYSDEVOP_IRQ_UNMASK_NOTIFY: { - ret = pirq_guest_unmask(v->domain); + ret = pirq_guest_unmask(currd); break; } @@ -388,12 +387,12 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; irq = irq_status_query.irq; ret = -EINVAL; - if ( (irq < 0) || (irq >= v->domain->nr_pirqs) ) + if ( (irq < 0) || (irq >= currd->nr_pirqs) ) break; irq_status_query.flags = 0; - if ( is_hvm_domain(v->domain) && - domain_pirq_to_irq(v->domain, irq) <= 0 && - domain_pirq_to_emuirq(v->domain, irq) == IRQ_UNBOUND ) + if ( is_hvm_domain(currd) && + domain_pirq_to_irq(currd, irq) <= 0 && + domain_pirq_to_emuirq(currd, irq) == IRQ_UNBOUND ) { ret = -EINVAL; break; @@ -408,7 +407,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) * then dom0 is probably modern anyway. */ irq_status_query.flags |= XENIRQSTAT_needs_eoi; - if ( pirq_shared(v->domain, irq) ) + if ( pirq_shared(currd, irq) ) irq_status_query.flags |= XENIRQSTAT_shared; ret = __copy_to_guest(arg, &irq_status_query, 1) ? -EFAULT : 0; break; @@ -469,7 +468,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) ret = -EFAULT; if ( copy_from_guest(&apic, arg, 1) != 0 ) break; - ret = xsm_apic(XSM_PRIV, v->domain, cmd); + ret = xsm_apic(XSM_PRIV, currd, cmd); if ( ret ) break; ret = ioapic_guest_read(apic.apic_physbase, apic.reg, &apic.value); @@ -483,7 +482,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) ret = -EFAULT; if ( copy_from_guest(&apic, arg, 1) != 0 ) break; - ret = xsm_apic(XSM_PRIV, v->domain, cmd); + ret = xsm_apic(XSM_PRIV, currd, cmd); if ( ret ) break; ret = ioapic_guest_write(apic.apic_physbase, apic.reg, apic.value); @@ -499,7 +498,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) /* Use the APIC check since this dummy hypercall should still only * be called by the domain with access to program the ioapic */ - ret = xsm_apic(XSM_PRIV, v->domain, cmd); + ret = xsm_apic(XSM_PRIV, currd, cmd); if ( ret ) break; @@ -516,10 +515,11 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) } case PHYSDEVOP_set_iopl: { + struct vcpu *curr = current; struct physdev_set_iopl set_iopl; ret = -ENOSYS; - if ( is_pvh_vcpu(current) ) + if ( is_pvh_vcpu(curr) ) break; ret = -EFAULT; @@ -529,15 +529,16 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( set_iopl.iopl > 3 ) break; ret = 0; - v->arch.pv_vcpu.iopl = set_iopl.iopl; + curr->arch.pv_vcpu.iopl = set_iopl.iopl; break; } case PHYSDEVOP_set_iobitmap: { + struct vcpu *curr = current; struct physdev_set_iobitmap set_iobitmap; ret = -ENOSYS; - if ( is_pvh_vcpu(current) ) + if ( is_pvh_vcpu(curr) ) break; ret = -EFAULT; @@ -549,11 +550,12 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; ret = 0; #ifndef COMPAT - v->arch.pv_vcpu.iobmp = set_iobitmap.bitmap; + curr->arch.pv_vcpu.iobmp = set_iobitmap.bitmap; #else - guest_from_compat_handle(v->arch.pv_vcpu.iobmp, set_iobitmap.bitmap); + guest_from_compat_handle(curr->arch.pv_vcpu.iobmp, + set_iobitmap.bitmap); #endif - v->arch.pv_vcpu.iobmp_limit = set_iobitmap.nr_ports; + curr->arch.pv_vcpu.iobmp_limit = set_iobitmap.nr_ports; break; } @@ -713,18 +715,17 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) } case PHYSDEVOP_get_free_pirq: { struct physdev_get_free_pirq out; - struct domain *d = v->domain; ret = -EFAULT; if ( copy_from_guest(&out, arg, 1) != 0 ) break; - spin_lock(&d->event_lock); + spin_lock(&currd->event_lock); - ret = get_free_pirq(d, out.type); + ret = get_free_pirq(currd, out.type); if ( ret >= 0 ) { - struct pirq *info = pirq_get_info(d, ret); + struct pirq *info = pirq_get_info(currd, ret); if ( info ) info->arch.irq = PIRQ_ALLOCATED; @@ -732,7 +733,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) ret = -ENOMEM; } - spin_unlock(&d->event_lock); + spin_unlock(&currd->event_lock); if ( ret >= 0 ) { @@ -746,7 +747,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case PHYSDEVOP_dbgp_op: { struct physdev_dbgp_op op; - if ( !is_hardware_domain(v->domain) ) + if ( !is_hardware_domain(currd) ) ret = -EPERM; else if ( copy_from_guest(&op, arg, 1) ) ret = -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 Fri Jan 23 00:47:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00:47:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESPQ-0006An-8W; Fri, 23 Jan 2015 00:47:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESPP-0006Ab-44 for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:35 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 1B/68-01254-62A91C45; Fri, 23 Jan 2015 00:47:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1421974051!17956408!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21663 invoked from network); 23 Jan 2015 00:47:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Jan 2015 00:47:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESPL-0007cf-PS for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESPL-0003mS-Nz for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:31 +0000 Date: Fri, 23 Jan 2015 00:47:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: latch current->domain in do_physdev_op() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 209dd7e944af5ce69906fcfb8ded95926d34559d Author: Jan Beulich AuthorDate: Tue Jan 20 10:46:19 2015 +0100 Commit: Jan Beulich CommitDate: Tue Jan 20 10:46:19 2015 +0100 x86: latch current->domain in do_physdev_op() ... and drop global latching of current, as being needed more than once only in PHYSDEVOP_set_iopl and PHYSDEVOP_set_iobitmap, and not at all in all other cases. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/physdev.c | 81 ++++++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 40 deletions(-) diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index c8bb797..1be1d50 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -291,7 +291,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { int irq; ret_t ret; - struct vcpu *v = current; + struct domain *currd = current->domain; switch ( cmd ) { @@ -303,32 +303,31 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( copy_from_guest(&eoi, arg, 1) != 0 ) break; ret = -EINVAL; - if ( eoi.irq >= v->domain->nr_pirqs ) + if ( eoi.irq >= currd->nr_pirqs ) break; - spin_lock(&v->domain->event_lock); - pirq = pirq_info(v->domain, eoi.irq); + spin_lock(&currd->event_lock); + pirq = pirq_info(currd, eoi.irq); if ( !pirq ) { - spin_unlock(&v->domain->event_lock); + spin_unlock(&currd->event_lock); break; } - if ( v->domain->arch.auto_unmask ) + if ( currd->arch.auto_unmask ) evtchn_unmask(pirq->evtchn); - if ( is_pv_domain(v->domain) || - domain_pirq_to_irq(v->domain, eoi.irq) > 0 ) + if ( is_pv_domain(currd) || domain_pirq_to_irq(currd, eoi.irq) > 0 ) pirq_guest_eoi(pirq); - if ( is_hvm_domain(v->domain) && - domain_pirq_to_emuirq(v->domain, eoi.irq) > 0 ) + if ( is_hvm_domain(currd) && + domain_pirq_to_emuirq(currd, eoi.irq) > 0 ) { - struct hvm_irq *hvm_irq = &v->domain->arch.hvm_domain.irq; - int gsi = domain_pirq_to_emuirq(v->domain, eoi.irq); + struct hvm_irq *hvm_irq = &currd->arch.hvm_domain.irq; + int gsi = domain_pirq_to_emuirq(currd, eoi.irq); /* if this is a level irq and count > 0, send another * notification */ if ( gsi >= NR_ISAIRQS /* ISA irqs are edge triggered */ && hvm_irq->gsi_assert_count[gsi] ) - send_guest_pirq(v->domain, pirq); + send_guest_pirq(currd, pirq); } - spin_unlock(&v->domain->event_lock); + spin_unlock(&currd->event_lock); ret = 0; break; } @@ -352,7 +351,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; } - if ( cmpxchg(&v->domain->arch.pirq_eoi_map_mfn, + if ( cmpxchg(&currd->arch.pirq_eoi_map_mfn, 0, page_to_mfn(page)) != 0 ) { put_page_and_type(page); @@ -360,16 +359,16 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; } - v->domain->arch.pirq_eoi_map = __map_domain_page_global(page); - if ( v->domain->arch.pirq_eoi_map == NULL ) + currd->arch.pirq_eoi_map = __map_domain_page_global(page); + if ( currd->arch.pirq_eoi_map == NULL ) { - v->domain->arch.pirq_eoi_map_mfn = 0; + currd->arch.pirq_eoi_map_mfn = 0; put_page_and_type(page); ret = -ENOSPC; break; } if ( cmd == PHYSDEVOP_pirq_eoi_gmfn_v1 ) - v->domain->arch.auto_unmask = 1; + currd->arch.auto_unmask = 1; ret = 0; break; @@ -377,7 +376,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) /* Legacy since 0x00030202. */ case PHYSDEVOP_IRQ_UNMASK_NOTIFY: { - ret = pirq_guest_unmask(v->domain); + ret = pirq_guest_unmask(currd); break; } @@ -388,12 +387,12 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; irq = irq_status_query.irq; ret = -EINVAL; - if ( (irq < 0) || (irq >= v->domain->nr_pirqs) ) + if ( (irq < 0) || (irq >= currd->nr_pirqs) ) break; irq_status_query.flags = 0; - if ( is_hvm_domain(v->domain) && - domain_pirq_to_irq(v->domain, irq) <= 0 && - domain_pirq_to_emuirq(v->domain, irq) == IRQ_UNBOUND ) + if ( is_hvm_domain(currd) && + domain_pirq_to_irq(currd, irq) <= 0 && + domain_pirq_to_emuirq(currd, irq) == IRQ_UNBOUND ) { ret = -EINVAL; break; @@ -408,7 +407,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) * then dom0 is probably modern anyway. */ irq_status_query.flags |= XENIRQSTAT_needs_eoi; - if ( pirq_shared(v->domain, irq) ) + if ( pirq_shared(currd, irq) ) irq_status_query.flags |= XENIRQSTAT_shared; ret = __copy_to_guest(arg, &irq_status_query, 1) ? -EFAULT : 0; break; @@ -469,7 +468,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) ret = -EFAULT; if ( copy_from_guest(&apic, arg, 1) != 0 ) break; - ret = xsm_apic(XSM_PRIV, v->domain, cmd); + ret = xsm_apic(XSM_PRIV, currd, cmd); if ( ret ) break; ret = ioapic_guest_read(apic.apic_physbase, apic.reg, &apic.value); @@ -483,7 +482,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) ret = -EFAULT; if ( copy_from_guest(&apic, arg, 1) != 0 ) break; - ret = xsm_apic(XSM_PRIV, v->domain, cmd); + ret = xsm_apic(XSM_PRIV, currd, cmd); if ( ret ) break; ret = ioapic_guest_write(apic.apic_physbase, apic.reg, apic.value); @@ -499,7 +498,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) /* Use the APIC check since this dummy hypercall should still only * be called by the domain with access to program the ioapic */ - ret = xsm_apic(XSM_PRIV, v->domain, cmd); + ret = xsm_apic(XSM_PRIV, currd, cmd); if ( ret ) break; @@ -516,10 +515,11 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) } case PHYSDEVOP_set_iopl: { + struct vcpu *curr = current; struct physdev_set_iopl set_iopl; ret = -ENOSYS; - if ( is_pvh_vcpu(current) ) + if ( is_pvh_vcpu(curr) ) break; ret = -EFAULT; @@ -529,15 +529,16 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( set_iopl.iopl > 3 ) break; ret = 0; - v->arch.pv_vcpu.iopl = set_iopl.iopl; + curr->arch.pv_vcpu.iopl = set_iopl.iopl; break; } case PHYSDEVOP_set_iobitmap: { + struct vcpu *curr = current; struct physdev_set_iobitmap set_iobitmap; ret = -ENOSYS; - if ( is_pvh_vcpu(current) ) + if ( is_pvh_vcpu(curr) ) break; ret = -EFAULT; @@ -549,11 +550,12 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; ret = 0; #ifndef COMPAT - v->arch.pv_vcpu.iobmp = set_iobitmap.bitmap; + curr->arch.pv_vcpu.iobmp = set_iobitmap.bitmap; #else - guest_from_compat_handle(v->arch.pv_vcpu.iobmp, set_iobitmap.bitmap); + guest_from_compat_handle(curr->arch.pv_vcpu.iobmp, + set_iobitmap.bitmap); #endif - v->arch.pv_vcpu.iobmp_limit = set_iobitmap.nr_ports; + curr->arch.pv_vcpu.iobmp_limit = set_iobitmap.nr_ports; break; } @@ -713,18 +715,17 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) } case PHYSDEVOP_get_free_pirq: { struct physdev_get_free_pirq out; - struct domain *d = v->domain; ret = -EFAULT; if ( copy_from_guest(&out, arg, 1) != 0 ) break; - spin_lock(&d->event_lock); + spin_lock(&currd->event_lock); - ret = get_free_pirq(d, out.type); + ret = get_free_pirq(currd, out.type); if ( ret >= 0 ) { - struct pirq *info = pirq_get_info(d, ret); + struct pirq *info = pirq_get_info(currd, ret); if ( info ) info->arch.irq = PIRQ_ALLOCATED; @@ -732,7 +733,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) ret = -ENOMEM; } - spin_unlock(&d->event_lock); + spin_unlock(&currd->event_lock); if ( ret >= 0 ) { @@ -746,7 +747,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case PHYSDEVOP_dbgp_op: { struct physdev_dbgp_op op; - if ( !is_hardware_domain(v->domain) ) + if ( !is_hardware_domain(currd) ) ret = -EPERM; else if ( copy_from_guest(&op, arg, 1) ) ret = -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 Fri Jan 23 00:47:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00: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 1YESPa-0006GN-BT; Fri, 23 Jan 2015 00:47:46 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESPY-0006G2-HO for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:44 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id A6/D2-07803-F2A91C45; Fri, 23 Jan 2015 00:47:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1421974062!15714731!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21886 invoked from network); 23 Jan 2015 00:47:43 -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; 23 Jan 2015 00:47:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESPV-0007cl-Th for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESPV-0003mr-So for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:41 +0000 Date: Fri, 23 Jan 2015 00:47:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] re-order struct domain fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7106c691a6332cffab4037186d1caa3012ae051e Author: Jan Beulich AuthorDate: Tue Jan 20 10:47:21 2015 +0100 Commit: Jan Beulich CommitDate: Tue Jan 20 10:47:21 2015 +0100 re-order struct domain fields ... to reduce padding holes. I also wonder whether having independent spin locks side by side is really a good thing cache-line-bouncing-wise. Also change suspend_evtchn's type to evtchn_port_t. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/include/xen/sched.h | 50 +++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 46fc6e3..814e087 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -306,6 +306,9 @@ struct domain { domid_t domain_id; + unsigned int max_vcpus; + struct vcpu **vcpu; + shared_info_t *shared_info; /* shared data area */ spinlock_t domain_lock; @@ -314,13 +317,11 @@ struct domain struct page_list_head page_list; /* linked list */ struct page_list_head xenpage_list; /* linked list (size xenheap_pages) */ unsigned int tot_pages; /* number of pages currently possesed */ + unsigned int xenheap_pages; /* # pages allocated from Xen heap */ unsigned int outstanding_pages; /* pages claimed but not possessed */ unsigned int max_pages; /* maximum value for tot_pages */ atomic_t shr_pages; /* number of shared pages */ atomic_t paged_pages; /* number of paged-out pages */ - unsigned int xenheap_pages; /* # pages allocated from Xen heap */ - - unsigned int max_vcpus; /* Scheduling. */ void *sched_priv; /* scheduler-specific data */ @@ -347,15 +348,19 @@ struct domain * Interrupt to event-channel mappings and other per-guest-pirq data. * Protected by the domain's event-channel spinlock. */ - unsigned int nr_pirqs; struct radix_tree_root pirq_tree; - - /* I/O capabilities (access to IRQs and memory-mapped I/O). */ - struct rangeset *iomem_caps; - struct rangeset *irq_caps; + unsigned int nr_pirqs; enum guest_type guest_type; + /* Is this guest dying (i.e., a zombie)? */ + enum { DOMDYING_alive, DOMDYING_dying, DOMDYING_dead } is_dying; + + /* Domain is paused by controller software? */ + int controller_pause_count; + + int32_t time_offset_seconds; + #ifdef HAS_PASSTHROUGH /* Does this guest need iommu mappings (-1 meaning "being set up")? */ s8 need_iommu; @@ -364,16 +369,14 @@ struct domain bool_t auto_node_affinity; /* Is this guest fully privileged (aka dom0)? */ bool_t is_privileged; - /* Which guest this guest has privileges on */ - struct domain *target; - /* Is this guest being debugged by dom0? */ - bool_t debugger_attached; - /* Is this guest dying (i.e., a zombie)? */ - enum { DOMDYING_alive, DOMDYING_dying, DOMDYING_dead } is_dying; - /* Domain is paused by controller software? */ - int controller_pause_count; /* Domain's VCPUs are pinned 1:1 to physical CPUs? */ bool_t is_pinned; + /* Non-migratable and non-restoreable? */ + bool_t disable_migrate; + /* Is this guest being debugged by dom0? */ + bool_t debugger_attached; + /* Which guest this guest has privileges on */ + struct domain *target; /* Are any VCPUs polling event channels (SCHEDOP_poll)? */ #if MAX_VIRT_CPUS <= BITS_PER_LONG @@ -382,6 +385,10 @@ struct domain unsigned long *poll_mask; #endif + /* I/O capabilities (access to IRQs and memory-mapped I/O). */ + struct rangeset *iomem_caps; + struct rangeset *irq_caps; + /* Guest has shut down (inc. reason code)? */ spinlock_t shutdown_lock; bool_t is_shutting_down; /* in process of shutting down? */ @@ -390,15 +397,12 @@ struct domain /* If this is not 0, send suspend notification here instead of * raising DOM_EXC */ - int suspend_evtchn; + evtchn_port_t suspend_evtchn; atomic_t pause_count; - - unsigned long vm_assist; - atomic_t refcnt; - struct vcpu **vcpu; + unsigned long vm_assist; /* Bitmask of CPUs which are holding onto this domain's state. */ cpumask_var_t domain_dirty_cpumask; @@ -418,7 +422,6 @@ struct domain /* OProfile support. */ struct xenoprof *xenoprof; - int32_t time_offset_seconds; /* Domain watchdog. */ #define NR_DOMAIN_WATCHDOG_TIMERS 2 @@ -439,9 +442,6 @@ struct domain struct lock_profile_qhead profile_head; - /* Non-migratable and non-restoreable? */ - bool_t disable_migrate; - /* Various mem_events */ struct mem_event_per_domain *mem_event; -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 00:47:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 00: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 1YESPa-0006GN-BT; Fri, 23 Jan 2015 00:47:46 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESPY-0006G2-HO for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:44 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id A6/D2-07803-F2A91C45; Fri, 23 Jan 2015 00:47:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1421974062!15714731!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21886 invoked from network); 23 Jan 2015 00:47:43 -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; 23 Jan 2015 00:47:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YESPV-0007cl-Th for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YESPV-0003mr-So for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 00:47:41 +0000 Date: Fri, 23 Jan 2015 00:47:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] re-order struct domain fields X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7106c691a6332cffab4037186d1caa3012ae051e Author: Jan Beulich AuthorDate: Tue Jan 20 10:47:21 2015 +0100 Commit: Jan Beulich CommitDate: Tue Jan 20 10:47:21 2015 +0100 re-order struct domain fields ... to reduce padding holes. I also wonder whether having independent spin locks side by side is really a good thing cache-line-bouncing-wise. Also change suspend_evtchn's type to evtchn_port_t. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/include/xen/sched.h | 50 +++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 46fc6e3..814e087 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -306,6 +306,9 @@ struct domain { domid_t domain_id; + unsigned int max_vcpus; + struct vcpu **vcpu; + shared_info_t *shared_info; /* shared data area */ spinlock_t domain_lock; @@ -314,13 +317,11 @@ struct domain struct page_list_head page_list; /* linked list */ struct page_list_head xenpage_list; /* linked list (size xenheap_pages) */ unsigned int tot_pages; /* number of pages currently possesed */ + unsigned int xenheap_pages; /* # pages allocated from Xen heap */ unsigned int outstanding_pages; /* pages claimed but not possessed */ unsigned int max_pages; /* maximum value for tot_pages */ atomic_t shr_pages; /* number of shared pages */ atomic_t paged_pages; /* number of paged-out pages */ - unsigned int xenheap_pages; /* # pages allocated from Xen heap */ - - unsigned int max_vcpus; /* Scheduling. */ void *sched_priv; /* scheduler-specific data */ @@ -347,15 +348,19 @@ struct domain * Interrupt to event-channel mappings and other per-guest-pirq data. * Protected by the domain's event-channel spinlock. */ - unsigned int nr_pirqs; struct radix_tree_root pirq_tree; - - /* I/O capabilities (access to IRQs and memory-mapped I/O). */ - struct rangeset *iomem_caps; - struct rangeset *irq_caps; + unsigned int nr_pirqs; enum guest_type guest_type; + /* Is this guest dying (i.e., a zombie)? */ + enum { DOMDYING_alive, DOMDYING_dying, DOMDYING_dead } is_dying; + + /* Domain is paused by controller software? */ + int controller_pause_count; + + int32_t time_offset_seconds; + #ifdef HAS_PASSTHROUGH /* Does this guest need iommu mappings (-1 meaning "being set up")? */ s8 need_iommu; @@ -364,16 +369,14 @@ struct domain bool_t auto_node_affinity; /* Is this guest fully privileged (aka dom0)? */ bool_t is_privileged; - /* Which guest this guest has privileges on */ - struct domain *target; - /* Is this guest being debugged by dom0? */ - bool_t debugger_attached; - /* Is this guest dying (i.e., a zombie)? */ - enum { DOMDYING_alive, DOMDYING_dying, DOMDYING_dead } is_dying; - /* Domain is paused by controller software? */ - int controller_pause_count; /* Domain's VCPUs are pinned 1:1 to physical CPUs? */ bool_t is_pinned; + /* Non-migratable and non-restoreable? */ + bool_t disable_migrate; + /* Is this guest being debugged by dom0? */ + bool_t debugger_attached; + /* Which guest this guest has privileges on */ + struct domain *target; /* Are any VCPUs polling event channels (SCHEDOP_poll)? */ #if MAX_VIRT_CPUS <= BITS_PER_LONG @@ -382,6 +385,10 @@ struct domain unsigned long *poll_mask; #endif + /* I/O capabilities (access to IRQs and memory-mapped I/O). */ + struct rangeset *iomem_caps; + struct rangeset *irq_caps; + /* Guest has shut down (inc. reason code)? */ spinlock_t shutdown_lock; bool_t is_shutting_down; /* in process of shutting down? */ @@ -390,15 +397,12 @@ struct domain /* If this is not 0, send suspend notification here instead of * raising DOM_EXC */ - int suspend_evtchn; + evtchn_port_t suspend_evtchn; atomic_t pause_count; - - unsigned long vm_assist; - atomic_t refcnt; - struct vcpu **vcpu; + unsigned long vm_assist; /* Bitmask of CPUs which are holding onto this domain's state. */ cpumask_var_t domain_dirty_cpumask; @@ -418,7 +422,6 @@ struct domain /* OProfile support. */ struct xenoprof *xenoprof; - int32_t time_offset_seconds; /* Domain watchdog. */ #define NR_DOMAIN_WATCHDOG_TIMERS 2 @@ -439,9 +442,6 @@ struct domain struct lock_profile_qhead profile_head; - /* Non-migratable and non-restoreable? */ - bool_t disable_migrate; - /* Various mem_events */ struct mem_event_per_domain *mem_event; -- generated by git-patchbot for /home/xen/git/xen.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 Jan 23 14:55:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 14:55:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YEfdb-0004Nj-Hl; Fri, 23 Jan 2015 14:55:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YEfda-0004NV-NC for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 14:55:06 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id DC/5A-31115-AC062C45; Fri, 23 Jan 2015 14:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1422024904!22523591!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10352 invoked from network); 23 Jan 2015 14:55:05 -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; 23 Jan 2015 14:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YEfdX-0007gL-VP for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 14:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YEfdX-0007Z9-Du for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 14:55:03 +0000 Date: Fri, 23 Jan 2015 14:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: Don't ignore error when we fail to give access to ioport/irq/iomem X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 17664f0ba031344846090a482ad42d225aa911c7 Author: Julien Grall AuthorDate: Wed Jan 14 13:06:48 2015 +0000 Commit: Ian Jackson CommitDate: Mon Jan 19 17:47:03 2015 +0000 libxl: Don't ignore error when we fail to give access to ioport/irq/iomem If we fail to give the access, the domain will unlikely work correctly. So we should bail out at the first error. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu (Based on commit 7070eec417934360bf3aed434191246dfe4f8091) --- tools/libxl/libxl_create.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index a604cd8..e3350d5 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1068,6 +1068,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to ioports %"PRIx32"-%"PRIx32, domid, io->first, io->first + io->number - 1); ret = ERROR_FAIL; + goto error_out; } } @@ -1083,6 +1084,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, if (ret < 0) { LOGE(ERROR, "failed give dom%d access to irq %d", domid, irq); ret = ERROR_FAIL; + goto error_out; } } @@ -1099,6 +1101,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to iomem range %"PRIx64"-%"PRIx64, domid, io->start, io->start + io->number - 1); ret = ERROR_FAIL; + goto error_out; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jan 23 14:55:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 14:55:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YEfdb-0004Nj-Hl; Fri, 23 Jan 2015 14:55:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YEfda-0004NV-NC for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 14:55:06 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id DC/5A-31115-AC062C45; Fri, 23 Jan 2015 14:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1422024904!22523591!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10352 invoked from network); 23 Jan 2015 14:55:05 -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; 23 Jan 2015 14:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YEfdX-0007gL-VP for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 14:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YEfdX-0007Z9-Du for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 14:55:03 +0000 Date: Fri, 23 Jan 2015 14:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: Don't ignore error when we fail to give access to ioport/irq/iomem X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 17664f0ba031344846090a482ad42d225aa911c7 Author: Julien Grall AuthorDate: Wed Jan 14 13:06:48 2015 +0000 Commit: Ian Jackson CommitDate: Mon Jan 19 17:47:03 2015 +0000 libxl: Don't ignore error when we fail to give access to ioport/irq/iomem If we fail to give the access, the domain will unlikely work correctly. So we should bail out at the first error. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu (Based on commit 7070eec417934360bf3aed434191246dfe4f8091) --- tools/libxl/libxl_create.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index a604cd8..e3350d5 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1068,6 +1068,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to ioports %"PRIx32"-%"PRIx32, domid, io->first, io->first + io->number - 1); ret = ERROR_FAIL; + goto error_out; } } @@ -1083,6 +1084,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, if (ret < 0) { LOGE(ERROR, "failed give dom%d access to irq %d", domid, irq); ret = ERROR_FAIL; + goto error_out; } } @@ -1099,6 +1101,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to iomem range %"PRIx64"-%"PRIx64, domid, io->start, io->start + io->number - 1); ret = ERROR_FAIL; + goto error_out; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jan 23 14:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 14:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YEfdm-0004QI-1k; Fri, 23 Jan 2015 14:55:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YEfdk-0004Pk-PM for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 14:55:16 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id E9/13-17234-4D062C45; Fri, 23 Jan 2015 14:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1422024914!21859154!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20931 invoked from network); 23 Jan 2015 14:55: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; 23 Jan 2015 14:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YEfdi-0007gQ-7f for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 14:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YEfdi-0007ZX-3H for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 14:55:14 +0000 Date: Fri, 23 Jan 2015 14:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] dt-uart: use ':' as separator between path and options X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4da395fe75c24cceb9337b64d4c96e8c2da29b2e Author: Ian Campbell AuthorDate: Thu Jan 8 11:53:55 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jan 20 14:47:39 2015 +0000 dt-uart: use ':' as separator between path and options ',' is a valid character in a device-tree path (see ePAPR v1.1 Table 2-1), in fact ',' is actually pretty common in node names. Using ',' as a separator breaks for example on fast models. If you use the full path (/smb/motherboard/iofpga@3,00000000/uart@090000) rather than the alias then earlyprintk gives: (XEN) Looking for UART console /smb/motherboard/iofpga@3 (XEN) Unable to find device "/smb/motherboard/iofpga@3" (XEN) Bad console= option 'dtuart' I actually noticed this on Jetson where the uart is "/serial@0,70006300" and there happened to be no alias defined. Instead use ':' as the separator, it is defined to terminate the path in the context of /chosen/stdout-path (Table 3-4) which is pretty closely analogous to the dtuart= option and so makes a pretty good choice (especially since the next patch adds support for stdout-path). Since no DT aware driver current supports any options there is no point in retaining support for ',' for backwards compatibility. Additionally, expand the buffer for the dtuart option, a path can be far longer than 30 characters (in fact the maximum size of a single node name is 31, so it's not even necessarily enough for an alias). 128 is completely arbitrary and allows for paths at least 8 deep even with worst case node names. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall (cherry picked from commit f01af57300cb60ab0fd8487fb5bbbe97bee234f0) Conflicts: docs/misc/xen-command-line.markdown -- dropped since precursor patch not present. --- xen/drivers/char/dt-uart.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/drivers/char/dt-uart.c b/xen/drivers/char/dt-uart.c index d7204fb..0ffb6d7 100644 --- a/xen/drivers/char/dt-uart.c +++ b/xen/drivers/char/dt-uart.c @@ -26,13 +26,13 @@ /* * Configure UART port with a string: - * path,options + * path:options * * @path: full path used in the device tree for the UART. If the path * doesn't start with '/', we assuming that it's an alias. * @options: UART speficic options (see in each UART driver) */ -static char __initdata opt_dtuart[30] = ""; +static char __initdata opt_dtuart[256] = ""; string_param("dtuart", opt_dtuart); void __init dt_uart_init(void) @@ -48,7 +48,7 @@ void __init dt_uart_init(void) return; } - options = strchr(opt_dtuart, ','); + options = strchr(opt_dtuart, ':'); if ( options != NULL ) *(options++) = '\0'; else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jan 23 14:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 23 Jan 2015 14:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YEfdm-0004QI-1k; Fri, 23 Jan 2015 14:55:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YEfdk-0004Pk-PM for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 14:55:16 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id E9/13-17234-4D062C45; Fri, 23 Jan 2015 14:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1422024914!21859154!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20931 invoked from network); 23 Jan 2015 14:55: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; 23 Jan 2015 14:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YEfdi-0007gQ-7f for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 14:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YEfdi-0007ZX-3H for xen-changelog@lists.xensource.com; Fri, 23 Jan 2015 14:55:14 +0000 Date: Fri, 23 Jan 2015 14:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] dt-uart: use ':' as separator between path and options X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4da395fe75c24cceb9337b64d4c96e8c2da29b2e Author: Ian Campbell AuthorDate: Thu Jan 8 11:53:55 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jan 20 14:47:39 2015 +0000 dt-uart: use ':' as separator between path and options ',' is a valid character in a device-tree path (see ePAPR v1.1 Table 2-1), in fact ',' is actually pretty common in node names. Using ',' as a separator breaks for example on fast models. If you use the full path (/smb/motherboard/iofpga@3,00000000/uart@090000) rather than the alias then earlyprintk gives: (XEN) Looking for UART console /smb/motherboard/iofpga@3 (XEN) Unable to find device "/smb/motherboard/iofpga@3" (XEN) Bad console= option 'dtuart' I actually noticed this on Jetson where the uart is "/serial@0,70006300" and there happened to be no alias defined. Instead use ':' as the separator, it is defined to terminate the path in the context of /chosen/stdout-path (Table 3-4) which is pretty closely analogous to the dtuart= option and so makes a pretty good choice (especially since the next patch adds support for stdout-path). Since no DT aware driver current supports any options there is no point in retaining support for ',' for backwards compatibility. Additionally, expand the buffer for the dtuart option, a path can be far longer than 30 characters (in fact the maximum size of a single node name is 31, so it's not even necessarily enough for an alias). 128 is completely arbitrary and allows for paths at least 8 deep even with worst case node names. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall (cherry picked from commit f01af57300cb60ab0fd8487fb5bbbe97bee234f0) Conflicts: docs/misc/xen-command-line.markdown -- dropped since precursor patch not present. --- xen/drivers/char/dt-uart.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/drivers/char/dt-uart.c b/xen/drivers/char/dt-uart.c index d7204fb..0ffb6d7 100644 --- a/xen/drivers/char/dt-uart.c +++ b/xen/drivers/char/dt-uart.c @@ -26,13 +26,13 @@ /* * Configure UART port with a string: - * path,options + * path:options * * @path: full path used in the device tree for the UART. If the path * doesn't start with '/', we assuming that it's an alias. * @options: UART speficic options (see in each UART driver) */ -static char __initdata opt_dtuart[30] = ""; +static char __initdata opt_dtuart[256] = ""; string_param("dtuart", opt_dtuart); void __init dt_uart_init(void) @@ -48,7 +48,7 @@ void __init dt_uart_init(void) return; } - options = strchr(opt_dtuart, ','); + options = strchr(opt_dtuart, ':'); if ( options != NULL ) *(options++) = '\0'; else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jan 24 16:44:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jan 2015 16:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YF3oe-0008GG-QA; Sat, 24 Jan 2015 16:44:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YF3od-0008G8-VX for xen-changelog@lists.xensource.com; Sat, 24 Jan 2015 16:44:08 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 60/11-28359-7DBC3C45; Sat, 24 Jan 2015 16:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1422117845!18078247!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23883 invoked from network); 24 Jan 2015 16:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Jan 2015 16:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YF3oY-0007dw-US for xen-changelog@lists.xensource.com; Sat, 24 Jan 2015 16:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YF3oY-00013R-Qf for xen-changelog@lists.xensource.com; Sat, 24 Jan 2015 16:44:02 +0000 Date: Sat, 24 Jan 2015 16:44: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-rc1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f70c066bb55ed967a8e98bf30a50cf0a7a6155f9 Author: Jan Beulich AuthorDate: Fri Jan 23 17:59:42 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 23 17:59:42 2015 +0100 update Xen version to 4.3.4-rc1 --- Config.mk | 2 +- xen/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 0ff1eb7..9a3a9f7 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.3 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.4-rc1 SEABIOS_UPSTREAM_TAG ?= 3a28511b46f0c2af5fae1b6ed2b0c19d7913cee3 # Wed Jun 26 16:30:45 2013 +0100 # xen: Don't perform SMP setup. diff --git a/xen/Makefile b/xen/Makefile index fcbd02e..11be691 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-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4-rc1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jan 24 16:44:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jan 2015 16:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YF3oe-0008GG-QA; Sat, 24 Jan 2015 16:44:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YF3od-0008G8-VX for xen-changelog@lists.xensource.com; Sat, 24 Jan 2015 16:44:08 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 60/11-28359-7DBC3C45; Sat, 24 Jan 2015 16:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1422117845!18078247!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23883 invoked from network); 24 Jan 2015 16:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Jan 2015 16:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YF3oY-0007dw-US for xen-changelog@lists.xensource.com; Sat, 24 Jan 2015 16:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YF3oY-00013R-Qf for xen-changelog@lists.xensource.com; Sat, 24 Jan 2015 16:44:02 +0000 Date: Sat, 24 Jan 2015 16:44: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-rc1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f70c066bb55ed967a8e98bf30a50cf0a7a6155f9 Author: Jan Beulich AuthorDate: Fri Jan 23 17:59:42 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 23 17:59:42 2015 +0100 update Xen version to 4.3.4-rc1 --- Config.mk | 2 +- xen/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 0ff1eb7..9a3a9f7 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.3 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.4-rc1 SEABIOS_UPSTREAM_TAG ?= 3a28511b46f0c2af5fae1b6ed2b0c19d7913cee3 # Wed Jun 26 16:30:45 2013 +0100 # xen: Don't perform SMP setup. diff --git a/xen/Makefile b/xen/Makefile index fcbd02e..11be691 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-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4-rc1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 25 00:11:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 25 Jan 2015 00:11:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YFAnC-0002vF-Nr; Sun, 25 Jan 2015 00:11:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YFAnB-0002v5-RA for xen-changelog@lists.xensource.com; Sun, 25 Jan 2015 00:11:05 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id EA/15-14349-99434C45; Sun, 25 Jan 2015 00:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1422144663!22739876!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4635 invoked from network); 25 Jan 2015 00:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Jan 2015 00:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YFAn9-0004WV-Dn for xen-changelog@lists.xensource.com; Sun, 25 Jan 2015 00:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YFAn9-000860-18 for xen-changelog@lists.xensource.com; Sun, 25 Jan 2015 00:11:03 +0000 Date: Sun, 25 Jan 2015 00:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] update Xen version to 4.5.1-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 70f5abd95b5905f93edd3b1d5fcb9c025d14b9d5 Author: Jan Beulich AuthorDate: Wed Jan 21 11:09:15 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 21 11:09:15 2015 +0100 update Xen version to 4.5.1-pre --- MAINTAINERS | 11 ++++++++--- xen/Makefile | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index ee2fe90..a205136 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -49,9 +49,14 @@ for inclusion in xen-unstable. Please see http://wiki.xen.org/wiki/Xen_Maintenance_Releases for more information. -Remember to copy the appropriate stable branch maintainer who will be -listed in this section of the MAINTAINERS file in the appropriate -branch. +Remember to copy the stable branch maintainer. The maintainer for this +branch is: + + Jan Beulich + +Tools backport requests should also be copied to: + + Ian Jackson Unstable Subsystem Maintainers ============================== diff --git a/xen/Makefile b/xen/Makefile index 5d70741..7625ddc 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 5 -export XEN_EXTRAVERSION ?= .0$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1-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.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 25 00:11:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 25 Jan 2015 00:11:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YFAnC-0002vF-Nr; Sun, 25 Jan 2015 00:11:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YFAnB-0002v5-RA for xen-changelog@lists.xensource.com; Sun, 25 Jan 2015 00:11:05 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id EA/15-14349-99434C45; Sun, 25 Jan 2015 00:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1422144663!22739876!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4635 invoked from network); 25 Jan 2015 00:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Jan 2015 00:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YFAn9-0004WV-Dn for xen-changelog@lists.xensource.com; Sun, 25 Jan 2015 00:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YFAn9-000860-18 for xen-changelog@lists.xensource.com; Sun, 25 Jan 2015 00:11:03 +0000 Date: Sun, 25 Jan 2015 00:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] update Xen version to 4.5.1-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 70f5abd95b5905f93edd3b1d5fcb9c025d14b9d5 Author: Jan Beulich AuthorDate: Wed Jan 21 11:09:15 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 21 11:09:15 2015 +0100 update Xen version to 4.5.1-pre --- MAINTAINERS | 11 ++++++++--- xen/Makefile | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index ee2fe90..a205136 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -49,9 +49,14 @@ for inclusion in xen-unstable. Please see http://wiki.xen.org/wiki/Xen_Maintenance_Releases for more information. -Remember to copy the appropriate stable branch maintainer who will be -listed in this section of the MAINTAINERS file in the appropriate -branch. +Remember to copy the stable branch maintainer. The maintainer for this +branch is: + + Jan Beulich + +Tools backport requests should also be copied to: + + Ian Jackson Unstable Subsystem Maintainers ============================== diff --git a/xen/Makefile b/xen/Makefile index 5d70741..7625ddc 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 5 -export XEN_EXTRAVERSION ?= .0$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1-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.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Jan 25 00:11:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 25 Jan 2015 00:11:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YFAnM-0002wl-SB; Sun, 25 Jan 2015 00:11:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YFAnM-0002wU-0f for xen-changelog@lists.xensource.com; Sun, 25 Jan 2015 00:11:16 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 57/1A-03891-3A434C45; Sun, 25 Jan 2015 00:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1422144673!21961482!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16961 invoked from network); 25 Jan 2015 00:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Jan 2015 00:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YFAnJ-0004WZ-Is for xen-changelog@lists.xensource.com; Sun, 25 Jan 2015 00:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YFAnJ-00086O-HE for xen-changelog@lists.xensource.com; Sun, 25 Jan 2015 00:11:13 +0000 Date: Sun, 25 Jan 2015 00:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] bump __XEN_LATEST_INTERFACE_VERSION__ X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3367ca8e821eb8e3e48d82d661b18dc0e2c49918 Author: Jan Beulich AuthorDate: Wed Jan 21 11:09:34 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 21 11:09:34 2015 +0100 bump __XEN_LATEST_INTERFACE_VERSION__ --- xen/include/public/xen-compat.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/public/xen-compat.h b/xen/include/public/xen-compat.h index 3eb80a0..c1d660d 100644 --- a/xen/include/public/xen-compat.h +++ b/xen/include/public/xen-compat.h @@ -27,7 +27,7 @@ #ifndef __XEN_PUBLIC_XEN_COMPAT_H__ #define __XEN_PUBLIC_XEN_COMPAT_H__ -#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040400 +#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040500 #if defined(__XEN__) || defined(__XEN_TOOLS__) /* Xen is built with matching headers and implements the latest interface. */ -- 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 Sun Jan 25 00:11:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 25 Jan 2015 00:11:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YFAnM-0002wl-SB; Sun, 25 Jan 2015 00:11:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YFAnM-0002wU-0f for xen-changelog@lists.xensource.com; Sun, 25 Jan 2015 00:11:16 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 57/1A-03891-3A434C45; Sun, 25 Jan 2015 00:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1422144673!21961482!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16961 invoked from network); 25 Jan 2015 00:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Jan 2015 00:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YFAnJ-0004WZ-Is for xen-changelog@lists.xensource.com; Sun, 25 Jan 2015 00:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YFAnJ-00086O-HE for xen-changelog@lists.xensource.com; Sun, 25 Jan 2015 00:11:13 +0000 Date: Sun, 25 Jan 2015 00:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] bump __XEN_LATEST_INTERFACE_VERSION__ X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3367ca8e821eb8e3e48d82d661b18dc0e2c49918 Author: Jan Beulich AuthorDate: Wed Jan 21 11:09:34 2015 +0100 Commit: Jan Beulich CommitDate: Wed Jan 21 11:09:34 2015 +0100 bump __XEN_LATEST_INTERFACE_VERSION__ --- xen/include/public/xen-compat.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/public/xen-compat.h b/xen/include/public/xen-compat.h index 3eb80a0..c1d660d 100644 --- a/xen/include/public/xen-compat.h +++ b/xen/include/public/xen-compat.h @@ -27,7 +27,7 @@ #ifndef __XEN_PUBLIC_XEN_COMPAT_H__ #define __XEN_PUBLIC_XEN_COMPAT_H__ -#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040400 +#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040500 #if defined(__XEN__) || defined(__XEN_TOOLS__) /* Xen is built with matching headers and implements the latest interface. */ -- 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 Jan 26 10:33:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Jan 2015 10: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 1YFgyh-0000ug-0Y; Mon, 26 Jan 2015 10: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 1YFgyf-0000uU-G8 for xen-changelog@lists.xensource.com; Mon, 26 Jan 2015 10:33:05 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 5D/F0-03309-0E716C45; Mon, 26 Jan 2015 10:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1422268382!14839253!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25192 invoked from network); 26 Jan 2015 10:33:03 -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; 26 Jan 2015 10:33:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YFgyc-0000BW-Id for xen-changelog@lists.xensource.com; Mon, 26 Jan 2015 10:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YFgyc-0002po-Es for xen-changelog@lists.xensource.com; Mon, 26 Jan 2015 10:33:02 +0000 Date: Mon, 26 Jan 2015 10:33: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-rc1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 052bd9583c22e531433f2584325b2027d04bed6e Author: Jan Beulich AuthorDate: Fri Jan 23 17:57:20 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 23 17:57:20 2015 +0100 update Xen version to 4.4.2-rc1 --- Config.mk | 2 +- xen/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index c44853f..7f3910d 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.1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.2-rc1 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. diff --git a/xen/Makefile b/xen/Makefile index 301d8a1..21f6fb4 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-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2-rc1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jan 26 10:33:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 26 Jan 2015 10: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 1YFgyh-0000ug-0Y; Mon, 26 Jan 2015 10: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 1YFgyf-0000uU-G8 for xen-changelog@lists.xensource.com; Mon, 26 Jan 2015 10:33:05 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 5D/F0-03309-0E716C45; Mon, 26 Jan 2015 10:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1422268382!14839253!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25192 invoked from network); 26 Jan 2015 10:33:03 -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; 26 Jan 2015 10:33:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YFgyc-0000BW-Id for xen-changelog@lists.xensource.com; Mon, 26 Jan 2015 10:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YFgyc-0002po-Es for xen-changelog@lists.xensource.com; Mon, 26 Jan 2015 10:33:02 +0000 Date: Mon, 26 Jan 2015 10:33: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-rc1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 052bd9583c22e531433f2584325b2027d04bed6e Author: Jan Beulich AuthorDate: Fri Jan 23 17:57:20 2015 +0100 Commit: Jan Beulich CommitDate: Fri Jan 23 17:57:20 2015 +0100 update Xen version to 4.4.2-rc1 --- Config.mk | 2 +- xen/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index c44853f..7f3910d 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.1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.2-rc1 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. diff --git a/xen/Makefile b/xen/Makefile index 301d8a1..21f6fb4 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-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2-rc1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jan 29 16:22:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 29 Jan 2015 16:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YGrr4-0001L0-WC; Thu, 29 Jan 2015 16:22:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YGrr3-0001Kb-KR for xen-changelog@lists.xensource.com; Thu, 29 Jan 2015 16:22:05 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id A1/4C-02995-C2E5AC45; Thu, 29 Jan 2015 16:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1422548523!14434015!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6493 invoked from network); 29 Jan 2015 16:22:04 -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; 29 Jan 2015 16:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YGrr1-0000ls-0l for xen-changelog@lists.xensource.com; Thu, 29 Jan 2015 16:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YGrr0-0004Pk-Rj for xen-changelog@lists.xensource.com; Thu, 29 Jan 2015 16:22:02 +0000 Date: Thu, 29 Jan 2015 16:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] dt-uart: use ':' as separator between path and options X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 19283185e0cad1ccb50583e4eed5cd263f454e18 Author: Ian Campbell AuthorDate: Thu Jan 8 11:53:55 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jan 27 17:03:11 2015 +0000 dt-uart: use ':' as separator between path and options ',' is a valid character in a device-tree path (see ePAPR v1.1 Table 2-1), in fact ',' is actually pretty common in node names. Using ',' as a separator breaks for example on fast models. If you use the full path (/smb/motherboard/iofpga@3,00000000/uart@090000) rather than the alias then earlyprintk gives: (XEN) Looking for UART console /smb/motherboard/iofpga@3 (XEN) Unable to find device "/smb/motherboard/iofpga@3" (XEN) Bad console= option 'dtuart' I actually noticed this on Jetson where the uart is "/serial@0,70006300" and there happened to be no alias defined. Instead use ':' as the separator, it is defined to terminate the path in the context of /chosen/stdout-path (Table 3-4) which is pretty closely analogous to the dtuart= option and so makes a pretty good choice (especially since the next patch adds support for stdout-path). Since no DT aware driver current supports any options there is no point in retaining support for ',' for backwards compatibility. Additionally, expand the buffer for the dtuart option, a path can be far longer than 30 characters (in fact the maximum size of a single node name is 31, so it's not even necessarily enough for an alias). 128 is completely arbitrary and allows for paths at least 8 deep even with worst case node names. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall (cherry picked from commit f01af57300cb60ab0fd8487fb5bbbe97bee234f0) --- docs/misc/xen-command-line.markdown | 2 +- xen/drivers/char/dt-uart.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 152ae03..17cf563 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -550,7 +550,7 @@ Pin dom0 vcpus to their respective pcpus Flag that makes a 64bit dom0 boot in PVH mode. No 32bit support at present. ### dtuart (ARM) -> `= path [,options]` +> `= path [:options]` > Default: `""` diff --git a/xen/drivers/char/dt-uart.c b/xen/drivers/char/dt-uart.c index fa92b5c..1197230 100644 --- a/xen/drivers/char/dt-uart.c +++ b/xen/drivers/char/dt-uart.c @@ -25,13 +25,13 @@ /* * Configure UART port with a string: - * path,options + * path:options * * @path: full path used in the device tree for the UART. If the path * doesn't start with '/', we assuming that it's an alias. * @options: UART speficic options (see in each UART driver) */ -static char __initdata opt_dtuart[30] = ""; +static char __initdata opt_dtuart[256] = ""; string_param("dtuart", opt_dtuart); void __init dt_uart_init(void) @@ -47,7 +47,7 @@ void __init dt_uart_init(void) return; } - options = strchr(opt_dtuart, ','); + options = strchr(opt_dtuart, ':'); if ( options != NULL ) *(options++) = '\0'; else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jan 29 16:22:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 29 Jan 2015 16:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YGrr4-0001L0-WC; Thu, 29 Jan 2015 16:22:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YGrr3-0001Kb-KR for xen-changelog@lists.xensource.com; Thu, 29 Jan 2015 16:22:05 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id A1/4C-02995-C2E5AC45; Thu, 29 Jan 2015 16:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1422548523!14434015!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6493 invoked from network); 29 Jan 2015 16:22:04 -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; 29 Jan 2015 16:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YGrr1-0000ls-0l for xen-changelog@lists.xensource.com; Thu, 29 Jan 2015 16:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YGrr0-0004Pk-Rj for xen-changelog@lists.xensource.com; Thu, 29 Jan 2015 16:22:02 +0000 Date: Thu, 29 Jan 2015 16:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] dt-uart: use ':' as separator between path and options X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 19283185e0cad1ccb50583e4eed5cd263f454e18 Author: Ian Campbell AuthorDate: Thu Jan 8 11:53:55 2015 +0000 Commit: Ian Campbell CommitDate: Tue Jan 27 17:03:11 2015 +0000 dt-uart: use ':' as separator between path and options ',' is a valid character in a device-tree path (see ePAPR v1.1 Table 2-1), in fact ',' is actually pretty common in node names. Using ',' as a separator breaks for example on fast models. If you use the full path (/smb/motherboard/iofpga@3,00000000/uart@090000) rather than the alias then earlyprintk gives: (XEN) Looking for UART console /smb/motherboard/iofpga@3 (XEN) Unable to find device "/smb/motherboard/iofpga@3" (XEN) Bad console= option 'dtuart' I actually noticed this on Jetson where the uart is "/serial@0,70006300" and there happened to be no alias defined. Instead use ':' as the separator, it is defined to terminate the path in the context of /chosen/stdout-path (Table 3-4) which is pretty closely analogous to the dtuart= option and so makes a pretty good choice (especially since the next patch adds support for stdout-path). Since no DT aware driver current supports any options there is no point in retaining support for ',' for backwards compatibility. Additionally, expand the buffer for the dtuart option, a path can be far longer than 30 characters (in fact the maximum size of a single node name is 31, so it's not even necessarily enough for an alias). 128 is completely arbitrary and allows for paths at least 8 deep even with worst case node names. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall (cherry picked from commit f01af57300cb60ab0fd8487fb5bbbe97bee234f0) --- docs/misc/xen-command-line.markdown | 2 +- xen/drivers/char/dt-uart.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 152ae03..17cf563 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -550,7 +550,7 @@ Pin dom0 vcpus to their respective pcpus Flag that makes a 64bit dom0 boot in PVH mode. No 32bit support at present. ### dtuart (ARM) -> `= path [,options]` +> `= path [:options]` > Default: `""` diff --git a/xen/drivers/char/dt-uart.c b/xen/drivers/char/dt-uart.c index fa92b5c..1197230 100644 --- a/xen/drivers/char/dt-uart.c +++ b/xen/drivers/char/dt-uart.c @@ -25,13 +25,13 @@ /* * Configure UART port with a string: - * path,options + * path:options * * @path: full path used in the device tree for the UART. If the path * doesn't start with '/', we assuming that it's an alias. * @options: UART speficic options (see in each UART driver) */ -static char __initdata opt_dtuart[30] = ""; +static char __initdata opt_dtuart[256] = ""; string_param("dtuart", opt_dtuart); void __init dt_uart_init(void) @@ -47,7 +47,7 @@ void __init dt_uart_init(void) return; } - options = strchr(opt_dtuart, ','); + options = strchr(opt_dtuart, ':'); if ( options != NULL ) *(options++) = '\0'; else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jan 29 16:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 29 Jan 2015 16: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 1YGrrG-0001RM-2m; Thu, 29 Jan 2015 16:22:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YGrrD-0001Q9-RX for xen-changelog@lists.xensource.com; Thu, 29 Jan 2015 16:22:16 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 30/6A-03164-73E5AC45; Thu, 29 Jan 2015 16:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1422548533!12356564!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21896 invoked from network); 29 Jan 2015 16:22:14 -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; 29 Jan 2015 16:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YGrrB-0000lv-7p for xen-changelog@lists.xensource.com; Thu, 29 Jan 2015 16:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YGrrB-0004Qr-54 for xen-changelog@lists.xensource.com; Thu, 29 Jan 2015 16:22:13 +0000 Date: Thu, 29 Jan 2015 16:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xen/arm: Manage pl011 uart TX interrupt correctly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c93aa9bd457051dfda4890ca0af989889c3adfa1 Author: Vijaya Kumar K AuthorDate: Tue Dec 9 10:09:55 2014 +0530 Commit: Ian Campbell CommitDate: Tue Jan 27 17:03:12 2015 +0000 xen/arm: Manage pl011 uart TX interrupt correctly In pl011.c, when TX interrupt is received serial_tx_interrupt() is called to push next characters. If TX buffer is empty, serial_tx_interrupt() does not disable TX interrupt and hence pl011 UART irq handler pl011_interrupt() always sees TX interrupt status set in MIS register and cpu does not come out of UART irq handler. With this patch, mask TX interrupt by writing 0 to IMSC register when TX buffer is empty and unmask by writing 1 to IMSC register before sending characters. Signed-off-by: Vijaya Kumar K Reviewed-by: Tim Deegan (cherry picked from commit 20e297f84035da854ceb6a160981f78ed56a408b) --- xen/drivers/char/pl011.c | 16 ++++++++++++++++ xen/drivers/char/serial.c | 34 ++++++++++++++++++++++++++++++++++ xen/include/xen/serial.h | 4 ++++ 3 files changed, 54 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index dd19ce8..57274d9 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -197,6 +197,20 @@ static const struct vuart_info *pl011_vuart(struct serial_port *port) return &uart->vuart; } +static void pl011_tx_stop(struct serial_port *port) +{ + struct pl011 *uart = port->uart; + + pl011_write(uart, IMSC, pl011_read(uart, IMSC) & ~(TXI)); +} + +static void pl011_tx_start(struct serial_port *port) +{ + struct pl011 *uart = port->uart; + + pl011_write(uart, IMSC, pl011_read(uart, IMSC) | (TXI)); +} + static struct uart_driver __read_mostly pl011_driver = { .init_preirq = pl011_init_preirq, .init_postirq = pl011_init_postirq, @@ -207,6 +221,8 @@ static struct uart_driver __read_mostly pl011_driver = { .putc = pl011_putc, .getc = pl011_getc, .irq = pl011_irq, + .start_tx = pl011_tx_start, + .stop_tx = pl011_tx_stop, .vuart_info = pl011_vuart, }; diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index 44026b1..c583a48 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -31,6 +31,18 @@ static struct serial_port com[SERHND_IDX + 1] = { static bool_t __read_mostly post_irq; +static inline void serial_start_tx(struct serial_port *port) +{ + if ( port->driver->start_tx != NULL ) + port->driver->start_tx(port); +} + +static inline void serial_stop_tx(struct serial_port *port) +{ + if ( port->driver->stop_tx != NULL ) + port->driver->stop_tx(port); +} + void serial_rx_interrupt(struct serial_port *port, struct cpu_user_regs *regs) { char c; @@ -76,6 +88,18 @@ void serial_tx_interrupt(struct serial_port *port, struct cpu_user_regs *regs) cpu_relax(); } + if ( port->txbufc == port->txbufp ) + { + /* Disable TX. nothing to send */ + serial_stop_tx(port); + spin_unlock(&port->tx_lock); + goto out; + } + else + { + if ( port->driver->tx_ready(port) ) + serial_start_tx(port); + } for ( i = 0, n = port->driver->tx_ready(port); i < n; i++ ) { if ( port->txbufc == port->txbufp ) @@ -117,6 +141,8 @@ static void __serial_putc(struct serial_port *port, char c) cpu_relax(); if ( n > 0 ) { + /* Enable TX before sending chars */ + serial_start_tx(port); while ( n-- ) port->driver->putc( port, @@ -135,6 +161,8 @@ static void __serial_putc(struct serial_port *port, char c) if ( ((port->txbufp - port->txbufc) == 0) && port->driver->tx_ready(port) > 0 ) { + /* Enable TX before sending chars */ + serial_start_tx(port); /* Buffer and UART FIFO are both empty, and port is available. */ port->driver->putc(port, c); } @@ -152,11 +180,16 @@ static void __serial_putc(struct serial_port *port, char c) while ( !(n = port->driver->tx_ready(port)) ) cpu_relax(); if ( n > 0 ) + { + /* Enable TX before sending chars */ + serial_start_tx(port); port->driver->putc(port, c); + } } else { /* Simple synchronous transmitter. */ + serial_start_tx(port); port->driver->putc(port, c); } } @@ -404,6 +437,7 @@ void serial_start_sync(int handle) /* port is unavailable and might not come up until reenabled by dom0, we can't really do proper sync */ break; + serial_start_tx(port); port->driver->putc( port, port->txbuf[mask_serial_txbuf_idx(port->txbufc++)]); } diff --git a/xen/include/xen/serial.h b/xen/include/xen/serial.h index 9f4451b..71e6ade 100644 --- a/xen/include/xen/serial.h +++ b/xen/include/xen/serial.h @@ -81,6 +81,10 @@ struct uart_driver { int (*getc)(struct serial_port *, char *); /* Get IRQ number for this port's serial line: returns -1 if none. */ int (*irq)(struct serial_port *); + /* Unmask TX interrupt */ + void (*start_tx)(struct serial_port *); + /* Mask TX interrupt */ + void (*stop_tx)(struct serial_port *); /* Get serial information */ const struct vuart_info *(*vuart_info)(struct serial_port *); }; -- 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 Jan 29 16:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 29 Jan 2015 16: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 1YGrrG-0001RM-2m; Thu, 29 Jan 2015 16:22:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YGrrD-0001Q9-RX for xen-changelog@lists.xensource.com; Thu, 29 Jan 2015 16:22:16 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 30/6A-03164-73E5AC45; Thu, 29 Jan 2015 16:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1422548533!12356564!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21896 invoked from network); 29 Jan 2015 16:22:14 -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; 29 Jan 2015 16:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YGrrB-0000lv-7p for xen-changelog@lists.xensource.com; Thu, 29 Jan 2015 16:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YGrrB-0004Qr-54 for xen-changelog@lists.xensource.com; Thu, 29 Jan 2015 16:22:13 +0000 Date: Thu, 29 Jan 2015 16:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xen/arm: Manage pl011 uart TX interrupt correctly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c93aa9bd457051dfda4890ca0af989889c3adfa1 Author: Vijaya Kumar K AuthorDate: Tue Dec 9 10:09:55 2014 +0530 Commit: Ian Campbell CommitDate: Tue Jan 27 17:03:12 2015 +0000 xen/arm: Manage pl011 uart TX interrupt correctly In pl011.c, when TX interrupt is received serial_tx_interrupt() is called to push next characters. If TX buffer is empty, serial_tx_interrupt() does not disable TX interrupt and hence pl011 UART irq handler pl011_interrupt() always sees TX interrupt status set in MIS register and cpu does not come out of UART irq handler. With this patch, mask TX interrupt by writing 0 to IMSC register when TX buffer is empty and unmask by writing 1 to IMSC register before sending characters. Signed-off-by: Vijaya Kumar K Reviewed-by: Tim Deegan (cherry picked from commit 20e297f84035da854ceb6a160981f78ed56a408b) --- xen/drivers/char/pl011.c | 16 ++++++++++++++++ xen/drivers/char/serial.c | 34 ++++++++++++++++++++++++++++++++++ xen/include/xen/serial.h | 4 ++++ 3 files changed, 54 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index dd19ce8..57274d9 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -197,6 +197,20 @@ static const struct vuart_info *pl011_vuart(struct serial_port *port) return &uart->vuart; } +static void pl011_tx_stop(struct serial_port *port) +{ + struct pl011 *uart = port->uart; + + pl011_write(uart, IMSC, pl011_read(uart, IMSC) & ~(TXI)); +} + +static void pl011_tx_start(struct serial_port *port) +{ + struct pl011 *uart = port->uart; + + pl011_write(uart, IMSC, pl011_read(uart, IMSC) | (TXI)); +} + static struct uart_driver __read_mostly pl011_driver = { .init_preirq = pl011_init_preirq, .init_postirq = pl011_init_postirq, @@ -207,6 +221,8 @@ static struct uart_driver __read_mostly pl011_driver = { .putc = pl011_putc, .getc = pl011_getc, .irq = pl011_irq, + .start_tx = pl011_tx_start, + .stop_tx = pl011_tx_stop, .vuart_info = pl011_vuart, }; diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index 44026b1..c583a48 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -31,6 +31,18 @@ static struct serial_port com[SERHND_IDX + 1] = { static bool_t __read_mostly post_irq; +static inline void serial_start_tx(struct serial_port *port) +{ + if ( port->driver->start_tx != NULL ) + port->driver->start_tx(port); +} + +static inline void serial_stop_tx(struct serial_port *port) +{ + if ( port->driver->stop_tx != NULL ) + port->driver->stop_tx(port); +} + void serial_rx_interrupt(struct serial_port *port, struct cpu_user_regs *regs) { char c; @@ -76,6 +88,18 @@ void serial_tx_interrupt(struct serial_port *port, struct cpu_user_regs *regs) cpu_relax(); } + if ( port->txbufc == port->txbufp ) + { + /* Disable TX. nothing to send */ + serial_stop_tx(port); + spin_unlock(&port->tx_lock); + goto out; + } + else + { + if ( port->driver->tx_ready(port) ) + serial_start_tx(port); + } for ( i = 0, n = port->driver->tx_ready(port); i < n; i++ ) { if ( port->txbufc == port->txbufp ) @@ -117,6 +141,8 @@ static void __serial_putc(struct serial_port *port, char c) cpu_relax(); if ( n > 0 ) { + /* Enable TX before sending chars */ + serial_start_tx(port); while ( n-- ) port->driver->putc( port, @@ -135,6 +161,8 @@ static void __serial_putc(struct serial_port *port, char c) if ( ((port->txbufp - port->txbufc) == 0) && port->driver->tx_ready(port) > 0 ) { + /* Enable TX before sending chars */ + serial_start_tx(port); /* Buffer and UART FIFO are both empty, and port is available. */ port->driver->putc(port, c); } @@ -152,11 +180,16 @@ static void __serial_putc(struct serial_port *port, char c) while ( !(n = port->driver->tx_ready(port)) ) cpu_relax(); if ( n > 0 ) + { + /* Enable TX before sending chars */ + serial_start_tx(port); port->driver->putc(port, c); + } } else { /* Simple synchronous transmitter. */ + serial_start_tx(port); port->driver->putc(port, c); } } @@ -404,6 +437,7 @@ void serial_start_sync(int handle) /* port is unavailable and might not come up until reenabled by dom0, we can't really do proper sync */ break; + serial_start_tx(port); port->driver->putc( port, port->txbuf[mask_serial_txbuf_idx(port->txbufc++)]); } diff --git a/xen/include/xen/serial.h b/xen/include/xen/serial.h index 9f4451b..71e6ade 100644 --- a/xen/include/xen/serial.h +++ b/xen/include/xen/serial.h @@ -81,6 +81,10 @@ struct uart_driver { int (*getc)(struct serial_port *, char *); /* Get IRQ number for this port's serial line: returns -1 if none. */ int (*irq)(struct serial_port *); + /* Unmask TX interrupt */ + void (*start_tx)(struct serial_port *); + /* Mask TX interrupt */ + void (*stop_tx)(struct serial_port *); /* Get serial information */ const struct vuart_info *(*vuart_info)(struct serial_port *); }; -- 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