From xen-changelog-bounces@lists.xen.org Wed Jul 03 23:55:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWtK-0007dV-FN; Wed, 03 Jul 2013 23:55:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWtI-0007dG-TI for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:17 +0000 Received: from [85.158.139.83:39224] by server-4.bemta-5.messagelabs.com id C9/2D-17085-4E9B4D15; Wed, 03 Jul 2013 23:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-182.messagelabs.com!1372895714!29189238!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11891 invoked from network); 3 Jul 2013 23:55:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWt7-0005VQ-OI for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWt7-0006VM-Cd for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:05 +0000 Date: Wed, 03 Jul 2013 23:55:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suppress device assignment to HVM guest when there is no IOMMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 826eb17271d3c647516d9944c47b0779afedea25 Author: Ian Jackson AuthorDate: Mon Jul 1 15:20:28 2013 +0100 Commit: Ian Jackson CommitDate: Mon Jul 1 15:20:28 2013 +0100 libxl: suppress device assignment to HVM guest when there is no IOMMU This in effect copies similar logic from xend: While there's no way to check whether a device is assigned to a particular guest, XEN_DOMCTL_test_assign_device at least allows checking whether an IOMMU is there and whether a device has been assign to _some_ guest. For the time being, this should be enough to cover for the missing error checking/recovery in other parts of libxl's device assignment paths. There remains a (functionality-, but not security-related) race in that the iommu should be set up earlier, but this is too risky a change for this stage of the 4.3 release. This is a security issue, XSA-61. Signed-off-by: Jan Beulich Tested-by: George Dunlap Acked-by: George Dunlap Acked-by: Ian Jackson --- tools/libxl/libxl_pci.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 2f9f010..88bf91e 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1036,6 +1036,18 @@ int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcide int num_assigned, i, rc; int stubdomid = 0; + if (libxl__domain_type(gc, domid) == LIBXL_DOMAIN_TYPE_HVM) { + rc = xc_test_assign_device(ctx->xch, domid, pcidev_encode_bdf(pcidev)); + if (rc) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "PCI device %04x:%02x:%02x.%u %s?", + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func, + errno == ENOSYS ? "cannot be assigned - no IOMMU" + : "already assigned to a different guest"); + goto out; + } + } + rc = libxl__device_pci_setdefault(gc, pcidev); if (rc) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 03 23:55:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWtK-0007dV-FN; Wed, 03 Jul 2013 23:55:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWtI-0007dG-TI for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:17 +0000 Received: from [85.158.139.83:39224] by server-4.bemta-5.messagelabs.com id C9/2D-17085-4E9B4D15; Wed, 03 Jul 2013 23:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-182.messagelabs.com!1372895714!29189238!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11891 invoked from network); 3 Jul 2013 23:55:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWt7-0005VQ-OI for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWt7-0006VM-Cd for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:05 +0000 Date: Wed, 03 Jul 2013 23:55:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: suppress device assignment to HVM guest when there is no IOMMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 826eb17271d3c647516d9944c47b0779afedea25 Author: Ian Jackson AuthorDate: Mon Jul 1 15:20:28 2013 +0100 Commit: Ian Jackson CommitDate: Mon Jul 1 15:20:28 2013 +0100 libxl: suppress device assignment to HVM guest when there is no IOMMU This in effect copies similar logic from xend: While there's no way to check whether a device is assigned to a particular guest, XEN_DOMCTL_test_assign_device at least allows checking whether an IOMMU is there and whether a device has been assign to _some_ guest. For the time being, this should be enough to cover for the missing error checking/recovery in other parts of libxl's device assignment paths. There remains a (functionality-, but not security-related) race in that the iommu should be set up earlier, but this is too risky a change for this stage of the 4.3 release. This is a security issue, XSA-61. Signed-off-by: Jan Beulich Tested-by: George Dunlap Acked-by: George Dunlap Acked-by: Ian Jackson --- tools/libxl/libxl_pci.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 2f9f010..88bf91e 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1036,6 +1036,18 @@ int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcide int num_assigned, i, rc; int stubdomid = 0; + if (libxl__domain_type(gc, domid) == LIBXL_DOMAIN_TYPE_HVM) { + rc = xc_test_assign_device(ctx->xch, domid, pcidev_encode_bdf(pcidev)); + if (rc) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "PCI device %04x:%02x:%02x.%u %s?", + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func, + errno == ENOSYS ? "cannot be assigned - no IOMMU" + : "already assigned to a different guest"); + goto out; + } + } + rc = libxl__device_pci_setdefault(gc, pcidev); if (rc) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 03 23:55:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:55: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 1UuWtU-0007eo-IE; Wed, 03 Jul 2013 23:55:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWtT-0007eJ-59 for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:27 +0000 Received: from [85.158.136.67:19748] by server-8.bemta-5.messagelabs.com id FE/D4-15847-EE9B4D15; Wed, 03 Jul 2013 23:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-207.messagelabs.com!1372895724!25608432!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3036 invoked from network); 3 Jul 2013 23:55:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-207.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:55:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWtQ-0005VT-1v for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWtP-0006Vk-LS for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:23 +0000 Date: Wed, 03 Jul 2013 23:55:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] update Xen version to 4.4-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 a99235eb4f95ab86f0a3e8745ad8bb65c39db6fb Author: Jan Beulich AuthorDate: Mon Jul 1 18:00:34 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 1 18:00:34 2013 +0200 update Xen version to 4.4-unstable --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 201d9bc..b02e2dd 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -1,7 +1,7 @@ # 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 = 3 +export XEN_SUBVERSION = 4 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 Wed Jul 03 23:55:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:55: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 1UuWtU-0007eo-IE; Wed, 03 Jul 2013 23:55:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWtT-0007eJ-59 for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:27 +0000 Received: from [85.158.136.67:19748] by server-8.bemta-5.messagelabs.com id FE/D4-15847-EE9B4D15; Wed, 03 Jul 2013 23:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-207.messagelabs.com!1372895724!25608432!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3036 invoked from network); 3 Jul 2013 23:55:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-207.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:55:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWtQ-0005VT-1v for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWtP-0006Vk-LS for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:23 +0000 Date: Wed, 03 Jul 2013 23:55:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] update Xen version to 4.4-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 a99235eb4f95ab86f0a3e8745ad8bb65c39db6fb Author: Jan Beulich AuthorDate: Mon Jul 1 18:00:34 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 1 18:00:34 2013 +0200 update Xen version to 4.4-unstable --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 201d9bc..b02e2dd 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -1,7 +1,7 @@ # 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 = 3 +export XEN_SUBVERSION = 4 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 Wed Jul 03 23:55:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:55: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 1UuWte-0007g4-LT; Wed, 03 Jul 2013 23:55:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWtd-0007fo-EQ for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:37 +0000 Received: from [85.158.136.67:21934] by server-3.bemta-5.messagelabs.com id BD/E8-09186-8F9B4D15; Wed, 03 Jul 2013 23:55:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-207.messagelabs.com!1372895734!21122949!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7199 invoked from network); 3 Jul 2013 23:55:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-207.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:55:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWta-0005Vj-Bn for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWta-0006WA-6N for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:34 +0000 Date: Wed, 03 Jul 2013 23:55:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] README: Update version to 4.4-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 5f9537c4ba4089844820aeba009251d7436b7afe Author: Ian Jackson AuthorDate: Mon Jul 1 17:35:53 2013 +0100 Commit: Ian Jackson CommitDate: Mon Jul 1 17:35:53 2013 +0100 README: Update version to 4.4-unstable Signed-off-by: Ian Jackson --- README | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README b/README index 580f85a..62691ae 100644 --- a/README +++ b/README @@ -1,10 +1,10 @@ ################################# -__ __ _ _ _____ -\ \/ /___ _ __ | || | |___ / _ __ ___ - \ // _ \ '_ \ | || |_ |_ \ _____| '__/ __| - / \ __/ | | | |__ _| ___) |_____| | | (__ -/_/\_\___|_| |_| |_|(_)____/ |_| \___| - +__ __ _ _ _ _ _ _ _ +\ \/ /___ _ __ | || | | || | _ _ _ __ ___| |_ __ _| |__ | | ___ + \ // _ \ '_ \ | || |_| || |_ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ + / \ __/ | | | |__ _|__ _|_____| |_| | | | \__ \ || (_| | |_) | | __/ +/_/\_\___|_| |_| |_|(_) |_| \__,_|_| |_|___/\__\__,_|_.__/|_|\___| + ################################# http://www.xen.org/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 03 23:55:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:55: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 1UuWte-0007g4-LT; Wed, 03 Jul 2013 23:55:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWtd-0007fo-EQ for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:37 +0000 Received: from [85.158.136.67:21934] by server-3.bemta-5.messagelabs.com id BD/E8-09186-8F9B4D15; Wed, 03 Jul 2013 23:55:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-207.messagelabs.com!1372895734!21122949!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7199 invoked from network); 3 Jul 2013 23:55:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-207.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:55:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWta-0005Vj-Bn for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWta-0006WA-6N for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:34 +0000 Date: Wed, 03 Jul 2013 23:55:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] README: Update version to 4.4-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 5f9537c4ba4089844820aeba009251d7436b7afe Author: Ian Jackson AuthorDate: Mon Jul 1 17:35:53 2013 +0100 Commit: Ian Jackson CommitDate: Mon Jul 1 17:35:53 2013 +0100 README: Update version to 4.4-unstable Signed-off-by: Ian Jackson --- README | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README b/README index 580f85a..62691ae 100644 --- a/README +++ b/README @@ -1,10 +1,10 @@ ################################# -__ __ _ _ _____ -\ \/ /___ _ __ | || | |___ / _ __ ___ - \ // _ \ '_ \ | || |_ |_ \ _____| '__/ __| - / \ __/ | | | |__ _| ___) |_____| | | (__ -/_/\_\___|_| |_| |_|(_)____/ |_| \___| - +__ __ _ _ _ _ _ _ _ +\ \/ /___ _ __ | || | | || | _ _ _ __ ___| |_ __ _| |__ | | ___ + \ // _ \ '_ \ | || |_| || |_ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ + / \ __/ | | | |__ _|__ _|_____| |_| | | | \__ \ || (_| | |_) | | __/ +/_/\_\___|_| |_| |_|(_) |_| \__,_|_| |_|___/\__\__,_|_.__/|_|\___| + ################################# http://www.xen.org/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 03 23:55:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:55: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 1UuWto-0007ha-Ox; Wed, 03 Jul 2013 23:55:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWto-0007hM-4d for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:48 +0000 Received: from [85.158.139.211:52488] by server-1.bemta-5.messagelabs.com id 7E/36-21460-30AB4D15; Wed, 03 Jul 2013 23:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1372895745!19076131!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28903 invoked from network); 3 Jul 2013 23:55:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWtk-0005Vp-Q3 for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWtk-0006WW-IF for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:44 +0000 Date: Wed, 03 Jul 2013 23:55:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] README: Fix a whitespace 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 7b62e6bd2fcc862360c741cf64d2cbce7825402b Author: Ian Jackson AuthorDate: Mon Jul 1 17:36:07 2013 +0100 Commit: Ian Jackson CommitDate: Mon Jul 1 17:36:07 2013 +0100 README: Fix a whitespace error Signed-off-by: Ian Jackson --- README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index 62691ae..9f6c9f5 100644 --- a/README +++ b/README @@ -127,7 +127,7 @@ performed with root privileges.] version of udev scripts, for example), but make dist includes all versions of those scripts, so that you can copy the dist directory to another machine and install from that distribution. - + Python Runtime 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 Wed Jul 03 23:55:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:55: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 1UuWto-0007ha-Ox; Wed, 03 Jul 2013 23:55:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWto-0007hM-4d for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:48 +0000 Received: from [85.158.139.211:52488] by server-1.bemta-5.messagelabs.com id 7E/36-21460-30AB4D15; Wed, 03 Jul 2013 23:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1372895745!19076131!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28903 invoked from network); 3 Jul 2013 23:55:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWtk-0005Vp-Q3 for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWtk-0006WW-IF for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:44 +0000 Date: Wed, 03 Jul 2013 23:55:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] README: Fix a whitespace 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 7b62e6bd2fcc862360c741cf64d2cbce7825402b Author: Ian Jackson AuthorDate: Mon Jul 1 17:36:07 2013 +0100 Commit: Ian Jackson CommitDate: Mon Jul 1 17:36:07 2013 +0100 README: Fix a whitespace error Signed-off-by: Ian Jackson --- README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index 62691ae..9f6c9f5 100644 --- a/README +++ b/README @@ -127,7 +127,7 @@ performed with root privileges.] version of udev scripts, for example), but make dist includes all versions of those scripts, so that you can copy the dist directory to another machine and install from that distribution. - + Python Runtime 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 Wed Jul 03 23:56:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:56: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 1UuWu0-0007jF-S9; Wed, 03 Jul 2013 23:56:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWtz-0007ih-M0 for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:59 +0000 Received: from [85.158.139.211:46458] by server-10.bemta-5.messagelabs.com id 4C/3D-03093-D0AB4D15; Wed, 03 Jul 2013 23:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1372895755!17939835!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21629 invoked from network); 3 Jul 2013 23:55:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWtv-0005Vz-3H for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWtu-0006XO-UK for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:54 +0000 Date: Wed, 03 Jul 2013 23:55:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/xsave: adjust state management X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f9755488bf17c056111d1e442be394cfb63d7788 Author: Jan Beulich AuthorDate: Tue Jul 2 08:41:28 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 2 08:41:28 2013 +0200 x86/xsave: adjust state management The initial state for a vCPU is using default values, so there's no need to force the XRSTOR to read the state from memory. This saves a couple of thousand restores from memory just during boot of Linux on my Sandy Bridge system (I didn't try to make further measurements). The above requires that arch_set_info_guest() updates the state flags in the save area when valid floating point state got passed in, but that would really have been needed even before in case XSAVE{,OPT} decided to clear one or both of the FP and SSE bits. Furthermore, hvm_vcpu_reset_state() shouldn't just clear out the FPU/ SSE area, but needs to re-initialized MXCSR and FCW. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/domain.c | 4 ++++ xen/arch/x86/hvm/hvm.c | 8 +++++++- xen/arch/x86/xstate.c | 6 +++++- xen/include/asm-x86/xstate.h | 1 + 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 52c9040..874742c 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -712,7 +712,11 @@ int arch_set_info_guest( v->arch.vgc_flags = flags; if ( flags & VGCF_I387_VALID ) + { memcpy(v->arch.fpu_ctxt, &c.nat->fpu_ctxt, sizeof(c.nat->fpu_ctxt)); + if ( v->arch.xsave_area ) + v->arch.xsave_area->xsave_hdr.xstate_bv = XSTATE_FP_SSE; + } if ( !compat ) { diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 43b6d05..1fcaed0 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3466,6 +3466,7 @@ void hvm_vcpu_reset_state(struct vcpu *v, uint16_t cs, uint16_t ip) { struct domain *d = v->domain; struct segment_register reg; + typeof(v->arch.xsave_area->fpu_sse) *fpu_ctxt = v->arch.fpu_ctxt; domain_lock(d); @@ -3479,7 +3480,12 @@ void hvm_vcpu_reset_state(struct vcpu *v, uint16_t cs, uint16_t ip) v->arch.guest_table = pagetable_null(); } - memset(v->arch.fpu_ctxt, 0, sizeof(v->arch.xsave_area->fpu_sse)); + memset(fpu_ctxt, 0, sizeof(*fpu_ctxt)); + fpu_ctxt->fcw = FCW_RESET; + fpu_ctxt->mxcsr = MXCSR_DEFAULT; + if ( v->arch.xsave_area ) + v->arch.xsave_area->xsave_hdr.xstate_bv = XSTATE_FP; + v->arch.vgc_flags = VGCF_online; memset(&v->arch.user_regs, 0, sizeof(v->arch.user_regs)); v->arch.user_regs.eflags = 2; diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index d52dbd7..608accf 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -204,9 +204,13 @@ int xstate_alloc_save_area(struct vcpu *v) if ( save_area == NULL ) return -ENOMEM; + /* + * Set the memory image to default values, but don't force the context + * to be loaded from memory (i.e. keep save_area->xsave_hdr.xstate_bv + * clear). + */ save_area->fpu_sse.fcw = FCW_DEFAULT; save_area->fpu_sse.mxcsr = MXCSR_DEFAULT; - save_area->xsave_hdr.xstate_bv = XSTATE_FP_SSE; v->arch.xsave_area = save_area; v->arch.xcr0 = XSTATE_FP_SSE; diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index 49168f3..dc3cb8e 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -11,6 +11,7 @@ #include #define FCW_DEFAULT 0x037f +#define FCW_RESET 0x0040 #define MXCSR_DEFAULT 0x1f80 #define XSTATE_CPUID 0x0000000d -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 03 23:56:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:56: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 1UuWu0-0007jF-S9; Wed, 03 Jul 2013 23:56:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWtz-0007ih-M0 for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:59 +0000 Received: from [85.158.139.211:46458] by server-10.bemta-5.messagelabs.com id 4C/3D-03093-D0AB4D15; Wed, 03 Jul 2013 23:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1372895755!17939835!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21629 invoked from network); 3 Jul 2013 23:55:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWtv-0005Vz-3H for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWtu-0006XO-UK for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:55:54 +0000 Date: Wed, 03 Jul 2013 23:55:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/xsave: adjust state management X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f9755488bf17c056111d1e442be394cfb63d7788 Author: Jan Beulich AuthorDate: Tue Jul 2 08:41:28 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 2 08:41:28 2013 +0200 x86/xsave: adjust state management The initial state for a vCPU is using default values, so there's no need to force the XRSTOR to read the state from memory. This saves a couple of thousand restores from memory just during boot of Linux on my Sandy Bridge system (I didn't try to make further measurements). The above requires that arch_set_info_guest() updates the state flags in the save area when valid floating point state got passed in, but that would really have been needed even before in case XSAVE{,OPT} decided to clear one or both of the FP and SSE bits. Furthermore, hvm_vcpu_reset_state() shouldn't just clear out the FPU/ SSE area, but needs to re-initialized MXCSR and FCW. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/domain.c | 4 ++++ xen/arch/x86/hvm/hvm.c | 8 +++++++- xen/arch/x86/xstate.c | 6 +++++- xen/include/asm-x86/xstate.h | 1 + 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 52c9040..874742c 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -712,7 +712,11 @@ int arch_set_info_guest( v->arch.vgc_flags = flags; if ( flags & VGCF_I387_VALID ) + { memcpy(v->arch.fpu_ctxt, &c.nat->fpu_ctxt, sizeof(c.nat->fpu_ctxt)); + if ( v->arch.xsave_area ) + v->arch.xsave_area->xsave_hdr.xstate_bv = XSTATE_FP_SSE; + } if ( !compat ) { diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 43b6d05..1fcaed0 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3466,6 +3466,7 @@ void hvm_vcpu_reset_state(struct vcpu *v, uint16_t cs, uint16_t ip) { struct domain *d = v->domain; struct segment_register reg; + typeof(v->arch.xsave_area->fpu_sse) *fpu_ctxt = v->arch.fpu_ctxt; domain_lock(d); @@ -3479,7 +3480,12 @@ void hvm_vcpu_reset_state(struct vcpu *v, uint16_t cs, uint16_t ip) v->arch.guest_table = pagetable_null(); } - memset(v->arch.fpu_ctxt, 0, sizeof(v->arch.xsave_area->fpu_sse)); + memset(fpu_ctxt, 0, sizeof(*fpu_ctxt)); + fpu_ctxt->fcw = FCW_RESET; + fpu_ctxt->mxcsr = MXCSR_DEFAULT; + if ( v->arch.xsave_area ) + v->arch.xsave_area->xsave_hdr.xstate_bv = XSTATE_FP; + v->arch.vgc_flags = VGCF_online; memset(&v->arch.user_regs, 0, sizeof(v->arch.user_regs)); v->arch.user_regs.eflags = 2; diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index d52dbd7..608accf 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -204,9 +204,13 @@ int xstate_alloc_save_area(struct vcpu *v) if ( save_area == NULL ) return -ENOMEM; + /* + * Set the memory image to default values, but don't force the context + * to be loaded from memory (i.e. keep save_area->xsave_hdr.xstate_bv + * clear). + */ save_area->fpu_sse.fcw = FCW_DEFAULT; save_area->fpu_sse.mxcsr = MXCSR_DEFAULT; - save_area->xsave_hdr.xstate_bv = XSTATE_FP_SSE; v->arch.xsave_area = save_area; v->arch.xcr0 = XSTATE_FP_SSE; diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index 49168f3..dc3cb8e 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -11,6 +11,7 @@ #include #define FCW_DEFAULT 0x037f +#define FCW_RESET 0x0040 #define MXCSR_DEFAULT 0x1f80 #define XSTATE_CPUID 0x0000000d -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 03 23:56:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:56:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWu9-0007l3-Ux; Wed, 03 Jul 2013 23:56:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWu8-0007kf-GG for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:08 +0000 Received: from [85.158.138.51:13795] by server-14.bemta-3.messagelabs.com id C2/5A-12881-71AB4D15; Wed, 03 Jul 2013 23:56:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-174.messagelabs.com!1372895765!29957203!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3798 invoked from network); 3 Jul 2013 23:56:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWu5-0005WX-8t for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWu5-0006Xu-79 for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:05 +0000 Date: Wed, 03 Jul 2013 23:56:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/fxsave: bring in line with recent xsave adjustments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f6c8c791522d6a2ef5e6abd44d0ed005446242b5 Author: Jan Beulich AuthorDate: Tue Jul 2 08:42:49 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 2 08:42:49 2013 +0200 x86/fxsave: bring in line with recent xsave adjustments Defer the FIP/FDP pointer reset needed on AMD CPUs to the restore path, and switch from using EMMS to FFREE here too (to be resistant against eventual future CPUs without MMX support). Also switch from using an almost typeless pointer in fpu_fxrstor() to a properly typed one, thus telling the compiler the truth about which memory gets accessed. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/i387.c | 47 +++++++++++++++++++++-------------------------- 1 files changed, 21 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index dbf24af..bd162a8 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -52,14 +52,30 @@ static inline void fpu_xrstor(struct vcpu *v, uint64_t mask) /* Restor x87 FPU, MMX, SSE and SSE2 state */ static inline void fpu_fxrstor(struct vcpu *v) { - const char *fpu_ctxt = v->arch.fpu_ctxt; + const typeof(v->arch.xsave_area->fpu_sse) *fpu_ctxt = v->arch.fpu_ctxt; + + /* + * AMD CPUs don't save/restore FDP/FIP/FOP unless an exception + * is pending. Clear the x87 state here by setting it to fixed + * values. The hypervisor data segment can be sometimes 0 and + * sometimes new user value. Both should be ok. Use the FPU saved + * data block as a safe address because it should be in L1. + */ + if ( !(fpu_ctxt->fsw & 0x0080) && + boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) + { + asm volatile ( "fnclex\n\t" + "ffree %%st(7)\n\t" /* clear stack tag */ + "fildl %0" /* load to clear state */ + : : "m" (*fpu_ctxt) ); + } /* * FXRSTOR can fault if passed a corrupted data block. We handle this * possibility, which may occur if the block was passed to us by control * tools or through VCPUOP_initialise, by silently clearing the block. */ - switch ( __builtin_expect(fpu_ctxt[FPU_WORD_SIZE_OFFSET], 8) ) + switch ( __builtin_expect(fpu_ctxt->x[FPU_WORD_SIZE_OFFSET], 8) ) { default: asm volatile ( @@ -80,8 +96,7 @@ static inline void fpu_fxrstor(struct vcpu *v) ".previous \n" _ASM_EXTABLE(1b, 2b) : - : "m" (*fpu_ctxt), - "i" (sizeof(v->arch.xsave_area->fpu_sse) / 4), + : "m" (*fpu_ctxt), "i" (sizeof(*fpu_ctxt) / 4), "cdaSDb" (fpu_ctxt) ); break; case 4: case 2: @@ -102,8 +117,7 @@ static inline void fpu_fxrstor(struct vcpu *v) ".previous \n" _ASM_EXTABLE(1b, 2b) : - : "m" (*fpu_ctxt), - "i" (sizeof(v->arch.xsave_area->fpu_sse) / 4) ); + : "m" (*fpu_ctxt), "i" (sizeof(*fpu_ctxt) / 4) ); break; } } @@ -156,7 +170,7 @@ static inline void fpu_fxsave(struct vcpu *v) */ if ( !(fpu_ctxt->fsw & 0x0080) && boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) - word_size = -1; + return; if ( word_size > 0 && !((fpu_ctxt->fip.addr | fpu_ctxt->fdp.addr) >> 32) ) @@ -177,25 +191,6 @@ static inline void fpu_fxsave(struct vcpu *v) if ( word_size >= 0 ) fpu_ctxt->x[FPU_WORD_SIZE_OFFSET] = word_size; - - /* Clear exception flags if FSW.ES is set. */ - if ( unlikely(fpu_ctxt->fsw & 0x0080) ) - asm volatile ("fnclex"); - - /* - * AMD CPUs don't save/restore FDP/FIP/FOP unless an exception - * is pending. Clear the x87 state here by setting it to fixed - * values. The hypervisor data segment can be sometimes 0 and - * sometimes new user value. Both should be ok. Use the FPU saved - * data block as a safe address because it should be in L1. - */ - if ( boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) - { - asm volatile ( - "emms\n\t" /* clear stack tags */ - "fildl %0" /* load to clear state */ - : : "m" (*fpu_ctxt) ); - } } /* Save x87 FPU state */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 03 23:56:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:56:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWu9-0007l3-Ux; Wed, 03 Jul 2013 23:56:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWu8-0007kf-GG for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:08 +0000 Received: from [85.158.138.51:13795] by server-14.bemta-3.messagelabs.com id C2/5A-12881-71AB4D15; Wed, 03 Jul 2013 23:56:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-174.messagelabs.com!1372895765!29957203!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3798 invoked from network); 3 Jul 2013 23:56:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWu5-0005WX-8t for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWu5-0006Xu-79 for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:05 +0000 Date: Wed, 03 Jul 2013 23:56:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/fxsave: bring in line with recent xsave adjustments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f6c8c791522d6a2ef5e6abd44d0ed005446242b5 Author: Jan Beulich AuthorDate: Tue Jul 2 08:42:49 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 2 08:42:49 2013 +0200 x86/fxsave: bring in line with recent xsave adjustments Defer the FIP/FDP pointer reset needed on AMD CPUs to the restore path, and switch from using EMMS to FFREE here too (to be resistant against eventual future CPUs without MMX support). Also switch from using an almost typeless pointer in fpu_fxrstor() to a properly typed one, thus telling the compiler the truth about which memory gets accessed. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/i387.c | 47 +++++++++++++++++++++-------------------------- 1 files changed, 21 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index dbf24af..bd162a8 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -52,14 +52,30 @@ static inline void fpu_xrstor(struct vcpu *v, uint64_t mask) /* Restor x87 FPU, MMX, SSE and SSE2 state */ static inline void fpu_fxrstor(struct vcpu *v) { - const char *fpu_ctxt = v->arch.fpu_ctxt; + const typeof(v->arch.xsave_area->fpu_sse) *fpu_ctxt = v->arch.fpu_ctxt; + + /* + * AMD CPUs don't save/restore FDP/FIP/FOP unless an exception + * is pending. Clear the x87 state here by setting it to fixed + * values. The hypervisor data segment can be sometimes 0 and + * sometimes new user value. Both should be ok. Use the FPU saved + * data block as a safe address because it should be in L1. + */ + if ( !(fpu_ctxt->fsw & 0x0080) && + boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) + { + asm volatile ( "fnclex\n\t" + "ffree %%st(7)\n\t" /* clear stack tag */ + "fildl %0" /* load to clear state */ + : : "m" (*fpu_ctxt) ); + } /* * FXRSTOR can fault if passed a corrupted data block. We handle this * possibility, which may occur if the block was passed to us by control * tools or through VCPUOP_initialise, by silently clearing the block. */ - switch ( __builtin_expect(fpu_ctxt[FPU_WORD_SIZE_OFFSET], 8) ) + switch ( __builtin_expect(fpu_ctxt->x[FPU_WORD_SIZE_OFFSET], 8) ) { default: asm volatile ( @@ -80,8 +96,7 @@ static inline void fpu_fxrstor(struct vcpu *v) ".previous \n" _ASM_EXTABLE(1b, 2b) : - : "m" (*fpu_ctxt), - "i" (sizeof(v->arch.xsave_area->fpu_sse) / 4), + : "m" (*fpu_ctxt), "i" (sizeof(*fpu_ctxt) / 4), "cdaSDb" (fpu_ctxt) ); break; case 4: case 2: @@ -102,8 +117,7 @@ static inline void fpu_fxrstor(struct vcpu *v) ".previous \n" _ASM_EXTABLE(1b, 2b) : - : "m" (*fpu_ctxt), - "i" (sizeof(v->arch.xsave_area->fpu_sse) / 4) ); + : "m" (*fpu_ctxt), "i" (sizeof(*fpu_ctxt) / 4) ); break; } } @@ -156,7 +170,7 @@ static inline void fpu_fxsave(struct vcpu *v) */ if ( !(fpu_ctxt->fsw & 0x0080) && boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) - word_size = -1; + return; if ( word_size > 0 && !((fpu_ctxt->fip.addr | fpu_ctxt->fdp.addr) >> 32) ) @@ -177,25 +191,6 @@ static inline void fpu_fxsave(struct vcpu *v) if ( word_size >= 0 ) fpu_ctxt->x[FPU_WORD_SIZE_OFFSET] = word_size; - - /* Clear exception flags if FSW.ES is set. */ - if ( unlikely(fpu_ctxt->fsw & 0x0080) ) - asm volatile ("fnclex"); - - /* - * AMD CPUs don't save/restore FDP/FIP/FOP unless an exception - * is pending. Clear the x87 state here by setting it to fixed - * values. The hypervisor data segment can be sometimes 0 and - * sometimes new user value. Both should be ok. Use the FPU saved - * data block as a safe address because it should be in L1. - */ - if ( boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) - { - asm volatile ( - "emms\n\t" /* clear stack tags */ - "fildl %0" /* load to clear state */ - : : "m" (*fpu_ctxt) ); - } } /* Save x87 FPU state */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 03 23:56:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:56:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuK-0007n9-28; Wed, 03 Jul 2013 23:56:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuI-0007mj-Jk for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:18 +0000 Received: from [85.158.143.99:45529] by server-2.bemta-4.messagelabs.com id A8/91-09492-12AB4D15; Wed, 03 Jul 2013 23:56:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-216.messagelabs.com!1372895775!24551409!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10262 invoked from network); 3 Jul 2013 23:56:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:56:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuF-0005Wg-EU for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWuF-0006YM-DP for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:15 +0000 Date: Wed, 03 Jul 2013 23:56:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: remove unused MAPTRACK_MAX_ENTRIES define X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec7e270db8639db880573f029881b9bee31d33d9 Author: Matthew Daley AuthorDate: Tue Jul 2 08:44:41 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 2 08:44:41 2013 +0200 gnttab: remove unused MAPTRACK_MAX_ENTRIES define The maximum number of grant mappings is given by max_nr_maptrack_frames() as of commit 5ce8faf, not this unused define. Signed-off-by: Matthew Daley --- xen/include/xen/grant_table.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index 0820da1..5941191 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -64,9 +64,6 @@ struct grant_mapping { domid_t domid; /* granting domain */ }; -/* Fairly arbitrary. [POLICY] */ -#define MAPTRACK_MAX_ENTRIES 16384 - /* Per-domain grant information. */ struct grant_table { /* Table size. Number of frames shared with guest */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 03 23:56:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:56:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuK-0007n9-28; Wed, 03 Jul 2013 23:56:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuI-0007mj-Jk for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:18 +0000 Received: from [85.158.143.99:45529] by server-2.bemta-4.messagelabs.com id A8/91-09492-12AB4D15; Wed, 03 Jul 2013 23:56:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-216.messagelabs.com!1372895775!24551409!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10262 invoked from network); 3 Jul 2013 23:56:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:56:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuF-0005Wg-EU for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWuF-0006YM-DP for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:15 +0000 Date: Wed, 03 Jul 2013 23:56:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: remove unused MAPTRACK_MAX_ENTRIES define X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec7e270db8639db880573f029881b9bee31d33d9 Author: Matthew Daley AuthorDate: Tue Jul 2 08:44:41 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 2 08:44:41 2013 +0200 gnttab: remove unused MAPTRACK_MAX_ENTRIES define The maximum number of grant mappings is given by max_nr_maptrack_frames() as of commit 5ce8faf, not this unused define. Signed-off-by: Matthew Daley --- xen/include/xen/grant_table.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index 0820da1..5941191 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -64,9 +64,6 @@ struct grant_mapping { domid_t domid; /* granting domain */ }; -/* Fairly arbitrary. [POLICY] */ -#define MAPTRACK_MAX_ENTRIES 16384 - /* Per-domain grant information. */ struct grant_table { /* Table size. Number of frames shared with guest */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 03 23:56:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:56:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuU-0007pP-4q; Wed, 03 Jul 2013 23:56:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuS-0007oy-Gy for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:28 +0000 Received: from [85.158.143.99:35154] by server-1.bemta-4.messagelabs.com id 02/09-28540-B2AB4D15; Wed, 03 Jul 2013 23:56:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-216.messagelabs.com!1372895785!23486828!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21677 invoked from network); 3 Jul 2013 23:56:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:56:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuP-0005Wm-K4 for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWuP-0006Yi-IC for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:25 +0000 Date: Wed, 03 Jul 2013 23:56:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cpufreq, xenpm: fix cpufreq and xenpm mismatch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6b104d91b81ac460a0a862f02c7cbeff82e14430 Author: Jacob Shin AuthorDate: Tue Jul 2 08:47:00 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 2 08:47:00 2013 +0200 cpufreq, xenpm: fix cpufreq and xenpm mismatch Currently cpufreq and xenpm are out of sync. Fix cpufreq reporting of if turbo mode is enabled or not. Fix xenpm to not decode for tristate, but a boolean. Signed-off-by: Jacob Shin --- tools/misc/xenpm.c | 14 +++----------- xen/drivers/cpufreq/utility.c | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index b5f1383..2e57f1f 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -31,10 +31,6 @@ #define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) -#define CPUFREQ_TURBO_DISABLED -1 -#define CPUFREQ_TURBO_UNSUPPORTED 0 -#define CPUFREQ_TURBO_ENABLED 1 - static xc_interface *xc_handle; static unsigned int max_cpu_nr; @@ -699,13 +695,9 @@ static void print_cpufreq_para(int cpuid, struct xc_get_cpufreq_para *p_cpufreq) p_cpufreq->scaling_max_freq, p_cpufreq->scaling_min_freq, p_cpufreq->scaling_cur_freq); - if (p_cpufreq->turbo_enabled != CPUFREQ_TURBO_UNSUPPORTED) { - printf("turbo mode : "); - if (p_cpufreq->turbo_enabled == CPUFREQ_TURBO_ENABLED) - printf("enabled\n"); - else - printf("disabled\n"); - } + + printf("turbo mode : %s\n", + p_cpufreq->turbo_enabled ? "enabled" : "disabled or n/a"); printf("\n"); } diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c index 3dd70e2..519f862 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -428,7 +428,7 @@ int cpufreq_get_turbo_status(int cpuid) struct cpufreq_policy *policy; policy = per_cpu(cpufreq_cpu_policy, cpuid); - return policy && policy->turbo; + return policy && policy->turbo == CPUFREQ_TURBO_ENABLED; } /********************************************************************* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 03 23:56:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:56:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuU-0007pP-4q; Wed, 03 Jul 2013 23:56:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuS-0007oy-Gy for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:28 +0000 Received: from [85.158.143.99:35154] by server-1.bemta-4.messagelabs.com id 02/09-28540-B2AB4D15; Wed, 03 Jul 2013 23:56:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-216.messagelabs.com!1372895785!23486828!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21677 invoked from network); 3 Jul 2013 23:56:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:56:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuP-0005Wm-K4 for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWuP-0006Yi-IC for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:25 +0000 Date: Wed, 03 Jul 2013 23:56:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cpufreq, xenpm: fix cpufreq and xenpm mismatch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6b104d91b81ac460a0a862f02c7cbeff82e14430 Author: Jacob Shin AuthorDate: Tue Jul 2 08:47:00 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 2 08:47:00 2013 +0200 cpufreq, xenpm: fix cpufreq and xenpm mismatch Currently cpufreq and xenpm are out of sync. Fix cpufreq reporting of if turbo mode is enabled or not. Fix xenpm to not decode for tristate, but a boolean. Signed-off-by: Jacob Shin --- tools/misc/xenpm.c | 14 +++----------- xen/drivers/cpufreq/utility.c | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index b5f1383..2e57f1f 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -31,10 +31,6 @@ #define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) -#define CPUFREQ_TURBO_DISABLED -1 -#define CPUFREQ_TURBO_UNSUPPORTED 0 -#define CPUFREQ_TURBO_ENABLED 1 - static xc_interface *xc_handle; static unsigned int max_cpu_nr; @@ -699,13 +695,9 @@ static void print_cpufreq_para(int cpuid, struct xc_get_cpufreq_para *p_cpufreq) p_cpufreq->scaling_max_freq, p_cpufreq->scaling_min_freq, p_cpufreq->scaling_cur_freq); - if (p_cpufreq->turbo_enabled != CPUFREQ_TURBO_UNSUPPORTED) { - printf("turbo mode : "); - if (p_cpufreq->turbo_enabled == CPUFREQ_TURBO_ENABLED) - printf("enabled\n"); - else - printf("disabled\n"); - } + + printf("turbo mode : %s\n", + p_cpufreq->turbo_enabled ? "enabled" : "disabled or n/a"); printf("\n"); } diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c index 3dd70e2..519f862 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -428,7 +428,7 @@ int cpufreq_get_turbo_status(int cpuid) struct cpufreq_policy *policy; policy = per_cpu(cpufreq_cpu_policy, cpuid); - return policy && policy->turbo; + return policy && policy->turbo == CPUFREQ_TURBO_ENABLED; } /********************************************************************* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 03 23:56:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:56: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 1UuWue-0007ro-A1; Wed, 03 Jul 2013 23:56:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuc-0007rL-R8 for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:39 +0000 Received: from [85.158.143.99:35380] by server-3.bemta-4.messagelabs.com id 01/41-29480-63AB4D15; Wed, 03 Jul 2013 23:56:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-216.messagelabs.com!1372895796!20097391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26926 invoked from network); 3 Jul 2013 23:56:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:56:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuZ-0005Wu-RK for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWuZ-0006Z8-OP for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:35 +0000 Date: Wed, 03 Jul 2013 23:56:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't pass negative time to gtime_to_gtsc() (try 2) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5ad914bc867c5a6a4957869c89918f4e1f9dd9c4 Author: Jan Beulich AuthorDate: Tue Jul 2 08:48:03 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 2 08:48:03 2013 +0200 x86: don't pass negative time to gtime_to_gtsc() (try 2) This mostly reverts commit eb60be3d ("x86: don't pass negative time to gtime_to_gtsc()") and instead corrects __update_vcpu_system_time()'s handling of this_cpu(cpu_time).stime_local_stamp dating back before the start of a HVM guest (which would otherwise lead to a negative value getting passed to gtime_to_gtsc(), causing scale_delta() to produce meaningless output). Flushing the value to zero was wrong, and printing a message for something that can validly happen wasn't very useful either. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/time.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 86640f5..cf8bc78 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -823,16 +823,13 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) struct pl_time *pl = &v->domain->arch.hvm_domain.pl_time; stime += pl->stime_offset + v->arch.hvm_vcpu.stime_offset; - if ( (s64)stime < 0 ) - { - printk(XENLOG_G_WARNING "d%dv%d: bogus time %" PRId64 - " (offsets %" PRId64 "/%" PRId64 ")\n", - d->domain_id, v->vcpu_id, stime, - pl->stime_offset, v->arch.hvm_vcpu.stime_offset); - stime = 0; - } + if ( stime >= 0 ) + tsc_stamp = gtime_to_gtsc(d, stime); + else + tsc_stamp = -gtime_to_gtsc(d, -stime); } - tsc_stamp = gtime_to_gtsc(d, stime); + else + tsc_stamp = gtime_to_gtsc(d, stime); } 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 Wed Jul 03 23:56:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:56: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 1UuWue-0007ro-A1; Wed, 03 Jul 2013 23:56:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuc-0007rL-R8 for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:39 +0000 Received: from [85.158.143.99:35380] by server-3.bemta-4.messagelabs.com id 01/41-29480-63AB4D15; Wed, 03 Jul 2013 23:56:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-216.messagelabs.com!1372895796!20097391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26926 invoked from network); 3 Jul 2013 23:56:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:56:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuZ-0005Wu-RK for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWuZ-0006Z8-OP for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:35 +0000 Date: Wed, 03 Jul 2013 23:56:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't pass negative time to gtime_to_gtsc() (try 2) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5ad914bc867c5a6a4957869c89918f4e1f9dd9c4 Author: Jan Beulich AuthorDate: Tue Jul 2 08:48:03 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 2 08:48:03 2013 +0200 x86: don't pass negative time to gtime_to_gtsc() (try 2) This mostly reverts commit eb60be3d ("x86: don't pass negative time to gtime_to_gtsc()") and instead corrects __update_vcpu_system_time()'s handling of this_cpu(cpu_time).stime_local_stamp dating back before the start of a HVM guest (which would otherwise lead to a negative value getting passed to gtime_to_gtsc(), causing scale_delta() to produce meaningless output). Flushing the value to zero was wrong, and printing a message for something that can validly happen wasn't very useful either. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/time.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 86640f5..cf8bc78 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -823,16 +823,13 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) struct pl_time *pl = &v->domain->arch.hvm_domain.pl_time; stime += pl->stime_offset + v->arch.hvm_vcpu.stime_offset; - if ( (s64)stime < 0 ) - { - printk(XENLOG_G_WARNING "d%dv%d: bogus time %" PRId64 - " (offsets %" PRId64 "/%" PRId64 ")\n", - d->domain_id, v->vcpu_id, stime, - pl->stime_offset, v->arch.hvm_vcpu.stime_offset); - stime = 0; - } + if ( stime >= 0 ) + tsc_stamp = gtime_to_gtsc(d, stime); + else + tsc_stamp = -gtime_to_gtsc(d, -stime); } - tsc_stamp = gtime_to_gtsc(d, stime); + else + tsc_stamp = gtime_to_gtsc(d, stime); } 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 Wed Jul 03 23:56:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:56: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 1UuWup-0007vJ-De; Wed, 03 Jul 2013 23:56:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWun-0007tv-HP for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:49 +0000 Received: from [85.158.143.99:35592] by server-1.bemta-4.messagelabs.com id D0/19-28540-04AB4D15; Wed, 03 Jul 2013 23:56:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-216.messagelabs.com!1372895806!20236250!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.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7567 invoked from network); 3 Jul 2013 23:56:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:56:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuk-0005X0-0p for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWuj-0006ZU-Vl for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:45 +0000 Date: Wed, 03 Jul 2013 23:56:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] iommu/amd: Fix logic for clearing the IOMMU interrupt bits X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2823a0c7dfc979db316787e1dd42a8845e5825c0 Author: Suravee Suthikulpanit AuthorDate: Tue Jul 2 08:49:43 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 2 08:49:43 2013 +0200 iommu/amd: Fix logic for clearing the IOMMU interrupt bits The IOMMU interrupt bits in the IOMMU status registers are "read-only, and write-1-to-clear (RW1C). Therefore, the existing logic which reads the register, set the bit, and then writing back the values could accidentally clear certain bits if it has been set. The correct logic would just be writing only the value which only set the interrupt bits, and leave the rest to zeros. This patch also, clean up #define masks as Jan has suggested. Signed-off-by: Suravee Suthikulpanit With iommu_interrupt_handler() properly having got switched its readl() from status to control register, the subsequent writel() needed to be switched too (and the RW1C comment there was bogus). Some of the cleanup went too far - undone. Further, with iommu_interrupt_handler() now actually disabling the interrupt sources, they also need to get re-enabled by the tasklet once it finished processing the respective log. This also implies re-running the tasklet so that log entries added between reading the log and re- enabling the interrupt will get handled in a timely manner. Finally, guest write emulation to the status register needs to be done with the RW1C (and RO for all other bits) semantics in mind too. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_cmd.c | 14 ++--- xen/drivers/passthrough/amd/iommu_guest.c | 9 +++- xen/drivers/passthrough/amd/iommu_init.c | 84 ++++++++++++++++---------- xen/include/asm-x86/hvm/svm/amd-iommu-defs.h | 22 +++++-- 4 files changed, 84 insertions(+), 45 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_cmd.c b/xen/drivers/passthrough/amd/iommu_cmd.c index 4c60149..d27bd3c 100644 --- a/xen/drivers/passthrough/amd/iommu_cmd.c +++ b/xen/drivers/passthrough/amd/iommu_cmd.c @@ -75,11 +75,9 @@ static void flush_command_buffer(struct amd_iommu *iommu) u32 cmd[4], status; int loop_count, comp_wait; - /* clear 'ComWaitInt' in status register (WIC) */ - set_field_in_reg_u32(IOMMU_CONTROL_ENABLED, 0, - IOMMU_STATUS_COMP_WAIT_INT_MASK, - IOMMU_STATUS_COMP_WAIT_INT_SHIFT, &status); - writel(status, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + /* RW1C 'ComWaitInt' in status register */ + writel(IOMMU_STATUS_COMP_WAIT_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); /* send an empty COMPLETION_WAIT command to flush command buffer */ cmd[3] = cmd[2] = 0; @@ -103,9 +101,9 @@ static void flush_command_buffer(struct amd_iommu *iommu) if ( comp_wait ) { - /* clear 'ComWaitInt' in status register (WIC) */ - status &= IOMMU_STATUS_COMP_WAIT_INT_MASK; - writel(status, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + /* RW1C 'ComWaitInt' in status register */ + writel(IOMMU_STATUS_COMP_WAIT_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); return; } AMD_IOMMU_DEBUG("Warning: ComWaitInt bit did not assert!\n"); diff --git a/xen/drivers/passthrough/amd/iommu_guest.c b/xen/drivers/passthrough/amd/iommu_guest.c index e2daf0e..85f2361 100644 --- a/xen/drivers/passthrough/amd/iommu_guest.c +++ b/xen/drivers/passthrough/amd/iommu_guest.c @@ -754,7 +754,14 @@ static void guest_iommu_mmio_write64(struct guest_iommu *iommu, u64_to_reg(&iommu->ppr_log.reg_tail, val); break; case IOMMU_STATUS_MMIO_OFFSET: - u64_to_reg(&iommu->reg_status, val); + val &= IOMMU_STATUS_EVENT_OVERFLOW_MASK | + IOMMU_STATUS_EVENT_LOG_INT_MASK | + IOMMU_STATUS_COMP_WAIT_INT_MASK | + IOMMU_STATUS_PPR_LOG_OVERFLOW_MASK | + IOMMU_STATUS_PPR_LOG_INT_MASK | + IOMMU_STATUS_GAPIC_LOG_OVERFLOW_MASK | + IOMMU_STATUS_GAPIC_LOG_INT_MASK; + u64_to_reg(&iommu->reg_status, reg_to_u64(iommu->reg_status) & ~val); break; default: diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index b2b92ba..b01e630 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -344,13 +344,13 @@ static void set_iommu_ppr_log_control(struct amd_iommu *iommu, writeq(0, iommu->mmio_base + IOMMU_PPR_LOG_TAIL_OFFSET); iommu_set_bit(&entry, IOMMU_CONTROL_PPR_ENABLE_SHIFT); - iommu_set_bit(&entry, IOMMU_CONTROL_PPR_INT_SHIFT); + iommu_set_bit(&entry, IOMMU_CONTROL_PPR_LOG_INT_SHIFT); iommu_set_bit(&entry, IOMMU_CONTROL_PPR_LOG_ENABLE_SHIFT); } else { iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_ENABLE_SHIFT); - iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_INT_SHIFT); + iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_LOG_INT_SHIFT); iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_LOG_ENABLE_SHIFT); } @@ -410,7 +410,7 @@ static void iommu_reset_log(struct amd_iommu *iommu, void (*ctrl_func)(struct amd_iommu *iommu, int)) { u32 entry; - int log_run, run_bit, of_bit; + int log_run, run_bit; int loop_count = 1000; BUG_ON(!iommu || ((log != &iommu->event_log) && (log != &iommu->ppr_log))); @@ -419,10 +419,6 @@ static void iommu_reset_log(struct amd_iommu *iommu, IOMMU_STATUS_EVENT_LOG_RUN_SHIFT : IOMMU_STATUS_PPR_LOG_RUN_SHIFT; - of_bit = ( log == &iommu->event_log ) ? - IOMMU_STATUS_EVENT_OVERFLOW_SHIFT : - IOMMU_STATUS_PPR_LOG_OVERFLOW_SHIFT; - /* wait until EventLogRun bit = 0 */ do { entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); @@ -439,9 +435,10 @@ static void iommu_reset_log(struct amd_iommu *iommu, ctrl_func(iommu, IOMMU_CONTROL_DISABLED); - /*clear overflow bit */ - iommu_clear_bit(&entry, of_bit); - writel(entry, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + /* RW1C overflow bit */ + writel(log == &iommu->event_log ? IOMMU_STATUS_EVENT_OVERFLOW_MASK + : IOMMU_STATUS_PPR_LOG_OVERFLOW_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); /*reset event log base address */ log->head = 0; @@ -611,22 +608,33 @@ static void iommu_check_event_log(struct amd_iommu *iommu) u32 entry; unsigned long flags; + /* RW1C interrupt status bit */ + writel(IOMMU_STATUS_EVENT_LOG_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + iommu_read_log(iommu, &iommu->event_log, sizeof(event_entry_t), parse_event_log_entry); spin_lock_irqsave(&iommu->lock, flags); - /*check event overflow */ + /* Check event overflow. */ entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - if ( iommu_get_bit(entry, IOMMU_STATUS_EVENT_OVERFLOW_SHIFT) ) iommu_reset_log(iommu, &iommu->event_log, set_iommu_event_log_control); - - /* reset interrupt status bit */ - entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - iommu_set_bit(&entry, IOMMU_STATUS_EVENT_LOG_INT_SHIFT); - - writel(entry, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + else + { + entry = readl(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + if ( !(entry & IOMMU_CONTROL_EVENT_LOG_INT_MASK) ) + { + entry |= IOMMU_CONTROL_EVENT_LOG_INT_MASK; + writel(entry, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + /* + * Re-schedule the tasklet to handle eventual log entries added + * between reading the log above and re-enabling the interrupt. + */ + tasklet_schedule(&amd_iommu_irq_tasklet); + } + } spin_unlock_irqrestore(&iommu->lock, flags); } @@ -681,22 +689,33 @@ static void iommu_check_ppr_log(struct amd_iommu *iommu) u32 entry; unsigned long flags; + /* RW1C interrupt status bit */ + writel(IOMMU_STATUS_PPR_LOG_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + iommu_read_log(iommu, &iommu->ppr_log, sizeof(ppr_entry_t), parse_ppr_log_entry); spin_lock_irqsave(&iommu->lock, flags); - /*check event overflow */ + /* Check event overflow. */ entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - if ( iommu_get_bit(entry, IOMMU_STATUS_PPR_LOG_OVERFLOW_SHIFT) ) iommu_reset_log(iommu, &iommu->ppr_log, set_iommu_ppr_log_control); - - /* reset interrupt status bit */ - entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - iommu_set_bit(&entry, IOMMU_STATUS_PPR_LOG_INT_SHIFT); - - writel(entry, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + else + { + entry = readl(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + if ( !(entry & IOMMU_CONTROL_PPR_LOG_INT_MASK) ) + { + entry |= IOMMU_CONTROL_PPR_LOG_INT_MASK; + writel(entry, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + /* + * Re-schedule the tasklet to handle eventual log entries added + * between reading the log above and re-enabling the interrupt. + */ + tasklet_schedule(&amd_iommu_irq_tasklet); + } + } spin_unlock_irqrestore(&iommu->lock, flags); } @@ -733,11 +752,14 @@ static void iommu_interrupt_handler(int irq, void *dev_id, spin_lock_irqsave(&iommu->lock, flags); - /* Silence interrupts from both event and PPR logging */ - entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - iommu_clear_bit(&entry, IOMMU_STATUS_EVENT_LOG_INT_SHIFT); - iommu_clear_bit(&entry, IOMMU_STATUS_PPR_LOG_INT_SHIFT); - writel(entry, iommu->mmio_base+IOMMU_STATUS_MMIO_OFFSET); + /* + * Silence interrupts from both event and PPR by clearing the + * enable logging bits in the control register + */ + entry = readl(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + iommu_clear_bit(&entry, IOMMU_CONTROL_EVENT_LOG_INT_SHIFT); + iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_LOG_INT_SHIFT); + writel(entry, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); spin_unlock_irqrestore(&iommu->lock, flags); diff --git a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h index d2176d0..a88d982 100644 --- a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h +++ b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h @@ -336,14 +336,17 @@ #define IOMMU_CONTROL_ISOCHRONOUS_SHIFT 11 #define IOMMU_CONTROL_COMMAND_BUFFER_ENABLE_MASK 0x00001000 #define IOMMU_CONTROL_COMMAND_BUFFER_ENABLE_SHIFT 12 +#define IOMMU_CONTROL_PPR_LOG_ENABLE_MASK 0x00002000 +#define IOMMU_CONTROL_PPR_LOG_ENABLE_SHIFT 13 +#define IOMMU_CONTROL_PPR_LOG_INT_MASK 0x00004000 +#define IOMMU_CONTROL_PPR_LOG_INT_SHIFT 14 +#define IOMMU_CONTROL_PPR_ENABLE_MASK 0x00008000 +#define IOMMU_CONTROL_PPR_ENABLE_SHIFT 15 +#define IOMMU_CONTROL_GT_ENABLE_MASK 0x00010000 +#define IOMMU_CONTROL_GT_ENABLE_SHIFT 16 #define IOMMU_CONTROL_RESTART_MASK 0x80000000 #define IOMMU_CONTROL_RESTART_SHIFT 31 -#define IOMMU_CONTROL_PPR_LOG_ENABLE_SHIFT 13 -#define IOMMU_CONTROL_PPR_INT_SHIFT 14 -#define IOMMU_CONTROL_PPR_ENABLE_SHIFT 15 -#define IOMMU_CONTROL_GT_ENABLE_SHIFT 16 - /* Exclusion Register */ #define IOMMU_EXCLUSION_BASE_LOW_OFFSET 0x20 #define IOMMU_EXCLUSION_BASE_HIGH_OFFSET 0x24 @@ -395,9 +398,18 @@ #define IOMMU_STATUS_EVENT_LOG_RUN_SHIFT 3 #define IOMMU_STATUS_CMD_BUFFER_RUN_MASK 0x00000010 #define IOMMU_STATUS_CMD_BUFFER_RUN_SHIFT 4 +#define IOMMU_STATUS_PPR_LOG_OVERFLOW_MASK 0x00000020 #define IOMMU_STATUS_PPR_LOG_OVERFLOW_SHIFT 5 +#define IOMMU_STATUS_PPR_LOG_INT_MASK 0x00000040 #define IOMMU_STATUS_PPR_LOG_INT_SHIFT 6 +#define IOMMU_STATUS_PPR_LOG_RUN_MASK 0x00000080 #define IOMMU_STATUS_PPR_LOG_RUN_SHIFT 7 +#define IOMMU_STATUS_GAPIC_LOG_OVERFLOW_MASK 0x00000100 +#define IOMMU_STATUS_GAPIC_LOG_OVERFLOW_SHIFT 8 +#define IOMMU_STATUS_GAPIC_LOG_INT_MASK 0x00000200 +#define IOMMU_STATUS_GAPIC_LOG_INT_SHIFT 9 +#define IOMMU_STATUS_GAPIC_LOG_RUN_MASK 0x00000400 +#define IOMMU_STATUS_GAPIC_LOG_RUN_SHIFT 10 /* I/O Page Table */ #define IOMMU_PAGE_TABLE_ENTRY_SIZE 8 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 03 23:56:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:56: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 1UuWup-0007vJ-De; Wed, 03 Jul 2013 23:56:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWun-0007tv-HP for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:49 +0000 Received: from [85.158.143.99:35592] by server-1.bemta-4.messagelabs.com id D0/19-28540-04AB4D15; Wed, 03 Jul 2013 23:56:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-216.messagelabs.com!1372895806!20236250!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.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7567 invoked from network); 3 Jul 2013 23:56:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:56:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuk-0005X0-0p for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWuj-0006ZU-Vl for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:45 +0000 Date: Wed, 03 Jul 2013 23:56:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] iommu/amd: Fix logic for clearing the IOMMU interrupt bits X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2823a0c7dfc979db316787e1dd42a8845e5825c0 Author: Suravee Suthikulpanit AuthorDate: Tue Jul 2 08:49:43 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 2 08:49:43 2013 +0200 iommu/amd: Fix logic for clearing the IOMMU interrupt bits The IOMMU interrupt bits in the IOMMU status registers are "read-only, and write-1-to-clear (RW1C). Therefore, the existing logic which reads the register, set the bit, and then writing back the values could accidentally clear certain bits if it has been set. The correct logic would just be writing only the value which only set the interrupt bits, and leave the rest to zeros. This patch also, clean up #define masks as Jan has suggested. Signed-off-by: Suravee Suthikulpanit With iommu_interrupt_handler() properly having got switched its readl() from status to control register, the subsequent writel() needed to be switched too (and the RW1C comment there was bogus). Some of the cleanup went too far - undone. Further, with iommu_interrupt_handler() now actually disabling the interrupt sources, they also need to get re-enabled by the tasklet once it finished processing the respective log. This also implies re-running the tasklet so that log entries added between reading the log and re- enabling the interrupt will get handled in a timely manner. Finally, guest write emulation to the status register needs to be done with the RW1C (and RO for all other bits) semantics in mind too. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_cmd.c | 14 ++--- xen/drivers/passthrough/amd/iommu_guest.c | 9 +++- xen/drivers/passthrough/amd/iommu_init.c | 84 ++++++++++++++++---------- xen/include/asm-x86/hvm/svm/amd-iommu-defs.h | 22 +++++-- 4 files changed, 84 insertions(+), 45 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_cmd.c b/xen/drivers/passthrough/amd/iommu_cmd.c index 4c60149..d27bd3c 100644 --- a/xen/drivers/passthrough/amd/iommu_cmd.c +++ b/xen/drivers/passthrough/amd/iommu_cmd.c @@ -75,11 +75,9 @@ static void flush_command_buffer(struct amd_iommu *iommu) u32 cmd[4], status; int loop_count, comp_wait; - /* clear 'ComWaitInt' in status register (WIC) */ - set_field_in_reg_u32(IOMMU_CONTROL_ENABLED, 0, - IOMMU_STATUS_COMP_WAIT_INT_MASK, - IOMMU_STATUS_COMP_WAIT_INT_SHIFT, &status); - writel(status, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + /* RW1C 'ComWaitInt' in status register */ + writel(IOMMU_STATUS_COMP_WAIT_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); /* send an empty COMPLETION_WAIT command to flush command buffer */ cmd[3] = cmd[2] = 0; @@ -103,9 +101,9 @@ static void flush_command_buffer(struct amd_iommu *iommu) if ( comp_wait ) { - /* clear 'ComWaitInt' in status register (WIC) */ - status &= IOMMU_STATUS_COMP_WAIT_INT_MASK; - writel(status, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + /* RW1C 'ComWaitInt' in status register */ + writel(IOMMU_STATUS_COMP_WAIT_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); return; } AMD_IOMMU_DEBUG("Warning: ComWaitInt bit did not assert!\n"); diff --git a/xen/drivers/passthrough/amd/iommu_guest.c b/xen/drivers/passthrough/amd/iommu_guest.c index e2daf0e..85f2361 100644 --- a/xen/drivers/passthrough/amd/iommu_guest.c +++ b/xen/drivers/passthrough/amd/iommu_guest.c @@ -754,7 +754,14 @@ static void guest_iommu_mmio_write64(struct guest_iommu *iommu, u64_to_reg(&iommu->ppr_log.reg_tail, val); break; case IOMMU_STATUS_MMIO_OFFSET: - u64_to_reg(&iommu->reg_status, val); + val &= IOMMU_STATUS_EVENT_OVERFLOW_MASK | + IOMMU_STATUS_EVENT_LOG_INT_MASK | + IOMMU_STATUS_COMP_WAIT_INT_MASK | + IOMMU_STATUS_PPR_LOG_OVERFLOW_MASK | + IOMMU_STATUS_PPR_LOG_INT_MASK | + IOMMU_STATUS_GAPIC_LOG_OVERFLOW_MASK | + IOMMU_STATUS_GAPIC_LOG_INT_MASK; + u64_to_reg(&iommu->reg_status, reg_to_u64(iommu->reg_status) & ~val); break; default: diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index b2b92ba..b01e630 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -344,13 +344,13 @@ static void set_iommu_ppr_log_control(struct amd_iommu *iommu, writeq(0, iommu->mmio_base + IOMMU_PPR_LOG_TAIL_OFFSET); iommu_set_bit(&entry, IOMMU_CONTROL_PPR_ENABLE_SHIFT); - iommu_set_bit(&entry, IOMMU_CONTROL_PPR_INT_SHIFT); + iommu_set_bit(&entry, IOMMU_CONTROL_PPR_LOG_INT_SHIFT); iommu_set_bit(&entry, IOMMU_CONTROL_PPR_LOG_ENABLE_SHIFT); } else { iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_ENABLE_SHIFT); - iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_INT_SHIFT); + iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_LOG_INT_SHIFT); iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_LOG_ENABLE_SHIFT); } @@ -410,7 +410,7 @@ static void iommu_reset_log(struct amd_iommu *iommu, void (*ctrl_func)(struct amd_iommu *iommu, int)) { u32 entry; - int log_run, run_bit, of_bit; + int log_run, run_bit; int loop_count = 1000; BUG_ON(!iommu || ((log != &iommu->event_log) && (log != &iommu->ppr_log))); @@ -419,10 +419,6 @@ static void iommu_reset_log(struct amd_iommu *iommu, IOMMU_STATUS_EVENT_LOG_RUN_SHIFT : IOMMU_STATUS_PPR_LOG_RUN_SHIFT; - of_bit = ( log == &iommu->event_log ) ? - IOMMU_STATUS_EVENT_OVERFLOW_SHIFT : - IOMMU_STATUS_PPR_LOG_OVERFLOW_SHIFT; - /* wait until EventLogRun bit = 0 */ do { entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); @@ -439,9 +435,10 @@ static void iommu_reset_log(struct amd_iommu *iommu, ctrl_func(iommu, IOMMU_CONTROL_DISABLED); - /*clear overflow bit */ - iommu_clear_bit(&entry, of_bit); - writel(entry, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + /* RW1C overflow bit */ + writel(log == &iommu->event_log ? IOMMU_STATUS_EVENT_OVERFLOW_MASK + : IOMMU_STATUS_PPR_LOG_OVERFLOW_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); /*reset event log base address */ log->head = 0; @@ -611,22 +608,33 @@ static void iommu_check_event_log(struct amd_iommu *iommu) u32 entry; unsigned long flags; + /* RW1C interrupt status bit */ + writel(IOMMU_STATUS_EVENT_LOG_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + iommu_read_log(iommu, &iommu->event_log, sizeof(event_entry_t), parse_event_log_entry); spin_lock_irqsave(&iommu->lock, flags); - /*check event overflow */ + /* Check event overflow. */ entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - if ( iommu_get_bit(entry, IOMMU_STATUS_EVENT_OVERFLOW_SHIFT) ) iommu_reset_log(iommu, &iommu->event_log, set_iommu_event_log_control); - - /* reset interrupt status bit */ - entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - iommu_set_bit(&entry, IOMMU_STATUS_EVENT_LOG_INT_SHIFT); - - writel(entry, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + else + { + entry = readl(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + if ( !(entry & IOMMU_CONTROL_EVENT_LOG_INT_MASK) ) + { + entry |= IOMMU_CONTROL_EVENT_LOG_INT_MASK; + writel(entry, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + /* + * Re-schedule the tasklet to handle eventual log entries added + * between reading the log above and re-enabling the interrupt. + */ + tasklet_schedule(&amd_iommu_irq_tasklet); + } + } spin_unlock_irqrestore(&iommu->lock, flags); } @@ -681,22 +689,33 @@ static void iommu_check_ppr_log(struct amd_iommu *iommu) u32 entry; unsigned long flags; + /* RW1C interrupt status bit */ + writel(IOMMU_STATUS_PPR_LOG_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + iommu_read_log(iommu, &iommu->ppr_log, sizeof(ppr_entry_t), parse_ppr_log_entry); spin_lock_irqsave(&iommu->lock, flags); - /*check event overflow */ + /* Check event overflow. */ entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - if ( iommu_get_bit(entry, IOMMU_STATUS_PPR_LOG_OVERFLOW_SHIFT) ) iommu_reset_log(iommu, &iommu->ppr_log, set_iommu_ppr_log_control); - - /* reset interrupt status bit */ - entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - iommu_set_bit(&entry, IOMMU_STATUS_PPR_LOG_INT_SHIFT); - - writel(entry, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + else + { + entry = readl(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + if ( !(entry & IOMMU_CONTROL_PPR_LOG_INT_MASK) ) + { + entry |= IOMMU_CONTROL_PPR_LOG_INT_MASK; + writel(entry, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + /* + * Re-schedule the tasklet to handle eventual log entries added + * between reading the log above and re-enabling the interrupt. + */ + tasklet_schedule(&amd_iommu_irq_tasklet); + } + } spin_unlock_irqrestore(&iommu->lock, flags); } @@ -733,11 +752,14 @@ static void iommu_interrupt_handler(int irq, void *dev_id, spin_lock_irqsave(&iommu->lock, flags); - /* Silence interrupts from both event and PPR logging */ - entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - iommu_clear_bit(&entry, IOMMU_STATUS_EVENT_LOG_INT_SHIFT); - iommu_clear_bit(&entry, IOMMU_STATUS_PPR_LOG_INT_SHIFT); - writel(entry, iommu->mmio_base+IOMMU_STATUS_MMIO_OFFSET); + /* + * Silence interrupts from both event and PPR by clearing the + * enable logging bits in the control register + */ + entry = readl(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + iommu_clear_bit(&entry, IOMMU_CONTROL_EVENT_LOG_INT_SHIFT); + iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_LOG_INT_SHIFT); + writel(entry, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); spin_unlock_irqrestore(&iommu->lock, flags); diff --git a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h index d2176d0..a88d982 100644 --- a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h +++ b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h @@ -336,14 +336,17 @@ #define IOMMU_CONTROL_ISOCHRONOUS_SHIFT 11 #define IOMMU_CONTROL_COMMAND_BUFFER_ENABLE_MASK 0x00001000 #define IOMMU_CONTROL_COMMAND_BUFFER_ENABLE_SHIFT 12 +#define IOMMU_CONTROL_PPR_LOG_ENABLE_MASK 0x00002000 +#define IOMMU_CONTROL_PPR_LOG_ENABLE_SHIFT 13 +#define IOMMU_CONTROL_PPR_LOG_INT_MASK 0x00004000 +#define IOMMU_CONTROL_PPR_LOG_INT_SHIFT 14 +#define IOMMU_CONTROL_PPR_ENABLE_MASK 0x00008000 +#define IOMMU_CONTROL_PPR_ENABLE_SHIFT 15 +#define IOMMU_CONTROL_GT_ENABLE_MASK 0x00010000 +#define IOMMU_CONTROL_GT_ENABLE_SHIFT 16 #define IOMMU_CONTROL_RESTART_MASK 0x80000000 #define IOMMU_CONTROL_RESTART_SHIFT 31 -#define IOMMU_CONTROL_PPR_LOG_ENABLE_SHIFT 13 -#define IOMMU_CONTROL_PPR_INT_SHIFT 14 -#define IOMMU_CONTROL_PPR_ENABLE_SHIFT 15 -#define IOMMU_CONTROL_GT_ENABLE_SHIFT 16 - /* Exclusion Register */ #define IOMMU_EXCLUSION_BASE_LOW_OFFSET 0x20 #define IOMMU_EXCLUSION_BASE_HIGH_OFFSET 0x24 @@ -395,9 +398,18 @@ #define IOMMU_STATUS_EVENT_LOG_RUN_SHIFT 3 #define IOMMU_STATUS_CMD_BUFFER_RUN_MASK 0x00000010 #define IOMMU_STATUS_CMD_BUFFER_RUN_SHIFT 4 +#define IOMMU_STATUS_PPR_LOG_OVERFLOW_MASK 0x00000020 #define IOMMU_STATUS_PPR_LOG_OVERFLOW_SHIFT 5 +#define IOMMU_STATUS_PPR_LOG_INT_MASK 0x00000040 #define IOMMU_STATUS_PPR_LOG_INT_SHIFT 6 +#define IOMMU_STATUS_PPR_LOG_RUN_MASK 0x00000080 #define IOMMU_STATUS_PPR_LOG_RUN_SHIFT 7 +#define IOMMU_STATUS_GAPIC_LOG_OVERFLOW_MASK 0x00000100 +#define IOMMU_STATUS_GAPIC_LOG_OVERFLOW_SHIFT 8 +#define IOMMU_STATUS_GAPIC_LOG_INT_MASK 0x00000200 +#define IOMMU_STATUS_GAPIC_LOG_INT_SHIFT 9 +#define IOMMU_STATUS_GAPIC_LOG_RUN_MASK 0x00000400 +#define IOMMU_STATUS_GAPIC_LOG_RUN_SHIFT 10 /* I/O Page Table */ #define IOMMU_PAGE_TABLE_ENTRY_SIZE 8 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 03 23:57:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:57:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuy-0007xY-HG; Wed, 03 Jul 2013 23:57:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWux-0007xE-97 for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:59 +0000 Received: from [85.158.139.211:50265] by server-16.bemta-5.messagelabs.com id 16/88-31941-A4AB4D15; Wed, 03 Jul 2013 23:56:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1372895816!20169029!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30940 invoked from network); 3 Jul 2013 23:56:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:56:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuu-0005XB-68 for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWuu-0006aZ-4B for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:56 +0000 Date: Wed, 03 Jul 2013 23:56:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] iommu/amd: Workaround for erratum 787 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9eabb0735400e2b6059dfa3f0b47a426f61f570a Author: Suravee Suthikulpanit AuthorDate: Tue Jul 2 08:50:41 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 2 08:50:41 2013 +0200 iommu/amd: Workaround for erratum 787 The IOMMU interrupt handling in bottom half must clear the PPR log interrupt and event log interrupt bits to re-enable the interrupt. This is done by writing 1 to the memory mapped register to clear the bit. Due to hardware bug, if the driver tries to clear this bit while the IOMMU hardware also setting this bit, the conflict will result with the bit being set. If the interrupt handling code does not make sure to clear this bit, subsequent changes in the event/PPR logs will no longer generating interrupts, and would result if buffer overflow. After clearing the bits, the driver must read back the register to verify. Signed-off-by: Suravee Suthikulpanit Adjust to apply on top of heavily modified patch 1. Adjust flow to get away with a single readl() in each instance of the status register checks. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_init.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index b01e630..ba86e1b 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -636,6 +636,14 @@ static void iommu_check_event_log(struct amd_iommu *iommu) } } + /* + * Workaround for erratum787: + * Re-check to make sure the bit has been cleared. + */ + entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + if ( entry & IOMMU_STATUS_EVENT_LOG_INT_MASK ) + tasklet_schedule(&amd_iommu_irq_tasklet); + spin_unlock_irqrestore(&iommu->lock, flags); } @@ -717,6 +725,14 @@ static void iommu_check_ppr_log(struct amd_iommu *iommu) } } + /* + * Workaround for erratum787: + * Re-check to make sure the bit has been cleared. + */ + entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + if ( entry & IOMMU_STATUS_PPR_LOG_INT_MASK ) + tasklet_schedule(&amd_iommu_irq_tasklet); + spin_unlock_irqrestore(&iommu->lock, flags); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 03 23:57:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Jul 2013 23:57:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuy-0007xY-HG; Wed, 03 Jul 2013 23:57:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWux-0007xE-97 for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:59 +0000 Received: from [85.158.139.211:50265] by server-16.bemta-5.messagelabs.com id 16/88-31941-A4AB4D15; Wed, 03 Jul 2013 23:56:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1372895816!20169029!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30940 invoked from network); 3 Jul 2013 23:56:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Jul 2013 23:56:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UuWuu-0005XB-68 for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UuWuu-0006aZ-4B for xen-changelog@lists.xensource.com; Wed, 03 Jul 2013 23:56:56 +0000 Date: Wed, 03 Jul 2013 23:56:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] iommu/amd: Workaround for erratum 787 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9eabb0735400e2b6059dfa3f0b47a426f61f570a Author: Suravee Suthikulpanit AuthorDate: Tue Jul 2 08:50:41 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 2 08:50:41 2013 +0200 iommu/amd: Workaround for erratum 787 The IOMMU interrupt handling in bottom half must clear the PPR log interrupt and event log interrupt bits to re-enable the interrupt. This is done by writing 1 to the memory mapped register to clear the bit. Due to hardware bug, if the driver tries to clear this bit while the IOMMU hardware also setting this bit, the conflict will result with the bit being set. If the interrupt handling code does not make sure to clear this bit, subsequent changes in the event/PPR logs will no longer generating interrupts, and would result if buffer overflow. After clearing the bits, the driver must read back the register to verify. Signed-off-by: Suravee Suthikulpanit Adjust to apply on top of heavily modified patch 1. Adjust flow to get away with a single readl() in each instance of the status register checks. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_init.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index b01e630..ba86e1b 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -636,6 +636,14 @@ static void iommu_check_event_log(struct amd_iommu *iommu) } } + /* + * Workaround for erratum787: + * Re-check to make sure the bit has been cleared. + */ + entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + if ( entry & IOMMU_STATUS_EVENT_LOG_INT_MASK ) + tasklet_schedule(&amd_iommu_irq_tasklet); + spin_unlock_irqrestore(&iommu->lock, flags); } @@ -717,6 +725,14 @@ static void iommu_check_ppr_log(struct amd_iommu *iommu) } } + /* + * Workaround for erratum787: + * Re-check to make sure the bit has been cleared. + */ + entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + if ( entry & IOMMU_STATUS_PPR_LOG_INT_MASK ) + tasklet_schedule(&amd_iommu_irq_tasklet); + spin_unlock_irqrestore(&iommu->lock, flags); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 04 05:55:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Jul 2013 05:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucVi-00018q-GI; Thu, 04 Jul 2013 05:55:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucVg-00018k-SP for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:17 +0000 Received: from [85.158.139.211:18189] by server-1.bemta-5.messagelabs.com id 2C/90-21460-44E05D15; Thu, 04 Jul 2013 05:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1372917314!20107934!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12197 invoked from network); 4 Jul 2013 05:55:15 -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; 4 Jul 2013 05:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucVU-0008Cr-FL for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UucVU-0008Jd-1Y for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:04 +0000 Date: Thu, 04 Jul 2013 05:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] Revert "irq: Add extra debugging to help track down why an assertion is failing" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b7fba0ebe61332ebbe671a21950cc9f83750a1f0 Author: Jan Beulich AuthorDate: Mon Jul 1 11:55:53 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 1 11:55:53 2013 +0200 Revert "irq: Add extra debugging to help track down why an assertion is failing" This reverts commits 2ae8b9173fb2388af6514c730d620ed5f450bc34 and 98e10364bde098e12104caa4f566b17d05f8b791. This was never reported to be hit, and we assume to have taken care of the problem by excluding legacy IRQs from the IRQ move cleanup logic. Suggested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: George Dunlap master commit: ac9e298cb4bda0238f50da814b8af2b90dc758a1 master date: 2013-06-10 13:43:03 +0200 --- xen/arch/x86/irq.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index a56f7f8..f3d86a8 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -623,8 +623,6 @@ void move_native_irq(struct irq_desc *desc) desc->handler->enable(desc); } -static void dump_irqs(unsigned char key); - void irq_move_cleanup_interrupt(struct cpu_user_regs *regs) { unsigned vector, me; @@ -686,19 +684,7 @@ void irq_move_cleanup_interrupt(struct cpu_user_regs *regs) if ( desc->arch.used_vectors ) { - if ( unlikely(!test_bit(vector, desc->arch.used_vectors)) ) - { - spin_unlock(&desc->lock); - bitmap_scnlistprintf(keyhandler_scratch, - sizeof(keyhandler_scratch), - desc->arch.used_vectors->_bits, - NR_VECTORS); - printk("*** IRQ BUG found ***\n" - "CPU%d -Testing vector %d from bitmap %s\n", - me, vector, keyhandler_scratch); - dump_irqs('i'); - BUG(); - } + ASSERT(test_bit(vector, desc->arch.used_vectors)); clear_bit(vector, desc->arch.used_vectors); } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 04 05:55:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Jul 2013 05:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucVi-00018q-GI; Thu, 04 Jul 2013 05:55:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucVg-00018k-SP for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:17 +0000 Received: from [85.158.139.211:18189] by server-1.bemta-5.messagelabs.com id 2C/90-21460-44E05D15; Thu, 04 Jul 2013 05:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1372917314!20107934!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12197 invoked from network); 4 Jul 2013 05:55:15 -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; 4 Jul 2013 05:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucVU-0008Cr-FL for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UucVU-0008Jd-1Y for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:04 +0000 Date: Thu, 04 Jul 2013 05:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] Revert "irq: Add extra debugging to help track down why an assertion is failing" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b7fba0ebe61332ebbe671a21950cc9f83750a1f0 Author: Jan Beulich AuthorDate: Mon Jul 1 11:55:53 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 1 11:55:53 2013 +0200 Revert "irq: Add extra debugging to help track down why an assertion is failing" This reverts commits 2ae8b9173fb2388af6514c730d620ed5f450bc34 and 98e10364bde098e12104caa4f566b17d05f8b791. This was never reported to be hit, and we assume to have taken care of the problem by excluding legacy IRQs from the IRQ move cleanup logic. Suggested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: George Dunlap master commit: ac9e298cb4bda0238f50da814b8af2b90dc758a1 master date: 2013-06-10 13:43:03 +0200 --- xen/arch/x86/irq.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index a56f7f8..f3d86a8 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -623,8 +623,6 @@ void move_native_irq(struct irq_desc *desc) desc->handler->enable(desc); } -static void dump_irqs(unsigned char key); - void irq_move_cleanup_interrupt(struct cpu_user_regs *regs) { unsigned vector, me; @@ -686,19 +684,7 @@ void irq_move_cleanup_interrupt(struct cpu_user_regs *regs) if ( desc->arch.used_vectors ) { - if ( unlikely(!test_bit(vector, desc->arch.used_vectors)) ) - { - spin_unlock(&desc->lock); - bitmap_scnlistprintf(keyhandler_scratch, - sizeof(keyhandler_scratch), - desc->arch.used_vectors->_bits, - NR_VECTORS); - printk("*** IRQ BUG found ***\n" - "CPU%d -Testing vector %d from bitmap %s\n", - me, vector, keyhandler_scratch); - dump_irqs('i'); - BUG(); - } + ASSERT(test_bit(vector, desc->arch.used_vectors)); clear_bit(vector, desc->arch.used_vectors); } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 04 05:55:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Jul 2013 05:55: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 1UucVt-00019X-JH; Thu, 04 Jul 2013 05:55:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucVs-00019P-0o for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:28 +0000 Received: from [85.158.137.99:17666] by server-12.bemta-3.messagelabs.com id 32/B5-17731-F4E05D15; Thu, 04 Jul 2013 05:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1372917324!13542435!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18505 invoked from network); 4 Jul 2013 05:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2013 05:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucVo-0008Cu-Bs for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UucVo-0008Kn-41 for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:24 +0000 Date: Thu, 04 Jul 2013 05:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: fix x2APIC APIC_ID read 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 a0c56a2b9f5b3232ee83618bd82eb0439e30d2be Author: Zhenguo Wang AuthorDate: Mon Jul 1 11:58:26 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 1 11:58:26 2013 +0200 x86/HVM: fix x2APIC APIC_ID read emulation APIC and x2APIC have different format for APIC_ID register. Need translation. Signed-off-by: Zhenguo Wang Signed-off-by: Xiaowei Yang Convert code to use switch(), fixing coding style issue at once, and use GET_xAPIC_ID() on the value read instead of VLAPIC_ID() (reading the field again). In the course of this also properly reject both read and writes on the non-existing MSR corresponding to APIC_ICR2. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 6859874b61d5ddaf5289e72ed2b2157739b72ca5 master date: 2013-06-11 09:45:55 +0200 --- xen/arch/x86/hvm/vlapic.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 7778342..f3833be 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -583,8 +583,19 @@ int hvm_x2apic_msr_read(struct vcpu *v, unsigned int msr, uint64_t *msr_content) return 1; vlapic_read_aligned(vlapic, offset, &low); - if ( offset == APIC_ICR ) + switch ( offset ) + { + case APIC_ID: + low = GET_xAPIC_ID(low); + break; + + case APIC_ICR: vlapic_read_aligned(vlapic, APIC_ICR2, &high); + break; + + case APIC_ICR2: + return 1; + } *msr_content = (((uint64_t)high) << 32) | low; return 0; @@ -833,11 +844,17 @@ int hvm_x2apic_msr_write(struct vcpu *v, unsigned int msr, uint64_t msr_content) if ( !vlapic_x2apic_mode(vlapic) ) return X86EMUL_UNHANDLEABLE; - if ( offset == APIC_ICR ) + switch ( offset ) { - int rc = vlapic_reg_write(v, APIC_ICR2, (uint32_t)(msr_content >> 32)); + int rc; + + case APIC_ICR: + rc = vlapic_reg_write(v, APIC_ICR2, (uint32_t)(msr_content >> 32)); if ( rc ) return rc; + + case APIC_ICR2: + return X86EMUL_UNHANDLEABLE; } return vlapic_reg_write(v, offset, (uint32_t)msr_content); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 04 05:55:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Jul 2013 05:55: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 1UucVt-00019X-JH; Thu, 04 Jul 2013 05:55:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucVs-00019P-0o for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:28 +0000 Received: from [85.158.137.99:17666] by server-12.bemta-3.messagelabs.com id 32/B5-17731-F4E05D15; Thu, 04 Jul 2013 05:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1372917324!13542435!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18505 invoked from network); 4 Jul 2013 05:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2013 05:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucVo-0008Cu-Bs for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UucVo-0008Kn-41 for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:24 +0000 Date: Thu, 04 Jul 2013 05:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: fix x2APIC APIC_ID read 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 a0c56a2b9f5b3232ee83618bd82eb0439e30d2be Author: Zhenguo Wang AuthorDate: Mon Jul 1 11:58:26 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 1 11:58:26 2013 +0200 x86/HVM: fix x2APIC APIC_ID read emulation APIC and x2APIC have different format for APIC_ID register. Need translation. Signed-off-by: Zhenguo Wang Signed-off-by: Xiaowei Yang Convert code to use switch(), fixing coding style issue at once, and use GET_xAPIC_ID() on the value read instead of VLAPIC_ID() (reading the field again). In the course of this also properly reject both read and writes on the non-existing MSR corresponding to APIC_ICR2. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 6859874b61d5ddaf5289e72ed2b2157739b72ca5 master date: 2013-06-11 09:45:55 +0200 --- xen/arch/x86/hvm/vlapic.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 7778342..f3833be 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -583,8 +583,19 @@ int hvm_x2apic_msr_read(struct vcpu *v, unsigned int msr, uint64_t *msr_content) return 1; vlapic_read_aligned(vlapic, offset, &low); - if ( offset == APIC_ICR ) + switch ( offset ) + { + case APIC_ID: + low = GET_xAPIC_ID(low); + break; + + case APIC_ICR: vlapic_read_aligned(vlapic, APIC_ICR2, &high); + break; + + case APIC_ICR2: + return 1; + } *msr_content = (((uint64_t)high) << 32) | low; return 0; @@ -833,11 +844,17 @@ int hvm_x2apic_msr_write(struct vcpu *v, unsigned int msr, uint64_t msr_content) if ( !vlapic_x2apic_mode(vlapic) ) return X86EMUL_UNHANDLEABLE; - if ( offset == APIC_ICR ) + switch ( offset ) { - int rc = vlapic_reg_write(v, APIC_ICR2, (uint32_t)(msr_content >> 32)); + int rc; + + case APIC_ICR: + rc = vlapic_reg_write(v, APIC_ICR2, (uint32_t)(msr_content >> 32)); if ( rc ) return rc; + + case APIC_ICR2: + return X86EMUL_UNHANDLEABLE; } return vlapic_reg_write(v, offset, (uint32_t)msr_content); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 04 05:55:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Jul 2013 05:55:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucW2-0001AY-OK; Thu, 04 Jul 2013 05:55:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucW1-0001AP-PB for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:37 +0000 Received: from [85.158.139.83:9921] by server-10.bemta-5.messagelabs.com id E8/20-03093-85E05D15; Thu, 04 Jul 2013 05:55:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-182.messagelabs.com!1372917334!29787100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21053 invoked from network); 4 Jul 2013 05:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2013 05:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucVy-0008D2-Jw for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UucVy-0008LD-GY for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:34 +0000 Date: Thu, 04 Jul 2013 05:55:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: fix initialization of wallclock time for PVHVM on migration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0764118633931228946==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0764118633931228946== Content-Type: text/plain commit 2967614da4953e7af34b3f015df3eb8fd4201f89 Author: Roger Pau Monné AuthorDate: Mon Jul 1 11:59:31 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 1 11:59:31 2013 +0200 x86/HVM: fix initialization of wallclock time for PVHVM on migration Call update_domain_wallclock_time on hvm_latch_shinfo_size even if the bitness of the guest has already been set, this fixes the problem with the wallclock not being set for PVHVM guests on resume from migration. Signed-off-by: Roger Pau Monné Clean up the resulting code and retain the (slightly adjusted) original comment. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: f8e8fd56bd7d5675e8331b4ec74bae76c9dbf24e master date: 2013-06-12 10:05:39 +0200 --- xen/arch/x86/hvm/hvm.c | 33 ++++++++++++++------------------- 1 files changed, 14 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index be79fb6..130c84b 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3338,31 +3338,26 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) static void hvm_latch_shinfo_size(struct domain *d) { - bool_t new_has_32bit; - /* * Called from operations which are among the very first executed by * PV drivers on initialisation or after save/restore. These are sensible * points at which to sample the execution mode of the guest and latch * 32- or 64-bit format for shared state. */ - if ( current->domain == d ) { - new_has_32bit = (hvm_guest_x86_mode(current) != 8); - if (new_has_32bit != d->arch.has_32bit_shinfo) { - d->arch.has_32bit_shinfo = new_has_32bit; - /* - * Make sure that the timebase in the shared info - * structure is correct for its new bit-ness. We should - * arguably try to convert the other fields as well, but - * that's much more problematic (e.g. what do you do if - * you're going from 64 bit to 32 bit and there's an event - * channel pending which doesn't exist in the 32 bit - * version?). Just setting the wallclock time seems to be - * sufficient for everything we do, even if it is a bit of - * a hack. - */ - update_domain_wallclock_time(d); - } + if ( current->domain == d ) + { + d->arch.has_32bit_shinfo = (hvm_guest_x86_mode(current) != 8); + /* + * Make sure that the timebase in the shared info structure is correct. + * + * If the bit-ness changed we should arguably try to convert the other + * fields as well, but that's much more problematic (e.g. what do you + * do if you're going from 64 bit to 32 bit and there's an event + * channel pending which doesn't exist in the 32 bit version?). Just + * setting the wallclock time seems to be sufficient for everything + * we do, even if it is a bit of a hack. + */ + update_domain_wallclock_time(d); } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 --===============0764118633931228946== 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 --===============0764118633931228946==-- From xen-changelog-bounces@lists.xen.org Thu Jul 04 05:55:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Jul 2013 05:55:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucW2-0001AY-OK; Thu, 04 Jul 2013 05:55:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucW1-0001AP-PB for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:37 +0000 Received: from [85.158.139.83:9921] by server-10.bemta-5.messagelabs.com id E8/20-03093-85E05D15; Thu, 04 Jul 2013 05:55:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-182.messagelabs.com!1372917334!29787100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21053 invoked from network); 4 Jul 2013 05:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2013 05:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucVy-0008D2-Jw for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UucVy-0008LD-GY for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:34 +0000 Date: Thu, 04 Jul 2013 05:55:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: fix initialization of wallclock time for PVHVM on migration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0764118633931228946==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0764118633931228946== Content-Type: text/plain commit 2967614da4953e7af34b3f015df3eb8fd4201f89 Author: Roger Pau Monné AuthorDate: Mon Jul 1 11:59:31 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 1 11:59:31 2013 +0200 x86/HVM: fix initialization of wallclock time for PVHVM on migration Call update_domain_wallclock_time on hvm_latch_shinfo_size even if the bitness of the guest has already been set, this fixes the problem with the wallclock not being set for PVHVM guests on resume from migration. Signed-off-by: Roger Pau Monné Clean up the resulting code and retain the (slightly adjusted) original comment. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: f8e8fd56bd7d5675e8331b4ec74bae76c9dbf24e master date: 2013-06-12 10:05:39 +0200 --- xen/arch/x86/hvm/hvm.c | 33 ++++++++++++++------------------- 1 files changed, 14 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index be79fb6..130c84b 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3338,31 +3338,26 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) static void hvm_latch_shinfo_size(struct domain *d) { - bool_t new_has_32bit; - /* * Called from operations which are among the very first executed by * PV drivers on initialisation or after save/restore. These are sensible * points at which to sample the execution mode of the guest and latch * 32- or 64-bit format for shared state. */ - if ( current->domain == d ) { - new_has_32bit = (hvm_guest_x86_mode(current) != 8); - if (new_has_32bit != d->arch.has_32bit_shinfo) { - d->arch.has_32bit_shinfo = new_has_32bit; - /* - * Make sure that the timebase in the shared info - * structure is correct for its new bit-ness. We should - * arguably try to convert the other fields as well, but - * that's much more problematic (e.g. what do you do if - * you're going from 64 bit to 32 bit and there's an event - * channel pending which doesn't exist in the 32 bit - * version?). Just setting the wallclock time seems to be - * sufficient for everything we do, even if it is a bit of - * a hack. - */ - update_domain_wallclock_time(d); - } + if ( current->domain == d ) + { + d->arch.has_32bit_shinfo = (hvm_guest_x86_mode(current) != 8); + /* + * Make sure that the timebase in the shared info structure is correct. + * + * If the bit-ness changed we should arguably try to convert the other + * fields as well, but that's much more problematic (e.g. what do you + * do if you're going from 64 bit to 32 bit and there's an event + * channel pending which doesn't exist in the 32 bit version?). Just + * setting the wallclock time seems to be sufficient for everything + * we do, even if it is a bit of a hack. + */ + update_domain_wallclock_time(d); } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 --===============0764118633931228946== 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 --===============0764118633931228946==-- From xen-changelog-bounces@lists.xen.org Thu Jul 04 05:55:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Jul 2013 05:55:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucWC-0001Bn-RK; Thu, 04 Jul 2013 05:55:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucWC-0001BY-6t for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:48 +0000 Received: from [85.158.137.99:24290] by server-1.bemta-3.messagelabs.com id 94/E1-01921-36E05D15; Thu, 04 Jul 2013 05:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1372917345!13542463!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19841 invoked from network); 4 Jul 2013 05:55:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2013 05:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucW8-0008D8-T2 for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UucW8-0008LZ-OE for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:44 +0000 Date: Thu, 04 Jul 2013 05:55:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/hvm: fix HVMOP_inject_trap return value on success X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit da1aa339c82f30ff9dba9d72bc61f52a443c18f5 Author: Tim Deegan AuthorDate: Mon Jul 1 12:00:27 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 1 12:00:27 2013 +0200 x86/hvm: fix HVMOP_inject_trap return value on success Reported-by: Antony Saba Signed-off-by: Tim Deegan Acked-by: Keir Fraser Acked-by: George Dunlap master commit: a12d15d8c1d512a4ed6498b39f9058f69a1c1f6c master date: 2013-06-21 17:01:50 +0200 --- xen/arch/x86/hvm/hvm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 130c84b..0740df7 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4379,6 +4379,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) v->arch.hvm_vcpu.inject_trap.error_code = tr.error_code; v->arch.hvm_vcpu.inject_trap.insn_len = tr.insn_len; v->arch.hvm_vcpu.inject_trap.cr2 = tr.cr2; + rc = 0; } param_fail8: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 04 05:55:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Jul 2013 05:55:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucWC-0001Bn-RK; Thu, 04 Jul 2013 05:55:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucWC-0001BY-6t for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:48 +0000 Received: from [85.158.137.99:24290] by server-1.bemta-3.messagelabs.com id 94/E1-01921-36E05D15; Thu, 04 Jul 2013 05:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1372917345!13542463!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19841 invoked from network); 4 Jul 2013 05:55:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2013 05:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucW8-0008D8-T2 for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UucW8-0008LZ-OE for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:44 +0000 Date: Thu, 04 Jul 2013 05:55:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/hvm: fix HVMOP_inject_trap return value on success X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit da1aa339c82f30ff9dba9d72bc61f52a443c18f5 Author: Tim Deegan AuthorDate: Mon Jul 1 12:00:27 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 1 12:00:27 2013 +0200 x86/hvm: fix HVMOP_inject_trap return value on success Reported-by: Antony Saba Signed-off-by: Tim Deegan Acked-by: Keir Fraser Acked-by: George Dunlap master commit: a12d15d8c1d512a4ed6498b39f9058f69a1c1f6c master date: 2013-06-21 17:01:50 +0200 --- xen/arch/x86/hvm/hvm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 130c84b..0740df7 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4379,6 +4379,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) v->arch.hvm_vcpu.inject_trap.error_code = tr.error_code; v->arch.hvm_vcpu.inject_trap.insn_len = tr.insn_len; v->arch.hvm_vcpu.inject_trap.cr2 = tr.cr2; + rc = 0; } param_fail8: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 04 05:56:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Jul 2013 05:56:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucWM-0001Do-UE; Thu, 04 Jul 2013 05:55:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucWL-0001DN-K2 for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:57 +0000 Received: from [85.158.137.99:58657] by server-7.bemta-3.messagelabs.com id 0B/F9-22631-C6E05D15; Thu, 04 Jul 2013 05:55:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1372917355!13542477!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20751 invoked from network); 4 Jul 2013 05:55:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2013 05:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucWJ-0008DH-2A for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UucWJ-0008Lv-0Z for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:55 +0000 Date: Thu, 04 Jul 2013 05:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] also override library path for hotplug scripts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 650ec8e1241dc0953285731c8b65f41db7d63027 Author: Jan Beulich AuthorDate: Mon Jul 1 12:01:53 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 1 12:01:53 2013 +0200 also override library path for hotplug scripts Overriding PATH but not LD_LIBRARY_PATH is bogus, as it may result in the use of mismatched binaries and libraries. Signed-off-by: Jan Beulich Acked-by: Ian Campbell Acked-by: George Dunlap master commit: d0f535e9af564642250badf1fa300725ef996616 master date: 2013-06-26 18:06:24 +0200 --- tools/hotplug/Linux/xen-hotplug-common.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/hotplug/Linux/xen-hotplug-common.sh b/tools/hotplug/Linux/xen-hotplug-common.sh index 4a7bc73..7af4688 100644 --- a/tools/hotplug/Linux/xen-hotplug-common.sh +++ b/tools/hotplug/Linux/xen-hotplug-common.sh @@ -31,6 +31,7 @@ dir=$(dirname "$0") exec 2>>/var/log/xen/xen-hotplug.log export PATH="${BINDIR}:${SBINDIR}:${LIBEXEC}:${PRIVATE_BINDIR}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH" +export LD_LIBRARY_PATH="${LIBDIR}${LD_LIBRARY_PATH+:}$LD_LIBRARY_PATH" export LANG="POSIX" unset $(set | grep ^LC_ | cut -d= -f1) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 04 05:56:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Jul 2013 05:56:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucWM-0001Do-UE; Thu, 04 Jul 2013 05:55:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucWL-0001DN-K2 for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:57 +0000 Received: from [85.158.137.99:58657] by server-7.bemta-3.messagelabs.com id 0B/F9-22631-C6E05D15; Thu, 04 Jul 2013 05:55:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1372917355!13542477!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20751 invoked from network); 4 Jul 2013 05:55:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jul 2013 05:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UucWJ-0008DH-2A for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UucWJ-0008Lv-0Z for xen-changelog@lists.xensource.com; Thu, 04 Jul 2013 05:55:55 +0000 Date: Thu, 04 Jul 2013 05:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] also override library path for hotplug scripts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 650ec8e1241dc0953285731c8b65f41db7d63027 Author: Jan Beulich AuthorDate: Mon Jul 1 12:01:53 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 1 12:01:53 2013 +0200 also override library path for hotplug scripts Overriding PATH but not LD_LIBRARY_PATH is bogus, as it may result in the use of mismatched binaries and libraries. Signed-off-by: Jan Beulich Acked-by: Ian Campbell Acked-by: George Dunlap master commit: d0f535e9af564642250badf1fa300725ef996616 master date: 2013-06-26 18:06:24 +0200 --- tools/hotplug/Linux/xen-hotplug-common.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/hotplug/Linux/xen-hotplug-common.sh b/tools/hotplug/Linux/xen-hotplug-common.sh index 4a7bc73..7af4688 100644 --- a/tools/hotplug/Linux/xen-hotplug-common.sh +++ b/tools/hotplug/Linux/xen-hotplug-common.sh @@ -31,6 +31,7 @@ dir=$(dirname "$0") exec 2>>/var/log/xen/xen-hotplug.log export PATH="${BINDIR}:${SBINDIR}:${LIBEXEC}:${PRIVATE_BINDIR}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH" +export LD_LIBRARY_PATH="${LIBDIR}${LD_LIBRARY_PATH+:}$LD_LIBRARY_PATH" export LANG="POSIX" unset $(set | grep ^LC_ | cut -d= -f1) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 09 19:55:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jul 2013 19: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 1Uwe0D-0002Zw-MP; Tue, 09 Jul 2013 19:55:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwe0C-0002Zk-Fu for xen-changelog@lists.xensource.com; Tue, 09 Jul 2013 19:55:08 +0000 Received: from [85.158.136.67:42767] by server-1.bemta-5.messagelabs.com id 23/10-21460-B9A6CD15; Tue, 09 Jul 2013 19:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-207.messagelabs.com!1373399704!21903476!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30816 invoked from network); 9 Jul 2013 19:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-207.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jul 2013 19:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwe08-0000sk-4k for xen-changelog@lists.xensource.com; Tue, 09 Jul 2013 19:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uwe07-0001zi-OZ for xen-changelog@lists.xensource.com; Tue, 09 Jul 2013 19:55:03 +0000 Date: Tue, 09 Jul 2013 19:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] Revert "hvmloader: always include HPET table" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aca0217117922130140f422b6e1b74c76757f304 Author: Jan Beulich AuthorDate: Mon Jul 8 13:22:59 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 8 13:22:59 2013 +0200 Revert "hvmloader: always include HPET table" This reverts commit e4fd0475a08fda414da27c4e57b568f147cfc07e. Conflicts: tools/firmware/hvmloader/acpi/build.c Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 4867685f7916bb594a67f2f64a28bbf5ecb4949c master date: 2013-07-08 13:20:20 +0200 --- tools/firmware/hvmloader/acpi/build.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index d09785d..3fd3d64 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -219,11 +219,13 @@ static int construct_secondary_tables(unsigned long *table_ptrs, table_ptrs[nr_tables++] = (unsigned long)madt; } - /* HPET. Always included in DSDT, so always include it here too. */ - /* (And it's unconditionally required by Windows SVVP tests.) */ - hpet = construct_hpet(); - if (!hpet) return -1; - table_ptrs[nr_tables++] = (unsigned long)hpet; + /* HPET. */ + if ( hpet_exists(ACPI_HPET_ADDRESS) ) + { + hpet = construct_hpet(); + if (!hpet) return -1; + table_ptrs[nr_tables++] = (unsigned long)hpet; + } /* WAET. */ waet = construct_waet(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 09 19:55:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jul 2013 19: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 1Uwe0D-0002Zw-MP; Tue, 09 Jul 2013 19:55:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwe0C-0002Zk-Fu for xen-changelog@lists.xensource.com; Tue, 09 Jul 2013 19:55:08 +0000 Received: from [85.158.136.67:42767] by server-1.bemta-5.messagelabs.com id 23/10-21460-B9A6CD15; Tue, 09 Jul 2013 19:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-207.messagelabs.com!1373399704!21903476!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30816 invoked from network); 9 Jul 2013 19:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-207.messagelabs.com with AES256-SHA encrypted SMTP; 9 Jul 2013 19:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwe08-0000sk-4k for xen-changelog@lists.xensource.com; Tue, 09 Jul 2013 19:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uwe07-0001zi-OZ for xen-changelog@lists.xensource.com; Tue, 09 Jul 2013 19:55:03 +0000 Date: Tue, 09 Jul 2013 19:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] Revert "hvmloader: always include HPET table" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aca0217117922130140f422b6e1b74c76757f304 Author: Jan Beulich AuthorDate: Mon Jul 8 13:22:59 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 8 13:22:59 2013 +0200 Revert "hvmloader: always include HPET table" This reverts commit e4fd0475a08fda414da27c4e57b568f147cfc07e. Conflicts: tools/firmware/hvmloader/acpi/build.c Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 4867685f7916bb594a67f2f64a28bbf5ecb4949c master date: 2013-07-08 13:20:20 +0200 --- tools/firmware/hvmloader/acpi/build.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index d09785d..3fd3d64 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -219,11 +219,13 @@ static int construct_secondary_tables(unsigned long *table_ptrs, table_ptrs[nr_tables++] = (unsigned long)madt; } - /* HPET. Always included in DSDT, so always include it here too. */ - /* (And it's unconditionally required by Windows SVVP tests.) */ - hpet = construct_hpet(); - if (!hpet) return -1; - table_ptrs[nr_tables++] = (unsigned long)hpet; + /* HPET. */ + if ( hpet_exists(ACPI_HPET_ADDRESS) ) + { + hpet = construct_hpet(); + if (!hpet) return -1; + table_ptrs[nr_tables++] = (unsigned long)hpet; + } /* WAET. */ waet = construct_waet(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 09 19:55:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jul 2013 19: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 1Uwe0N-0002ar-Rg; Tue, 09 Jul 2013 19:55:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwe0M-0002aQ-Aa for xen-changelog@lists.xensource.com; Tue, 09 Jul 2013 19:55:18 +0000 Received: from [85.158.139.211:16207] by server-9.bemta-5.messagelabs.com id 76/6C-26025-5AA6CD15; Tue, 09 Jul 2013 19:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1373399715!18103598!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20067 invoked from network); 9 Jul 2013 19:55:16 -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; 9 Jul 2013 19:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwe0I-0000sn-IT for xen-changelog@lists.xensource.com; Tue, 09 Jul 2013 19:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uwe0I-000206-AW for xen-changelog@lists.xensource.com; Tue, 09 Jul 2013 19:55:14 +0000 Date: Tue, 09 Jul 2013 19:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: suppress device assignment to HVM guest when there is no IOMMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 78748fe8846627ddf3cccdaa3a1ff907a6132568 Author: Jan Beulich AuthorDate: Tue Jul 9 10:04:04 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 9 10:04:04 2013 +0200 libxl: suppress device assignment to HVM guest when there is no IOMMU This in effect copies similar logic from xend: While there's no way to check whether a device is assigned to a particular guest, XEN_DOMCTL_test_assign_device at least allows checking whether an IOMMU is there and whether a device has been assign to _some_ guest. For the time being, this should be enough to cover for the missing error checking/recovery in other parts of libxl's device assignment paths. There remains a (functionality-, but not security-related) race in that the iommu should be set up earlier, but this is too risky a change for this stage of the 4.3 release. This is a security issue, XSA-61. Signed-off-by: Jan Beulich Tested-by: George Dunlap Acked-by: George Dunlap Acked-by: Ian Jackson master commit: 826eb17271d3c647516d9944c47b0779afedea25 master date: 2013-07-01 15:20:28 +0100 --- tools/libxl/libxl_pci.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index d373b4d..2d476e0 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1048,6 +1048,18 @@ int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcide int num_assigned, i, rc; int stubdomid = 0; + if (libxl__domain_type(gc, domid) == LIBXL_DOMAIN_TYPE_HVM) { + rc = xc_test_assign_device(ctx->xch, domid, pcidev_encode_bdf(pcidev)); + if (rc) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "PCI device %04x:%02x:%02x.%u %s?", + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func, + errno == ENOSYS ? "cannot be assigned - no IOMMU" + : "already assigned to a different guest"); + goto out; + } + } + rc = libxl__device_pci_setdefault(gc, pcidev); if (rc) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jul 09 19:55:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Jul 2013 19: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 1Uwe0N-0002ar-Rg; Tue, 09 Jul 2013 19:55:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwe0M-0002aQ-Aa for xen-changelog@lists.xensource.com; Tue, 09 Jul 2013 19:55:18 +0000 Received: from [85.158.139.211:16207] by server-9.bemta-5.messagelabs.com id 76/6C-26025-5AA6CD15; Tue, 09 Jul 2013 19:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1373399715!18103598!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20067 invoked from network); 9 Jul 2013 19:55:16 -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; 9 Jul 2013 19:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwe0I-0000sn-IT for xen-changelog@lists.xensource.com; Tue, 09 Jul 2013 19:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uwe0I-000206-AW for xen-changelog@lists.xensource.com; Tue, 09 Jul 2013 19:55:14 +0000 Date: Tue, 09 Jul 2013 19:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: suppress device assignment to HVM guest when there is no IOMMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 78748fe8846627ddf3cccdaa3a1ff907a6132568 Author: Jan Beulich AuthorDate: Tue Jul 9 10:04:04 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 9 10:04:04 2013 +0200 libxl: suppress device assignment to HVM guest when there is no IOMMU This in effect copies similar logic from xend: While there's no way to check whether a device is assigned to a particular guest, XEN_DOMCTL_test_assign_device at least allows checking whether an IOMMU is there and whether a device has been assign to _some_ guest. For the time being, this should be enough to cover for the missing error checking/recovery in other parts of libxl's device assignment paths. There remains a (functionality-, but not security-related) race in that the iommu should be set up earlier, but this is too risky a change for this stage of the 4.3 release. This is a security issue, XSA-61. Signed-off-by: Jan Beulich Tested-by: George Dunlap Acked-by: George Dunlap Acked-by: Ian Jackson master commit: 826eb17271d3c647516d9944c47b0779afedea25 master date: 2013-07-01 15:20:28 +0100 --- tools/libxl/libxl_pci.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index d373b4d..2d476e0 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1048,6 +1048,18 @@ int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcide int num_assigned, i, rc; int stubdomid = 0; + if (libxl__domain_type(gc, domid) == LIBXL_DOMAIN_TYPE_HVM) { + rc = xc_test_assign_device(ctx->xch, domid, pcidev_encode_bdf(pcidev)); + if (rc) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "PCI device %04x:%02x:%02x.%u %s?", + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func, + errno == ENOSYS ? "cannot be assigned - no IOMMU" + : "already assigned to a different guest"); + goto out; + } + } + rc = libxl__device_pci_setdefault(gc, pcidev); if (rc) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 10 01:55:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jul 2013 01:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwjcf-00025x-UR; Wed, 10 Jul 2013 01: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 1Uwjcf-00025r-FM for xen-changelog@lists.xensource.com; Wed, 10 Jul 2013 01:55:13 +0000 Received: from [85.158.139.211:55442] by server-14.bemta-5.messagelabs.com id C2/FE-11419-FFEBCD15; Wed, 10 Jul 2013 01:55:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1373421309!20890793!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19846 invoked from network); 10 Jul 2013 01:55:10 -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; 10 Jul 2013 01:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwjca-0003CT-FF for xen-changelog@lists.xensource.com; Wed, 10 Jul 2013 01:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UwjcV-000432-6U for xen-changelog@lists.xensource.com; Wed, 10 Jul 2013 01:55:03 +0000 Date: Wed, 10 Jul 2013 01:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] xsm/flask: Fix XSM support for HVMOP_track_dirty_vram X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 75c411d02b1b8eca02c97d32120ded0ce4146114 Author: Aurelien Chartier AuthorDate: Thu Jul 4 10:46:25 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 4 10:46:25 2013 +0200 xsm/flask: Fix XSM support for HVMOP_track_dirty_vram The XSM check for HVMOP_track_dirty_vram is done with a call to xsm_hvm_param, therefore the switch handling that case should be located in flask_hvm_param and not in flask_hvmcontext. This was fixed upstream by the two following patches : * 875756ca34fabc7243c4a682ffd7008710a907e2 (add case in flask_hvm_param) * 652f94327383c5517b709f0a3e4b970216b3d375 (remove case from flask_hvmcontext) Signed-off-by: Aurelien Chartier Acked-by: Daniel De Graaf --- xen/xsm/flask/hooks.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 02a0d20..8f49e67 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -844,9 +844,6 @@ static int flask_hvmcontext(struct domain *d, uint32_t cmd) case XEN_DOMCTL_gethvmcontext_partial: perm = HVM__GETHVMC; break; - case HVMOP_track_dirty_vram: - perm = HVM__TRACKDIRTYVRAM; - break; default: return -EPERM; } @@ -885,6 +882,9 @@ static int flask_hvm_param(struct domain *d, unsigned long op) case HVMOP_get_param: perm = HVM__GETPARAM; break; + case HVMOP_track_dirty_vram: + perm = HVM__TRACKDIRTYVRAM; + break; default: return -EPERM; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 10 01:55:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jul 2013 01:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwjcf-00025x-UR; Wed, 10 Jul 2013 01: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 1Uwjcf-00025r-FM for xen-changelog@lists.xensource.com; Wed, 10 Jul 2013 01:55:13 +0000 Received: from [85.158.139.211:55442] by server-14.bemta-5.messagelabs.com id C2/FE-11419-FFEBCD15; Wed, 10 Jul 2013 01:55:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1373421309!20890793!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19846 invoked from network); 10 Jul 2013 01:55:10 -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; 10 Jul 2013 01:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwjca-0003CT-FF for xen-changelog@lists.xensource.com; Wed, 10 Jul 2013 01:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UwjcV-000432-6U for xen-changelog@lists.xensource.com; Wed, 10 Jul 2013 01:55:03 +0000 Date: Wed, 10 Jul 2013 01:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] xsm/flask: Fix XSM support for HVMOP_track_dirty_vram X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 75c411d02b1b8eca02c97d32120ded0ce4146114 Author: Aurelien Chartier AuthorDate: Thu Jul 4 10:46:25 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 4 10:46:25 2013 +0200 xsm/flask: Fix XSM support for HVMOP_track_dirty_vram The XSM check for HVMOP_track_dirty_vram is done with a call to xsm_hvm_param, therefore the switch handling that case should be located in flask_hvm_param and not in flask_hvmcontext. This was fixed upstream by the two following patches : * 875756ca34fabc7243c4a682ffd7008710a907e2 (add case in flask_hvm_param) * 652f94327383c5517b709f0a3e4b970216b3d375 (remove case from flask_hvmcontext) Signed-off-by: Aurelien Chartier Acked-by: Daniel De Graaf --- xen/xsm/flask/hooks.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 02a0d20..8f49e67 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -844,9 +844,6 @@ static int flask_hvmcontext(struct domain *d, uint32_t cmd) case XEN_DOMCTL_gethvmcontext_partial: perm = HVM__GETHVMC; break; - case HVMOP_track_dirty_vram: - perm = HVM__TRACKDIRTYVRAM; - break; default: return -EPERM; } @@ -885,6 +882,9 @@ static int flask_hvm_param(struct domain *d, unsigned long op) case HVMOP_get_param: perm = HVM__GETPARAM; break; + case HVMOP_track_dirty_vram: + perm = HVM__TRACKDIRTYVRAM; + break; default: return -EPERM; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 10 01:55:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jul 2013 01:55:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwjcq-00026Q-1X; Wed, 10 Jul 2013 01:55:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwjcp-00026I-BI for xen-changelog@lists.xensource.com; Wed, 10 Jul 2013 01:55:23 +0000 Received: from [85.158.138.51:34286] by server-9.bemta-3.messagelabs.com id 68/71-31358-A0FBCD15; Wed, 10 Jul 2013 01:55:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-174.messagelabs.com!1373421320!30768171!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14834 invoked from network); 10 Jul 2013 01:55:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jul 2013 01:55:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwjcl-0003CW-HY for xen-changelog@lists.xensource.com; Wed, 10 Jul 2013 01:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uwjcl-00043R-91 for xen-changelog@lists.xensource.com; Wed, 10 Jul 2013 01:55:19 +0000 Date: Wed, 10 Jul 2013 01:55:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] libxl: suppress device assignment to HVM guest when there is no IOMMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 52f527f726b756f6e42db3f7f05f5603c4f69dfd Author: Jan Beulich AuthorDate: Tue Jul 9 10:07:06 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 9 10:07:06 2013 +0200 libxl: suppress device assignment to HVM guest when there is no IOMMU This in effect copies similar logic from xend: While there's no way to check whether a device is assigned to a particular guest, XEN_DOMCTL_test_assign_device at least allows checking whether an IOMMU is there and whether a device has been assign to _some_ guest. For the time being, this should be enough to cover for the missing error checking/recovery in other parts of libxl's device assignment paths. There remains a (functionality-, but not security-related) race in that the iommu should be set up earlier, but this is too risky a change for this stage of the 4.3 release. This is a security issue, XSA-61. Signed-off-by: Jan Beulich Tested-by: George Dunlap Acked-by: George Dunlap Acked-by: Ian Jackson master commit: 826eb17271d3c647516d9944c47b0779afedea25 master date: 2013-07-01 15:20:28 +0100 master commit: 826eb17271d3c647516d9944c47b0779afedea25 master date: 2013-07-01 15:20:28 +0100 --- tools/libxl/libxl_pci.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 9c76bce..61bef12 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -786,6 +786,18 @@ int libxl__device_pci_add(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcid int num_assigned, i, rc; int stubdomid = 0; + if (libxl__domain_is_hvm(ctx, domid)) { + rc = xc_test_assign_device(ctx->xch, domid, pcidev_value(pcidev)); + if (rc) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "PCI device %04x:%02x:%02x.%u %s?", + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func, + errno == ENOSYS ? "cannot be assigned - no IOMMU" + : "already assigned to a different guest"); + goto out; + } + } + if (!libxl_pcidev_assignable(ctx, pcidev)) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "PCI device %x:%x:%x.%x is not assignable", pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Jul 10 01:55:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Jul 2013 01:55:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwjcq-00026Q-1X; Wed, 10 Jul 2013 01:55:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwjcp-00026I-BI for xen-changelog@lists.xensource.com; Wed, 10 Jul 2013 01:55:23 +0000 Received: from [85.158.138.51:34286] by server-9.bemta-3.messagelabs.com id 68/71-31358-A0FBCD15; Wed, 10 Jul 2013 01:55:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-174.messagelabs.com!1373421320!30768171!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14834 invoked from network); 10 Jul 2013 01:55:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 10 Jul 2013 01:55:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uwjcl-0003CW-HY for xen-changelog@lists.xensource.com; Wed, 10 Jul 2013 01:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uwjcl-00043R-91 for xen-changelog@lists.xensource.com; Wed, 10 Jul 2013 01:55:19 +0000 Date: Wed, 10 Jul 2013 01:55:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] libxl: suppress device assignment to HVM guest when there is no IOMMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 52f527f726b756f6e42db3f7f05f5603c4f69dfd Author: Jan Beulich AuthorDate: Tue Jul 9 10:07:06 2013 +0200 Commit: Jan Beulich CommitDate: Tue Jul 9 10:07:06 2013 +0200 libxl: suppress device assignment to HVM guest when there is no IOMMU This in effect copies similar logic from xend: While there's no way to check whether a device is assigned to a particular guest, XEN_DOMCTL_test_assign_device at least allows checking whether an IOMMU is there and whether a device has been assign to _some_ guest. For the time being, this should be enough to cover for the missing error checking/recovery in other parts of libxl's device assignment paths. There remains a (functionality-, but not security-related) race in that the iommu should be set up earlier, but this is too risky a change for this stage of the 4.3 release. This is a security issue, XSA-61. Signed-off-by: Jan Beulich Tested-by: George Dunlap Acked-by: George Dunlap Acked-by: Ian Jackson master commit: 826eb17271d3c647516d9944c47b0779afedea25 master date: 2013-07-01 15:20:28 +0100 master commit: 826eb17271d3c647516d9944c47b0779afedea25 master date: 2013-07-01 15:20:28 +0100 --- tools/libxl/libxl_pci.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 9c76bce..61bef12 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -786,6 +786,18 @@ int libxl__device_pci_add(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcid int num_assigned, i, rc; int stubdomid = 0; + if (libxl__domain_is_hvm(ctx, domid)) { + rc = xc_test_assign_device(ctx->xch, domid, pcidev_value(pcidev)); + if (rc) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "PCI device %04x:%02x:%02x.%u %s?", + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func, + errno == ENOSYS ? "cannot be assigned - no IOMMU" + : "already assigned to a different guest"); + goto out; + } + } + if (!libxl_pcidev_assignable(ctx, pcidev)) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "PCI device %x:%x:%x.%x is not assignable", pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 11 20:44:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jul 2013 20: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 1UxNij-0007pz-Sm; Thu, 11 Jul 2013 20:44:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNii-0007ps-R2 for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:09 +0000 Received: from [85.158.136.67:10387] by server-7.bemta-5.messagelabs.com id 7A/DC-21002-8191FD15; Thu, 11 Jul 2013 20:44:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-207.messagelabs.com!1373575443!27794349!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 886 invoked from network); 11 Jul 2013 20:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-207.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jul 2013 20:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNid-0006xI-Fr for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxNid-0002Qf-9j for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:03 +0000 Date: Thu, 11 Jul 2013 20:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86/HVM: fix x2APIC APIC_ID read 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 80c237d19c6d850a26e0c5c0493005f09bf1ae39 Author: Zhenguo Wang AuthorDate: Thu Jul 11 15:04:50 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 15:04:50 2013 +0200 x86/HVM: fix x2APIC APIC_ID read emulation APIC and x2APIC have different format for APIC_ID register. Need translation. Signed-off-by: Zhenguo Wang Signed-off-by: Xiaowei Yang Convert code to use switch(), fixing coding style issue at once, and use GET_xAPIC_ID() on the value read instead of VLAPIC_ID() (reading the field again). In the course of this also properly reject both read and writes on the non-existing MSR corresponding to APIC_ICR2. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 6859874b61d5ddaf5289e72ed2b2157739b72ca5 master date: 2013-06-11 09:45:55 +0200 --- xen/arch/x86/hvm/vlapic.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index a2ec9ae..1ed0d43 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -574,8 +574,19 @@ int hvm_x2apic_msr_read(struct vcpu *v, unsigned int msr, uint64_t *msr_content) return 1; vlapic_read_aligned(vlapic, offset, &low); - if ( offset == APIC_ICR ) + switch ( offset ) + { + case APIC_ID: + low = GET_xAPIC_ID(low); + break; + + case APIC_ICR: vlapic_read_aligned(vlapic, APIC_ICR2, &high); + break; + + case APIC_ICR2: + return 1; + } *msr_content = (((uint64_t)high) << 32) | low; return 0; @@ -824,11 +835,17 @@ int hvm_x2apic_msr_write(struct vcpu *v, unsigned int msr, uint64_t msr_content) if ( !vlapic_x2apic_mode(vlapic) ) return X86EMUL_UNHANDLEABLE; - if ( offset == APIC_ICR ) + switch ( offset ) { - int rc = vlapic_reg_write(v, APIC_ICR2, (uint32_t)(msr_content >> 32)); + int rc; + + case APIC_ICR: + rc = vlapic_reg_write(v, APIC_ICR2, (uint32_t)(msr_content >> 32)); if ( rc ) return rc; + + case APIC_ICR2: + return X86EMUL_UNHANDLEABLE; } return vlapic_reg_write(v, offset, (uint32_t)msr_content); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 11 20:44:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jul 2013 20: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 1UxNij-0007pz-Sm; Thu, 11 Jul 2013 20:44:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNii-0007ps-R2 for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:09 +0000 Received: from [85.158.136.67:10387] by server-7.bemta-5.messagelabs.com id 7A/DC-21002-8191FD15; Thu, 11 Jul 2013 20:44:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-207.messagelabs.com!1373575443!27794349!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 886 invoked from network); 11 Jul 2013 20:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-207.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jul 2013 20:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNid-0006xI-Fr for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxNid-0002Qf-9j for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:03 +0000 Date: Thu, 11 Jul 2013 20:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86/HVM: fix x2APIC APIC_ID read 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 80c237d19c6d850a26e0c5c0493005f09bf1ae39 Author: Zhenguo Wang AuthorDate: Thu Jul 11 15:04:50 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 15:04:50 2013 +0200 x86/HVM: fix x2APIC APIC_ID read emulation APIC and x2APIC have different format for APIC_ID register. Need translation. Signed-off-by: Zhenguo Wang Signed-off-by: Xiaowei Yang Convert code to use switch(), fixing coding style issue at once, and use GET_xAPIC_ID() on the value read instead of VLAPIC_ID() (reading the field again). In the course of this also properly reject both read and writes on the non-existing MSR corresponding to APIC_ICR2. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 6859874b61d5ddaf5289e72ed2b2157739b72ca5 master date: 2013-06-11 09:45:55 +0200 --- xen/arch/x86/hvm/vlapic.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index a2ec9ae..1ed0d43 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -574,8 +574,19 @@ int hvm_x2apic_msr_read(struct vcpu *v, unsigned int msr, uint64_t *msr_content) return 1; vlapic_read_aligned(vlapic, offset, &low); - if ( offset == APIC_ICR ) + switch ( offset ) + { + case APIC_ID: + low = GET_xAPIC_ID(low); + break; + + case APIC_ICR: vlapic_read_aligned(vlapic, APIC_ICR2, &high); + break; + + case APIC_ICR2: + return 1; + } *msr_content = (((uint64_t)high) << 32) | low; return 0; @@ -824,11 +835,17 @@ int hvm_x2apic_msr_write(struct vcpu *v, unsigned int msr, uint64_t msr_content) if ( !vlapic_x2apic_mode(vlapic) ) return X86EMUL_UNHANDLEABLE; - if ( offset == APIC_ICR ) + switch ( offset ) { - int rc = vlapic_reg_write(v, APIC_ICR2, (uint32_t)(msr_content >> 32)); + int rc; + + case APIC_ICR: + rc = vlapic_reg_write(v, APIC_ICR2, (uint32_t)(msr_content >> 32)); if ( rc ) return rc; + + case APIC_ICR2: + return X86EMUL_UNHANDLEABLE; } return vlapic_reg_write(v, offset, (uint32_t)msr_content); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 11 20:44:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jul 2013 20:44: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 1UxNis-0007qv-Vj; Thu, 11 Jul 2013 20:44:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNir-0007qg-BL for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:17 +0000 Received: from [85.158.137.99:42369] by server-5.bemta-3.messagelabs.com id 78/CA-15398-0291FD15; Thu, 11 Jul 2013 20:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-217.messagelabs.com!1373575454!15223166!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32186 invoked from network); 11 Jul 2013 20:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jul 2013 20:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNio-0006xL-Aa for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxNin-0002R3-Kq for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:13 +0000 Date: Thu, 11 Jul 2013 20:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86/HVM: fix initialization of wallclock time for PVHVM on migration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5213897283719303965==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5213897283719303965== Content-Type: text/plain commit e3962c81ef8b04bf84df971ec26e2c160d6b1bac Author: Roger Pau Monné AuthorDate: Thu Jul 11 15:05:54 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 15:05:54 2013 +0200 x86/HVM: fix initialization of wallclock time for PVHVM on migration Call update_domain_wallclock_time on hvm_latch_shinfo_size even if the bitness of the guest has already been set, this fixes the problem with the wallclock not being set for PVHVM guests on resume from migration. Signed-off-by: Roger Pau Monné Clean up the resulting code and retain the (slightly adjusted) original comment. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: f8e8fd56bd7d5675e8331b4ec74bae76c9dbf24e master date: 2013-06-12 10:05:39 +0200 --- xen/arch/x86/hvm/hvm.c | 33 ++++++++++++++------------------- 1 files changed, 14 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 140e70c..b63e4be 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2903,31 +2903,26 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) static void hvm_latch_shinfo_size(struct domain *d) { - bool_t new_has_32bit; - /* * Called from operations which are among the very first executed by * PV drivers on initialisation or after save/restore. These are sensible * points at which to sample the execution mode of the guest and latch * 32- or 64-bit format for shared state. */ - if ( current->domain == d ) { - new_has_32bit = (hvm_guest_x86_mode(current) != 8); - if (new_has_32bit != d->arch.has_32bit_shinfo) { - d->arch.has_32bit_shinfo = new_has_32bit; - /* - * Make sure that the timebase in the shared info - * structure is correct for its new bit-ness. We should - * arguably try to convert the other fields as well, but - * that's much more problematic (e.g. what do you do if - * you're going from 64 bit to 32 bit and there's an event - * channel pending which doesn't exist in the 32 bit - * version?). Just setting the wallclock time seems to be - * sufficient for everything we do, even if it is a bit of - * a hack. - */ - update_domain_wallclock_time(d); - } + if ( current->domain == d ) + { + d->arch.has_32bit_shinfo = (hvm_guest_x86_mode(current) != 8); + /* + * Make sure that the timebase in the shared info structure is correct. + * + * If the bit-ness changed we should arguably try to convert the other + * fields as well, but that's much more problematic (e.g. what do you + * do if you're going from 64 bit to 32 bit and there's an event + * channel pending which doesn't exist in the 32 bit version?). Just + * setting the wallclock time seems to be sufficient for everything + * we do, even if it is a bit of a hack. + */ + update_domain_wallclock_time(d); } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 --===============5213897283719303965== 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 --===============5213897283719303965==-- From xen-changelog-bounces@lists.xen.org Thu Jul 11 20:44:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jul 2013 20:44: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 1UxNis-0007qv-Vj; Thu, 11 Jul 2013 20:44:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNir-0007qg-BL for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:17 +0000 Received: from [85.158.137.99:42369] by server-5.bemta-3.messagelabs.com id 78/CA-15398-0291FD15; Thu, 11 Jul 2013 20:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-217.messagelabs.com!1373575454!15223166!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32186 invoked from network); 11 Jul 2013 20:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jul 2013 20:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNio-0006xL-Aa for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxNin-0002R3-Kq for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:13 +0000 Date: Thu, 11 Jul 2013 20:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86/HVM: fix initialization of wallclock time for PVHVM on migration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5213897283719303965==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5213897283719303965== Content-Type: text/plain commit e3962c81ef8b04bf84df971ec26e2c160d6b1bac Author: Roger Pau Monné AuthorDate: Thu Jul 11 15:05:54 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 15:05:54 2013 +0200 x86/HVM: fix initialization of wallclock time for PVHVM on migration Call update_domain_wallclock_time on hvm_latch_shinfo_size even if the bitness of the guest has already been set, this fixes the problem with the wallclock not being set for PVHVM guests on resume from migration. Signed-off-by: Roger Pau Monné Clean up the resulting code and retain the (slightly adjusted) original comment. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: f8e8fd56bd7d5675e8331b4ec74bae76c9dbf24e master date: 2013-06-12 10:05:39 +0200 --- xen/arch/x86/hvm/hvm.c | 33 ++++++++++++++------------------- 1 files changed, 14 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 140e70c..b63e4be 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2903,31 +2903,26 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) static void hvm_latch_shinfo_size(struct domain *d) { - bool_t new_has_32bit; - /* * Called from operations which are among the very first executed by * PV drivers on initialisation or after save/restore. These are sensible * points at which to sample the execution mode of the guest and latch * 32- or 64-bit format for shared state. */ - if ( current->domain == d ) { - new_has_32bit = (hvm_guest_x86_mode(current) != 8); - if (new_has_32bit != d->arch.has_32bit_shinfo) { - d->arch.has_32bit_shinfo = new_has_32bit; - /* - * Make sure that the timebase in the shared info - * structure is correct for its new bit-ness. We should - * arguably try to convert the other fields as well, but - * that's much more problematic (e.g. what do you do if - * you're going from 64 bit to 32 bit and there's an event - * channel pending which doesn't exist in the 32 bit - * version?). Just setting the wallclock time seems to be - * sufficient for everything we do, even if it is a bit of - * a hack. - */ - update_domain_wallclock_time(d); - } + if ( current->domain == d ) + { + d->arch.has_32bit_shinfo = (hvm_guest_x86_mode(current) != 8); + /* + * Make sure that the timebase in the shared info structure is correct. + * + * If the bit-ness changed we should arguably try to convert the other + * fields as well, but that's much more problematic (e.g. what do you + * do if you're going from 64 bit to 32 bit and there's an event + * channel pending which doesn't exist in the 32 bit version?). Just + * setting the wallclock time seems to be sufficient for everything + * we do, even if it is a bit of a hack. + */ + update_domain_wallclock_time(d); } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 --===============5213897283719303965== 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 --===============5213897283719303965==-- From xen-changelog-bounces@lists.xen.org Thu Jul 11 20:44:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jul 2013 20:44: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 1UxNj3-0007s5-2X; Thu, 11 Jul 2013 20:44:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNj1-0007rq-BP for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:27 +0000 Received: from [85.158.138.51:40739] by server-4.bemta-3.messagelabs.com id 18/78-24959-A291FD15; Thu, 11 Jul 2013 20:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-174.messagelabs.com!1373575464!23411634!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14816 invoked from network); 11 Jul 2013 20:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jul 2013 20:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNiy-0006xR-Ld for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxNiy-0002S8-Dv for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:24 +0000 Date: Thu, 11 Jul 2013 20:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86/hvm: fix HVMOP_inject_trap return value on success X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8c0fc241f273108a75d33303b829e295b2865a8e Author: Tim Deegan AuthorDate: Thu Jul 11 15:06:49 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 15:06:49 2013 +0200 x86/hvm: fix HVMOP_inject_trap return value on success Reported-by: Antony Saba Signed-off-by: Tim Deegan Acked-by: Keir Fraser Acked-by: George Dunlap master commit: a12d15d8c1d512a4ed6498b39f9058f69a1c1f6c master date: 2013-06-21 17:01:50 +0200 --- xen/arch/x86/hvm/hvm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index b63e4be..42ee784 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3910,6 +3910,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) v->arch.hvm_vcpu.inject_trap = tr.trap; v->arch.hvm_vcpu.inject_error_code = tr.error_code; v->arch.hvm_vcpu.inject_cr2 = tr.cr2; + rc = 0; } param_fail8: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 11 20:44:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jul 2013 20:44: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 1UxNj3-0007s5-2X; Thu, 11 Jul 2013 20:44:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNj1-0007rq-BP for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:27 +0000 Received: from [85.158.138.51:40739] by server-4.bemta-3.messagelabs.com id 18/78-24959-A291FD15; Thu, 11 Jul 2013 20:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-174.messagelabs.com!1373575464!23411634!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14816 invoked from network); 11 Jul 2013 20:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jul 2013 20:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNiy-0006xR-Ld for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxNiy-0002S8-Dv for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:24 +0000 Date: Thu, 11 Jul 2013 20:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86/hvm: fix HVMOP_inject_trap return value on success X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8c0fc241f273108a75d33303b829e295b2865a8e Author: Tim Deegan AuthorDate: Thu Jul 11 15:06:49 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 15:06:49 2013 +0200 x86/hvm: fix HVMOP_inject_trap return value on success Reported-by: Antony Saba Signed-off-by: Tim Deegan Acked-by: Keir Fraser Acked-by: George Dunlap master commit: a12d15d8c1d512a4ed6498b39f9058f69a1c1f6c master date: 2013-06-21 17:01:50 +0200 --- xen/arch/x86/hvm/hvm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index b63e4be..42ee784 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3910,6 +3910,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) v->arch.hvm_vcpu.inject_trap = tr.trap; v->arch.hvm_vcpu.inject_error_code = tr.error_code; v->arch.hvm_vcpu.inject_cr2 = tr.cr2; + rc = 0; } param_fail8: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 11 20:44:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jul 2013 20:44:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjC-0007tO-5P; Thu, 11 Jul 2013 20:44:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjB-0007tA-9a for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:37 +0000 Received: from [193.109.254.147:43637] by server-1.bemta-14.messagelabs.com id 71/27-20106-4391FD15; Thu, 11 Jul 2013 20:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1373575475!274147!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6744 invoked from network); 11 Jul 2013 20:44:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jul 2013 20:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNj8-0006xa-VO for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxNj8-0002SY-Pv for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:34 +0000 Date: Thu, 11 Jul 2013 20:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] libelf: fix printing of 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 f2b90b639b2c5aceeccda9e48b58dbe816151258 Author: Jan Beulich AuthorDate: Thu Jul 11 15:07:36 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 15:07:36 2013 +0200 libelf: fix printing of pointers Printing them as decimal number, the more with 0x prefix, is confusing and presumably relatively useless to most of us. Signed-off-by: Jan Beulich master commit: 59912eb06fda88af6c5ec16a2a382619d3829a7b master date: 2013-06-26 14:43:52 +0100 --- xen/include/xen/libelf.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h index 41fc513..1da66f7 100644 --- a/xen/include/xen/libelf.h +++ b/xen/include/xen/libelf.h @@ -76,14 +76,14 @@ typedef void elf_log_callback(struct elf_binary*, void *caller_data, #ifdef __XEN__ # ifdef __i386__ typedef uint32_t elf_uintptr_t; -# define ELF_PRPTRVAL PRIu32 +# define ELF_PRPTRVAL PRIx32 # else typedef uint64_t elf_uintptr_t; -# define ELF_PRPTRVAL PRIu64 +# define ELF_PRPTRVAL PRIx64 # endif #else typedef uintptr_t elf_uintptr_t; -# define ELF_PRPTRVAL PRIuPTR +# define ELF_PRPTRVAL PRIxPTR #endif typedef elf_uintptr_t elf_ptrval; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 11 20:44:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jul 2013 20:44:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjC-0007tO-5P; Thu, 11 Jul 2013 20:44:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjB-0007tA-9a for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:37 +0000 Received: from [193.109.254.147:43637] by server-1.bemta-14.messagelabs.com id 71/27-20106-4391FD15; Thu, 11 Jul 2013 20:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1373575475!274147!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6744 invoked from network); 11 Jul 2013 20:44:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jul 2013 20:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNj8-0006xa-VO for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxNj8-0002SY-Pv for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:34 +0000 Date: Thu, 11 Jul 2013 20:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] libelf: fix printing of 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 f2b90b639b2c5aceeccda9e48b58dbe816151258 Author: Jan Beulich AuthorDate: Thu Jul 11 15:07:36 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 15:07:36 2013 +0200 libelf: fix printing of pointers Printing them as decimal number, the more with 0x prefix, is confusing and presumably relatively useless to most of us. Signed-off-by: Jan Beulich master commit: 59912eb06fda88af6c5ec16a2a382619d3829a7b master date: 2013-06-26 14:43:52 +0100 --- xen/include/xen/libelf.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h index 41fc513..1da66f7 100644 --- a/xen/include/xen/libelf.h +++ b/xen/include/xen/libelf.h @@ -76,14 +76,14 @@ typedef void elf_log_callback(struct elf_binary*, void *caller_data, #ifdef __XEN__ # ifdef __i386__ typedef uint32_t elf_uintptr_t; -# define ELF_PRPTRVAL PRIu32 +# define ELF_PRPTRVAL PRIx32 # else typedef uint64_t elf_uintptr_t; -# define ELF_PRPTRVAL PRIu64 +# define ELF_PRPTRVAL PRIx64 # endif #else typedef uintptr_t elf_uintptr_t; -# define ELF_PRPTRVAL PRIuPTR +# define ELF_PRPTRVAL PRIxPTR #endif typedef elf_uintptr_t elf_ptrval; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 11 20:44:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jul 2013 20:44: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 1UxNjN-0007vW-A7; Thu, 11 Jul 2013 20:44:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjL-0007vC-L8 for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:47 +0000 Received: from [85.158.143.99:29491] by server-3.bemta-4.messagelabs.com id E6/FC-29480-E391FD15; Thu, 11 Jul 2013 20:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-216.messagelabs.com!1373575485!21012661!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6768 invoked from network); 11 Jul 2013 20:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jul 2013 20:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjJ-0006xi-4f for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxNjJ-0002Su-3O for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:45 +0000 Date: Thu, 11 Jul 2013 20:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] AMD/intremap: Prevent use of per-device vector maps until irq logic is fixed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f6ed24eb4b4b0ab29152bd7a315e5825c7ff791 Author: Andrew Cooper AuthorDate: Thu Jul 11 15:08:14 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 15:08:14 2013 +0200 AMD/intremap: Prevent use of per-device vector maps until irq logic is fixed XSA-36 changed the default vector map mode from global to per-device. This is because a global vector map does not prevent one PCI device from impersonating another and launching a DoS on the system. However, the per-device vector map logic is broken for devices with multiple MSI-X vectors, which can either result in a failed ASSERT() or misprogramming of a guests interrupt remapping tables. The core problem is not trivial to fix. In an effort to get AMD systems back to a non-regressed state, introduce a new type of vector map called per-device-global. This uses per-device vector maps in the IOMMU, but uses a single used_vector map for the core IRQ logic. This patch is intended to be removed as soon as the per-device logic is fixed correctly. Signed-off-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: f0fe8227624d5c02715ed086867d12cd24f6ff47 master date: 2013-06-27 14:01:18 +0200 --- xen/drivers/passthrough/amd/pci_amd_iommu.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 43175cd..7251796 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -182,8 +182,19 @@ int __init amd_iov_detect(void) { if ( amd_iommu_perdev_intremap ) { - printk("AMD-Vi: Enabling per-device vector maps\n"); - opt_irq_vector_map = OPT_IRQ_VECTOR_MAP_PERDEV; + /* Per-device vector map logic is broken for devices with multiple + * MSI-X interrupts (and would also be for multiple MSI, if Xen + * supported it). + * + * Until this is fixed, use global vector tables as far as the irq + * logic is concerned to avoid the buggy behaviour of per-device + * maps in map_domain_pirq(), and use per-device tables as far as + * intremap code is concerned to avoid the security issue. + */ + printk(XENLOG_WARNING "AMD-Vi: per-device vector map logic is broken. " + "Using per-device-global maps instead until a fix is found.\n"); + + opt_irq_vector_map = OPT_IRQ_VECTOR_MAP_GLOBAL; } else { @@ -194,6 +205,10 @@ int __init amd_iov_detect(void) else { printk("AMD-Vi: Not overriding irq_vector_map setting\n"); + + if ( opt_irq_vector_map != OPT_IRQ_VECTOR_MAP_GLOBAL ) + printk(XENLOG_WARNING "AMD-Vi: per-device vector map logic is broken. " + "Use irq_vector_map=global to work around.\n"); } if ( !amd_iommu_perdev_intremap ) printk(XENLOG_WARNING "AMD-Vi: Using global interrupt remap table is not recommended (see XSA-36)!\n"); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 11 20:44:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jul 2013 20:44: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 1UxNjN-0007vW-A7; Thu, 11 Jul 2013 20:44:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjL-0007vC-L8 for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:47 +0000 Received: from [85.158.143.99:29491] by server-3.bemta-4.messagelabs.com id E6/FC-29480-E391FD15; Thu, 11 Jul 2013 20:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-216.messagelabs.com!1373575485!21012661!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6768 invoked from network); 11 Jul 2013 20:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jul 2013 20:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjJ-0006xi-4f for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxNjJ-0002Su-3O for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:45 +0000 Date: Thu, 11 Jul 2013 20:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] AMD/intremap: Prevent use of per-device vector maps until irq logic is fixed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f6ed24eb4b4b0ab29152bd7a315e5825c7ff791 Author: Andrew Cooper AuthorDate: Thu Jul 11 15:08:14 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 15:08:14 2013 +0200 AMD/intremap: Prevent use of per-device vector maps until irq logic is fixed XSA-36 changed the default vector map mode from global to per-device. This is because a global vector map does not prevent one PCI device from impersonating another and launching a DoS on the system. However, the per-device vector map logic is broken for devices with multiple MSI-X vectors, which can either result in a failed ASSERT() or misprogramming of a guests interrupt remapping tables. The core problem is not trivial to fix. In an effort to get AMD systems back to a non-regressed state, introduce a new type of vector map called per-device-global. This uses per-device vector maps in the IOMMU, but uses a single used_vector map for the core IRQ logic. This patch is intended to be removed as soon as the per-device logic is fixed correctly. Signed-off-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: f0fe8227624d5c02715ed086867d12cd24f6ff47 master date: 2013-06-27 14:01:18 +0200 --- xen/drivers/passthrough/amd/pci_amd_iommu.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 43175cd..7251796 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -182,8 +182,19 @@ int __init amd_iov_detect(void) { if ( amd_iommu_perdev_intremap ) { - printk("AMD-Vi: Enabling per-device vector maps\n"); - opt_irq_vector_map = OPT_IRQ_VECTOR_MAP_PERDEV; + /* Per-device vector map logic is broken for devices with multiple + * MSI-X interrupts (and would also be for multiple MSI, if Xen + * supported it). + * + * Until this is fixed, use global vector tables as far as the irq + * logic is concerned to avoid the buggy behaviour of per-device + * maps in map_domain_pirq(), and use per-device tables as far as + * intremap code is concerned to avoid the security issue. + */ + printk(XENLOG_WARNING "AMD-Vi: per-device vector map logic is broken. " + "Using per-device-global maps instead until a fix is found.\n"); + + opt_irq_vector_map = OPT_IRQ_VECTOR_MAP_GLOBAL; } else { @@ -194,6 +205,10 @@ int __init amd_iov_detect(void) else { printk("AMD-Vi: Not overriding irq_vector_map setting\n"); + + if ( opt_irq_vector_map != OPT_IRQ_VECTOR_MAP_GLOBAL ) + printk(XENLOG_WARNING "AMD-Vi: per-device vector map logic is broken. " + "Use irq_vector_map=global to work around.\n"); } if ( !amd_iommu_perdev_intremap ) printk(XENLOG_WARNING "AMD-Vi: Using global interrupt remap table is not recommended (see XSA-36)!\n"); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 11 20:45:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jul 2013 20:45: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 1UxNjX-0007xk-D7; Thu, 11 Jul 2013 20: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 1UxNjV-0007xJ-SF for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:58 +0000 Received: from [193.109.254.147:14532] by server-4.bemta-14.messagelabs.com id E5/85-27904-9491FD15; Thu, 11 Jul 2013 20:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1373575495!271864!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4625 invoked from network); 11 Jul 2013 20:44:56 -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; 11 Jul 2013 20:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjT-0006xr-Cv for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxNjT-0002TG-8E for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:55 +0000 Date: Thu, 11 Jul 2013 20:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86: don't pass negative time to gtime_to_gtsc() (try 2) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4e5c53055025170124213e8cb4844e66f2f6ec12 Author: Jan Beulich AuthorDate: Thu Jul 11 15:09:07 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 15:09:07 2013 +0200 x86: don't pass negative time to gtime_to_gtsc() (try 2) This mostly reverts commit eb60be3d ("x86: don't pass negative time to gtime_to_gtsc()") and instead corrects __update_vcpu_system_time()'s handling of this_cpu(cpu_time).stime_local_stamp dating back before the start of a HVM guest (which would otherwise lead to a negative value getting passed to gtime_to_gtsc(), causing scale_delta() to produce meaningless output). Flushing the value to zero was wrong, and printing a message for something that can validly happen wasn't very useful either. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 5ad914bc867c5a6a4957869c89918f4e1f9dd9c4 master date: 2013-07-02 08:48:03 +0200 --- xen/arch/x86/time.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index a176b88..c2fc955 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -823,16 +823,13 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) struct pl_time *pl = &v->domain->arch.hvm_domain.pl_time; stime += pl->stime_offset + v->arch.hvm_vcpu.stime_offset; - if ( (s64)stime < 0 ) - { - printk(XENLOG_G_WARNING "d%dv%d: bogus time %" PRId64 - " (offsets %" PRId64 "/%" PRId64 ")\n", - d->domain_id, v->vcpu_id, stime, - pl->stime_offset, v->arch.hvm_vcpu.stime_offset); - stime = 0; - } + if ( stime >= 0 ) + tsc_stamp = gtime_to_gtsc(d, stime); + else + tsc_stamp = -gtime_to_gtsc(d, -stime); } - tsc_stamp = gtime_to_gtsc(d, stime); + else + tsc_stamp = gtime_to_gtsc(d, stime); } else { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 11 20:45:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jul 2013 20:45: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 1UxNjX-0007xk-D7; Thu, 11 Jul 2013 20: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 1UxNjV-0007xJ-SF for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:58 +0000 Received: from [193.109.254.147:14532] by server-4.bemta-14.messagelabs.com id E5/85-27904-9491FD15; Thu, 11 Jul 2013 20:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1373575495!271864!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4625 invoked from network); 11 Jul 2013 20:44:56 -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; 11 Jul 2013 20:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjT-0006xr-Cv for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxNjT-0002TG-8E for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:44:55 +0000 Date: Thu, 11 Jul 2013 20:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86: don't pass negative time to gtime_to_gtsc() (try 2) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4e5c53055025170124213e8cb4844e66f2f6ec12 Author: Jan Beulich AuthorDate: Thu Jul 11 15:09:07 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 15:09:07 2013 +0200 x86: don't pass negative time to gtime_to_gtsc() (try 2) This mostly reverts commit eb60be3d ("x86: don't pass negative time to gtime_to_gtsc()") and instead corrects __update_vcpu_system_time()'s handling of this_cpu(cpu_time).stime_local_stamp dating back before the start of a HVM guest (which would otherwise lead to a negative value getting passed to gtime_to_gtsc(), causing scale_delta() to produce meaningless output). Flushing the value to zero was wrong, and printing a message for something that can validly happen wasn't very useful either. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 5ad914bc867c5a6a4957869c89918f4e1f9dd9c4 master date: 2013-07-02 08:48:03 +0200 --- xen/arch/x86/time.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index a176b88..c2fc955 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -823,16 +823,13 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) struct pl_time *pl = &v->domain->arch.hvm_domain.pl_time; stime += pl->stime_offset + v->arch.hvm_vcpu.stime_offset; - if ( (s64)stime < 0 ) - { - printk(XENLOG_G_WARNING "d%dv%d: bogus time %" PRId64 - " (offsets %" PRId64 "/%" PRId64 ")\n", - d->domain_id, v->vcpu_id, stime, - pl->stime_offset, v->arch.hvm_vcpu.stime_offset); - stime = 0; - } + if ( stime >= 0 ) + tsc_stamp = gtime_to_gtsc(d, stime); + else + tsc_stamp = -gtime_to_gtsc(d, -stime); } - tsc_stamp = gtime_to_gtsc(d, stime); + else + tsc_stamp = gtime_to_gtsc(d, stime); } else { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 11 20:45:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jul 2013 20:45:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjj-0007zj-Sn; Thu, 11 Jul 2013 20:45:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjh-0007zJ-R8 for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:45:10 +0000 Received: from [85.158.139.211:36447] by server-12.bemta-5.messagelabs.com id 80/4E-22750-5591FD15; Thu, 11 Jul 2013 20:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1373575506!19106560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25631 invoked from network); 11 Jul 2013 20:45:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jul 2013 20:45:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNje-0006yp-3j for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:45:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxNjd-0002Tu-HH for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:45:05 +0000 Date: Thu, 11 Jul 2013 20:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] iommu/amd: Fix logic for clearing the IOMMU interrupt bits X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d57d46c71ded043c14b39660c7eeddb96c650a9 Author: Suravee Suthikulpanit AuthorDate: Thu Jul 11 15:09:49 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 15:09:49 2013 +0200 iommu/amd: Fix logic for clearing the IOMMU interrupt bits The IOMMU interrupt bits in the IOMMU status registers are "read-only, and write-1-to-clear (RW1C). Therefore, the existing logic which reads the register, set the bit, and then writing back the values could accidentally clear certain bits if it has been set. The correct logic would just be writing only the value which only set the interrupt bits, and leave the rest to zeros. This patch also, clean up #define masks as Jan has suggested. Signed-off-by: Suravee Suthikulpanit With iommu_interrupt_handler() properly having got switched its readl() from status to control register, the subsequent writel() needed to be switched too (and the RW1C comment there was bogus). Some of the cleanup went too far - undone. Further, with iommu_interrupt_handler() now actually disabling the interrupt sources, they also need to get re-enabled by the tasklet once it finished processing the respective log. This also implies re-running the tasklet so that log entries added between reading the log and re- enabling the interrupt will get handled in a timely manner. Finally, guest write emulation to the status register needs to be done with the RW1C (and RO for all other bits) semantics in mind too. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Suravee Suthikulpanit master commit: 2823a0c7dfc979db316787e1dd42a8845e5825c0 master date: 2013-07-02 08:49:43 +0200 --- xen/drivers/passthrough/amd/iommu_init.c | 46 +++++++++++++++++++----------- xen/drivers/passthrough/amd/iommu_map.c | 14 ++++----- 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index fcb7e87..b87b613 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -336,11 +336,9 @@ static void amd_iommu_reset_event_log(struct amd_iommu *iommu) /* read event log for debugging */ amd_iommu_read_event_log(iommu); - /*clear overflow bit */ - set_field_in_reg_u32(IOMMU_CONTROL_DISABLED, entry, - IOMMU_STATUS_EVENT_OVERFLOW_MASK, - IOMMU_STATUS_EVENT_OVERFLOW_SHIFT, &entry); - writel(entry, iommu->mmio_base+IOMMU_STATUS_MMIO_OFFSET); + /* RW1C overflow bit */ + writel(IOMMU_STATUS_EVENT_OVERFLOW_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); /*reset event log base address */ iommu->event_log_head = 0; @@ -564,6 +562,11 @@ static void do_amd_iommu_irq(unsigned long data) int of; spin_lock_irqsave(&iommu->lock, flags); + + /* RW1C interrupt status bit */ + writel(IOMMU_STATUS_EVENT_LOG_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + amd_iommu_read_event_log(iommu); /* check event overflow */ @@ -575,13 +578,21 @@ static void do_amd_iommu_irq(unsigned long data) /* reset event log if event overflow */ if ( of ) amd_iommu_reset_event_log(iommu); + else + { + entry = readl(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + if ( !(entry & IOMMU_CONTROL_EVENT_LOG_INT_MASK) ) + { + entry |= IOMMU_CONTROL_EVENT_LOG_INT_MASK; + writel(entry, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + /* + * Re-schedule the tasklet to handle eventual log entries added + * between reading the log above and re-enabling the interrupt. + */ + tasklet_schedule(&amd_iommu_irq_tasklet); + } + } - /* reset interrupt status bit */ - entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - set_field_in_reg_u32(IOMMU_CONTROL_ENABLED, entry, - IOMMU_STATUS_EVENT_LOG_INT_MASK, - IOMMU_STATUS_EVENT_LOG_INT_SHIFT, &entry); - writel(entry, iommu->mmio_base+IOMMU_STATUS_MMIO_OFFSET); spin_unlock_irqrestore(&iommu->lock, flags); } } @@ -595,12 +606,13 @@ static void amd_iommu_page_fault(int irq, void *dev_id, spin_lock_irqsave(&iommu->lock, flags); - /* Silence interrupts from both event logging */ - entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - set_field_in_reg_u32(IOMMU_CONTROL_DISABLED, entry, - IOMMU_STATUS_EVENT_LOG_INT_MASK, - IOMMU_STATUS_EVENT_LOG_INT_SHIFT, &entry); - writel(entry, iommu->mmio_base+IOMMU_STATUS_MMIO_OFFSET); + /* + * Silence interrupts from both event and PPR by clearing the + * enable logging bits in the control register + */ + entry = readl(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + entry &= ~IOMMU_CONTROL_EVENT_LOG_INT_MASK; + writel(entry, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); spin_unlock_irqrestore(&iommu->lock, flags); diff --git a/xen/drivers/passthrough/amd/iommu_map.c b/xen/drivers/passthrough/amd/iommu_map.c index a65e01a..ea1f273 100644 --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -131,11 +131,9 @@ void flush_command_buffer(struct amd_iommu *iommu) u32 cmd[4], status; int loop_count, comp_wait; - /* clear 'ComWaitInt' in status register (WIC) */ - set_field_in_reg_u32(IOMMU_CONTROL_ENABLED, 0, - IOMMU_STATUS_COMP_WAIT_INT_MASK, - IOMMU_STATUS_COMP_WAIT_INT_SHIFT, &status); - writel(status, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + /* RW1C 'ComWaitInt' in status register */ + writel(IOMMU_STATUS_COMP_WAIT_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); /* send an empty COMPLETION_WAIT command to flush command buffer */ cmd[3] = cmd[2] = 0; @@ -159,9 +157,9 @@ void flush_command_buffer(struct amd_iommu *iommu) if ( comp_wait ) { - /* clear 'ComWaitInt' in status register (WIC) */ - status &= IOMMU_STATUS_COMP_WAIT_INT_MASK; - writel(status, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + /* RW1C 'ComWaitInt' in status register */ + writel(IOMMU_STATUS_COMP_WAIT_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); return; } AMD_IOMMU_DEBUG("Warning: ComWaitInt bit did not assert!\n"); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 11 20:45:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jul 2013 20:45:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjj-0007zj-Sn; Thu, 11 Jul 2013 20:45:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjh-0007zJ-R8 for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:45:10 +0000 Received: from [85.158.139.211:36447] by server-12.bemta-5.messagelabs.com id 80/4E-22750-5591FD15; Thu, 11 Jul 2013 20:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1373575506!19106560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25631 invoked from network); 11 Jul 2013 20:45:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jul 2013 20:45:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNje-0006yp-3j for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:45:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxNjd-0002Tu-HH for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:45:05 +0000 Date: Thu, 11 Jul 2013 20:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] iommu/amd: Fix logic for clearing the IOMMU interrupt bits X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d57d46c71ded043c14b39660c7eeddb96c650a9 Author: Suravee Suthikulpanit AuthorDate: Thu Jul 11 15:09:49 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 15:09:49 2013 +0200 iommu/amd: Fix logic for clearing the IOMMU interrupt bits The IOMMU interrupt bits in the IOMMU status registers are "read-only, and write-1-to-clear (RW1C). Therefore, the existing logic which reads the register, set the bit, and then writing back the values could accidentally clear certain bits if it has been set. The correct logic would just be writing only the value which only set the interrupt bits, and leave the rest to zeros. This patch also, clean up #define masks as Jan has suggested. Signed-off-by: Suravee Suthikulpanit With iommu_interrupt_handler() properly having got switched its readl() from status to control register, the subsequent writel() needed to be switched too (and the RW1C comment there was bogus). Some of the cleanup went too far - undone. Further, with iommu_interrupt_handler() now actually disabling the interrupt sources, they also need to get re-enabled by the tasklet once it finished processing the respective log. This also implies re-running the tasklet so that log entries added between reading the log and re- enabling the interrupt will get handled in a timely manner. Finally, guest write emulation to the status register needs to be done with the RW1C (and RO for all other bits) semantics in mind too. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Suravee Suthikulpanit master commit: 2823a0c7dfc979db316787e1dd42a8845e5825c0 master date: 2013-07-02 08:49:43 +0200 --- xen/drivers/passthrough/amd/iommu_init.c | 46 +++++++++++++++++++----------- xen/drivers/passthrough/amd/iommu_map.c | 14 ++++----- 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index fcb7e87..b87b613 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -336,11 +336,9 @@ static void amd_iommu_reset_event_log(struct amd_iommu *iommu) /* read event log for debugging */ amd_iommu_read_event_log(iommu); - /*clear overflow bit */ - set_field_in_reg_u32(IOMMU_CONTROL_DISABLED, entry, - IOMMU_STATUS_EVENT_OVERFLOW_MASK, - IOMMU_STATUS_EVENT_OVERFLOW_SHIFT, &entry); - writel(entry, iommu->mmio_base+IOMMU_STATUS_MMIO_OFFSET); + /* RW1C overflow bit */ + writel(IOMMU_STATUS_EVENT_OVERFLOW_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); /*reset event log base address */ iommu->event_log_head = 0; @@ -564,6 +562,11 @@ static void do_amd_iommu_irq(unsigned long data) int of; spin_lock_irqsave(&iommu->lock, flags); + + /* RW1C interrupt status bit */ + writel(IOMMU_STATUS_EVENT_LOG_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + amd_iommu_read_event_log(iommu); /* check event overflow */ @@ -575,13 +578,21 @@ static void do_amd_iommu_irq(unsigned long data) /* reset event log if event overflow */ if ( of ) amd_iommu_reset_event_log(iommu); + else + { + entry = readl(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + if ( !(entry & IOMMU_CONTROL_EVENT_LOG_INT_MASK) ) + { + entry |= IOMMU_CONTROL_EVENT_LOG_INT_MASK; + writel(entry, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + /* + * Re-schedule the tasklet to handle eventual log entries added + * between reading the log above and re-enabling the interrupt. + */ + tasklet_schedule(&amd_iommu_irq_tasklet); + } + } - /* reset interrupt status bit */ - entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - set_field_in_reg_u32(IOMMU_CONTROL_ENABLED, entry, - IOMMU_STATUS_EVENT_LOG_INT_MASK, - IOMMU_STATUS_EVENT_LOG_INT_SHIFT, &entry); - writel(entry, iommu->mmio_base+IOMMU_STATUS_MMIO_OFFSET); spin_unlock_irqrestore(&iommu->lock, flags); } } @@ -595,12 +606,13 @@ static void amd_iommu_page_fault(int irq, void *dev_id, spin_lock_irqsave(&iommu->lock, flags); - /* Silence interrupts from both event logging */ - entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - set_field_in_reg_u32(IOMMU_CONTROL_DISABLED, entry, - IOMMU_STATUS_EVENT_LOG_INT_MASK, - IOMMU_STATUS_EVENT_LOG_INT_SHIFT, &entry); - writel(entry, iommu->mmio_base+IOMMU_STATUS_MMIO_OFFSET); + /* + * Silence interrupts from both event and PPR by clearing the + * enable logging bits in the control register + */ + entry = readl(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + entry &= ~IOMMU_CONTROL_EVENT_LOG_INT_MASK; + writel(entry, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); spin_unlock_irqrestore(&iommu->lock, flags); diff --git a/xen/drivers/passthrough/amd/iommu_map.c b/xen/drivers/passthrough/amd/iommu_map.c index a65e01a..ea1f273 100644 --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -131,11 +131,9 @@ void flush_command_buffer(struct amd_iommu *iommu) u32 cmd[4], status; int loop_count, comp_wait; - /* clear 'ComWaitInt' in status register (WIC) */ - set_field_in_reg_u32(IOMMU_CONTROL_ENABLED, 0, - IOMMU_STATUS_COMP_WAIT_INT_MASK, - IOMMU_STATUS_COMP_WAIT_INT_SHIFT, &status); - writel(status, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + /* RW1C 'ComWaitInt' in status register */ + writel(IOMMU_STATUS_COMP_WAIT_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); /* send an empty COMPLETION_WAIT command to flush command buffer */ cmd[3] = cmd[2] = 0; @@ -159,9 +157,9 @@ void flush_command_buffer(struct amd_iommu *iommu) if ( comp_wait ) { - /* clear 'ComWaitInt' in status register (WIC) */ - status &= IOMMU_STATUS_COMP_WAIT_INT_MASK; - writel(status, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + /* RW1C 'ComWaitInt' in status register */ + writel(IOMMU_STATUS_COMP_WAIT_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); return; } AMD_IOMMU_DEBUG("Warning: ComWaitInt bit did not assert!\n"); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 11 20:45:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jul 2013 20: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 1UxNjt-00081r-9l; Thu, 11 Jul 2013 20:45:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjs-00081Q-35 for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:45:20 +0000 Received: from [85.158.136.67:11921] by server-14.bemta-5.messagelabs.com id 7E/3F-11419-F591FD15; Thu, 11 Jul 2013 20:45:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-207.messagelabs.com!1373575517!20813590!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28473 invoked from network); 11 Jul 2013 20:45:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-207.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jul 2013 20:45:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjo-0006yv-Ri for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:45:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxNjo-0002Up-Ou for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:45:16 +0000 Date: Thu, 11 Jul 2013 20:45:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] iommu/amd: Workaround for erratum 787 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 625adff3a665e0edcce6fc96b269379263f4ff6d Author: Suravee Suthikulpanit AuthorDate: Thu Jul 11 15:10:23 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 15:10:23 2013 +0200 iommu/amd: Workaround for erratum 787 The IOMMU interrupt handling in bottom half must clear the PPR log interrupt and event log interrupt bits to re-enable the interrupt. This is done by writing 1 to the memory mapped register to clear the bit. Due to hardware bug, if the driver tries to clear this bit while the IOMMU hardware also setting this bit, the conflict will result with the bit being set. If the interrupt handling code does not make sure to clear this bit, subsequent changes in the event/PPR logs will no longer generating interrupts, and would result if buffer overflow. After clearing the bits, the driver must read back the register to verify. Signed-off-by: Suravee Suthikulpanit Adjust to apply on top of heavily modified patch 1. Adjust flow to get away with a single readl() in each instance of the status register checks. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Suravee Suthikulpanit master commit: 9eabb0735400e2b6059dfa3f0b47a426f61f570a master date: 2013-07-02 08:50:41 +0200 --- xen/drivers/passthrough/amd/iommu_init.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index b87b613..d105e35 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -593,6 +593,14 @@ static void do_amd_iommu_irq(unsigned long data) } } + /* + * Workaround for erratum787: + * Re-check to make sure the bit has been cleared. + */ + entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + if ( entry & IOMMU_STATUS_EVENT_LOG_INT_MASK ) + tasklet_schedule(&amd_iommu_irq_tasklet); + spin_unlock_irqrestore(&iommu->lock, flags); } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jul 11 20:45:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Jul 2013 20: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 1UxNjt-00081r-9l; Thu, 11 Jul 2013 20:45:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjs-00081Q-35 for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:45:20 +0000 Received: from [85.158.136.67:11921] by server-14.bemta-5.messagelabs.com id 7E/3F-11419-F591FD15; Thu, 11 Jul 2013 20:45:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-207.messagelabs.com!1373575517!20813590!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28473 invoked from network); 11 Jul 2013 20:45:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-207.messagelabs.com with AES256-SHA encrypted SMTP; 11 Jul 2013 20:45:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxNjo-0006yv-Ri for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:45:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxNjo-0002Up-Ou for xen-changelog@lists.xensource.com; Thu, 11 Jul 2013 20:45:16 +0000 Date: Thu, 11 Jul 2013 20:45:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] iommu/amd: Workaround for erratum 787 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 625adff3a665e0edcce6fc96b269379263f4ff6d Author: Suravee Suthikulpanit AuthorDate: Thu Jul 11 15:10:23 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 15:10:23 2013 +0200 iommu/amd: Workaround for erratum 787 The IOMMU interrupt handling in bottom half must clear the PPR log interrupt and event log interrupt bits to re-enable the interrupt. This is done by writing 1 to the memory mapped register to clear the bit. Due to hardware bug, if the driver tries to clear this bit while the IOMMU hardware also setting this bit, the conflict will result with the bit being set. If the interrupt handling code does not make sure to clear this bit, subsequent changes in the event/PPR logs will no longer generating interrupts, and would result if buffer overflow. After clearing the bits, the driver must read back the register to verify. Signed-off-by: Suravee Suthikulpanit Adjust to apply on top of heavily modified patch 1. Adjust flow to get away with a single readl() in each instance of the status register checks. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Suravee Suthikulpanit master commit: 9eabb0735400e2b6059dfa3f0b47a426f61f570a master date: 2013-07-02 08:50:41 +0200 --- xen/drivers/passthrough/amd/iommu_init.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index b87b613..d105e35 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -593,6 +593,14 @@ static void do_amd_iommu_irq(unsigned long data) } } + /* + * Workaround for erratum787: + * Re-check to make sure the bit has been cleared. + */ + entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + if ( entry & IOMMU_STATUS_EVENT_LOG_INT_MASK ) + tasklet_schedule(&amd_iommu_irq_tasklet); + spin_unlock_irqrestore(&iommu->lock, flags); } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 08:22:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 08:22: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 1UxYcD-00042x-6o; Fri, 12 Jul 2013 08:22:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYcB-00042p-7E for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:07 +0000 Received: from [85.158.143.99:31903] by server-1.bemta-4.messagelabs.com id 9F/A1-28540-EACBFD15; Fri, 12 Jul 2013 08:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-216.messagelabs.com!1373617325!26545228!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 344 invoked from network); 12 Jul 2013 08:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 08:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYc7-0005GR-14 for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxYc6-0005D8-Tz for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:02 +0000 Date: Fri, 12 Jul 2013 08:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libelf: fix printing of 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 7f6b1086489c0382c3f8c6a2026a6d0eaa53ea97 Author: Jan Beulich AuthorDate: Thu Jul 11 13:41:54 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 13:41:54 2013 +0200 libelf: fix printing of pointers Printing them as decimal number, the more with 0x prefix, is confusing and presumably relatively useless to most of us. Signed-off-by: Jan Beulich master commit: 59912eb06fda88af6c5ec16a2a382619d3829a7b master date: 2013-06-26 14:43:52 +0100 --- xen/include/xen/libelf.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h index 174f8da..36b2b3f 100644 --- a/xen/include/xen/libelf.h +++ b/xen/include/xen/libelf.h @@ -82,13 +82,13 @@ typedef uintptr_t elf_ptrval; /* Provides a type declaration for a HANDLE. */ #ifdef __XEN__ -# define ELF_PRPTRVAL "lu" +# define ELF_PRPTRVAL "lx" /* - * PRIuPTR is misdefined in xen/include/xen/inttypes.h, on 32-bit, - * to "u", when in fact uintptr_t is an unsigned long. + * PRIxPTR is misdefined in xen/include/xen/inttypes.h, on 32-bit, + * to "x", when in fact uintptr_t is an unsigned long. */ #else -# define ELF_PRPTRVAL PRIuPTR +# define ELF_PRPTRVAL PRIxPTR #endif /* printf format a la PRId... for a PTRVAL */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 08:22:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 08:22: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 1UxYcD-00042x-6o; Fri, 12 Jul 2013 08:22:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYcB-00042p-7E for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:07 +0000 Received: from [85.158.143.99:31903] by server-1.bemta-4.messagelabs.com id 9F/A1-28540-EACBFD15; Fri, 12 Jul 2013 08:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-216.messagelabs.com!1373617325!26545228!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 344 invoked from network); 12 Jul 2013 08:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 08:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYc7-0005GR-14 for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxYc6-0005D8-Tz for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:02 +0000 Date: Fri, 12 Jul 2013 08:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libelf: fix printing of 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 7f6b1086489c0382c3f8c6a2026a6d0eaa53ea97 Author: Jan Beulich AuthorDate: Thu Jul 11 13:41:54 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 13:41:54 2013 +0200 libelf: fix printing of pointers Printing them as decimal number, the more with 0x prefix, is confusing and presumably relatively useless to most of us. Signed-off-by: Jan Beulich master commit: 59912eb06fda88af6c5ec16a2a382619d3829a7b master date: 2013-06-26 14:43:52 +0100 --- xen/include/xen/libelf.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h index 174f8da..36b2b3f 100644 --- a/xen/include/xen/libelf.h +++ b/xen/include/xen/libelf.h @@ -82,13 +82,13 @@ typedef uintptr_t elf_ptrval; /* Provides a type declaration for a HANDLE. */ #ifdef __XEN__ -# define ELF_PRPTRVAL "lu" +# define ELF_PRPTRVAL "lx" /* - * PRIuPTR is misdefined in xen/include/xen/inttypes.h, on 32-bit, - * to "u", when in fact uintptr_t is an unsigned long. + * PRIxPTR is misdefined in xen/include/xen/inttypes.h, on 32-bit, + * to "x", when in fact uintptr_t is an unsigned long. */ #else -# define ELF_PRPTRVAL PRIuPTR +# define ELF_PRPTRVAL PRIxPTR #endif /* printf format a la PRId... for a PTRVAL */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 08:22:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 08:22: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 1UxYcM-00043g-9f; Fri, 12 Jul 2013 08:22:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYcL-00043Z-Rg for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:18 +0000 Received: from [85.158.137.99:19201] by server-1.bemta-3.messagelabs.com id 8A/23-01921-9BCBFD15; Fri, 12 Jul 2013 08:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-217.messagelabs.com!1373617335!19992102!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26762 invoked from network); 12 Jul 2013 08:22:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 08:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYcJ-0005GU-3c for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxYcJ-0005E3-1M for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:15 +0000 Date: Fri, 12 Jul 2013 08:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] AMD/intremap: Prevent use of per-device vector maps until irq logic is fixed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8109c123702e2387b0781f3feaa4b53744464009 Author: Andrew Cooper AuthorDate: Thu Jul 11 14:18:57 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 14:18:57 2013 +0200 AMD/intremap: Prevent use of per-device vector maps until irq logic is fixed XSA-36 changed the default vector map mode from global to per-device. This is because a global vector map does not prevent one PCI device from impersonating another and launching a DoS on the system. However, the per-device vector map logic is broken for devices with multiple MSI-X vectors, which can either result in a failed ASSERT() or misprogramming of a guests interrupt remapping tables. The core problem is not trivial to fix. In an effort to get AMD systems back to a non-regressed state, introduce a new type of vector map called per-device-global. This uses per-device vector maps in the IOMMU, but uses a single used_vector map for the core IRQ logic. This patch is intended to be removed as soon as the per-device logic is fixed correctly. Signed-off-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: f0fe8227624d5c02715ed086867d12cd24f6ff47 master date: 2013-06-27 14:01:18 +0200 --- xen/drivers/passthrough/amd/pci_amd_iommu.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 281a52b..c3cbf88 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -192,8 +192,19 @@ int __init amd_iov_detect(void) { if ( amd_iommu_perdev_intremap ) { - printk("AMD-Vi: Enabling per-device vector maps\n"); - opt_irq_vector_map = OPT_IRQ_VECTOR_MAP_PERDEV; + /* Per-device vector map logic is broken for devices with multiple + * MSI-X interrupts (and would also be for multiple MSI, if Xen + * supported it). + * + * Until this is fixed, use global vector tables as far as the irq + * logic is concerned to avoid the buggy behaviour of per-device + * maps in map_domain_pirq(), and use per-device tables as far as + * intremap code is concerned to avoid the security issue. + */ + printk(XENLOG_WARNING "AMD-Vi: per-device vector map logic is broken. " + "Using per-device-global maps instead until a fix is found.\n"); + + opt_irq_vector_map = OPT_IRQ_VECTOR_MAP_GLOBAL; } else { @@ -204,6 +215,10 @@ int __init amd_iov_detect(void) else { printk("AMD-Vi: Not overriding irq_vector_map setting\n"); + + if ( opt_irq_vector_map != OPT_IRQ_VECTOR_MAP_GLOBAL ) + printk(XENLOG_WARNING "AMD-Vi: per-device vector map logic is broken. " + "Use irq_vector_map=global to work around.\n"); } if ( !amd_iommu_perdev_intremap ) printk(XENLOG_WARNING "AMD-Vi: Using global interrupt remap table is not recommended (see XSA-36)!\n"); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 08:22:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 08:22: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 1UxYcM-00043g-9f; Fri, 12 Jul 2013 08:22:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYcL-00043Z-Rg for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:18 +0000 Received: from [85.158.137.99:19201] by server-1.bemta-3.messagelabs.com id 8A/23-01921-9BCBFD15; Fri, 12 Jul 2013 08:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-217.messagelabs.com!1373617335!19992102!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26762 invoked from network); 12 Jul 2013 08:22:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 08:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYcJ-0005GU-3c for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxYcJ-0005E3-1M for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:15 +0000 Date: Fri, 12 Jul 2013 08:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] AMD/intremap: Prevent use of per-device vector maps until irq logic is fixed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8109c123702e2387b0781f3feaa4b53744464009 Author: Andrew Cooper AuthorDate: Thu Jul 11 14:18:57 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 14:18:57 2013 +0200 AMD/intremap: Prevent use of per-device vector maps until irq logic is fixed XSA-36 changed the default vector map mode from global to per-device. This is because a global vector map does not prevent one PCI device from impersonating another and launching a DoS on the system. However, the per-device vector map logic is broken for devices with multiple MSI-X vectors, which can either result in a failed ASSERT() or misprogramming of a guests interrupt remapping tables. The core problem is not trivial to fix. In an effort to get AMD systems back to a non-regressed state, introduce a new type of vector map called per-device-global. This uses per-device vector maps in the IOMMU, but uses a single used_vector map for the core IRQ logic. This patch is intended to be removed as soon as the per-device logic is fixed correctly. Signed-off-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: f0fe8227624d5c02715ed086867d12cd24f6ff47 master date: 2013-06-27 14:01:18 +0200 --- xen/drivers/passthrough/amd/pci_amd_iommu.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 281a52b..c3cbf88 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -192,8 +192,19 @@ int __init amd_iov_detect(void) { if ( amd_iommu_perdev_intremap ) { - printk("AMD-Vi: Enabling per-device vector maps\n"); - opt_irq_vector_map = OPT_IRQ_VECTOR_MAP_PERDEV; + /* Per-device vector map logic is broken for devices with multiple + * MSI-X interrupts (and would also be for multiple MSI, if Xen + * supported it). + * + * Until this is fixed, use global vector tables as far as the irq + * logic is concerned to avoid the buggy behaviour of per-device + * maps in map_domain_pirq(), and use per-device tables as far as + * intremap code is concerned to avoid the security issue. + */ + printk(XENLOG_WARNING "AMD-Vi: per-device vector map logic is broken. " + "Using per-device-global maps instead until a fix is found.\n"); + + opt_irq_vector_map = OPT_IRQ_VECTOR_MAP_GLOBAL; } else { @@ -204,6 +215,10 @@ int __init amd_iov_detect(void) else { printk("AMD-Vi: Not overriding irq_vector_map setting\n"); + + if ( opt_irq_vector_map != OPT_IRQ_VECTOR_MAP_GLOBAL ) + printk(XENLOG_WARNING "AMD-Vi: per-device vector map logic is broken. " + "Use irq_vector_map=global to work around.\n"); } if ( !amd_iommu_perdev_intremap ) printk(XENLOG_WARNING "AMD-Vi: Using global interrupt remap table is not recommended (see XSA-36)!\n"); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 08:22:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 08:22: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 1UxYcX-00044x-DA; Fri, 12 Jul 2013 08:22:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYcV-00044i-Ty for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:28 +0000 Received: from [85.158.136.67:30589] by server-13.bemta-5.messagelabs.com id D2/15-11519-3CCBFD15; Fri, 12 Jul 2013 08:22:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-207.messagelabs.com!1373617345!22091567!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27084 invoked from network); 12 Jul 2013 08:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-207.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 08:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYcT-0005Gb-8p for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxYcT-0005EP-6M for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:25 +0000 Date: Fri, 12 Jul 2013 08:22:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: don't pass negative time to gtime_to_gtsc() (try 2) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 094c1cb9757a3456ea63491a1c0d6016bdfa2711 Author: Jan Beulich AuthorDate: Thu Jul 11 14:21:48 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 14:21:48 2013 +0200 x86: don't pass negative time to gtime_to_gtsc() (try 2) This mostly reverts commit eb60be3d ("x86: don't pass negative time to gtime_to_gtsc()") and instead corrects __update_vcpu_system_time()'s handling of this_cpu(cpu_time).stime_local_stamp dating back before the start of a HVM guest (which would otherwise lead to a negative value getting passed to gtime_to_gtsc(), causing scale_delta() to produce meaningless output). Flushing the value to zero was wrong, and printing a message for something that can validly happen wasn't very useful either. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 5ad914bc867c5a6a4957869c89918f4e1f9dd9c4 master date: 2013-07-02 08:48:03 +0200 --- xen/arch/x86/time.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 4c6c233..2e7b019 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -834,16 +834,13 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) struct pl_time *pl = &v->domain->arch.hvm_domain.pl_time; stime += pl->stime_offset + v->arch.hvm_vcpu.stime_offset; - if ( (s64)stime < 0 ) - { - printk(XENLOG_G_WARNING "d%dv%d: bogus time %" PRId64 - " (offsets %" PRId64 "/%" PRId64 ")\n", - d->domain_id, v->vcpu_id, stime, - pl->stime_offset, v->arch.hvm_vcpu.stime_offset); - stime = 0; - } + if ( stime >= 0 ) + tsc_stamp = gtime_to_gtsc(d, stime); + else + tsc_stamp = -gtime_to_gtsc(d, -stime); } - tsc_stamp = gtime_to_gtsc(d, stime); + else + tsc_stamp = gtime_to_gtsc(d, stime); } else { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 08:22:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 08:22: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 1UxYcX-00044x-DA; Fri, 12 Jul 2013 08:22:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYcV-00044i-Ty for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:28 +0000 Received: from [85.158.136.67:30589] by server-13.bemta-5.messagelabs.com id D2/15-11519-3CCBFD15; Fri, 12 Jul 2013 08:22:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-207.messagelabs.com!1373617345!22091567!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27084 invoked from network); 12 Jul 2013 08:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-207.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 08:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYcT-0005Gb-8p for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxYcT-0005EP-6M for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:25 +0000 Date: Fri, 12 Jul 2013 08:22:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: don't pass negative time to gtime_to_gtsc() (try 2) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 094c1cb9757a3456ea63491a1c0d6016bdfa2711 Author: Jan Beulich AuthorDate: Thu Jul 11 14:21:48 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 14:21:48 2013 +0200 x86: don't pass negative time to gtime_to_gtsc() (try 2) This mostly reverts commit eb60be3d ("x86: don't pass negative time to gtime_to_gtsc()") and instead corrects __update_vcpu_system_time()'s handling of this_cpu(cpu_time).stime_local_stamp dating back before the start of a HVM guest (which would otherwise lead to a negative value getting passed to gtime_to_gtsc(), causing scale_delta() to produce meaningless output). Flushing the value to zero was wrong, and printing a message for something that can validly happen wasn't very useful either. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 5ad914bc867c5a6a4957869c89918f4e1f9dd9c4 master date: 2013-07-02 08:48:03 +0200 --- xen/arch/x86/time.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 4c6c233..2e7b019 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -834,16 +834,13 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) struct pl_time *pl = &v->domain->arch.hvm_domain.pl_time; stime += pl->stime_offset + v->arch.hvm_vcpu.stime_offset; - if ( (s64)stime < 0 ) - { - printk(XENLOG_G_WARNING "d%dv%d: bogus time %" PRId64 - " (offsets %" PRId64 "/%" PRId64 ")\n", - d->domain_id, v->vcpu_id, stime, - pl->stime_offset, v->arch.hvm_vcpu.stime_offset); - stime = 0; - } + if ( stime >= 0 ) + tsc_stamp = gtime_to_gtsc(d, stime); + else + tsc_stamp = -gtime_to_gtsc(d, -stime); } - tsc_stamp = gtime_to_gtsc(d, stime); + else + tsc_stamp = gtime_to_gtsc(d, stime); } else { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 08:22:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 08:22: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 1UxYch-00046J-GF; Fri, 12 Jul 2013 08:22:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYcg-000468-Jp for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:39 +0000 Received: from [85.158.139.83:41000] by server-16.bemta-5.messagelabs.com id EF/42-31941-DCCBFD15; Fri, 12 Jul 2013 08:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-182.messagelabs.com!1373617355!20064320!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.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9023 invoked from network); 12 Jul 2013 08:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 08:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYcd-0005Gi-Du for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxYcd-0005Ep-CV for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:35 +0000 Date: Fri, 12 Jul 2013 08:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] iommu/amd: Fix logic for clearing the IOMMU interrupt bits X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c33c9ce22fe3c03242cdd465feb518bb614f7c7 Author: Suravee Suthikulpanit AuthorDate: Thu Jul 11 14:22:44 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 14:22:44 2013 +0200 iommu/amd: Fix logic for clearing the IOMMU interrupt bits The IOMMU interrupt bits in the IOMMU status registers are "read-only, and write-1-to-clear (RW1C). Therefore, the existing logic which reads the register, set the bit, and then writing back the values could accidentally clear certain bits if it has been set. The correct logic would just be writing only the value which only set the interrupt bits, and leave the rest to zeros. This patch also, clean up #define masks as Jan has suggested. Signed-off-by: Suravee Suthikulpanit With iommu_interrupt_handler() properly having got switched its readl() from status to control register, the subsequent writel() needed to be switched too (and the RW1C comment there was bogus). Some of the cleanup went too far - undone. Further, with iommu_interrupt_handler() now actually disabling the interrupt sources, they also need to get re-enabled by the tasklet once it finished processing the respective log. This also implies re-running the tasklet so that log entries added between reading the log and re- enabling the interrupt will get handled in a timely manner. Finally, guest write emulation to the status register needs to be done with the RW1C (and RO for all other bits) semantics in mind too. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Suravee Suthikulpanit master commit: 2823a0c7dfc979db316787e1dd42a8845e5825c0 master date: 2013-07-02 08:49:43 +0200 --- xen/drivers/passthrough/amd/iommu_cmd.c | 14 ++--- xen/drivers/passthrough/amd/iommu_guest.c | 9 +++- xen/drivers/passthrough/amd/iommu_init.c | 84 ++++++++++++++++---------- xen/include/asm-x86/hvm/svm/amd-iommu-defs.h | 22 +++++-- 4 files changed, 84 insertions(+), 45 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_cmd.c b/xen/drivers/passthrough/amd/iommu_cmd.c index e39e7e1..7f87c57 100644 --- a/xen/drivers/passthrough/amd/iommu_cmd.c +++ b/xen/drivers/passthrough/amd/iommu_cmd.c @@ -75,11 +75,9 @@ static void flush_command_buffer(struct amd_iommu *iommu) u32 cmd[4], status; int loop_count, comp_wait; - /* clear 'ComWaitInt' in status register (WIC) */ - set_field_in_reg_u32(IOMMU_CONTROL_ENABLED, 0, - IOMMU_STATUS_COMP_WAIT_INT_MASK, - IOMMU_STATUS_COMP_WAIT_INT_SHIFT, &status); - writel(status, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + /* RW1C 'ComWaitInt' in status register */ + writel(IOMMU_STATUS_COMP_WAIT_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); /* send an empty COMPLETION_WAIT command to flush command buffer */ cmd[3] = cmd[2] = 0; @@ -103,9 +101,9 @@ static void flush_command_buffer(struct amd_iommu *iommu) if ( comp_wait ) { - /* clear 'ComWaitInt' in status register (WIC) */ - status &= IOMMU_STATUS_COMP_WAIT_INT_MASK; - writel(status, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + /* RW1C 'ComWaitInt' in status register */ + writel(IOMMU_STATUS_COMP_WAIT_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); return; } AMD_IOMMU_DEBUG("Warning: ComWaitInt bit did not assert!\n"); diff --git a/xen/drivers/passthrough/amd/iommu_guest.c b/xen/drivers/passthrough/amd/iommu_guest.c index e2daf0e..85f2361 100644 --- a/xen/drivers/passthrough/amd/iommu_guest.c +++ b/xen/drivers/passthrough/amd/iommu_guest.c @@ -754,7 +754,14 @@ static void guest_iommu_mmio_write64(struct guest_iommu *iommu, u64_to_reg(&iommu->ppr_log.reg_tail, val); break; case IOMMU_STATUS_MMIO_OFFSET: - u64_to_reg(&iommu->reg_status, val); + val &= IOMMU_STATUS_EVENT_OVERFLOW_MASK | + IOMMU_STATUS_EVENT_LOG_INT_MASK | + IOMMU_STATUS_COMP_WAIT_INT_MASK | + IOMMU_STATUS_PPR_LOG_OVERFLOW_MASK | + IOMMU_STATUS_PPR_LOG_INT_MASK | + IOMMU_STATUS_GAPIC_LOG_OVERFLOW_MASK | + IOMMU_STATUS_GAPIC_LOG_INT_MASK; + u64_to_reg(&iommu->reg_status, reg_to_u64(iommu->reg_status) & ~val); break; default: diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index ebf964c..d5f0bcf 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -344,13 +344,13 @@ static void set_iommu_ppr_log_control(struct amd_iommu *iommu, writel(0x0, iommu->mmio_base + IOMMU_PPR_LOG_TAIL_OFFSET); iommu_set_bit(&entry, IOMMU_CONTROL_PPR_ENABLE_SHIFT); - iommu_set_bit(&entry, IOMMU_CONTROL_PPR_INT_SHIFT); + iommu_set_bit(&entry, IOMMU_CONTROL_PPR_LOG_INT_SHIFT); iommu_set_bit(&entry, IOMMU_CONTROL_PPR_LOG_ENABLE_SHIFT); } else { iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_ENABLE_SHIFT); - iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_INT_SHIFT); + iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_LOG_INT_SHIFT); iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_LOG_ENABLE_SHIFT); } @@ -410,7 +410,7 @@ static void iommu_reset_log(struct amd_iommu *iommu, void (*ctrl_func)(struct amd_iommu *iommu, int)) { u32 entry; - int log_run, run_bit, of_bit; + int log_run, run_bit; int loop_count = 1000; BUG_ON(!iommu || ((log != &iommu->event_log) && (log != &iommu->ppr_log))); @@ -419,10 +419,6 @@ static void iommu_reset_log(struct amd_iommu *iommu, IOMMU_STATUS_EVENT_LOG_RUN_SHIFT : IOMMU_STATUS_PPR_LOG_RUN_SHIFT; - of_bit = ( log == &iommu->event_log ) ? - IOMMU_STATUS_EVENT_OVERFLOW_SHIFT : - IOMMU_STATUS_PPR_LOG_OVERFLOW_SHIFT; - /* wait until EventLogRun bit = 0 */ do { entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); @@ -439,9 +435,10 @@ static void iommu_reset_log(struct amd_iommu *iommu, ctrl_func(iommu, IOMMU_CONTROL_DISABLED); - /*clear overflow bit */ - iommu_clear_bit(&entry, of_bit); - writel(entry, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + /* RW1C overflow bit */ + writel(log == &iommu->event_log ? IOMMU_STATUS_EVENT_OVERFLOW_MASK + : IOMMU_STATUS_PPR_LOG_OVERFLOW_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); /*reset event log base address */ log->head = 0; @@ -644,22 +641,33 @@ static void iommu_check_event_log(struct amd_iommu *iommu) u32 entry; unsigned long flags; + /* RW1C interrupt status bit */ + writel(IOMMU_STATUS_EVENT_LOG_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + iommu_read_log(iommu, &iommu->event_log, sizeof(event_entry_t), parse_event_log_entry); spin_lock_irqsave(&iommu->lock, flags); - /*check event overflow */ + /* Check event overflow. */ entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - if ( iommu_get_bit(entry, IOMMU_STATUS_EVENT_OVERFLOW_SHIFT) ) iommu_reset_log(iommu, &iommu->event_log, set_iommu_event_log_control); - - /* reset interrupt status bit */ - entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - iommu_set_bit(&entry, IOMMU_STATUS_EVENT_LOG_INT_SHIFT); - - writel(entry, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + else + { + entry = readl(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + if ( !(entry & IOMMU_CONTROL_EVENT_LOG_INT_MASK) ) + { + entry |= IOMMU_CONTROL_EVENT_LOG_INT_MASK; + writel(entry, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + /* + * Re-schedule the tasklet to handle eventual log entries added + * between reading the log above and re-enabling the interrupt. + */ + tasklet_schedule(&amd_iommu_irq_tasklet); + } + } spin_unlock_irqrestore(&iommu->lock, flags); } @@ -714,22 +722,33 @@ static void iommu_check_ppr_log(struct amd_iommu *iommu) u32 entry; unsigned long flags; + /* RW1C interrupt status bit */ + writel(IOMMU_STATUS_PPR_LOG_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + iommu_read_log(iommu, &iommu->ppr_log, sizeof(ppr_entry_t), parse_ppr_log_entry); spin_lock_irqsave(&iommu->lock, flags); - /*check event overflow */ + /* Check event overflow. */ entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - if ( iommu_get_bit(entry, IOMMU_STATUS_PPR_LOG_OVERFLOW_SHIFT) ) iommu_reset_log(iommu, &iommu->ppr_log, set_iommu_ppr_log_control); - - /* reset interrupt status bit */ - entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - iommu_set_bit(&entry, IOMMU_STATUS_PPR_LOG_INT_SHIFT); - - writel(entry, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + else + { + entry = readl(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + if ( !(entry & IOMMU_CONTROL_PPR_LOG_INT_MASK) ) + { + entry |= IOMMU_CONTROL_PPR_LOG_INT_MASK; + writel(entry, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + /* + * Re-schedule the tasklet to handle eventual log entries added + * between reading the log above and re-enabling the interrupt. + */ + tasklet_schedule(&amd_iommu_irq_tasklet); + } + } spin_unlock_irqrestore(&iommu->lock, flags); } @@ -766,11 +785,14 @@ static void iommu_interrupt_handler(int irq, void *dev_id, spin_lock_irqsave(&iommu->lock, flags); - /* Silence interrupts from both event and PPR logging */ - entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - iommu_clear_bit(&entry, IOMMU_STATUS_EVENT_LOG_INT_SHIFT); - iommu_clear_bit(&entry, IOMMU_STATUS_PPR_LOG_INT_SHIFT); - writel(entry, iommu->mmio_base+IOMMU_STATUS_MMIO_OFFSET); + /* + * Silence interrupts from both event and PPR by clearing the + * enable logging bits in the control register + */ + entry = readl(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + iommu_clear_bit(&entry, IOMMU_CONTROL_EVENT_LOG_INT_SHIFT); + iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_LOG_INT_SHIFT); + writel(entry, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); spin_unlock_irqrestore(&iommu->lock, flags); diff --git a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h index 5b84670..b5baee1 100644 --- a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h +++ b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h @@ -334,14 +334,17 @@ #define IOMMU_CONTROL_ISOCHRONOUS_SHIFT 11 #define IOMMU_CONTROL_COMMAND_BUFFER_ENABLE_MASK 0x00001000 #define IOMMU_CONTROL_COMMAND_BUFFER_ENABLE_SHIFT 12 +#define IOMMU_CONTROL_PPR_LOG_ENABLE_MASK 0x00002000 +#define IOMMU_CONTROL_PPR_LOG_ENABLE_SHIFT 13 +#define IOMMU_CONTROL_PPR_LOG_INT_MASK 0x00004000 +#define IOMMU_CONTROL_PPR_LOG_INT_SHIFT 14 +#define IOMMU_CONTROL_PPR_ENABLE_MASK 0x00008000 +#define IOMMU_CONTROL_PPR_ENABLE_SHIFT 15 +#define IOMMU_CONTROL_GT_ENABLE_MASK 0x00010000 +#define IOMMU_CONTROL_GT_ENABLE_SHIFT 16 #define IOMMU_CONTROL_RESTART_MASK 0x80000000 #define IOMMU_CONTROL_RESTART_SHIFT 31 -#define IOMMU_CONTROL_PPR_LOG_ENABLE_SHIFT 13 -#define IOMMU_CONTROL_PPR_INT_SHIFT 14 -#define IOMMU_CONTROL_PPR_ENABLE_SHIFT 15 -#define IOMMU_CONTROL_GT_ENABLE_SHIFT 16 - /* Exclusion Register */ #define IOMMU_EXCLUSION_BASE_LOW_OFFSET 0x20 #define IOMMU_EXCLUSION_BASE_HIGH_OFFSET 0x24 @@ -393,9 +396,18 @@ #define IOMMU_STATUS_EVENT_LOG_RUN_SHIFT 3 #define IOMMU_STATUS_CMD_BUFFER_RUN_MASK 0x00000010 #define IOMMU_STATUS_CMD_BUFFER_RUN_SHIFT 4 +#define IOMMU_STATUS_PPR_LOG_OVERFLOW_MASK 0x00000020 #define IOMMU_STATUS_PPR_LOG_OVERFLOW_SHIFT 5 +#define IOMMU_STATUS_PPR_LOG_INT_MASK 0x00000040 #define IOMMU_STATUS_PPR_LOG_INT_SHIFT 6 +#define IOMMU_STATUS_PPR_LOG_RUN_MASK 0x00000080 #define IOMMU_STATUS_PPR_LOG_RUN_SHIFT 7 +#define IOMMU_STATUS_GAPIC_LOG_OVERFLOW_MASK 0x00000100 +#define IOMMU_STATUS_GAPIC_LOG_OVERFLOW_SHIFT 8 +#define IOMMU_STATUS_GAPIC_LOG_INT_MASK 0x00000200 +#define IOMMU_STATUS_GAPIC_LOG_INT_SHIFT 9 +#define IOMMU_STATUS_GAPIC_LOG_RUN_MASK 0x00000400 +#define IOMMU_STATUS_GAPIC_LOG_RUN_SHIFT 10 /* I/O Page Table */ #define IOMMU_PAGE_TABLE_ENTRY_SIZE 8 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 08:22:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 08:22: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 1UxYch-00046J-GF; Fri, 12 Jul 2013 08:22:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYcg-000468-Jp for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:39 +0000 Received: from [85.158.139.83:41000] by server-16.bemta-5.messagelabs.com id EF/42-31941-DCCBFD15; Fri, 12 Jul 2013 08:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-182.messagelabs.com!1373617355!20064320!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.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9023 invoked from network); 12 Jul 2013 08:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 08:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYcd-0005Gi-Du for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxYcd-0005Ep-CV for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:35 +0000 Date: Fri, 12 Jul 2013 08:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] iommu/amd: Fix logic for clearing the IOMMU interrupt bits X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c33c9ce22fe3c03242cdd465feb518bb614f7c7 Author: Suravee Suthikulpanit AuthorDate: Thu Jul 11 14:22:44 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 14:22:44 2013 +0200 iommu/amd: Fix logic for clearing the IOMMU interrupt bits The IOMMU interrupt bits in the IOMMU status registers are "read-only, and write-1-to-clear (RW1C). Therefore, the existing logic which reads the register, set the bit, and then writing back the values could accidentally clear certain bits if it has been set. The correct logic would just be writing only the value which only set the interrupt bits, and leave the rest to zeros. This patch also, clean up #define masks as Jan has suggested. Signed-off-by: Suravee Suthikulpanit With iommu_interrupt_handler() properly having got switched its readl() from status to control register, the subsequent writel() needed to be switched too (and the RW1C comment there was bogus). Some of the cleanup went too far - undone. Further, with iommu_interrupt_handler() now actually disabling the interrupt sources, they also need to get re-enabled by the tasklet once it finished processing the respective log. This also implies re-running the tasklet so that log entries added between reading the log and re- enabling the interrupt will get handled in a timely manner. Finally, guest write emulation to the status register needs to be done with the RW1C (and RO for all other bits) semantics in mind too. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Suravee Suthikulpanit master commit: 2823a0c7dfc979db316787e1dd42a8845e5825c0 master date: 2013-07-02 08:49:43 +0200 --- xen/drivers/passthrough/amd/iommu_cmd.c | 14 ++--- xen/drivers/passthrough/amd/iommu_guest.c | 9 +++- xen/drivers/passthrough/amd/iommu_init.c | 84 ++++++++++++++++---------- xen/include/asm-x86/hvm/svm/amd-iommu-defs.h | 22 +++++-- 4 files changed, 84 insertions(+), 45 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_cmd.c b/xen/drivers/passthrough/amd/iommu_cmd.c index e39e7e1..7f87c57 100644 --- a/xen/drivers/passthrough/amd/iommu_cmd.c +++ b/xen/drivers/passthrough/amd/iommu_cmd.c @@ -75,11 +75,9 @@ static void flush_command_buffer(struct amd_iommu *iommu) u32 cmd[4], status; int loop_count, comp_wait; - /* clear 'ComWaitInt' in status register (WIC) */ - set_field_in_reg_u32(IOMMU_CONTROL_ENABLED, 0, - IOMMU_STATUS_COMP_WAIT_INT_MASK, - IOMMU_STATUS_COMP_WAIT_INT_SHIFT, &status); - writel(status, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + /* RW1C 'ComWaitInt' in status register */ + writel(IOMMU_STATUS_COMP_WAIT_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); /* send an empty COMPLETION_WAIT command to flush command buffer */ cmd[3] = cmd[2] = 0; @@ -103,9 +101,9 @@ static void flush_command_buffer(struct amd_iommu *iommu) if ( comp_wait ) { - /* clear 'ComWaitInt' in status register (WIC) */ - status &= IOMMU_STATUS_COMP_WAIT_INT_MASK; - writel(status, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + /* RW1C 'ComWaitInt' in status register */ + writel(IOMMU_STATUS_COMP_WAIT_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); return; } AMD_IOMMU_DEBUG("Warning: ComWaitInt bit did not assert!\n"); diff --git a/xen/drivers/passthrough/amd/iommu_guest.c b/xen/drivers/passthrough/amd/iommu_guest.c index e2daf0e..85f2361 100644 --- a/xen/drivers/passthrough/amd/iommu_guest.c +++ b/xen/drivers/passthrough/amd/iommu_guest.c @@ -754,7 +754,14 @@ static void guest_iommu_mmio_write64(struct guest_iommu *iommu, u64_to_reg(&iommu->ppr_log.reg_tail, val); break; case IOMMU_STATUS_MMIO_OFFSET: - u64_to_reg(&iommu->reg_status, val); + val &= IOMMU_STATUS_EVENT_OVERFLOW_MASK | + IOMMU_STATUS_EVENT_LOG_INT_MASK | + IOMMU_STATUS_COMP_WAIT_INT_MASK | + IOMMU_STATUS_PPR_LOG_OVERFLOW_MASK | + IOMMU_STATUS_PPR_LOG_INT_MASK | + IOMMU_STATUS_GAPIC_LOG_OVERFLOW_MASK | + IOMMU_STATUS_GAPIC_LOG_INT_MASK; + u64_to_reg(&iommu->reg_status, reg_to_u64(iommu->reg_status) & ~val); break; default: diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index ebf964c..d5f0bcf 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -344,13 +344,13 @@ static void set_iommu_ppr_log_control(struct amd_iommu *iommu, writel(0x0, iommu->mmio_base + IOMMU_PPR_LOG_TAIL_OFFSET); iommu_set_bit(&entry, IOMMU_CONTROL_PPR_ENABLE_SHIFT); - iommu_set_bit(&entry, IOMMU_CONTROL_PPR_INT_SHIFT); + iommu_set_bit(&entry, IOMMU_CONTROL_PPR_LOG_INT_SHIFT); iommu_set_bit(&entry, IOMMU_CONTROL_PPR_LOG_ENABLE_SHIFT); } else { iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_ENABLE_SHIFT); - iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_INT_SHIFT); + iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_LOG_INT_SHIFT); iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_LOG_ENABLE_SHIFT); } @@ -410,7 +410,7 @@ static void iommu_reset_log(struct amd_iommu *iommu, void (*ctrl_func)(struct amd_iommu *iommu, int)) { u32 entry; - int log_run, run_bit, of_bit; + int log_run, run_bit; int loop_count = 1000; BUG_ON(!iommu || ((log != &iommu->event_log) && (log != &iommu->ppr_log))); @@ -419,10 +419,6 @@ static void iommu_reset_log(struct amd_iommu *iommu, IOMMU_STATUS_EVENT_LOG_RUN_SHIFT : IOMMU_STATUS_PPR_LOG_RUN_SHIFT; - of_bit = ( log == &iommu->event_log ) ? - IOMMU_STATUS_EVENT_OVERFLOW_SHIFT : - IOMMU_STATUS_PPR_LOG_OVERFLOW_SHIFT; - /* wait until EventLogRun bit = 0 */ do { entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); @@ -439,9 +435,10 @@ static void iommu_reset_log(struct amd_iommu *iommu, ctrl_func(iommu, IOMMU_CONTROL_DISABLED); - /*clear overflow bit */ - iommu_clear_bit(&entry, of_bit); - writel(entry, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + /* RW1C overflow bit */ + writel(log == &iommu->event_log ? IOMMU_STATUS_EVENT_OVERFLOW_MASK + : IOMMU_STATUS_PPR_LOG_OVERFLOW_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); /*reset event log base address */ log->head = 0; @@ -644,22 +641,33 @@ static void iommu_check_event_log(struct amd_iommu *iommu) u32 entry; unsigned long flags; + /* RW1C interrupt status bit */ + writel(IOMMU_STATUS_EVENT_LOG_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + iommu_read_log(iommu, &iommu->event_log, sizeof(event_entry_t), parse_event_log_entry); spin_lock_irqsave(&iommu->lock, flags); - /*check event overflow */ + /* Check event overflow. */ entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - if ( iommu_get_bit(entry, IOMMU_STATUS_EVENT_OVERFLOW_SHIFT) ) iommu_reset_log(iommu, &iommu->event_log, set_iommu_event_log_control); - - /* reset interrupt status bit */ - entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - iommu_set_bit(&entry, IOMMU_STATUS_EVENT_LOG_INT_SHIFT); - - writel(entry, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + else + { + entry = readl(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + if ( !(entry & IOMMU_CONTROL_EVENT_LOG_INT_MASK) ) + { + entry |= IOMMU_CONTROL_EVENT_LOG_INT_MASK; + writel(entry, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + /* + * Re-schedule the tasklet to handle eventual log entries added + * between reading the log above and re-enabling the interrupt. + */ + tasklet_schedule(&amd_iommu_irq_tasklet); + } + } spin_unlock_irqrestore(&iommu->lock, flags); } @@ -714,22 +722,33 @@ static void iommu_check_ppr_log(struct amd_iommu *iommu) u32 entry; unsigned long flags; + /* RW1C interrupt status bit */ + writel(IOMMU_STATUS_PPR_LOG_INT_MASK, + iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + iommu_read_log(iommu, &iommu->ppr_log, sizeof(ppr_entry_t), parse_ppr_log_entry); spin_lock_irqsave(&iommu->lock, flags); - /*check event overflow */ + /* Check event overflow. */ entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - if ( iommu_get_bit(entry, IOMMU_STATUS_PPR_LOG_OVERFLOW_SHIFT) ) iommu_reset_log(iommu, &iommu->ppr_log, set_iommu_ppr_log_control); - - /* reset interrupt status bit */ - entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - iommu_set_bit(&entry, IOMMU_STATUS_PPR_LOG_INT_SHIFT); - - writel(entry, iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + else + { + entry = readl(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + if ( !(entry & IOMMU_CONTROL_PPR_LOG_INT_MASK) ) + { + entry |= IOMMU_CONTROL_PPR_LOG_INT_MASK; + writel(entry, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + /* + * Re-schedule the tasklet to handle eventual log entries added + * between reading the log above and re-enabling the interrupt. + */ + tasklet_schedule(&amd_iommu_irq_tasklet); + } + } spin_unlock_irqrestore(&iommu->lock, flags); } @@ -766,11 +785,14 @@ static void iommu_interrupt_handler(int irq, void *dev_id, spin_lock_irqsave(&iommu->lock, flags); - /* Silence interrupts from both event and PPR logging */ - entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - iommu_clear_bit(&entry, IOMMU_STATUS_EVENT_LOG_INT_SHIFT); - iommu_clear_bit(&entry, IOMMU_STATUS_PPR_LOG_INT_SHIFT); - writel(entry, iommu->mmio_base+IOMMU_STATUS_MMIO_OFFSET); + /* + * Silence interrupts from both event and PPR by clearing the + * enable logging bits in the control register + */ + entry = readl(iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); + iommu_clear_bit(&entry, IOMMU_CONTROL_EVENT_LOG_INT_SHIFT); + iommu_clear_bit(&entry, IOMMU_CONTROL_PPR_LOG_INT_SHIFT); + writel(entry, iommu->mmio_base + IOMMU_CONTROL_MMIO_OFFSET); spin_unlock_irqrestore(&iommu->lock, flags); diff --git a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h index 5b84670..b5baee1 100644 --- a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h +++ b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h @@ -334,14 +334,17 @@ #define IOMMU_CONTROL_ISOCHRONOUS_SHIFT 11 #define IOMMU_CONTROL_COMMAND_BUFFER_ENABLE_MASK 0x00001000 #define IOMMU_CONTROL_COMMAND_BUFFER_ENABLE_SHIFT 12 +#define IOMMU_CONTROL_PPR_LOG_ENABLE_MASK 0x00002000 +#define IOMMU_CONTROL_PPR_LOG_ENABLE_SHIFT 13 +#define IOMMU_CONTROL_PPR_LOG_INT_MASK 0x00004000 +#define IOMMU_CONTROL_PPR_LOG_INT_SHIFT 14 +#define IOMMU_CONTROL_PPR_ENABLE_MASK 0x00008000 +#define IOMMU_CONTROL_PPR_ENABLE_SHIFT 15 +#define IOMMU_CONTROL_GT_ENABLE_MASK 0x00010000 +#define IOMMU_CONTROL_GT_ENABLE_SHIFT 16 #define IOMMU_CONTROL_RESTART_MASK 0x80000000 #define IOMMU_CONTROL_RESTART_SHIFT 31 -#define IOMMU_CONTROL_PPR_LOG_ENABLE_SHIFT 13 -#define IOMMU_CONTROL_PPR_INT_SHIFT 14 -#define IOMMU_CONTROL_PPR_ENABLE_SHIFT 15 -#define IOMMU_CONTROL_GT_ENABLE_SHIFT 16 - /* Exclusion Register */ #define IOMMU_EXCLUSION_BASE_LOW_OFFSET 0x20 #define IOMMU_EXCLUSION_BASE_HIGH_OFFSET 0x24 @@ -393,9 +396,18 @@ #define IOMMU_STATUS_EVENT_LOG_RUN_SHIFT 3 #define IOMMU_STATUS_CMD_BUFFER_RUN_MASK 0x00000010 #define IOMMU_STATUS_CMD_BUFFER_RUN_SHIFT 4 +#define IOMMU_STATUS_PPR_LOG_OVERFLOW_MASK 0x00000020 #define IOMMU_STATUS_PPR_LOG_OVERFLOW_SHIFT 5 +#define IOMMU_STATUS_PPR_LOG_INT_MASK 0x00000040 #define IOMMU_STATUS_PPR_LOG_INT_SHIFT 6 +#define IOMMU_STATUS_PPR_LOG_RUN_MASK 0x00000080 #define IOMMU_STATUS_PPR_LOG_RUN_SHIFT 7 +#define IOMMU_STATUS_GAPIC_LOG_OVERFLOW_MASK 0x00000100 +#define IOMMU_STATUS_GAPIC_LOG_OVERFLOW_SHIFT 8 +#define IOMMU_STATUS_GAPIC_LOG_INT_MASK 0x00000200 +#define IOMMU_STATUS_GAPIC_LOG_INT_SHIFT 9 +#define IOMMU_STATUS_GAPIC_LOG_RUN_MASK 0x00000400 +#define IOMMU_STATUS_GAPIC_LOG_RUN_SHIFT 10 /* I/O Page Table */ #define IOMMU_PAGE_TABLE_ENTRY_SIZE 8 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 08:23:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 08:23: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 1UxYdm-0004C4-NV; Fri, 12 Jul 2013 08:23:46 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYdl-0004Bx-Cp for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:23:45 +0000 Received: from [85.158.139.211:60320] by server-10.bemta-5.messagelabs.com id 9D/60-03093-01DBFD15; Fri, 12 Jul 2013 08:23:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1373617365!21257739!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32714 invoked from network); 12 Jul 2013 08:22:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 08:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYcn-0005Gp-Ic for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxYcn-0005FN-Go for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:45 +0000 Date: Fri, 12 Jul 2013 08:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] iommu/amd: Workaround for erratum 787 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 30c091a4b9911eb608b2de604652d02aeaadb806 Author: Suravee Suthikulpanit AuthorDate: Thu Jul 11 14:23:27 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 14:23:27 2013 +0200 iommu/amd: Workaround for erratum 787 The IOMMU interrupt handling in bottom half must clear the PPR log interrupt and event log interrupt bits to re-enable the interrupt. This is done by writing 1 to the memory mapped register to clear the bit. Due to hardware bug, if the driver tries to clear this bit while the IOMMU hardware also setting this bit, the conflict will result with the bit being set. If the interrupt handling code does not make sure to clear this bit, subsequent changes in the event/PPR logs will no longer generating interrupts, and would result if buffer overflow. After clearing the bits, the driver must read back the register to verify. Signed-off-by: Suravee Suthikulpanit Adjust to apply on top of heavily modified patch 1. Adjust flow to get away with a single readl() in each instance of the status register checks. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Suravee Suthikulpanit master commit: 9eabb0735400e2b6059dfa3f0b47a426f61f570a master date: 2013-07-02 08:50:41 +0200 --- xen/drivers/passthrough/amd/iommu_init.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index d5f0bcf..4bc5077 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -669,6 +669,14 @@ static void iommu_check_event_log(struct amd_iommu *iommu) } } + /* + * Workaround for erratum787: + * Re-check to make sure the bit has been cleared. + */ + entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + if ( entry & IOMMU_STATUS_EVENT_LOG_INT_MASK ) + tasklet_schedule(&amd_iommu_irq_tasklet); + spin_unlock_irqrestore(&iommu->lock, flags); } @@ -750,6 +758,14 @@ static void iommu_check_ppr_log(struct amd_iommu *iommu) } } + /* + * Workaround for erratum787: + * Re-check to make sure the bit has been cleared. + */ + entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + if ( entry & IOMMU_STATUS_PPR_LOG_INT_MASK ) + tasklet_schedule(&amd_iommu_irq_tasklet); + spin_unlock_irqrestore(&iommu->lock, flags); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 08:23:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 08:23: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 1UxYdm-0004C4-NV; Fri, 12 Jul 2013 08:23:46 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYdl-0004Bx-Cp for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:23:45 +0000 Received: from [85.158.139.211:60320] by server-10.bemta-5.messagelabs.com id 9D/60-03093-01DBFD15; Fri, 12 Jul 2013 08:23:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1373617365!21257739!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32714 invoked from network); 12 Jul 2013 08:22:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 08:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxYcn-0005Gp-Ic for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxYcn-0005FN-Go for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 08:22:45 +0000 Date: Fri, 12 Jul 2013 08:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] iommu/amd: Workaround for erratum 787 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 30c091a4b9911eb608b2de604652d02aeaadb806 Author: Suravee Suthikulpanit AuthorDate: Thu Jul 11 14:23:27 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 11 14:23:27 2013 +0200 iommu/amd: Workaround for erratum 787 The IOMMU interrupt handling in bottom half must clear the PPR log interrupt and event log interrupt bits to re-enable the interrupt. This is done by writing 1 to the memory mapped register to clear the bit. Due to hardware bug, if the driver tries to clear this bit while the IOMMU hardware also setting this bit, the conflict will result with the bit being set. If the interrupt handling code does not make sure to clear this bit, subsequent changes in the event/PPR logs will no longer generating interrupts, and would result if buffer overflow. After clearing the bits, the driver must read back the register to verify. Signed-off-by: Suravee Suthikulpanit Adjust to apply on top of heavily modified patch 1. Adjust flow to get away with a single readl() in each instance of the status register checks. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Suravee Suthikulpanit master commit: 9eabb0735400e2b6059dfa3f0b47a426f61f570a master date: 2013-07-02 08:50:41 +0200 --- xen/drivers/passthrough/amd/iommu_init.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index d5f0bcf..4bc5077 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -669,6 +669,14 @@ static void iommu_check_event_log(struct amd_iommu *iommu) } } + /* + * Workaround for erratum787: + * Re-check to make sure the bit has been cleared. + */ + entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + if ( entry & IOMMU_STATUS_EVENT_LOG_INT_MASK ) + tasklet_schedule(&amd_iommu_irq_tasklet); + spin_unlock_irqrestore(&iommu->lock, flags); } @@ -750,6 +758,14 @@ static void iommu_check_ppr_log(struct amd_iommu *iommu) } } + /* + * Workaround for erratum787: + * Re-check to make sure the bit has been cleared. + */ + entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + if ( entry & IOMMU_STATUS_PPR_LOG_INT_MASK ) + tasklet_schedule(&amd_iommu_irq_tasklet); + spin_unlock_irqrestore(&iommu->lock, flags); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 10:22:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 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 1UxaUL-00089Z-Ia; Fri, 12 Jul 2013 10:22:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUK-00089S-QL for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:09 +0000 Received: from [85.158.143.99:33548] by server-3.bemta-4.messagelabs.com id 71/49-29480-FC8DFD15; Fri, 12 Jul 2013 10:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-216.messagelabs.com!1373624525!19935570!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24039 invoked from network); 12 Jul 2013 10:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 10:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUF-0006bM-M5 for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxaUF-0000XQ-HB for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:03 +0000 Date: Fri, 12 Jul 2013 10:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: suppress device assignment to HVM guest when there is no IOMMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 826eb17271d3c647516d9944c47b0779afedea25 Author: Ian Jackson AuthorDate: Mon Jul 1 15:20:28 2013 +0100 Commit: Ian Jackson CommitDate: Mon Jul 1 15:20:28 2013 +0100 libxl: suppress device assignment to HVM guest when there is no IOMMU This in effect copies similar logic from xend: While there's no way to check whether a device is assigned to a particular guest, XEN_DOMCTL_test_assign_device at least allows checking whether an IOMMU is there and whether a device has been assign to _some_ guest. For the time being, this should be enough to cover for the missing error checking/recovery in other parts of libxl's device assignment paths. There remains a (functionality-, but not security-related) race in that the iommu should be set up earlier, but this is too risky a change for this stage of the 4.3 release. This is a security issue, XSA-61. Signed-off-by: Jan Beulich Tested-by: George Dunlap Acked-by: George Dunlap Acked-by: Ian Jackson --- tools/libxl/libxl_pci.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 2f9f010..88bf91e 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1036,6 +1036,18 @@ int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcide int num_assigned, i, rc; int stubdomid = 0; + if (libxl__domain_type(gc, domid) == LIBXL_DOMAIN_TYPE_HVM) { + rc = xc_test_assign_device(ctx->xch, domid, pcidev_encode_bdf(pcidev)); + if (rc) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "PCI device %04x:%02x:%02x.%u %s?", + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func, + errno == ENOSYS ? "cannot be assigned - no IOMMU" + : "already assigned to a different guest"); + goto out; + } + } + rc = libxl__device_pci_setdefault(gc, pcidev); if (rc) goto 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 Jul 12 10:22:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 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 1UxaUL-00089Z-Ia; Fri, 12 Jul 2013 10:22:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUK-00089S-QL for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:09 +0000 Received: from [85.158.143.99:33548] by server-3.bemta-4.messagelabs.com id 71/49-29480-FC8DFD15; Fri, 12 Jul 2013 10:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-216.messagelabs.com!1373624525!19935570!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24039 invoked from network); 12 Jul 2013 10:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 10:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUF-0006bM-M5 for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxaUF-0000XQ-HB for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:03 +0000 Date: Fri, 12 Jul 2013 10:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: suppress device assignment to HVM guest when there is no IOMMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 826eb17271d3c647516d9944c47b0779afedea25 Author: Ian Jackson AuthorDate: Mon Jul 1 15:20:28 2013 +0100 Commit: Ian Jackson CommitDate: Mon Jul 1 15:20:28 2013 +0100 libxl: suppress device assignment to HVM guest when there is no IOMMU This in effect copies similar logic from xend: While there's no way to check whether a device is assigned to a particular guest, XEN_DOMCTL_test_assign_device at least allows checking whether an IOMMU is there and whether a device has been assign to _some_ guest. For the time being, this should be enough to cover for the missing error checking/recovery in other parts of libxl's device assignment paths. There remains a (functionality-, but not security-related) race in that the iommu should be set up earlier, but this is too risky a change for this stage of the 4.3 release. This is a security issue, XSA-61. Signed-off-by: Jan Beulich Tested-by: George Dunlap Acked-by: George Dunlap Acked-by: Ian Jackson --- tools/libxl/libxl_pci.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 2f9f010..88bf91e 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1036,6 +1036,18 @@ int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcide int num_assigned, i, rc; int stubdomid = 0; + if (libxl__domain_type(gc, domid) == LIBXL_DOMAIN_TYPE_HVM) { + rc = xc_test_assign_device(ctx->xch, domid, pcidev_encode_bdf(pcidev)); + if (rc) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "PCI device %04x:%02x:%02x.%u %s?", + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func, + errno == ENOSYS ? "cannot be assigned - no IOMMU" + : "already assigned to a different guest"); + goto out; + } + } + rc = libxl__device_pci_setdefault(gc, pcidev); if (rc) goto 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 Jul 12 10:22:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 10:22:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUV-0008AX-LM; Fri, 12 Jul 2013 10:22:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUU-0008AN-CN for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:18 +0000 Received: from [85.158.143.99:38032] by server-3.bemta-4.messagelabs.com id A5/69-29480-9D8DFD15; Fri, 12 Jul 2013 10:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-216.messagelabs.com!1373624535!27446768!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17164 invoked from network); 12 Jul 2013 10:22:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 10:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUR-0006bQ-4k for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxaUR-0000Xp-2o for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:15 +0000 Date: Fri, 12 Jul 2013 10:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Config.mk: Fetch qemu trees from 4.3-testing branches X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c8d233c644cbaba24b823ddd2394e4b4e07f7d9d Author: Ian Jackson AuthorDate: Mon Jul 1 16:24:27 2013 +0100 Commit: Ian Jackson CommitDate: Mon Jul 1 16:24:27 2013 +0100 Config.mk: Fetch qemu trees from 4.3-testing branches Signed-off-by: Ian Jackson --- Config.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 4f819f3..7a77899 100644 --- a/Config.mk +++ b/Config.mk @@ -197,18 +197,18 @@ XEN_EXTFILES_URL=http://xenbits.xen.org/xen-extfiles # near the place in the Xen Makefiles where the file is used. ifeq ($(GIT_HTTP),y) -QEMU_REMOTE=http://xenbits.xen.org/git-http/qemu-xen-unstable.git +QEMU_REMOTE=http://xenbits.xen.org/git-http/qemu-xen-4.3-testing.git else -QEMU_REMOTE=git://xenbits.xen.org/qemu-xen-unstable.git +QEMU_REMOTE=git://xenbits.xen.org/qemu-xen-4.3-testing.git endif ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git -QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git +QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-4.3-testing.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git -QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git +QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.3-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 -- 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 Jul 12 10:22:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 10:22:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUV-0008AX-LM; Fri, 12 Jul 2013 10:22:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUU-0008AN-CN for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:18 +0000 Received: from [85.158.143.99:38032] by server-3.bemta-4.messagelabs.com id A5/69-29480-9D8DFD15; Fri, 12 Jul 2013 10:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-216.messagelabs.com!1373624535!27446768!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17164 invoked from network); 12 Jul 2013 10:22:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 10:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUR-0006bQ-4k for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxaUR-0000Xp-2o for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:15 +0000 Date: Fri, 12 Jul 2013 10:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Config.mk: Fetch qemu trees from 4.3-testing branches X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c8d233c644cbaba24b823ddd2394e4b4e07f7d9d Author: Ian Jackson AuthorDate: Mon Jul 1 16:24:27 2013 +0100 Commit: Ian Jackson CommitDate: Mon Jul 1 16:24:27 2013 +0100 Config.mk: Fetch qemu trees from 4.3-testing branches Signed-off-by: Ian Jackson --- Config.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 4f819f3..7a77899 100644 --- a/Config.mk +++ b/Config.mk @@ -197,18 +197,18 @@ XEN_EXTFILES_URL=http://xenbits.xen.org/xen-extfiles # near the place in the Xen Makefiles where the file is used. ifeq ($(GIT_HTTP),y) -QEMU_REMOTE=http://xenbits.xen.org/git-http/qemu-xen-unstable.git +QEMU_REMOTE=http://xenbits.xen.org/git-http/qemu-xen-4.3-testing.git else -QEMU_REMOTE=git://xenbits.xen.org/qemu-xen-unstable.git +QEMU_REMOTE=git://xenbits.xen.org/qemu-xen-4.3-testing.git endif ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git -QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git +QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-4.3-testing.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git -QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git +QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.3-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 -- 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 Jul 12 10:22:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 10:22: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 1UxaUp-0008DX-F2; Fri, 12 Jul 2013 10:22:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUo-0008DE-7K for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:38 +0000 Received: from [193.109.254.147:2509] by server-1.bemta-14.messagelabs.com id E4/43-20106-DE8DFD15; Fri, 12 Jul 2013 10:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1373624555!35040!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19308 invoked from network); 12 Jul 2013 10:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 10:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUl-0006bd-Ik for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxaUl-0000ZA-DV for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:35 +0000 Date: Fri, 12 Jul 2013 10:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Config.mk: switch to debug?=n in preparation for the 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 21ecf2392463a463b0507ae2142ccd5849e86bd9 Author: Ian Jackson AuthorDate: Mon Jul 1 17:07:36 2013 +0100 Commit: Ian Jackson CommitDate: Mon Jul 1 17:07:36 2013 +0100 Config.mk: switch to debug?=n in preparation for the release --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 328afc5..11d7a7d 100644 --- a/Config.mk +++ b/Config.mk @@ -10,7 +10,7 @@ realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo " -include $(XEN_ROOT)/.config # A debug build of Xen and tools? -debug ?= y +debug ?= n debug_symbols ?= $(debug) # Test coverage support -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 10:22:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 10:22: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 1UxaUp-0008DX-F2; Fri, 12 Jul 2013 10:22:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUo-0008DE-7K for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:38 +0000 Received: from [193.109.254.147:2509] by server-1.bemta-14.messagelabs.com id E4/43-20106-DE8DFD15; Fri, 12 Jul 2013 10:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1373624555!35040!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19308 invoked from network); 12 Jul 2013 10:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 10:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUl-0006bd-Ik for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxaUl-0000ZA-DV for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:35 +0000 Date: Fri, 12 Jul 2013 10:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Config.mk: switch to debug?=n in preparation for the 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 21ecf2392463a463b0507ae2142ccd5849e86bd9 Author: Ian Jackson AuthorDate: Mon Jul 1 17:07:36 2013 +0100 Commit: Ian Jackson CommitDate: Mon Jul 1 17:07:36 2013 +0100 Config.mk: switch to debug?=n in preparation for the release --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 328afc5..11d7a7d 100644 --- a/Config.mk +++ b/Config.mk @@ -10,7 +10,7 @@ realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo " -include $(XEN_ROOT)/.config # A debug build of Xen and tools? -debug ?= y +debug ?= n debug_symbols ?= $(debug) # Test coverage support -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 10:22:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 10:22:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaV1-0008Ge-3a; Fri, 12 Jul 2013 10:22:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaV0-0008G5-7E for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:50 +0000 Received: from [85.158.139.211:12923] by server-2.bemta-5.messagelabs.com id FD/0F-23285-9F8DFD15; Fri, 12 Jul 2013 10:22:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1373624545!21257737!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31795 invoked from network); 12 Jul 2013 10:22:26 -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 Jul 2013 10:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUb-0006bY-9p for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxaUb-0000Yk-7s for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:25 +0000 Date: Fri, 12 Jul 2013 10:22:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Config.mk: Update QEMU_TAG and QEMU_UPSTREAM_REVISION for 4.3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3dfb4018d4948588ff00e32f4ab12d4715bb8c5e Author: Ian Jackson AuthorDate: Mon Jul 1 16:51:43 2013 +0100 Commit: Ian Jackson CommitDate: Mon Jul 1 16:51:43 2013 +0100 Config.mk: Update QEMU_TAG and QEMU_UPSTREAM_REVISION for 4.3 Signed-off-by: Ian Jackson --- Config.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 7a77899..328afc5 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 ?= 1c514a7734b7f98625a0d18d5e8ee7581f26e50c +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.0 SEABIOS_UPSTREAM_TAG ?= 3a28511b46f0c2af5fae1b6ed2b0c19d7913cee3 # Wed Jun 26 16:30:45 2013 +0100 # xen: Don't perform SMP setup. @@ -224,7 +224,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 13c144d96e825f145e5b37f97e5f6210c2c645e9 +QEMU_TAG ?= xen-4.3.0 # Mon Jun 17 17:39:51 2013 +0100 # qemu-xen-traditional: disable docs -- 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 Jul 12 10:22:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 10:22:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaV1-0008Ge-3a; Fri, 12 Jul 2013 10:22:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaV0-0008G5-7E for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:50 +0000 Received: from [85.158.139.211:12923] by server-2.bemta-5.messagelabs.com id FD/0F-23285-9F8DFD15; Fri, 12 Jul 2013 10:22:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1373624545!21257737!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31795 invoked from network); 12 Jul 2013 10:22:26 -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 Jul 2013 10:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUb-0006bY-9p for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxaUb-0000Yk-7s for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:25 +0000 Date: Fri, 12 Jul 2013 10:22:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Config.mk: Update QEMU_TAG and QEMU_UPSTREAM_REVISION for 4.3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3dfb4018d4948588ff00e32f4ab12d4715bb8c5e Author: Ian Jackson AuthorDate: Mon Jul 1 16:51:43 2013 +0100 Commit: Ian Jackson CommitDate: Mon Jul 1 16:51:43 2013 +0100 Config.mk: Update QEMU_TAG and QEMU_UPSTREAM_REVISION for 4.3 Signed-off-by: Ian Jackson --- Config.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 7a77899..328afc5 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 ?= 1c514a7734b7f98625a0d18d5e8ee7581f26e50c +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.0 SEABIOS_UPSTREAM_TAG ?= 3a28511b46f0c2af5fae1b6ed2b0c19d7913cee3 # Wed Jun 26 16:30:45 2013 +0100 # xen: Don't perform SMP setup. @@ -224,7 +224,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 13c144d96e825f145e5b37f97e5f6210c2c645e9 +QEMU_TAG ?= xen-4.3.0 # Mon Jun 17 17:39:51 2013 +0100 # qemu-xen-traditional: disable docs -- 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 Jul 12 10:22:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 10:22: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 1UxaUz-0008GB-VU; Fri, 12 Jul 2013 10:22:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUy-0008FR-L7 for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:48 +0000 Received: from [85.158.143.99:63968] by server-1.bemta-4.messagelabs.com id F4/C8-28540-7F8DFD15; Fri, 12 Jul 2013 10:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1373624566!16267156!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9627 invoked from network); 12 Jul 2013 10:22:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 10:22:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUv-0006bm-OB for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxaUv-0000ZW-MD for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:45 +0000 Date: Fri, 12 Jul 2013 10:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] docs: Pull Xen version from canonical location X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a12a88e966ce21587ea58d3c4d670cde25d1932e Author: Andrew Cooper AuthorDate: Tue Jul 2 21:02:33 2013 +0100 Commit: Ian Campbell CommitDate: Wed Jul 3 16:38:16 2013 +0100 docs: Pull Xen version from canonical location rather than hard coding it and being wrong every time we branch for a release. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell (cherry picked from commit f487767ad0e58acb6c1ed3cc56daa0fb71b1f23a) --- docs/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 72bd5e4..472b7ed 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -2,7 +2,7 @@ XEN_ROOT=$(CURDIR)/.. include $(XEN_ROOT)/Config.mk -include $(XEN_ROOT)/config/Docs.mk -VERSION = xen-unstable +VERSION := $(shell $(MAKE) -C $(XEN_ROOT)/xen --no-print-directory xenversion) DOC_MAN5SRC := $(wildcard man/*.pod.5) DOC_MAN1SRC := $(wildcard man/*.pod.1) -- 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 Jul 12 10:22:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 10:22: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 1UxaUz-0008GB-VU; Fri, 12 Jul 2013 10:22:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUy-0008FR-L7 for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:48 +0000 Received: from [85.158.143.99:63968] by server-1.bemta-4.messagelabs.com id F4/C8-28540-7F8DFD15; Fri, 12 Jul 2013 10:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1373624566!16267156!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9627 invoked from network); 12 Jul 2013 10:22:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 10:22:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaUv-0006bm-OB for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxaUv-0000ZW-MD for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:45 +0000 Date: Fri, 12 Jul 2013 10:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] docs: Pull Xen version from canonical location X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a12a88e966ce21587ea58d3c4d670cde25d1932e Author: Andrew Cooper AuthorDate: Tue Jul 2 21:02:33 2013 +0100 Commit: Ian Campbell CommitDate: Wed Jul 3 16:38:16 2013 +0100 docs: Pull Xen version from canonical location rather than hard coding it and being wrong every time we branch for a release. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell (cherry picked from commit f487767ad0e58acb6c1ed3cc56daa0fb71b1f23a) --- docs/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 72bd5e4..472b7ed 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -2,7 +2,7 @@ XEN_ROOT=$(CURDIR)/.. include $(XEN_ROOT)/Config.mk -include $(XEN_ROOT)/config/Docs.mk -VERSION = xen-unstable +VERSION := $(shell $(MAKE) -C $(XEN_ROOT)/xen --no-print-directory xenversion) DOC_MAN5SRC := $(wildcard man/*.pod.5) DOC_MAN1SRC := $(wildcard man/*.pod.1) -- 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 Jul 12 10:23:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 10:23:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaVI-0008Mp-8C; Fri, 12 Jul 2013 10: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 1UxaVG-0008Lr-2y for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:23:06 +0000 Received: from [85.158.139.211:51157] by server-12.bemta-5.messagelabs.com id AD/FC-22750-909DFD15; Fri, 12 Jul 2013 10:23:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1373624576!18494996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24063 invoked from network); 12 Jul 2013 10:22:57 -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; 12 Jul 2013 10:22:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaV5-0006bt-VD for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxaV5-0000Zu-R0 for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:55 +0000 Date: Fri, 12 Jul 2013 10:22:55 +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.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 903521a38c3c5bd1c3d196a67e4abac4a064bc34 Author: Jan Beulich AuthorDate: Mon Jul 8 15:20:49 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 8 15:20:49 2013 +0200 update Xen version to 4.3.0 --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 201d9bc..b76fb2b 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 ?= -unstable$(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.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 10:23:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 10:23:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaVI-0008Mp-8C; Fri, 12 Jul 2013 10: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 1UxaVG-0008Lr-2y for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:23:06 +0000 Received: from [85.158.139.211:51157] by server-12.bemta-5.messagelabs.com id AD/FC-22750-909DFD15; Fri, 12 Jul 2013 10:23:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1373624576!18494996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24063 invoked from network); 12 Jul 2013 10:22:57 -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; 12 Jul 2013 10:22:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaV5-0006bt-VD for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxaV5-0000Zu-R0 for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:22:55 +0000 Date: Fri, 12 Jul 2013 10:22:55 +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.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 903521a38c3c5bd1c3d196a67e4abac4a064bc34 Author: Jan Beulich AuthorDate: Mon Jul 8 15:20:49 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 8 15:20:49 2013 +0200 update Xen version to 4.3.0 --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 201d9bc..b76fb2b 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 ?= -unstable$(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.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 10:23:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 10:23: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 1UxaVL-0008Or-Eq; Fri, 12 Jul 2013 10:23:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaVK-0008Nz-Ea for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:23:10 +0000 Received: from [85.158.139.211:13943] by server-5.bemta-5.messagelabs.com id FD/6E-27868-D09DFD15; Fri, 12 Jul 2013 10:23:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1373624586!21276476!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22890 invoked from network); 12 Jul 2013 10:23:07 -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 Jul 2013 10:23:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaVG-0006cX-3x for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:23:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxaVG-0000aS-1b for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:23:06 +0000 Date: Fri, 12 Jul 2013 10:23:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] release: Remove -rc from README ASCII art X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f8cc9c2b713b1739b1d3d324716547fa639dce86 Author: George Dunlap AuthorDate: Tue Jul 9 11:46:56 2013 +0100 Commit: George Dunlap CommitDate: Tue Jul 9 11:46:56 2013 +0100 release: Remove -rc from README ASCII art Signed-off-by: George Dunlap --- README | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index 580f85a..19b3c05 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ ################################# __ __ _ _ _____ -\ \/ /___ _ __ | || | |___ / _ __ ___ - \ // _ \ '_ \ | || |_ |_ \ _____| '__/ __| - / \ __/ | | | |__ _| ___) |_____| | | (__ -/_/\_\___|_| |_| |_|(_)____/ |_| \___| +\ \/ /___ _ __ | || | |___ / + \ // _ \ '_ \ | || |_ |_ \ + / \ __/ | | | |__ _| ___) | +/_/\_\___|_| |_| |_|(_)____/ ################################# -- 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 Jul 12 10:23:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 10:23: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 1UxaVL-0008Or-Eq; Fri, 12 Jul 2013 10:23:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaVK-0008Nz-Ea for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:23:10 +0000 Received: from [85.158.139.211:13943] by server-5.bemta-5.messagelabs.com id FD/6E-27868-D09DFD15; Fri, 12 Jul 2013 10:23:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1373624586!21276476!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22890 invoked from network); 12 Jul 2013 10:23:07 -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 Jul 2013 10:23:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxaVG-0006cX-3x for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:23:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxaVG-0000aS-1b for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 10:23:06 +0000 Date: Fri, 12 Jul 2013 10:23:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] release: Remove -rc from README ASCII art X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f8cc9c2b713b1739b1d3d324716547fa639dce86 Author: George Dunlap AuthorDate: Tue Jul 9 11:46:56 2013 +0100 Commit: George Dunlap CommitDate: Tue Jul 9 11:46:56 2013 +0100 release: Remove -rc from README ASCII art Signed-off-by: George Dunlap --- README | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index 580f85a..19b3c05 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ ################################# __ __ _ _ _____ -\ \/ /___ _ __ | || | |___ / _ __ ___ - \ // _ \ '_ \ | || |_ |_ \ _____| '__/ __| - / \ __/ | | | |__ _| ___) |_____| | | (__ -/_/\_\___|_| |_| |_|(_)____/ |_| \___| +\ \/ /___ _ __ | || | |___ / + \ // _ \ '_ \ | || |_ |_ \ + / \ __/ | | | |__ _| ___) | +/_/\_\___|_| |_| |_|(_)____/ ################################# -- 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 Jul 12 22:11:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 22:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxlYS-0007VE-Ku; Fri, 12 Jul 2013 22:11:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxlYR-0007V5-Aq for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 22:11:07 +0000 Received: from [85.158.143.99:35368] by server-2.bemta-4.messagelabs.com id 35/27-09492-AFE70E15; Fri, 12 Jul 2013 22:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-216.messagelabs.com!1373667064!27515758!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20062 invoked from network); 12 Jul 2013 22:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 22:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxlYO-0006Jt-71 for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 22:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxlYN-00046T-KW for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 22:11:03 +0000 Date: Fri, 12 Jul 2013 22:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl_json: Fix backport of JSON_BOOL to 4.2.2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 253d1cb0e217ddf60f9a9ef3dca541368a86b93e Author: Don Slutz AuthorDate: Fri Jul 5 10:58:48 2013 -0400 Commit: Ian Jackson CommitDate: Fri Jul 12 14:06:13 2013 +0100 libxl_json: Fix backport of JSON_BOOL to 4.2.2 git commit 2b3072ed0cbeed8c0385f20e92ba0f1201db8a17 ('libxl_json: Replace JSON_TRUE/FALSE by JSON_BOOL.') has the setting of obj->u.b git commit 6a2aca9fdef0499e613715baf107f2296b9007cf ('libxl_json: Replace JSON_TRUE/FALSE by JSON_BOOL.') does not. This shows up by vnc-port and vnc-listen are missing in xenstore when they should not be. Signed-off-by: Don Slutz Acked-By: Alex Bligh --- tools/libxl/libxl_json.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c index 72b52e8..0810630 100644 --- a/tools/libxl/libxl_json.c +++ b/tools/libxl/libxl_json.c @@ -474,6 +474,7 @@ static int json_callback_boolean(void *opaque, int boolean) if ((obj = libxl__json_object_alloc(ctx->gc, JSON_BOOL)) == NULL) return 0; + obj->u.b = boolean; if (libxl__json_object_append_to(ctx->gc, obj, ctx->current) == -1) { libxl__json_object_free(ctx->gc, obj); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 22:11:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 22:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxlYS-0007VE-Ku; Fri, 12 Jul 2013 22:11:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxlYR-0007V5-Aq for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 22:11:07 +0000 Received: from [85.158.143.99:35368] by server-2.bemta-4.messagelabs.com id 35/27-09492-AFE70E15; Fri, 12 Jul 2013 22:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-216.messagelabs.com!1373667064!27515758!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20062 invoked from network); 12 Jul 2013 22:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 22:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxlYO-0006Jt-71 for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 22:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxlYN-00046T-KW for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 22:11:03 +0000 Date: Fri, 12 Jul 2013 22:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl_json: Fix backport of JSON_BOOL to 4.2.2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 253d1cb0e217ddf60f9a9ef3dca541368a86b93e Author: Don Slutz AuthorDate: Fri Jul 5 10:58:48 2013 -0400 Commit: Ian Jackson CommitDate: Fri Jul 12 14:06:13 2013 +0100 libxl_json: Fix backport of JSON_BOOL to 4.2.2 git commit 2b3072ed0cbeed8c0385f20e92ba0f1201db8a17 ('libxl_json: Replace JSON_TRUE/FALSE by JSON_BOOL.') has the setting of obj->u.b git commit 6a2aca9fdef0499e613715baf107f2296b9007cf ('libxl_json: Replace JSON_TRUE/FALSE by JSON_BOOL.') does not. This shows up by vnc-port and vnc-listen are missing in xenstore when they should not be. Signed-off-by: Don Slutz Acked-By: Alex Bligh --- tools/libxl/libxl_json.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c index 72b52e8..0810630 100644 --- a/tools/libxl/libxl_json.c +++ b/tools/libxl/libxl_json.c @@ -474,6 +474,7 @@ static int json_callback_boolean(void *opaque, int boolean) if ((obj = libxl__json_object_alloc(ctx->gc, JSON_BOOL)) == NULL) return 0; + obj->u.b = boolean; if (libxl__json_object_append_to(ctx->gc, obj, ctx->current) == -1) { libxl__json_object_free(ctx->gc, obj); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 22:11:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 22:11: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 1UxlYc-0007Vr-Ns; Fri, 12 Jul 2013 22:11:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxlYb-0007Vl-Qy for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 22:11:18 +0000 Received: from [85.158.139.83:40019] by server-16.bemta-5.messagelabs.com id 67/1B-31941-50F70E15; Fri, 12 Jul 2013 22:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-182.messagelabs.com!1373667075!16239714!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30748 invoked from network); 12 Jul 2013 22:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 22:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxlYY-0006Jw-NH for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 22:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxlYY-00046u-Be for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 22:11:14 +0000 Date: Fri, 12 Jul 2013 22:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] Fix issue with 'xl list -l' showing domids as -1 when using SXP X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 23830f68e1878ef92606d0e0b0511762fbb3d9a8 Author: Ian Murray AuthorDate: Thu Jul 4 23:42:50 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jul 12 14:21:50 2013 +0100 Fix issue with 'xl list -l' showing domids as -1 when using SXP During investigation of other issues, it came to light that in at least 4.2.2, "xl list -l" displays domain ids as -1 when using SXP, irrespective of actual value. Ian C identified that this issue was likely fixed in the upcoming 4.3 release but the commit responsible for the fix (a73a7a0c647a9a5e30d8bc473c0a1e8648817183) was not likely a candidate for backporting in its entirety. Therefore, this patch is just an isolation of the hunk to fix the above issue. Original Commit Signed-off-by: Ian Campbell Backport Created-by: Ian Murray --- tools/libxl/xl_cmdimpl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 7780426..fe8dc92 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2809,7 +2809,7 @@ static void list_domains_details(const libxl_dominfo *info, int nb_domain) if (default_output_format == OUTPUT_FORMAT_JSON) s = printf_info_one_json(hand, info[i].domid, &d_config); else - printf_info_sexp(domid, &d_config); + printf_info_sexp(info[i].domid, &d_config); libxl_domain_config_dispose(&d_config); free(data); free(config_source); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jul 12 22:11:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Jul 2013 22:11: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 1UxlYc-0007Vr-Ns; Fri, 12 Jul 2013 22:11:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxlYb-0007Vl-Qy for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 22:11:18 +0000 Received: from [85.158.139.83:40019] by server-16.bemta-5.messagelabs.com id 67/1B-31941-50F70E15; Fri, 12 Jul 2013 22:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-182.messagelabs.com!1373667075!16239714!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30748 invoked from network); 12 Jul 2013 22:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jul 2013 22:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UxlYY-0006Jw-NH for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 22:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1UxlYY-00046u-Be for xen-changelog@lists.xensource.com; Fri, 12 Jul 2013 22:11:14 +0000 Date: Fri, 12 Jul 2013 22:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] Fix issue with 'xl list -l' showing domids as -1 when using SXP X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 23830f68e1878ef92606d0e0b0511762fbb3d9a8 Author: Ian Murray AuthorDate: Thu Jul 4 23:42:50 2013 +0000 Commit: Ian Jackson CommitDate: Fri Jul 12 14:21:50 2013 +0100 Fix issue with 'xl list -l' showing domids as -1 when using SXP During investigation of other issues, it came to light that in at least 4.2.2, "xl list -l" displays domain ids as -1 when using SXP, irrespective of actual value. Ian C identified that this issue was likely fixed in the upcoming 4.3 release but the commit responsible for the fix (a73a7a0c647a9a5e30d8bc473c0a1e8648817183) was not likely a candidate for backporting in its entirety. Therefore, this patch is just an isolation of the hunk to fix the above issue. Original Commit Signed-off-by: Ian Campbell Backport Created-by: Ian Murray --- tools/libxl/xl_cmdimpl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 7780426..fe8dc92 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2809,7 +2809,7 @@ static void list_domains_details(const libxl_dominfo *info, int nb_domain) if (default_output_format == OUTPUT_FORMAT_JSON) s = printf_info_one_json(hand, info[i].domid, &d_config); else - printf_info_sexp(domid, &d_config); + printf_info_sexp(info[i].domid, &d_config); libxl_domain_config_dispose(&d_config); free(data); free(config_source); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 15 13:44:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:44: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 1Uyj4T-00085G-Tx; Mon, 15 Jul 2013 13:44:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4T-000852-1E for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:09 +0000 Received: from [193.109.254.147:3177] by server-2.bemta-14.messagelabs.com id B3/F6-18376-7ACF3E15; Mon, 15 Jul 2013 13:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1373895845!323513!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16255 invoked from network); 15 Jul 2013 13:44: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; 15 Jul 2013 13:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4P-0003QE-Mq for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj4N-0005Rc-QP for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:03 +0000 Date: Mon, 15 Jul 2013 13:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Pull Xen version from canonical location X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f487767ad0e58acb6c1ed3cc56daa0fb71b1f23a Author: Andrew Cooper AuthorDate: Tue Jul 2 21:02:33 2013 +0100 Commit: Ian Campbell CommitDate: Wed Jul 3 16:35:14 2013 +0100 docs: Pull Xen version from canonical location rather than hard coding it and being wrong every time we branch for a release. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- docs/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 72bd5e4..472b7ed 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -2,7 +2,7 @@ XEN_ROOT=$(CURDIR)/.. include $(XEN_ROOT)/Config.mk -include $(XEN_ROOT)/config/Docs.mk -VERSION = xen-unstable +VERSION := $(shell $(MAKE) -C $(XEN_ROOT)/xen --no-print-directory xenversion) DOC_MAN5SRC := $(wildcard man/*.pod.5) DOC_MAN1SRC := $(wildcard man/*.pod.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 Mon Jul 15 13:44:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:44: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 1Uyj4T-00085G-Tx; Mon, 15 Jul 2013 13:44:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4T-000852-1E for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:09 +0000 Received: from [193.109.254.147:3177] by server-2.bemta-14.messagelabs.com id B3/F6-18376-7ACF3E15; Mon, 15 Jul 2013 13:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1373895845!323513!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16255 invoked from network); 15 Jul 2013 13:44: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; 15 Jul 2013 13:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4P-0003QE-Mq for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj4N-0005Rc-QP for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:03 +0000 Date: Mon, 15 Jul 2013 13:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Pull Xen version from canonical location X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f487767ad0e58acb6c1ed3cc56daa0fb71b1f23a Author: Andrew Cooper AuthorDate: Tue Jul 2 21:02:33 2013 +0100 Commit: Ian Campbell CommitDate: Wed Jul 3 16:35:14 2013 +0100 docs: Pull Xen version from canonical location rather than hard coding it and being wrong every time we branch for a release. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- docs/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 72bd5e4..472b7ed 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -2,7 +2,7 @@ XEN_ROOT=$(CURDIR)/.. include $(XEN_ROOT)/Config.mk -include $(XEN_ROOT)/config/Docs.mk -VERSION = xen-unstable +VERSION := $(shell $(MAKE) -C $(XEN_ROOT)/xen --no-print-directory xenversion) DOC_MAN5SRC := $(wildcard man/*.pod.5) DOC_MAN1SRC := $(wildcard man/*.pod.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 Mon Jul 15 13:44:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:44:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4g-00086H-1F; Mon, 15 Jul 2013 13:44:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4e-000867-Qn for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:21 +0000 Received: from [85.158.138.51:55897] by server-2.bemta-3.messagelabs.com id 36/75-21241-3BCF3E15; Mon, 15 Jul 2013 13:44:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-174.messagelabs.com!1373895856!460905!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.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2921 invoked from network); 15 Jul 2013 13:44:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4a-0003QH-1O for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj4Z-0005S1-Pe for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:15 +0000 Date: Mon, 15 Jul 2013 13:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: Restore reboot quirks by DMI, fix reboot on a number of systems X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit da72c56322c012f67aad79ca6093a5f21a0a3395 Author: Ben Guthro AuthorDate: Thu Jul 4 10:23:36 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 4 10:23:36 2013 +0200 x86: Restore reboot quirks by DMI, fix reboot on a number of systems The following patch ports the functionality following changeset from Linux (from 2008) to xen: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=14d7ca5c It implements an additional reboot quirk to do a PCI reset via port CF9. This also restores some code dropped in the x86_32 target removal (changeset 5d1181a5ea5e0f11d481a94b16ed00d883f9726e) which sets some quirks based on DMI matching. This will add reboot quirks on the following systems that are known to be necessary on Linux: Dell E520 Dell PowerEdge 1300 Dell PowerEdge 300 Dell OptiPlex 745 Dell OptiPlex 745 Dell OptiPlex 745 Dell OptiPlex 330 Dell OptiPlex 360 Dell OptiPlex 760 Dell PowerEdge 2400 Dell Precision T5400 Dell Precision T7400 HP Compaq Laptop Dell XPS710 Dell DXP061 Sony VGN-Z540N ASUS P4S800 Acer Aspire One A110 Apple MacBook5 Apple MacBookPro5 Apple Macmini3,1 Apple iMac9,1 Dell Latitude E6320 Dell Latitude E5420 Dell Latitude E6220 Dell Latitude E6420 Dell OptiPlex 990 Dell OptiPlex 990 Dell Latitude E6520 Dell OptiPlex 790 Dell OptiPlex 990 Dell OptiPlex 390 Dell Latitude E6320 Dell Latitude E6420 Dell Latitude E6520 I clearly have not been able to test on all of these systems. It does fix rebooting on the Dell 790, and should *not* change the reboot paths of systems not on this DMI match list. Signed-off-by: Ben Guthro Use driver_data, thus requiring only a single handler function. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/shutdown.c | 365 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 365 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 7593191..c637883 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -32,6 +32,7 @@ enum reboot_type { BOOT_KBD = 'k', BOOT_ACPI = 'a', BOOT_BIOS = 'b', + BOOT_CF9 = 'p', }; static long no_idt[2]; @@ -45,6 +46,7 @@ static int reboot_mode; * triple Force a triple fault (init) * kbd Use the keyboard controller. cold reset (default) * acpi Use the RESET_REG in the FADT + * pci Use the so-called "PCI reset register", CF9 */ static enum reboot_type reboot_type = BOOT_ACPI; static void __init set_reboot_type(char *str) @@ -66,6 +68,7 @@ static void __init set_reboot_type(char *str) case 'a': case 'k': case 't': + case 'p': reboot_type = *str; break; } @@ -101,6 +104,358 @@ void machine_halt(void) __machine_halt(NULL); } +static int __init override_reboot(struct dmi_system_id *d) +{ + enum reboot_type type = (long)d->driver_data; + + if ( reboot_type != type ) + { + static const char *__initdata msg[] = + { + [BOOT_BIOS] = "BIOS", + [BOOT_KBD] = "keyboard controller", + [BOOT_CF9] = "PCI", + }; + + reboot_type = type; + ASSERT(type >= 0 && type < ARRAY_SIZE(msg) && msg[type]); + printk("%s series board detected. Selecting %s reboot method.\n", + d->ident, msg[type]); + } + return 0; +} + +static struct dmi_system_id __initdata reboot_dmi_table[] = { + { /* Handle problems with rebooting on Dell E520's */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell E520", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Dell DM061"), + }, + }, + { /* Handle problems with rebooting on Dell 1300's */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell PowerEdge 1300", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 1300/"), + }, + }, + { /* Handle problems with rebooting on Dell 300's */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell PowerEdge 300", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 300/"), + }, + }, + { /* Handle problems with rebooting on Dell Optiplex 745's SFF */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell OptiPlex 745", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 745"), + }, + }, + { /* Handle problems with rebooting on Dell Optiplex 745's DFF */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell OptiPlex 745", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 745"), + DMI_MATCH(DMI_BOARD_NAME, "0MM599"), + }, + }, + { /* Handle problems with rebooting on Dell Optiplex 745 with 0KW626 */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell OptiPlex 745", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 745"), + DMI_MATCH(DMI_BOARD_NAME, "0KW626"), + }, + }, + { /* Handle problems with rebooting on Dell Optiplex 330 with 0KP561 */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell OptiPlex 330", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 330"), + DMI_MATCH(DMI_BOARD_NAME, "0KP561"), + }, + }, + { /* Handle problems with rebooting on Dell Optiplex 360 with 0T656F */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell OptiPlex 360", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 360"), + DMI_MATCH(DMI_BOARD_NAME, "0T656F"), + }, + }, + { /* Handle problems with rebooting on Dell OptiPlex 760 with 0G919G */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell OptiPlex 760", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 760"), + DMI_MATCH(DMI_BOARD_NAME, "0G919G"), + }, + }, + { /* Handle problems with rebooting on Dell 2400's */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell PowerEdge 2400", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"), + }, + }, + { /* Handle problems with rebooting on Dell T5400's */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell Precision T5400", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Precision WorkStation T5400"), + }, + }, + { /* Handle problems with rebooting on Dell T7400's */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell Precision T7400", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Precision WorkStation T7400"), + }, + }, + { /* Handle problems with rebooting on HP laptops */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "HP Compaq Laptop", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq"), + }, + }, + { /* Handle problems with rebooting on Dell XPS710 */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell XPS710", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Dell XPS710"), + }, + }, + { /* Handle problems with rebooting on Dell DXP061 */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell DXP061", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Dell DXP061"), + }, + }, + { /* Handle problems with rebooting on Sony VGN-Z540N */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Sony VGN-Z540N", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "VGN-Z540N"), + }, + }, + { /* Handle problems with rebooting on ASUS P4S800 */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "ASUS P4S800", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), + DMI_MATCH(DMI_BOARD_NAME, "P4S800"), + }, + }, + { /* Handle reboot issue on Acer Aspire one */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_KBD, + .ident = "Acer Aspire One A110", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "AOA110"), + }, + }, + { /* Handle problems with rebooting on Apple MacBook5 */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Apple MacBook5", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5"), + }, + }, + { /* Handle problems with rebooting on Apple MacBookPro5 */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Apple MacBookPro5", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5"), + }, + }, + { /* Handle problems with rebooting on Apple Macmini3,1 */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Apple Macmini3,1", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Macmini3,1"), + }, + }, + { /* Handle problems with rebooting on the iMac9,1. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Apple iMac9,1", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"), + }, + }, + { /* Handle problems with rebooting on the Latitude E6320. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell Latitude E6320", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"), + }, + }, + { /* Handle problems with rebooting on the Latitude E5420. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell Latitude E5420", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5420"), + }, + }, + { /* Handle problems with rebooting on the Latitude E6220. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell Latitude E6220", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6220"), + }, + }, + { /* Handle problems with rebooting on the Latitude E6420. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell Latitude E6420", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"), + }, + }, + { /* Handle problems with rebooting on the OptiPlex 990. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell OptiPlex 990", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"), + }, + }, + { /* Handle problems with rebooting on the Precision M6600. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell OptiPlex 990", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"), + }, + }, + { /* Handle problems with rebooting on the Latitude E6520. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell Latitude E6520", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6520"), + }, + }, + { /* Handle problems with rebooting on the OptiPlex 790. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell OptiPlex 790", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 790"), + }, + }, + { /* Handle problems with rebooting on the OptiPlex 990. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell OptiPlex 990", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"), + }, + }, + { /* Handle problems with rebooting on the OptiPlex 390. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell OptiPlex 390", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 390"), + }, + }, + { /* Handle problems with rebooting on the Latitude E6320. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell Latitude E6320", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"), + }, + }, + { /* Handle problems with rebooting on the Latitude E6420. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell Latitude E6420", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"), + }, + }, + { /* Handle problems with rebooting on the Latitude E6520. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell Latitude E6520", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6520"), + }, + }, + { } +}; + +static int __init reboot_init(void) +{ + dmi_check_system(reboot_dmi_table); + return 0; +} +__initcall(reboot_init); + static void __machine_restart(void *pdelay) { machine_restart(*(unsigned int *)pdelay); @@ -183,6 +538,16 @@ void machine_restart(unsigned int delay_millisecs) acpi_reboot(); reboot_type = BOOT_KBD; break; + case BOOT_CF9: + { + u8 cf9 = inb(0xcf9) & ~6; + outb(cf9|2, 0xcf9); /* Request hard reset */ + udelay(50); + outb(cf9|6, 0xcf9); /* Actually do the reset */ + udelay(50); + } + reboot_type = BOOT_ACPI; + 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 Mon Jul 15 13:44:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:44:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4g-00086H-1F; Mon, 15 Jul 2013 13:44:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4e-000867-Qn for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:21 +0000 Received: from [85.158.138.51:55897] by server-2.bemta-3.messagelabs.com id 36/75-21241-3BCF3E15; Mon, 15 Jul 2013 13:44:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-174.messagelabs.com!1373895856!460905!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.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2921 invoked from network); 15 Jul 2013 13:44:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4a-0003QH-1O for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj4Z-0005S1-Pe for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:15 +0000 Date: Mon, 15 Jul 2013 13:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: Restore reboot quirks by DMI, fix reboot on a number of systems X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit da72c56322c012f67aad79ca6093a5f21a0a3395 Author: Ben Guthro AuthorDate: Thu Jul 4 10:23:36 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 4 10:23:36 2013 +0200 x86: Restore reboot quirks by DMI, fix reboot on a number of systems The following patch ports the functionality following changeset from Linux (from 2008) to xen: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=14d7ca5c It implements an additional reboot quirk to do a PCI reset via port CF9. This also restores some code dropped in the x86_32 target removal (changeset 5d1181a5ea5e0f11d481a94b16ed00d883f9726e) which sets some quirks based on DMI matching. This will add reboot quirks on the following systems that are known to be necessary on Linux: Dell E520 Dell PowerEdge 1300 Dell PowerEdge 300 Dell OptiPlex 745 Dell OptiPlex 745 Dell OptiPlex 745 Dell OptiPlex 330 Dell OptiPlex 360 Dell OptiPlex 760 Dell PowerEdge 2400 Dell Precision T5400 Dell Precision T7400 HP Compaq Laptop Dell XPS710 Dell DXP061 Sony VGN-Z540N ASUS P4S800 Acer Aspire One A110 Apple MacBook5 Apple MacBookPro5 Apple Macmini3,1 Apple iMac9,1 Dell Latitude E6320 Dell Latitude E5420 Dell Latitude E6220 Dell Latitude E6420 Dell OptiPlex 990 Dell OptiPlex 990 Dell Latitude E6520 Dell OptiPlex 790 Dell OptiPlex 990 Dell OptiPlex 390 Dell Latitude E6320 Dell Latitude E6420 Dell Latitude E6520 I clearly have not been able to test on all of these systems. It does fix rebooting on the Dell 790, and should *not* change the reboot paths of systems not on this DMI match list. Signed-off-by: Ben Guthro Use driver_data, thus requiring only a single handler function. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/shutdown.c | 365 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 365 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 7593191..c637883 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -32,6 +32,7 @@ enum reboot_type { BOOT_KBD = 'k', BOOT_ACPI = 'a', BOOT_BIOS = 'b', + BOOT_CF9 = 'p', }; static long no_idt[2]; @@ -45,6 +46,7 @@ static int reboot_mode; * triple Force a triple fault (init) * kbd Use the keyboard controller. cold reset (default) * acpi Use the RESET_REG in the FADT + * pci Use the so-called "PCI reset register", CF9 */ static enum reboot_type reboot_type = BOOT_ACPI; static void __init set_reboot_type(char *str) @@ -66,6 +68,7 @@ static void __init set_reboot_type(char *str) case 'a': case 'k': case 't': + case 'p': reboot_type = *str; break; } @@ -101,6 +104,358 @@ void machine_halt(void) __machine_halt(NULL); } +static int __init override_reboot(struct dmi_system_id *d) +{ + enum reboot_type type = (long)d->driver_data; + + if ( reboot_type != type ) + { + static const char *__initdata msg[] = + { + [BOOT_BIOS] = "BIOS", + [BOOT_KBD] = "keyboard controller", + [BOOT_CF9] = "PCI", + }; + + reboot_type = type; + ASSERT(type >= 0 && type < ARRAY_SIZE(msg) && msg[type]); + printk("%s series board detected. Selecting %s reboot method.\n", + d->ident, msg[type]); + } + return 0; +} + +static struct dmi_system_id __initdata reboot_dmi_table[] = { + { /* Handle problems with rebooting on Dell E520's */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell E520", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Dell DM061"), + }, + }, + { /* Handle problems with rebooting on Dell 1300's */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell PowerEdge 1300", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 1300/"), + }, + }, + { /* Handle problems with rebooting on Dell 300's */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell PowerEdge 300", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 300/"), + }, + }, + { /* Handle problems with rebooting on Dell Optiplex 745's SFF */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell OptiPlex 745", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 745"), + }, + }, + { /* Handle problems with rebooting on Dell Optiplex 745's DFF */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell OptiPlex 745", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 745"), + DMI_MATCH(DMI_BOARD_NAME, "0MM599"), + }, + }, + { /* Handle problems with rebooting on Dell Optiplex 745 with 0KW626 */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell OptiPlex 745", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 745"), + DMI_MATCH(DMI_BOARD_NAME, "0KW626"), + }, + }, + { /* Handle problems with rebooting on Dell Optiplex 330 with 0KP561 */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell OptiPlex 330", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 330"), + DMI_MATCH(DMI_BOARD_NAME, "0KP561"), + }, + }, + { /* Handle problems with rebooting on Dell Optiplex 360 with 0T656F */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell OptiPlex 360", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 360"), + DMI_MATCH(DMI_BOARD_NAME, "0T656F"), + }, + }, + { /* Handle problems with rebooting on Dell OptiPlex 760 with 0G919G */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell OptiPlex 760", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 760"), + DMI_MATCH(DMI_BOARD_NAME, "0G919G"), + }, + }, + { /* Handle problems with rebooting on Dell 2400's */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell PowerEdge 2400", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"), + }, + }, + { /* Handle problems with rebooting on Dell T5400's */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell Precision T5400", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Precision WorkStation T5400"), + }, + }, + { /* Handle problems with rebooting on Dell T7400's */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell Precision T7400", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Precision WorkStation T7400"), + }, + }, + { /* Handle problems with rebooting on HP laptops */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "HP Compaq Laptop", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq"), + }, + }, + { /* Handle problems with rebooting on Dell XPS710 */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell XPS710", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Dell XPS710"), + }, + }, + { /* Handle problems with rebooting on Dell DXP061 */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Dell DXP061", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Dell DXP061"), + }, + }, + { /* Handle problems with rebooting on Sony VGN-Z540N */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "Sony VGN-Z540N", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "VGN-Z540N"), + }, + }, + { /* Handle problems with rebooting on ASUS P4S800 */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_BIOS, + .ident = "ASUS P4S800", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), + DMI_MATCH(DMI_BOARD_NAME, "P4S800"), + }, + }, + { /* Handle reboot issue on Acer Aspire one */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_KBD, + .ident = "Acer Aspire One A110", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "AOA110"), + }, + }, + { /* Handle problems with rebooting on Apple MacBook5 */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Apple MacBook5", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5"), + }, + }, + { /* Handle problems with rebooting on Apple MacBookPro5 */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Apple MacBookPro5", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5"), + }, + }, + { /* Handle problems with rebooting on Apple Macmini3,1 */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Apple Macmini3,1", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Macmini3,1"), + }, + }, + { /* Handle problems with rebooting on the iMac9,1. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Apple iMac9,1", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"), + }, + }, + { /* Handle problems with rebooting on the Latitude E6320. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell Latitude E6320", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"), + }, + }, + { /* Handle problems with rebooting on the Latitude E5420. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell Latitude E5420", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5420"), + }, + }, + { /* Handle problems with rebooting on the Latitude E6220. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell Latitude E6220", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6220"), + }, + }, + { /* Handle problems with rebooting on the Latitude E6420. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell Latitude E6420", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"), + }, + }, + { /* Handle problems with rebooting on the OptiPlex 990. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell OptiPlex 990", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"), + }, + }, + { /* Handle problems with rebooting on the Precision M6600. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell OptiPlex 990", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"), + }, + }, + { /* Handle problems with rebooting on the Latitude E6520. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell Latitude E6520", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6520"), + }, + }, + { /* Handle problems with rebooting on the OptiPlex 790. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell OptiPlex 790", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 790"), + }, + }, + { /* Handle problems with rebooting on the OptiPlex 990. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell OptiPlex 990", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"), + }, + }, + { /* Handle problems with rebooting on the OptiPlex 390. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell OptiPlex 390", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 390"), + }, + }, + { /* Handle problems with rebooting on the Latitude E6320. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell Latitude E6320", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"), + }, + }, + { /* Handle problems with rebooting on the Latitude E6420. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell Latitude E6420", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"), + }, + }, + { /* Handle problems with rebooting on the Latitude E6520. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_CF9, + .ident = "Dell Latitude E6520", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6520"), + }, + }, + { } +}; + +static int __init reboot_init(void) +{ + dmi_check_system(reboot_dmi_table); + return 0; +} +__initcall(reboot_init); + static void __machine_restart(void *pdelay) { machine_restart(*(unsigned int *)pdelay); @@ -183,6 +538,16 @@ void machine_restart(unsigned int delay_millisecs) acpi_reboot(); reboot_type = BOOT_KBD; break; + case BOOT_CF9: + { + u8 cf9 = inb(0xcf9) & ~6; + outb(cf9|2, 0xcf9); /* Request hard reset */ + udelay(50); + outb(cf9|6, 0xcf9); /* Actually do the reset */ + udelay(50); + } + reboot_type = BOOT_ACPI; + 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 Mon Jul 15 13:44:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:44: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 1Uyj4o-00086v-5R; Mon, 15 Jul 2013 13:44:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4m-00086h-JK for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:28 +0000 Received: from [85.158.143.99:33888] by server-1.bemta-4.messagelabs.com id 66/EA-28540-BBCF3E15; Mon, 15 Jul 2013 13:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-216.messagelabs.com!1373895866!27734490!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7999 invoked from network); 15 Jul 2013 13:44:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:44:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4k-0003QN-6D for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj4k-0005SO-4R for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:26 +0000 Date: Mon, 15 Jul 2013 13:44:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: drop MAX_VECTOR definition X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 966e77e9d6855274954d2d38eca2393121da477d Author: Jan Beulich AuthorDate: Thu Jul 4 10:25:31 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 4 10:25:31 2013 +0200 x86: drop MAX_VECTOR definition .. in favor of NR_VECTORS, as being redundant and as the latter is correct in terms of its naming, while the former is off by one. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/vlapic.c | 6 +++--- xen/include/asm-x86/hvm/vlapic.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 7dea8fb..e039ed0 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -90,10 +90,10 @@ static const unsigned int vlapic_lvt_mask[VLAPIC_LVT_NUM] = ((vlapic_get_reg(vlapic, APIC_LVTT) & APIC_TIMER_MODE_MASK) \ == APIC_TIMER_MODE_TSC_DEADLINE) -static int vlapic_find_highest_vector(void *bitmap) +static int vlapic_find_highest_vector(const void *bitmap) { - uint32_t *word = bitmap; - int word_offset = MAX_VECTOR / 32; + const uint32_t *word = bitmap; + unsigned int word_offset = NR_VECTORS / 32; /* Work backwards through the bitmap (first 32-bit word in every four). */ while ( (word_offset != 0) && (word[(--word_offset)*4] == 0) ) diff --git a/xen/include/asm-x86/hvm/vlapic.h b/xen/include/asm-x86/hvm/vlapic.h index 3277125..021a5f2 100644 --- a/xen/include/asm-x86/hvm/vlapic.h +++ b/xen/include/asm-x86/hvm/vlapic.h @@ -26,8 +26,6 @@ #include #include -#define MAX_VECTOR 256 - #define vcpu_vlapic(x) (&(x)->arch.hvm_vcpu.vlapic) #define vlapic_vcpu(x) (container_of((x), struct vcpu, arch.hvm_vcpu.vlapic)) #define vlapic_domain(x) (vlapic_vcpu(x)->domain) -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:44:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:44: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 1Uyj4o-00086v-5R; Mon, 15 Jul 2013 13:44:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4m-00086h-JK for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:28 +0000 Received: from [85.158.143.99:33888] by server-1.bemta-4.messagelabs.com id 66/EA-28540-BBCF3E15; Mon, 15 Jul 2013 13:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-216.messagelabs.com!1373895866!27734490!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7999 invoked from network); 15 Jul 2013 13:44:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:44:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4k-0003QN-6D for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj4k-0005SO-4R for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:26 +0000 Date: Mon, 15 Jul 2013 13:44:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: drop MAX_VECTOR definition X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 966e77e9d6855274954d2d38eca2393121da477d Author: Jan Beulich AuthorDate: Thu Jul 4 10:25:31 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 4 10:25:31 2013 +0200 x86: drop MAX_VECTOR definition .. in favor of NR_VECTORS, as being redundant and as the latter is correct in terms of its naming, while the former is off by one. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/vlapic.c | 6 +++--- xen/include/asm-x86/hvm/vlapic.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 7dea8fb..e039ed0 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -90,10 +90,10 @@ static const unsigned int vlapic_lvt_mask[VLAPIC_LVT_NUM] = ((vlapic_get_reg(vlapic, APIC_LVTT) & APIC_TIMER_MODE_MASK) \ == APIC_TIMER_MODE_TSC_DEADLINE) -static int vlapic_find_highest_vector(void *bitmap) +static int vlapic_find_highest_vector(const void *bitmap) { - uint32_t *word = bitmap; - int word_offset = MAX_VECTOR / 32; + const uint32_t *word = bitmap; + unsigned int word_offset = NR_VECTORS / 32; /* Work backwards through the bitmap (first 32-bit word in every four). */ while ( (word_offset != 0) && (word[(--word_offset)*4] == 0) ) diff --git a/xen/include/asm-x86/hvm/vlapic.h b/xen/include/asm-x86/hvm/vlapic.h index 3277125..021a5f2 100644 --- a/xen/include/asm-x86/hvm/vlapic.h +++ b/xen/include/asm-x86/hvm/vlapic.h @@ -26,8 +26,6 @@ #include #include -#define MAX_VECTOR 256 - #define vcpu_vlapic(x) (&(x)->arch.hvm_vcpu.vlapic) #define vlapic_vcpu(x) (container_of((x), struct vcpu, arch.hvm_vcpu.vlapic)) #define vlapic_domain(x) (vlapic_vcpu(x)->domain) -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:44:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:44: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 1Uyj4z-00088a-8n; Mon, 15 Jul 2013 13:44:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4x-00088K-Db for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:39 +0000 Received: from [193.109.254.147:22572] by server-14.bemta-14.messagelabs.com id A1/7D-23280-6CCF3E15; Mon, 15 Jul 2013 13:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1373895876!322008!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26826 invoked from network); 15 Jul 2013 13:44:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4u-0003QY-Bo for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj4u-0005TM-9B for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:36 +0000 Date: Mon, 15 Jul 2013 13:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] bitmap_*() should cope with zero size bitmaps X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d8a7694e5a415ac0a871f0ae58f50876ad30d619 Author: Jan Beulich AuthorDate: Thu Jul 4 10:26:24 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 4 10:26:24 2013 +0200 bitmap_*() should cope with zero size bitmaps ... to match expectations set by memset()/memcpy(). Similarly for find_{first,next}_{,zero_}_bit() on x86. __bitmap_shift_{left,right}() would also need fixing (they more generally can't cope with the shift count being larger than the bitmap size, and they perform undefined operations by possibly shifting an unsigned long value by BITS_PER_LONG bits), but since these functions aren't really used anywhere I wonder if we wouldn't better simply get rid of them. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/include/asm-x86/bitops.h | 54 ++++++++++++----- xen/include/xen/bitmap.h | 128 +++++++++++++++++++++--------------------- 2 files changed, 102 insertions(+), 80 deletions(-) diff --git a/xen/include/asm-x86/bitops.h b/xen/include/asm-x86/bitops.h index f5a84ef..ab21d92 100644 --- a/xen/include/asm-x86/bitops.h +++ b/xen/include/asm-x86/bitops.h @@ -327,10 +327,7 @@ static inline unsigned int __scanbit(unsigned long val, unsigned long max) * Returns the bit-number of the first set bit, not the number of the byte * containing a bit. */ -#define find_first_bit(addr,size) \ -((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ? \ - (__scanbit(*(const unsigned long *)addr, size)) : \ - __find_first_bit(addr,size))) +#define find_first_bit(addr, size) find_next_bit(addr, size, 0) /** * find_next_bit - find the first set bit in a memory region @@ -338,10 +335,24 @@ static inline unsigned int __scanbit(unsigned long val, unsigned long max) * @offset: The bitnumber to start searching at * @size: The maximum size to search */ -#define find_next_bit(addr,size,off) \ -((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ? \ - ((off) + (__scanbit((*(const unsigned long *)addr) >> (off), size))) : \ - __find_next_bit(addr,size,off))) +#define find_next_bit(addr, size, off) ({ \ + unsigned int r__ = (size); \ + unsigned int o__ = (off); \ + switch ( -!__builtin_constant_p(size) | r__ ) \ + { \ + case 0: (void)(addr); break; \ + case 1 ... BITS_PER_LONG: \ + r__ = o__ + __scanbit(*(const unsigned long *)(addr) >> o__, r__); \ + break; \ + default: \ + if ( __builtin_constant_p(off) && !o__ ) \ + r__ = __find_first_bit(addr, r__); \ + else \ + r__ = __find_next_bit(addr, r__, o__); \ + break; \ + } \ + r__; \ +}) /** * find_first_zero_bit - find the first zero bit in a memory region @@ -351,10 +362,7 @@ static inline unsigned int __scanbit(unsigned long val, unsigned long max) * Returns the bit-number of the first zero bit, not the number of the byte * containing a bit. */ -#define find_first_zero_bit(addr,size) \ -((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ? \ - (__scanbit(~*(const unsigned long *)addr, size)) : \ - __find_first_zero_bit(addr,size))) +#define find_first_zero_bit(addr, size) find_next_zero_bit(addr, size, 0) /** * find_next_zero_bit - find the first zero bit in a memory region @@ -362,10 +370,24 @@ static inline unsigned int __scanbit(unsigned long val, unsigned long max) * @offset: The bitnumber to start searching at * @size: The maximum size to search */ -#define find_next_zero_bit(addr,size,off) \ -((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ? \ - ((off)+(__scanbit(~(((*(const unsigned long *)addr)) >> (off)), size))) : \ - __find_next_zero_bit(addr,size,off))) +#define find_next_zero_bit(addr, size, off) ({ \ + unsigned int r__ = (size); \ + unsigned int o__ = (off); \ + switch ( -!__builtin_constant_p(size) | r__ ) \ + { \ + case 0: (void)(addr); break; \ + case 1 ... BITS_PER_LONG: \ + r__ = o__ + __scanbit(~*(const unsigned long *)(addr) >> o__, r__); \ + break; \ + default: \ + if ( __builtin_constant_p(off) && !o__ ) \ + r__ = __find_first_zero_bit(addr, r__); \ + else \ + r__ = __find_next_zero_bit(addr, r__, o__); \ + break; \ + } \ + r__; \ +}) /** * find_first_set_bit - find the first set bit in @word diff --git a/xen/include/xen/bitmap.h b/xen/include/xen/bitmap.h index 56fe602..b5ec455 100644 --- a/xen/include/xen/bitmap.h +++ b/xen/include/xen/bitmap.h @@ -108,123 +108,122 @@ extern int bitmap_allocate_region(unsigned long *bitmap, int pos, int order); (1UL<<((nbits) % BITS_PER_LONG))-1 : ~0UL \ ) +#define bitmap_bytes(nbits) (BITS_TO_LONGS(nbits) * sizeof(unsigned long)) + +#define bitmap_switch(nbits, zero_ret, small, large) \ + switch (-!__builtin_constant_p(nbits) | (nbits)) { \ + case 0: return zero_ret; \ + case 1 ... BITS_PER_LONG: \ + small; break; \ + default: \ + large; break; \ + } + static inline void bitmap_zero(unsigned long *dst, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = 0UL; - else { - int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long); - memset(dst, 0, len); - } + bitmap_switch(nbits,, + *dst = 0UL, + memset(dst, 0, bitmap_bytes(nbits))); } static inline void bitmap_fill(unsigned long *dst, int nbits) { size_t nlongs = BITS_TO_LONGS(nbits); - if (nlongs > 1) { - int len = (nlongs - 1) * sizeof(unsigned long); - memset(dst, 0xff, len); + + switch (nlongs) { + default: + memset(dst, -1, (nlongs - 1) * sizeof(unsigned long)); + /* fall through */ + case 1: + dst[nlongs - 1] = BITMAP_LAST_WORD_MASK(nbits); + break; } - dst[nlongs - 1] = BITMAP_LAST_WORD_MASK(nbits); } static inline void bitmap_copy(unsigned long *dst, const unsigned long *src, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = *src; - else { - int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long); - memcpy(dst, src, len); - } + bitmap_switch(nbits,, + *dst = *src, + memcpy(dst, src, bitmap_bytes(nbits))); } static inline void bitmap_and(unsigned long *dst, const unsigned long *src1, const unsigned long *src2, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = *src1 & *src2; - else - __bitmap_and(dst, src1, src2, nbits); + bitmap_switch(nbits,, + *dst = *src1 & *src2, + __bitmap_and(dst, src1, src2, nbits)); } static inline void bitmap_or(unsigned long *dst, const unsigned long *src1, const unsigned long *src2, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = *src1 | *src2; - else - __bitmap_or(dst, src1, src2, nbits); + bitmap_switch(nbits,, + *dst = *src1 | *src2, + __bitmap_or(dst, src1, src2, nbits)); } static inline void bitmap_xor(unsigned long *dst, const unsigned long *src1, const unsigned long *src2, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = *src1 ^ *src2; - else - __bitmap_xor(dst, src1, src2, nbits); + bitmap_switch(nbits,, + *dst = *src1 ^ *src2, + __bitmap_xor(dst, src1, src2, nbits)); } static inline void bitmap_andnot(unsigned long *dst, const unsigned long *src1, const unsigned long *src2, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = *src1 & ~(*src2); - else - __bitmap_andnot(dst, src1, src2, nbits); + bitmap_switch(nbits,, + *dst = *src1 & ~*src2, + __bitmap_andnot(dst, src1, src2, nbits)); } static inline void bitmap_complement(unsigned long *dst, const unsigned long *src, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = ~(*src) & BITMAP_LAST_WORD_MASK(nbits); - else - __bitmap_complement(dst, src, nbits); + bitmap_switch(nbits,, + *dst = ~*src & BITMAP_LAST_WORD_MASK(nbits), + __bitmap_complement(dst, src, nbits)); } static inline int bitmap_equal(const unsigned long *src1, const unsigned long *src2, int nbits) { - if (nbits <= BITS_PER_LONG) - return ! ((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits)); - else - return __bitmap_equal(src1, src2, nbits); + bitmap_switch(nbits, -1, + return !((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits)), + return __bitmap_equal(src1, src2, nbits)); } static inline int bitmap_intersects(const unsigned long *src1, const unsigned long *src2, int nbits) { - if (nbits <= BITS_PER_LONG) - return ((*src1 & *src2) & BITMAP_LAST_WORD_MASK(nbits)) != 0; - else - return __bitmap_intersects(src1, src2, nbits); + bitmap_switch(nbits, -1, + return ((*src1 & *src2) & BITMAP_LAST_WORD_MASK(nbits)) != 0, + return __bitmap_intersects(src1, src2, nbits)); } static inline int bitmap_subset(const unsigned long *src1, const unsigned long *src2, int nbits) { - if (nbits <= BITS_PER_LONG) - return ! ((*src1 & ~(*src2)) & BITMAP_LAST_WORD_MASK(nbits)); - else - return __bitmap_subset(src1, src2, nbits); + bitmap_switch(nbits, -1, + return !((*src1 & ~*src2) & BITMAP_LAST_WORD_MASK(nbits)), + return __bitmap_subset(src1, src2, nbits)); } static inline int bitmap_empty(const unsigned long *src, int nbits) { - if (nbits <= BITS_PER_LONG) - return ! (*src & BITMAP_LAST_WORD_MASK(nbits)); - else - return __bitmap_empty(src, nbits); + bitmap_switch(nbits, -1, + return !(*src & BITMAP_LAST_WORD_MASK(nbits)), + return __bitmap_empty(src, nbits)); } static inline int bitmap_full(const unsigned long *src, int nbits) { - if (nbits <= BITS_PER_LONG) - return ! (~(*src) & BITMAP_LAST_WORD_MASK(nbits)); - else - return __bitmap_full(src, nbits); + bitmap_switch(nbits, -1, + return !(~*src & BITMAP_LAST_WORD_MASK(nbits)), + return __bitmap_full(src, nbits)); } static inline int bitmap_weight(const unsigned long *src, int nbits) @@ -235,21 +234,22 @@ static inline int bitmap_weight(const unsigned long *src, int nbits) static inline void bitmap_shift_right(unsigned long *dst, const unsigned long *src, int n, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = *src >> n; - else - __bitmap_shift_right(dst, src, n, nbits); + bitmap_switch(nbits,, + *dst = *src >> n, + __bitmap_shift_right(dst, src, n, nbits)); } static inline void bitmap_shift_left(unsigned long *dst, const unsigned long *src, int n, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = (*src << n) & BITMAP_LAST_WORD_MASK(nbits); - else - __bitmap_shift_left(dst, src, n, nbits); + bitmap_switch(nbits,, + *dst = (*src << n) & BITMAP_LAST_WORD_MASK(nbits), + __bitmap_shift_left(dst, src, n, nbits)); } +#undef bitmap_switch +#undef bitmap_bytes + void bitmap_long_to_byte(uint8_t *bp, const unsigned long *lp, int nbits); void bitmap_byte_to_long(unsigned long *lp, const uint8_t *bp, int nbits); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:44:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:44: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 1Uyj4z-00088a-8n; Mon, 15 Jul 2013 13:44:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4x-00088K-Db for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:39 +0000 Received: from [193.109.254.147:22572] by server-14.bemta-14.messagelabs.com id A1/7D-23280-6CCF3E15; Mon, 15 Jul 2013 13:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1373895876!322008!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26826 invoked from network); 15 Jul 2013 13:44:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj4u-0003QY-Bo for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj4u-0005TM-9B for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:36 +0000 Date: Mon, 15 Jul 2013 13:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] bitmap_*() should cope with zero size bitmaps X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d8a7694e5a415ac0a871f0ae58f50876ad30d619 Author: Jan Beulich AuthorDate: Thu Jul 4 10:26:24 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 4 10:26:24 2013 +0200 bitmap_*() should cope with zero size bitmaps ... to match expectations set by memset()/memcpy(). Similarly for find_{first,next}_{,zero_}_bit() on x86. __bitmap_shift_{left,right}() would also need fixing (they more generally can't cope with the shift count being larger than the bitmap size, and they perform undefined operations by possibly shifting an unsigned long value by BITS_PER_LONG bits), but since these functions aren't really used anywhere I wonder if we wouldn't better simply get rid of them. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/include/asm-x86/bitops.h | 54 ++++++++++++----- xen/include/xen/bitmap.h | 128 +++++++++++++++++++++--------------------- 2 files changed, 102 insertions(+), 80 deletions(-) diff --git a/xen/include/asm-x86/bitops.h b/xen/include/asm-x86/bitops.h index f5a84ef..ab21d92 100644 --- a/xen/include/asm-x86/bitops.h +++ b/xen/include/asm-x86/bitops.h @@ -327,10 +327,7 @@ static inline unsigned int __scanbit(unsigned long val, unsigned long max) * Returns the bit-number of the first set bit, not the number of the byte * containing a bit. */ -#define find_first_bit(addr,size) \ -((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ? \ - (__scanbit(*(const unsigned long *)addr, size)) : \ - __find_first_bit(addr,size))) +#define find_first_bit(addr, size) find_next_bit(addr, size, 0) /** * find_next_bit - find the first set bit in a memory region @@ -338,10 +335,24 @@ static inline unsigned int __scanbit(unsigned long val, unsigned long max) * @offset: The bitnumber to start searching at * @size: The maximum size to search */ -#define find_next_bit(addr,size,off) \ -((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ? \ - ((off) + (__scanbit((*(const unsigned long *)addr) >> (off), size))) : \ - __find_next_bit(addr,size,off))) +#define find_next_bit(addr, size, off) ({ \ + unsigned int r__ = (size); \ + unsigned int o__ = (off); \ + switch ( -!__builtin_constant_p(size) | r__ ) \ + { \ + case 0: (void)(addr); break; \ + case 1 ... BITS_PER_LONG: \ + r__ = o__ + __scanbit(*(const unsigned long *)(addr) >> o__, r__); \ + break; \ + default: \ + if ( __builtin_constant_p(off) && !o__ ) \ + r__ = __find_first_bit(addr, r__); \ + else \ + r__ = __find_next_bit(addr, r__, o__); \ + break; \ + } \ + r__; \ +}) /** * find_first_zero_bit - find the first zero bit in a memory region @@ -351,10 +362,7 @@ static inline unsigned int __scanbit(unsigned long val, unsigned long max) * Returns the bit-number of the first zero bit, not the number of the byte * containing a bit. */ -#define find_first_zero_bit(addr,size) \ -((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ? \ - (__scanbit(~*(const unsigned long *)addr, size)) : \ - __find_first_zero_bit(addr,size))) +#define find_first_zero_bit(addr, size) find_next_zero_bit(addr, size, 0) /** * find_next_zero_bit - find the first zero bit in a memory region @@ -362,10 +370,24 @@ static inline unsigned int __scanbit(unsigned long val, unsigned long max) * @offset: The bitnumber to start searching at * @size: The maximum size to search */ -#define find_next_zero_bit(addr,size,off) \ -((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ? \ - ((off)+(__scanbit(~(((*(const unsigned long *)addr)) >> (off)), size))) : \ - __find_next_zero_bit(addr,size,off))) +#define find_next_zero_bit(addr, size, off) ({ \ + unsigned int r__ = (size); \ + unsigned int o__ = (off); \ + switch ( -!__builtin_constant_p(size) | r__ ) \ + { \ + case 0: (void)(addr); break; \ + case 1 ... BITS_PER_LONG: \ + r__ = o__ + __scanbit(~*(const unsigned long *)(addr) >> o__, r__); \ + break; \ + default: \ + if ( __builtin_constant_p(off) && !o__ ) \ + r__ = __find_first_zero_bit(addr, r__); \ + else \ + r__ = __find_next_zero_bit(addr, r__, o__); \ + break; \ + } \ + r__; \ +}) /** * find_first_set_bit - find the first set bit in @word diff --git a/xen/include/xen/bitmap.h b/xen/include/xen/bitmap.h index 56fe602..b5ec455 100644 --- a/xen/include/xen/bitmap.h +++ b/xen/include/xen/bitmap.h @@ -108,123 +108,122 @@ extern int bitmap_allocate_region(unsigned long *bitmap, int pos, int order); (1UL<<((nbits) % BITS_PER_LONG))-1 : ~0UL \ ) +#define bitmap_bytes(nbits) (BITS_TO_LONGS(nbits) * sizeof(unsigned long)) + +#define bitmap_switch(nbits, zero_ret, small, large) \ + switch (-!__builtin_constant_p(nbits) | (nbits)) { \ + case 0: return zero_ret; \ + case 1 ... BITS_PER_LONG: \ + small; break; \ + default: \ + large; break; \ + } + static inline void bitmap_zero(unsigned long *dst, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = 0UL; - else { - int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long); - memset(dst, 0, len); - } + bitmap_switch(nbits,, + *dst = 0UL, + memset(dst, 0, bitmap_bytes(nbits))); } static inline void bitmap_fill(unsigned long *dst, int nbits) { size_t nlongs = BITS_TO_LONGS(nbits); - if (nlongs > 1) { - int len = (nlongs - 1) * sizeof(unsigned long); - memset(dst, 0xff, len); + + switch (nlongs) { + default: + memset(dst, -1, (nlongs - 1) * sizeof(unsigned long)); + /* fall through */ + case 1: + dst[nlongs - 1] = BITMAP_LAST_WORD_MASK(nbits); + break; } - dst[nlongs - 1] = BITMAP_LAST_WORD_MASK(nbits); } static inline void bitmap_copy(unsigned long *dst, const unsigned long *src, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = *src; - else { - int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long); - memcpy(dst, src, len); - } + bitmap_switch(nbits,, + *dst = *src, + memcpy(dst, src, bitmap_bytes(nbits))); } static inline void bitmap_and(unsigned long *dst, const unsigned long *src1, const unsigned long *src2, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = *src1 & *src2; - else - __bitmap_and(dst, src1, src2, nbits); + bitmap_switch(nbits,, + *dst = *src1 & *src2, + __bitmap_and(dst, src1, src2, nbits)); } static inline void bitmap_or(unsigned long *dst, const unsigned long *src1, const unsigned long *src2, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = *src1 | *src2; - else - __bitmap_or(dst, src1, src2, nbits); + bitmap_switch(nbits,, + *dst = *src1 | *src2, + __bitmap_or(dst, src1, src2, nbits)); } static inline void bitmap_xor(unsigned long *dst, const unsigned long *src1, const unsigned long *src2, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = *src1 ^ *src2; - else - __bitmap_xor(dst, src1, src2, nbits); + bitmap_switch(nbits,, + *dst = *src1 ^ *src2, + __bitmap_xor(dst, src1, src2, nbits)); } static inline void bitmap_andnot(unsigned long *dst, const unsigned long *src1, const unsigned long *src2, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = *src1 & ~(*src2); - else - __bitmap_andnot(dst, src1, src2, nbits); + bitmap_switch(nbits,, + *dst = *src1 & ~*src2, + __bitmap_andnot(dst, src1, src2, nbits)); } static inline void bitmap_complement(unsigned long *dst, const unsigned long *src, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = ~(*src) & BITMAP_LAST_WORD_MASK(nbits); - else - __bitmap_complement(dst, src, nbits); + bitmap_switch(nbits,, + *dst = ~*src & BITMAP_LAST_WORD_MASK(nbits), + __bitmap_complement(dst, src, nbits)); } static inline int bitmap_equal(const unsigned long *src1, const unsigned long *src2, int nbits) { - if (nbits <= BITS_PER_LONG) - return ! ((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits)); - else - return __bitmap_equal(src1, src2, nbits); + bitmap_switch(nbits, -1, + return !((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits)), + return __bitmap_equal(src1, src2, nbits)); } static inline int bitmap_intersects(const unsigned long *src1, const unsigned long *src2, int nbits) { - if (nbits <= BITS_PER_LONG) - return ((*src1 & *src2) & BITMAP_LAST_WORD_MASK(nbits)) != 0; - else - return __bitmap_intersects(src1, src2, nbits); + bitmap_switch(nbits, -1, + return ((*src1 & *src2) & BITMAP_LAST_WORD_MASK(nbits)) != 0, + return __bitmap_intersects(src1, src2, nbits)); } static inline int bitmap_subset(const unsigned long *src1, const unsigned long *src2, int nbits) { - if (nbits <= BITS_PER_LONG) - return ! ((*src1 & ~(*src2)) & BITMAP_LAST_WORD_MASK(nbits)); - else - return __bitmap_subset(src1, src2, nbits); + bitmap_switch(nbits, -1, + return !((*src1 & ~*src2) & BITMAP_LAST_WORD_MASK(nbits)), + return __bitmap_subset(src1, src2, nbits)); } static inline int bitmap_empty(const unsigned long *src, int nbits) { - if (nbits <= BITS_PER_LONG) - return ! (*src & BITMAP_LAST_WORD_MASK(nbits)); - else - return __bitmap_empty(src, nbits); + bitmap_switch(nbits, -1, + return !(*src & BITMAP_LAST_WORD_MASK(nbits)), + return __bitmap_empty(src, nbits)); } static inline int bitmap_full(const unsigned long *src, int nbits) { - if (nbits <= BITS_PER_LONG) - return ! (~(*src) & BITMAP_LAST_WORD_MASK(nbits)); - else - return __bitmap_full(src, nbits); + bitmap_switch(nbits, -1, + return !(~*src & BITMAP_LAST_WORD_MASK(nbits)), + return __bitmap_full(src, nbits)); } static inline int bitmap_weight(const unsigned long *src, int nbits) @@ -235,21 +234,22 @@ static inline int bitmap_weight(const unsigned long *src, int nbits) static inline void bitmap_shift_right(unsigned long *dst, const unsigned long *src, int n, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = *src >> n; - else - __bitmap_shift_right(dst, src, n, nbits); + bitmap_switch(nbits,, + *dst = *src >> n, + __bitmap_shift_right(dst, src, n, nbits)); } static inline void bitmap_shift_left(unsigned long *dst, const unsigned long *src, int n, int nbits) { - if (nbits <= BITS_PER_LONG) - *dst = (*src << n) & BITMAP_LAST_WORD_MASK(nbits); - else - __bitmap_shift_left(dst, src, n, nbits); + bitmap_switch(nbits,, + *dst = (*src << n) & BITMAP_LAST_WORD_MASK(nbits), + __bitmap_shift_left(dst, src, n, nbits)); } +#undef bitmap_switch +#undef bitmap_bytes + void bitmap_long_to_byte(uint8_t *bp, const unsigned long *lp, int nbits); void bitmap_byte_to_long(unsigned long *lp, const uint8_t *bp, int nbits); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:44:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:44:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj59-0008AY-E5; Mon, 15 Jul 2013 13:44:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj57-0008A9-R2 for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:50 +0000 Received: from [85.158.139.83:4395] by server-16.bemta-5.messagelabs.com id 7A/B5-31941-1DCF3E15; Mon, 15 Jul 2013 13:44:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-182.messagelabs.com!1373895887!20401933!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2847 invoked from network); 15 Jul 2013 13:44:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj54-0003Qe-HT for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj54-0005Tj-Em for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:46 +0000 Date: Mon, 15 Jul 2013 13:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: make map_domain_page_global() a simple wrapper around vmap() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b0581b9214d2359207f836f4f075e978527b9a7b Author: Jan Beulich AuthorDate: Thu Jul 4 10:27:39 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 4 10:27:39 2013 +0200 x86: make map_domain_page_global() a simple wrapper around vmap() This is in order to reduce the number of fundamental mapping mechanisms as well as to reduce the amount of code to be maintained. In the course of this the virtual space available to vmap() is being grown from 16Gb to 64Gb. Note that this requires callers of unmap_domain_page_global() to no longer pass misaligned pointers - map_domain_page_global() returns page size aligned pointers, so unmappinmg should be done accordingly. unmap_vcpu_info() violated this and is being adjusted here. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/domain_page.c | 59 +++-------------------------------------- xen/common/domain.c | 3 +- xen/include/asm-x86/config.h | 22 +++++---------- 3 files changed, 15 insertions(+), 69 deletions(-) diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 9297ea0..bc18263 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -310,18 +311,8 @@ int mapcache_vcpu_init(struct vcpu *v) return 0; } -#define GLOBALMAP_BITS (GLOBALMAP_GBYTES << (30 - PAGE_SHIFT)) -static unsigned long inuse[BITS_TO_LONGS(GLOBALMAP_BITS)]; -static unsigned long garbage[BITS_TO_LONGS(GLOBALMAP_BITS)]; -static unsigned int inuse_cursor; -static DEFINE_SPINLOCK(globalmap_lock); - void *map_domain_page_global(unsigned long mfn) { - l1_pgentry_t *pl1e; - unsigned int idx, i; - unsigned long va; - ASSERT(!in_irq() && local_irq_is_enabled()); #ifdef NDEBUG @@ -329,59 +320,19 @@ void *map_domain_page_global(unsigned long mfn) return mfn_to_virt(mfn); #endif - spin_lock(&globalmap_lock); - - idx = find_next_zero_bit(inuse, GLOBALMAP_BITS, inuse_cursor); - va = GLOBALMAP_VIRT_START + pfn_to_paddr(idx); - if ( unlikely(va >= GLOBALMAP_VIRT_END) ) - { - /* /First/, clean the garbage map and update the inuse list. */ - for ( i = 0; i < ARRAY_SIZE(garbage); i++ ) - inuse[i] &= ~xchg(&garbage[i], 0); - - /* /Second/, flush all TLBs to get rid of stale garbage mappings. */ - flush_tlb_all(); - - idx = find_first_zero_bit(inuse, GLOBALMAP_BITS); - va = GLOBALMAP_VIRT_START + pfn_to_paddr(idx); - if ( unlikely(va >= GLOBALMAP_VIRT_END) ) - { - spin_unlock(&globalmap_lock); - return NULL; - } - } - - set_bit(idx, inuse); - inuse_cursor = idx + 1; - - pl1e = virt_to_xen_l1e(va); - - spin_unlock(&globalmap_lock); - - if ( !pl1e ) - return NULL; - l1e_write(pl1e, l1e_from_pfn(mfn, __PAGE_HYPERVISOR)); - - return (void *)va; + return vmap(&mfn, 1); } void unmap_domain_page_global(const void *ptr) { unsigned long va = (unsigned long)ptr; - l1_pgentry_t *pl1e; if ( va >= DIRECTMAP_VIRT_START ) return; - ASSERT(va >= GLOBALMAP_VIRT_START && va < GLOBALMAP_VIRT_END); - - /* /First/, we zap the PTE. */ - pl1e = virt_to_xen_l1e(va); - BUG_ON(!pl1e); - l1e_write(pl1e, l1e_empty()); + ASSERT(va >= VMAP_VIRT_START && va < VMAP_VIRT_END); - /* /Second/, we add to the garbage map. */ - set_bit(PFN_DOWN(va - GLOBALMAP_VIRT_START), garbage); + vunmap(ptr); } /* Translate a map-domain-page'd address to the underlying MFN */ @@ -393,7 +344,7 @@ unsigned long domain_page_map_to_mfn(const void *ptr) if ( va >= DIRECTMAP_VIRT_START ) return virt_to_mfn(ptr); - if ( va >= GLOBALMAP_VIRT_START && va < GLOBALMAP_VIRT_END ) + if ( va >= VMAP_VIRT_START && va < VMAP_VIRT_END ) { pl1e = virt_to_xen_l1e(va); BUG_ON(!pl1e); diff --git a/xen/common/domain.c b/xen/common/domain.c index fac3470..5b04172 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -958,7 +958,8 @@ void unmap_vcpu_info(struct vcpu *v) return; mfn = v->vcpu_info_mfn; - unmap_domain_page_global(v->vcpu_info); + unmap_domain_page_global((void *) + ((unsigned long)v->vcpu_info & PAGE_MASK)); v->vcpu_info = &dummy_vcpu_info; v->vcpu_info_mfn = INVALID_MFN; diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index bd8f61c..0044edb 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -146,17 +146,15 @@ extern unsigned char boot_edid_info[128]; * Per-domain mappings (e.g., GDT, LDT). * 0xffff828000000000 - 0xffff82bfffffffff [256GB, 2^38 bytes, PML4:261] * Machine-to-phys translation table. - * 0xffff82c000000000 - 0xffff82c3ffffffff [16GB, 2^34 bytes, PML4:261] + * 0xffff82c000000000 - 0xffff82cfffffffff [64GB, 2^36 bytes, PML4:261] * vmap()/ioremap()/fixmap area. - * 0xffff82c400000000 - 0xffff82c43fffffff [1GB, 2^30 bytes, PML4:261] - * Global domain page map area. - * 0xffff82c440000000 - 0xffff82c47fffffff [1GB, 2^30 bytes, PML4:261] + * 0xffff82d000000000 - 0xffff82d03fffffff [1GB, 2^30 bytes, PML4:261] * Compatibility machine-to-phys translation table. - * 0xffff82c480000000 - 0xffff82c4bfffffff [1GB, 2^30 bytes, PML4:261] + * 0xffff82d040000000 - 0xffff82d07fffffff [1GB, 2^30 bytes, PML4:261] * High read-only compatibility machine-to-phys translation table. - * 0xffff82c4c0000000 - 0xffff82c4ffffffff [1GB, 2^30 bytes, PML4:261] + * 0xffff82d080000000 - 0xffff82d0bfffffff [1GB, 2^30 bytes, PML4:261] * Xen text, static data, bss. - * 0xffff82c500000000 - 0xffff82dffbffffff [108GB - 64MB, PML4:261] + * 0xffff82d0c0000000 - 0xffff82dffbffffff [61GB - 64MB, PML4:261] * Reserved for future use. * 0xffff82dffc000000 - 0xffff82dfffffffff [64MB, 2^26 bytes, PML4:261] * Super-page information array. @@ -220,15 +218,11 @@ extern unsigned char boot_edid_info[128]; /* Slot 261: machine-to-phys conversion table (256GB). */ #define RDWR_MPT_VIRT_START (PML4_ADDR(261)) #define RDWR_MPT_VIRT_END (RDWR_MPT_VIRT_START + MPT_VIRT_SIZE) -/* Slot 261: vmap()/ioremap()/fixmap area (16GB). */ +/* Slot 261: vmap()/ioremap()/fixmap area (64GB). */ #define VMAP_VIRT_START RDWR_MPT_VIRT_END -#define VMAP_VIRT_END (VMAP_VIRT_START + GB(16)) -/* Slot 261: global domain page map area (1GB). */ -#define GLOBALMAP_GBYTES 1 -#define GLOBALMAP_VIRT_START VMAP_VIRT_END -#define GLOBALMAP_VIRT_END (GLOBALMAP_VIRT_START + (GLOBALMAP_GBYTES<<30)) +#define VMAP_VIRT_END (VMAP_VIRT_START + GB(64)) /* Slot 261: compatibility machine-to-phys conversion table (1GB). */ -#define RDWR_COMPAT_MPT_VIRT_START GLOBALMAP_VIRT_END +#define RDWR_COMPAT_MPT_VIRT_START VMAP_VIRT_END #define RDWR_COMPAT_MPT_VIRT_END (RDWR_COMPAT_MPT_VIRT_START + GB(1)) /* Slot 261: high read-only compat machine-to-phys conversion table (1GB). */ #define HIRO_COMPAT_MPT_VIRT_START RDWR_COMPAT_MPT_VIRT_END -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 15 13:44:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:44:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj59-0008AY-E5; Mon, 15 Jul 2013 13:44:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj57-0008A9-R2 for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:50 +0000 Received: from [85.158.139.83:4395] by server-16.bemta-5.messagelabs.com id 7A/B5-31941-1DCF3E15; Mon, 15 Jul 2013 13:44:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-182.messagelabs.com!1373895887!20401933!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2847 invoked from network); 15 Jul 2013 13:44:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj54-0003Qe-HT for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj54-0005Tj-Em for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:46 +0000 Date: Mon, 15 Jul 2013 13:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: make map_domain_page_global() a simple wrapper around vmap() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b0581b9214d2359207f836f4f075e978527b9a7b Author: Jan Beulich AuthorDate: Thu Jul 4 10:27:39 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 4 10:27:39 2013 +0200 x86: make map_domain_page_global() a simple wrapper around vmap() This is in order to reduce the number of fundamental mapping mechanisms as well as to reduce the amount of code to be maintained. In the course of this the virtual space available to vmap() is being grown from 16Gb to 64Gb. Note that this requires callers of unmap_domain_page_global() to no longer pass misaligned pointers - map_domain_page_global() returns page size aligned pointers, so unmappinmg should be done accordingly. unmap_vcpu_info() violated this and is being adjusted here. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/domain_page.c | 59 +++-------------------------------------- xen/common/domain.c | 3 +- xen/include/asm-x86/config.h | 22 +++++---------- 3 files changed, 15 insertions(+), 69 deletions(-) diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 9297ea0..bc18263 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -310,18 +311,8 @@ int mapcache_vcpu_init(struct vcpu *v) return 0; } -#define GLOBALMAP_BITS (GLOBALMAP_GBYTES << (30 - PAGE_SHIFT)) -static unsigned long inuse[BITS_TO_LONGS(GLOBALMAP_BITS)]; -static unsigned long garbage[BITS_TO_LONGS(GLOBALMAP_BITS)]; -static unsigned int inuse_cursor; -static DEFINE_SPINLOCK(globalmap_lock); - void *map_domain_page_global(unsigned long mfn) { - l1_pgentry_t *pl1e; - unsigned int idx, i; - unsigned long va; - ASSERT(!in_irq() && local_irq_is_enabled()); #ifdef NDEBUG @@ -329,59 +320,19 @@ void *map_domain_page_global(unsigned long mfn) return mfn_to_virt(mfn); #endif - spin_lock(&globalmap_lock); - - idx = find_next_zero_bit(inuse, GLOBALMAP_BITS, inuse_cursor); - va = GLOBALMAP_VIRT_START + pfn_to_paddr(idx); - if ( unlikely(va >= GLOBALMAP_VIRT_END) ) - { - /* /First/, clean the garbage map and update the inuse list. */ - for ( i = 0; i < ARRAY_SIZE(garbage); i++ ) - inuse[i] &= ~xchg(&garbage[i], 0); - - /* /Second/, flush all TLBs to get rid of stale garbage mappings. */ - flush_tlb_all(); - - idx = find_first_zero_bit(inuse, GLOBALMAP_BITS); - va = GLOBALMAP_VIRT_START + pfn_to_paddr(idx); - if ( unlikely(va >= GLOBALMAP_VIRT_END) ) - { - spin_unlock(&globalmap_lock); - return NULL; - } - } - - set_bit(idx, inuse); - inuse_cursor = idx + 1; - - pl1e = virt_to_xen_l1e(va); - - spin_unlock(&globalmap_lock); - - if ( !pl1e ) - return NULL; - l1e_write(pl1e, l1e_from_pfn(mfn, __PAGE_HYPERVISOR)); - - return (void *)va; + return vmap(&mfn, 1); } void unmap_domain_page_global(const void *ptr) { unsigned long va = (unsigned long)ptr; - l1_pgentry_t *pl1e; if ( va >= DIRECTMAP_VIRT_START ) return; - ASSERT(va >= GLOBALMAP_VIRT_START && va < GLOBALMAP_VIRT_END); - - /* /First/, we zap the PTE. */ - pl1e = virt_to_xen_l1e(va); - BUG_ON(!pl1e); - l1e_write(pl1e, l1e_empty()); + ASSERT(va >= VMAP_VIRT_START && va < VMAP_VIRT_END); - /* /Second/, we add to the garbage map. */ - set_bit(PFN_DOWN(va - GLOBALMAP_VIRT_START), garbage); + vunmap(ptr); } /* Translate a map-domain-page'd address to the underlying MFN */ @@ -393,7 +344,7 @@ unsigned long domain_page_map_to_mfn(const void *ptr) if ( va >= DIRECTMAP_VIRT_START ) return virt_to_mfn(ptr); - if ( va >= GLOBALMAP_VIRT_START && va < GLOBALMAP_VIRT_END ) + if ( va >= VMAP_VIRT_START && va < VMAP_VIRT_END ) { pl1e = virt_to_xen_l1e(va); BUG_ON(!pl1e); diff --git a/xen/common/domain.c b/xen/common/domain.c index fac3470..5b04172 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -958,7 +958,8 @@ void unmap_vcpu_info(struct vcpu *v) return; mfn = v->vcpu_info_mfn; - unmap_domain_page_global(v->vcpu_info); + unmap_domain_page_global((void *) + ((unsigned long)v->vcpu_info & PAGE_MASK)); v->vcpu_info = &dummy_vcpu_info; v->vcpu_info_mfn = INVALID_MFN; diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index bd8f61c..0044edb 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -146,17 +146,15 @@ extern unsigned char boot_edid_info[128]; * Per-domain mappings (e.g., GDT, LDT). * 0xffff828000000000 - 0xffff82bfffffffff [256GB, 2^38 bytes, PML4:261] * Machine-to-phys translation table. - * 0xffff82c000000000 - 0xffff82c3ffffffff [16GB, 2^34 bytes, PML4:261] + * 0xffff82c000000000 - 0xffff82cfffffffff [64GB, 2^36 bytes, PML4:261] * vmap()/ioremap()/fixmap area. - * 0xffff82c400000000 - 0xffff82c43fffffff [1GB, 2^30 bytes, PML4:261] - * Global domain page map area. - * 0xffff82c440000000 - 0xffff82c47fffffff [1GB, 2^30 bytes, PML4:261] + * 0xffff82d000000000 - 0xffff82d03fffffff [1GB, 2^30 bytes, PML4:261] * Compatibility machine-to-phys translation table. - * 0xffff82c480000000 - 0xffff82c4bfffffff [1GB, 2^30 bytes, PML4:261] + * 0xffff82d040000000 - 0xffff82d07fffffff [1GB, 2^30 bytes, PML4:261] * High read-only compatibility machine-to-phys translation table. - * 0xffff82c4c0000000 - 0xffff82c4ffffffff [1GB, 2^30 bytes, PML4:261] + * 0xffff82d080000000 - 0xffff82d0bfffffff [1GB, 2^30 bytes, PML4:261] * Xen text, static data, bss. - * 0xffff82c500000000 - 0xffff82dffbffffff [108GB - 64MB, PML4:261] + * 0xffff82d0c0000000 - 0xffff82dffbffffff [61GB - 64MB, PML4:261] * Reserved for future use. * 0xffff82dffc000000 - 0xffff82dfffffffff [64MB, 2^26 bytes, PML4:261] * Super-page information array. @@ -220,15 +218,11 @@ extern unsigned char boot_edid_info[128]; /* Slot 261: machine-to-phys conversion table (256GB). */ #define RDWR_MPT_VIRT_START (PML4_ADDR(261)) #define RDWR_MPT_VIRT_END (RDWR_MPT_VIRT_START + MPT_VIRT_SIZE) -/* Slot 261: vmap()/ioremap()/fixmap area (16GB). */ +/* Slot 261: vmap()/ioremap()/fixmap area (64GB). */ #define VMAP_VIRT_START RDWR_MPT_VIRT_END -#define VMAP_VIRT_END (VMAP_VIRT_START + GB(16)) -/* Slot 261: global domain page map area (1GB). */ -#define GLOBALMAP_GBYTES 1 -#define GLOBALMAP_VIRT_START VMAP_VIRT_END -#define GLOBALMAP_VIRT_END (GLOBALMAP_VIRT_START + (GLOBALMAP_GBYTES<<30)) +#define VMAP_VIRT_END (VMAP_VIRT_START + GB(64)) /* Slot 261: compatibility machine-to-phys conversion table (1GB). */ -#define RDWR_COMPAT_MPT_VIRT_START GLOBALMAP_VIRT_END +#define RDWR_COMPAT_MPT_VIRT_START VMAP_VIRT_END #define RDWR_COMPAT_MPT_VIRT_END (RDWR_COMPAT_MPT_VIRT_START + GB(1)) /* Slot 261: high read-only compat machine-to-phys conversion table (1GB). */ #define HIRO_COMPAT_MPT_VIRT_START RDWR_COMPAT_MPT_VIRT_END -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 15 13:45:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:45: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 1Uyj5K-0008CX-N4; Mon, 15 Jul 2013 13:45:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5I-0008C7-5p for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:00 +0000 Received: from [85.158.138.51:22606] by server-3.bemta-3.messagelabs.com id 07/B1-08372-BDCF3E15; Mon, 15 Jul 2013 13:44:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-174.messagelabs.com!1373895897!27770586!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6780 invoked from network); 15 Jul 2013 13:44:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:44:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5E-0003Qq-Nq for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj5E-0005UE-LZ for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:56 +0000 Date: Mon, 15 Jul 2013 13:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] use SMP barrier in common code dealing with shared memory protocols X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b12649ce9e7a162dae386d32bd04c5fdc537d65c Author: Ian Campbell AuthorDate: Thu Jul 4 10:32:44 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 4 10:32:44 2013 +0200 use SMP barrier in common code dealing with shared memory protocols Xen currently makes no strong distinction between the SMP barriers (smp_mb etc) and the regular barrier (mb etc). In Linux, where we inherited these names from having imported Linux code which uses them, the SMP barriers are intended to be sufficient for implementing shared-memory protocols between processors in an SMP system while the standard barriers are useful for MMIO etc. On x86 with the stronger ordering model there is not much practical difference here but ARM has weaker barriers available which are suitable for use as SMP barriers. Therefore ensure that common code uses the SMP barriers when that is all which is required. On both ARM and x86 both types of barrier are currently identical so there is no actual change. A future patch will change smp_mb to a weaker barrier on ARM. Signed-off-by: Ian Campbell Acked-by: Keir Fraser --- xen/common/domain.c | 2 +- xen/common/domctl.c | 2 +- xen/common/grant_table.c | 4 ++-- xen/common/page_alloc.c | 2 +- xen/common/smp.c | 4 ++-- xen/common/spinlock.c | 6 +++--- xen/common/tmem_xen.c | 10 +++++----- xen/common/trace.c | 8 ++++---- xen/drivers/char/console.c | 2 +- xen/include/xen/event.h | 4 ++-- xen/xsm/flask/ss/sidtab.c | 4 ++-- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 5b04172..6c264a5 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -932,7 +932,7 @@ int map_vcpu_info(struct vcpu *v, unsigned long gfn, unsigned offset) v->vcpu_info_mfn = page_to_mfn(page); /* Set new vcpu_info pointer /before/ setting pending flags. */ - wmb(); + smp_wmb(); /* * Mark everything as being pending just to make sure nothing gets diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 9bd8f80..c653efb 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -533,7 +533,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) /* Install vcpu array /then/ update max_vcpus. */ d->vcpu = vcpus; - wmb(); + smp_wmb(); d->max_vcpus = max; } diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 3f97328..eb50288 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -426,7 +426,7 @@ static int _set_status_v2(domid_t domid, /* Make sure guest sees status update before checking if flags are still valid */ - mb(); + smp_mb(); scombo.word = *(u32 *)shah; barrier(); @@ -1670,7 +1670,7 @@ gnttab_transfer( guest_physmap_add_page(e, sha->full_page.frame, mfn, 0); sha->full_page.frame = mfn; } - wmb(); + smp_wmb(); shared_entry_header(e->grant_table, gop.ref)->flags |= GTF_transfer_completed; diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 2162ef1..25a7d3d 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1472,7 +1472,7 @@ int assign_pages( ASSERT(page_get_owner(&pg[i]) == NULL); ASSERT((pg[i].count_info & ~(PGC_allocated | 1)) == 0); page_set_owner(&pg[i], d); - wmb(); /* Domain pointer must be visible before updating refcnt. */ + smp_wmb(); /* Domain pointer must be visible before updating refcnt. */ pg[i].count_info = PGC_allocated | 1; page_list_add_tail(&pg[i], &d->page_list); } diff --git a/xen/common/smp.c b/xen/common/smp.c index b2b056b..482a203 100644 --- a/xen/common/smp.c +++ b/xen/common/smp.c @@ -89,12 +89,12 @@ void smp_call_function_interrupt(void) if ( call_data.wait ) { (*func)(info); - mb(); + smp_mb(); cpumask_clear_cpu(cpu, &call_data.selected); } else { - mb(); + smp_mb(); cpumask_clear_cpu(cpu, &call_data.selected); (*func)(info); } diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index bfb9670..575cc6d 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -218,7 +218,7 @@ void _spin_barrier(spinlock_t *lock) u64 loop = 0; check_barrier(&lock->debug); - do { mb(); loop++;} while ( _raw_spin_is_locked(&lock->raw) ); + do { smp_mb(); loop++;} while ( _raw_spin_is_locked(&lock->raw) ); if ((loop > 1) && lock->profile) { lock->profile->time_block += NOW() - block; @@ -226,9 +226,9 @@ void _spin_barrier(spinlock_t *lock) } #else check_barrier(&lock->debug); - do { mb(); } while ( _raw_spin_is_locked(&lock->raw) ); + do { smp_mb(); } while ( _raw_spin_is_locked(&lock->raw) ); #endif - mb(); + smp_mb(); } int _spin_trylock_recursive(spinlock_t *lock) diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index 736a8c3..54ec09f 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -173,7 +173,7 @@ EXPORT int tmh_copy_from_client(pfp_t *pfp, return -EFAULT; } } - mb(); + smp_mb(); if ( len == PAGE_SIZE && !tmem_offset && !pfn_offset && cli_va ) tmh_copy_page(tmem_va, cli_va); else if ( (tmem_offset+len <= PAGE_SIZE) && @@ -216,7 +216,7 @@ EXPORT int tmh_compress_from_client(tmem_cli_mfn_t cmfn, return 0; else if ( copy_from_guest(scratch, clibuf, PAGE_SIZE) ) return -EFAULT; - mb(); + smp_mb(); ret = lzo1x_1_compress(cli_va ?: scratch, PAGE_SIZE, dmem, out_len, wmem); ASSERT(ret == LZO_E_OK); *out_va = dmem; @@ -260,7 +260,7 @@ EXPORT int tmh_copy_to_client(tmem_cli_mfn_t cmfn, pfp_t *pfp, unmap_domain_page(tmem_va); if ( cli_va ) cli_put_page(cli_va, cli_pfp, cli_mfn, 1); - mb(); + smp_mb(); return rc; } @@ -289,7 +289,7 @@ EXPORT int tmh_decompress_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, cli_put_page(cli_va, cli_pfp, cli_mfn, 1); else if ( copy_to_guest(clibuf, scratch, PAGE_SIZE) ) return -EFAULT; - mb(); + smp_mb(); return 1; } @@ -311,7 +311,7 @@ EXPORT int tmh_copy_tze_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, if ( len < PAGE_SIZE ) memset((char *)cli_va+len,0,PAGE_SIZE-len); cli_put_page(cli_va, cli_pfp, cli_mfn, 1); - mb(); + smp_mb(); return 1; } diff --git a/xen/common/trace.c b/xen/common/trace.c index fd4ac48..63ea0b7 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -255,7 +255,7 @@ static int alloc_trace_bufs(unsigned int pages) opt_tbuf_size = pages; printk("xentrace: initialised\n"); - wmb(); /* above must be visible before tb_init_done flag set */ + smp_wmb(); /* above must be visible before tb_init_done flag set */ tb_init_done = 1; return 0; @@ -414,7 +414,7 @@ int tb_control(xen_sysctl_tbuf_op_t *tbc) int i; tb_init_done = 0; - wmb(); + smp_wmb(); /* Clear any lost-record info so we don't get phantom lost records next time we * start tracing. Grab the lock to make sure we're not racing anyone. After this * hypercall returns, no more records should be placed into the buffers. */ @@ -607,7 +607,7 @@ static inline void __insert_record(struct t_buf *buf, memcpy(next_page, (char *)rec + remaining, rec_size - remaining); } - wmb(); + smp_wmb(); next += rec_size; if ( next >= 2*data_size ) @@ -718,7 +718,7 @@ void __trace_var(u32 event, bool_t cycles, unsigned int extra, return; /* Read tb_init_done /before/ t_bufs. */ - rmb(); + smp_rmb(); spin_lock_irqsave(&this_cpu(t_lock), flags); diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 7cd7bf6..b696b3e 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -648,7 +648,7 @@ void __init console_init_postirq(void) for ( i = conringc ; i != conringp; i++ ) ring[i & (opt_conring_size - 1)] = conring[i & (conring_size - 1)]; conring = ring; - wmb(); /* Allow users of console_force_unlock() to see larger buffer. */ + smp_wmb(); /* Allow users of console_force_unlock() to see larger buffer. */ conring_size = opt_conring_size; spin_unlock_irq(&console_lock); diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 4ac39ad..6f60162 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -85,7 +85,7 @@ void notify_via_xen_event_channel(struct domain *ld, int lport); if ( condition ) \ break; \ set_bit(_VPF_blocked_in_xen, ¤t->pause_flags); \ - mb(); /* set blocked status /then/ re-evaluate condition */ \ + smp_mb(); /* set blocked status /then/ re-evaluate condition */ \ if ( condition ) \ { \ clear_bit(_VPF_blocked_in_xen, ¤t->pause_flags); \ @@ -99,7 +99,7 @@ void notify_via_xen_event_channel(struct domain *ld, int lport); do { \ set_bit(_VPF_blocked_in_xen, ¤t->pause_flags); \ raise_softirq(SCHEDULE_SOFTIRQ); \ - mb(); /* set blocked status /then/ caller does his work */ \ + smp_mb(); /* set blocked status /then/ caller does his work */ \ } while ( 0 ) #endif /* __XEN_EVENT_H__ */ diff --git a/xen/xsm/flask/ss/sidtab.c b/xen/xsm/flask/ss/sidtab.c index 586033c..cd1360c 100644 --- a/xen/xsm/flask/ss/sidtab.c +++ b/xen/xsm/flask/ss/sidtab.c @@ -79,13 +79,13 @@ int sidtab_insert(struct sidtab *s, u32 sid, struct context *context) if ( prev ) { newnode->next = prev->next; - wmb(); + smp_wmb(); prev->next = newnode; } else { newnode->next = s->htable[hvalue]; - wmb(); + smp_wmb(); s->htable[hvalue] = newnode; } -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:45:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:45: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 1Uyj5K-0008CX-N4; Mon, 15 Jul 2013 13:45:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5I-0008C7-5p for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:00 +0000 Received: from [85.158.138.51:22606] by server-3.bemta-3.messagelabs.com id 07/B1-08372-BDCF3E15; Mon, 15 Jul 2013 13:44:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-174.messagelabs.com!1373895897!27770586!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6780 invoked from network); 15 Jul 2013 13:44:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:44:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5E-0003Qq-Nq for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj5E-0005UE-LZ for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:44:56 +0000 Date: Mon, 15 Jul 2013 13:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] use SMP barrier in common code dealing with shared memory protocols X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b12649ce9e7a162dae386d32bd04c5fdc537d65c Author: Ian Campbell AuthorDate: Thu Jul 4 10:32:44 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 4 10:32:44 2013 +0200 use SMP barrier in common code dealing with shared memory protocols Xen currently makes no strong distinction between the SMP barriers (smp_mb etc) and the regular barrier (mb etc). In Linux, where we inherited these names from having imported Linux code which uses them, the SMP barriers are intended to be sufficient for implementing shared-memory protocols between processors in an SMP system while the standard barriers are useful for MMIO etc. On x86 with the stronger ordering model there is not much practical difference here but ARM has weaker barriers available which are suitable for use as SMP barriers. Therefore ensure that common code uses the SMP barriers when that is all which is required. On both ARM and x86 both types of barrier are currently identical so there is no actual change. A future patch will change smp_mb to a weaker barrier on ARM. Signed-off-by: Ian Campbell Acked-by: Keir Fraser --- xen/common/domain.c | 2 +- xen/common/domctl.c | 2 +- xen/common/grant_table.c | 4 ++-- xen/common/page_alloc.c | 2 +- xen/common/smp.c | 4 ++-- xen/common/spinlock.c | 6 +++--- xen/common/tmem_xen.c | 10 +++++----- xen/common/trace.c | 8 ++++---- xen/drivers/char/console.c | 2 +- xen/include/xen/event.h | 4 ++-- xen/xsm/flask/ss/sidtab.c | 4 ++-- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 5b04172..6c264a5 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -932,7 +932,7 @@ int map_vcpu_info(struct vcpu *v, unsigned long gfn, unsigned offset) v->vcpu_info_mfn = page_to_mfn(page); /* Set new vcpu_info pointer /before/ setting pending flags. */ - wmb(); + smp_wmb(); /* * Mark everything as being pending just to make sure nothing gets diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 9bd8f80..c653efb 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -533,7 +533,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) /* Install vcpu array /then/ update max_vcpus. */ d->vcpu = vcpus; - wmb(); + smp_wmb(); d->max_vcpus = max; } diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 3f97328..eb50288 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -426,7 +426,7 @@ static int _set_status_v2(domid_t domid, /* Make sure guest sees status update before checking if flags are still valid */ - mb(); + smp_mb(); scombo.word = *(u32 *)shah; barrier(); @@ -1670,7 +1670,7 @@ gnttab_transfer( guest_physmap_add_page(e, sha->full_page.frame, mfn, 0); sha->full_page.frame = mfn; } - wmb(); + smp_wmb(); shared_entry_header(e->grant_table, gop.ref)->flags |= GTF_transfer_completed; diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 2162ef1..25a7d3d 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1472,7 +1472,7 @@ int assign_pages( ASSERT(page_get_owner(&pg[i]) == NULL); ASSERT((pg[i].count_info & ~(PGC_allocated | 1)) == 0); page_set_owner(&pg[i], d); - wmb(); /* Domain pointer must be visible before updating refcnt. */ + smp_wmb(); /* Domain pointer must be visible before updating refcnt. */ pg[i].count_info = PGC_allocated | 1; page_list_add_tail(&pg[i], &d->page_list); } diff --git a/xen/common/smp.c b/xen/common/smp.c index b2b056b..482a203 100644 --- a/xen/common/smp.c +++ b/xen/common/smp.c @@ -89,12 +89,12 @@ void smp_call_function_interrupt(void) if ( call_data.wait ) { (*func)(info); - mb(); + smp_mb(); cpumask_clear_cpu(cpu, &call_data.selected); } else { - mb(); + smp_mb(); cpumask_clear_cpu(cpu, &call_data.selected); (*func)(info); } diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index bfb9670..575cc6d 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -218,7 +218,7 @@ void _spin_barrier(spinlock_t *lock) u64 loop = 0; check_barrier(&lock->debug); - do { mb(); loop++;} while ( _raw_spin_is_locked(&lock->raw) ); + do { smp_mb(); loop++;} while ( _raw_spin_is_locked(&lock->raw) ); if ((loop > 1) && lock->profile) { lock->profile->time_block += NOW() - block; @@ -226,9 +226,9 @@ void _spin_barrier(spinlock_t *lock) } #else check_barrier(&lock->debug); - do { mb(); } while ( _raw_spin_is_locked(&lock->raw) ); + do { smp_mb(); } while ( _raw_spin_is_locked(&lock->raw) ); #endif - mb(); + smp_mb(); } int _spin_trylock_recursive(spinlock_t *lock) diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index 736a8c3..54ec09f 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -173,7 +173,7 @@ EXPORT int tmh_copy_from_client(pfp_t *pfp, return -EFAULT; } } - mb(); + smp_mb(); if ( len == PAGE_SIZE && !tmem_offset && !pfn_offset && cli_va ) tmh_copy_page(tmem_va, cli_va); else if ( (tmem_offset+len <= PAGE_SIZE) && @@ -216,7 +216,7 @@ EXPORT int tmh_compress_from_client(tmem_cli_mfn_t cmfn, return 0; else if ( copy_from_guest(scratch, clibuf, PAGE_SIZE) ) return -EFAULT; - mb(); + smp_mb(); ret = lzo1x_1_compress(cli_va ?: scratch, PAGE_SIZE, dmem, out_len, wmem); ASSERT(ret == LZO_E_OK); *out_va = dmem; @@ -260,7 +260,7 @@ EXPORT int tmh_copy_to_client(tmem_cli_mfn_t cmfn, pfp_t *pfp, unmap_domain_page(tmem_va); if ( cli_va ) cli_put_page(cli_va, cli_pfp, cli_mfn, 1); - mb(); + smp_mb(); return rc; } @@ -289,7 +289,7 @@ EXPORT int tmh_decompress_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, cli_put_page(cli_va, cli_pfp, cli_mfn, 1); else if ( copy_to_guest(clibuf, scratch, PAGE_SIZE) ) return -EFAULT; - mb(); + smp_mb(); return 1; } @@ -311,7 +311,7 @@ EXPORT int tmh_copy_tze_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, if ( len < PAGE_SIZE ) memset((char *)cli_va+len,0,PAGE_SIZE-len); cli_put_page(cli_va, cli_pfp, cli_mfn, 1); - mb(); + smp_mb(); return 1; } diff --git a/xen/common/trace.c b/xen/common/trace.c index fd4ac48..63ea0b7 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -255,7 +255,7 @@ static int alloc_trace_bufs(unsigned int pages) opt_tbuf_size = pages; printk("xentrace: initialised\n"); - wmb(); /* above must be visible before tb_init_done flag set */ + smp_wmb(); /* above must be visible before tb_init_done flag set */ tb_init_done = 1; return 0; @@ -414,7 +414,7 @@ int tb_control(xen_sysctl_tbuf_op_t *tbc) int i; tb_init_done = 0; - wmb(); + smp_wmb(); /* Clear any lost-record info so we don't get phantom lost records next time we * start tracing. Grab the lock to make sure we're not racing anyone. After this * hypercall returns, no more records should be placed into the buffers. */ @@ -607,7 +607,7 @@ static inline void __insert_record(struct t_buf *buf, memcpy(next_page, (char *)rec + remaining, rec_size - remaining); } - wmb(); + smp_wmb(); next += rec_size; if ( next >= 2*data_size ) @@ -718,7 +718,7 @@ void __trace_var(u32 event, bool_t cycles, unsigned int extra, return; /* Read tb_init_done /before/ t_bufs. */ - rmb(); + smp_rmb(); spin_lock_irqsave(&this_cpu(t_lock), flags); diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 7cd7bf6..b696b3e 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -648,7 +648,7 @@ void __init console_init_postirq(void) for ( i = conringc ; i != conringp; i++ ) ring[i & (opt_conring_size - 1)] = conring[i & (conring_size - 1)]; conring = ring; - wmb(); /* Allow users of console_force_unlock() to see larger buffer. */ + smp_wmb(); /* Allow users of console_force_unlock() to see larger buffer. */ conring_size = opt_conring_size; spin_unlock_irq(&console_lock); diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 4ac39ad..6f60162 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -85,7 +85,7 @@ void notify_via_xen_event_channel(struct domain *ld, int lport); if ( condition ) \ break; \ set_bit(_VPF_blocked_in_xen, ¤t->pause_flags); \ - mb(); /* set blocked status /then/ re-evaluate condition */ \ + smp_mb(); /* set blocked status /then/ re-evaluate condition */ \ if ( condition ) \ { \ clear_bit(_VPF_blocked_in_xen, ¤t->pause_flags); \ @@ -99,7 +99,7 @@ void notify_via_xen_event_channel(struct domain *ld, int lport); do { \ set_bit(_VPF_blocked_in_xen, ¤t->pause_flags); \ raise_softirq(SCHEDULE_SOFTIRQ); \ - mb(); /* set blocked status /then/ caller does his work */ \ + smp_mb(); /* set blocked status /then/ caller does his work */ \ } while ( 0 ) #endif /* __XEN_EVENT_H__ */ diff --git a/xen/xsm/flask/ss/sidtab.c b/xen/xsm/flask/ss/sidtab.c index 586033c..cd1360c 100644 --- a/xen/xsm/flask/ss/sidtab.c +++ b/xen/xsm/flask/ss/sidtab.c @@ -79,13 +79,13 @@ int sidtab_insert(struct sidtab *s, u32 sid, struct context *context) if ( prev ) { newnode->next = prev->next; - wmb(); + smp_wmb(); prev->next = newnode; } else { newnode->next = s->htable[hvalue]; - wmb(); + smp_wmb(); s->htable[hvalue] = newnode; } -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:45:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:45: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 1Uyj5V-0008EP-SL; Mon, 15 Jul 2013 13:45:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5U-0008E8-Dr for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:12 +0000 Received: from [85.158.143.35:64978] by server-1.bemta-4.messagelabs.com id 3C/CB-28540-7ECF3E15; Mon, 15 Jul 2013 13:45:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1373895908!265475!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28948 invoked from network); 15 Jul 2013 13:45:09 -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; 15 Jul 2013 13:45:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5Q-0003Ro-Eb for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj5O-0005Ut-SI for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:07 +0000 Date: Mon, 15 Jul 2013 13:45:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: Ensure useful progress in alloc_l2_table() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d3a55d7d9bb518efe08143d050deff9f4ee80ec1 Author: Andrew Cooper AuthorDate: Thu Jul 4 10:33:18 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 4 10:33:18 2013 +0200 x86/mm: Ensure useful progress in alloc_l2_table() While debugging the issue which turned out to be XSA-58, a printk in this loop showed that it was quite easy to never make useful progress, because of consistently failing the preemption check. One single l2 entry is a reasonable amount of work to do, even if an action is pending, and also assures forwards progress across repeat continuations. Tweak the continuation criteria to fail on the first iteration of the loop. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/mm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 77dcafc..f151dec 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -1278,7 +1278,8 @@ static int alloc_l2_table(struct page_info *page, unsigned long type, for ( i = page->nr_validated_ptes; i < L2_PAGETABLE_ENTRIES; i++ ) { - if ( preemptible && i && hypercall_preempt_check() ) + if ( preemptible && i > page->nr_validated_ptes + && hypercall_preempt_check() ) { page->nr_validated_ptes = i; rc = -EAGAIN; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:45:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:45: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 1Uyj5V-0008EP-SL; Mon, 15 Jul 2013 13:45:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5U-0008E8-Dr for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:12 +0000 Received: from [85.158.143.35:64978] by server-1.bemta-4.messagelabs.com id 3C/CB-28540-7ECF3E15; Mon, 15 Jul 2013 13:45:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1373895908!265475!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28948 invoked from network); 15 Jul 2013 13:45:09 -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; 15 Jul 2013 13:45:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5Q-0003Ro-Eb for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj5O-0005Ut-SI for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:07 +0000 Date: Mon, 15 Jul 2013 13:45:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: Ensure useful progress in alloc_l2_table() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d3a55d7d9bb518efe08143d050deff9f4ee80ec1 Author: Andrew Cooper AuthorDate: Thu Jul 4 10:33:18 2013 +0200 Commit: Jan Beulich CommitDate: Thu Jul 4 10:33:18 2013 +0200 x86/mm: Ensure useful progress in alloc_l2_table() While debugging the issue which turned out to be XSA-58, a printk in this loop showed that it was quite easy to never make useful progress, because of consistently failing the preemption check. One single l2 entry is a reasonable amount of work to do, even if an action is pending, and also assures forwards progress across repeat continuations. Tweak the continuation criteria to fail on the first iteration of the loop. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/mm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 77dcafc..f151dec 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -1278,7 +1278,8 @@ static int alloc_l2_table(struct page_info *page, unsigned long type, for ( i = page->nr_validated_ptes; i < L2_PAGETABLE_ENTRIES; i++ ) { - if ( preemptible && i && hypercall_preempt_check() ) + if ( preemptible && i > page->nr_validated_ptes + && hypercall_preempt_check() ) { page->nr_validated_ptes = i; rc = -EAGAIN; -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:45:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:45: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 1Uyj5h-0008Gm-Va; Mon, 15 Jul 2013 13:45:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5g-0008GM-4Q for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:24 +0000 Received: from [85.158.137.99:3213] by server-6.bemta-3.messagelabs.com id 8A/BC-00484-2FCF3E15; Mon, 15 Jul 2013 13:45:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-217.messagelabs.com!1373895919!15528124!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10319 invoked from network); 15 Jul 2013 13:45:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:45:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5a-0003Ru-Kz for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj5a-0005VJ-Hy for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:18 +0000 Date: Mon, 15 Jul 2013 13:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: do not call exit() in libxl_device_vtpm_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 af5102b81fd036976e785aa29dece8c3d2dd6577 Author: Marek Marczykowski AuthorDate: Wed May 8 05:47:53 2013 +0200 Commit: Ian Campbell CommitDate: Thu Jul 4 10:38:16 2013 +0100 libxl: do not call exit() in libxl_device_vtpm_list Signal error with NULL return value, do not terminate the whole process. Signed-off-by: Marek Marczykowski Reviewed-by: Jim Fehlig Acked-by: Ian Campbell --- tools/libxl/libxl.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 3236aa9..bd63a30 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1861,11 +1861,12 @@ libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx, uint32_t domid, int *n vtpm->backend_domid = atoi(tmp); tmp = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/uuid", be_path)); - if(tmp) { - if(libxl_uuid_from_string(&(vtpm->uuid), tmp)) { - LOG(ERROR, "%s/uuid is a malformed uuid?? (%s) Probably a bug!!\n", be_path, tmp); - exit(1); - } + if (tmp) { + if(libxl_uuid_from_string(&(vtpm->uuid), tmp)) { + LOG(ERROR, "%s/uuid is a malformed uuid?? (%s) Probably a bug!!\n", be_path, tmp); + free(vtpms); + return 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 Mon Jul 15 13:45:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:45: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 1Uyj5h-0008Gm-Va; Mon, 15 Jul 2013 13:45:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5g-0008GM-4Q for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:24 +0000 Received: from [85.158.137.99:3213] by server-6.bemta-3.messagelabs.com id 8A/BC-00484-2FCF3E15; Mon, 15 Jul 2013 13:45:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-217.messagelabs.com!1373895919!15528124!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10319 invoked from network); 15 Jul 2013 13:45:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:45:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5a-0003Ru-Kz for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj5a-0005VJ-Hy for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:18 +0000 Date: Mon, 15 Jul 2013 13:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: do not call exit() in libxl_device_vtpm_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 af5102b81fd036976e785aa29dece8c3d2dd6577 Author: Marek Marczykowski AuthorDate: Wed May 8 05:47:53 2013 +0200 Commit: Ian Campbell CommitDate: Thu Jul 4 10:38:16 2013 +0100 libxl: do not call exit() in libxl_device_vtpm_list Signal error with NULL return value, do not terminate the whole process. Signed-off-by: Marek Marczykowski Reviewed-by: Jim Fehlig Acked-by: Ian Campbell --- tools/libxl/libxl.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 3236aa9..bd63a30 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1861,11 +1861,12 @@ libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx, uint32_t domid, int *n vtpm->backend_domid = atoi(tmp); tmp = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/uuid", be_path)); - if(tmp) { - if(libxl_uuid_from_string(&(vtpm->uuid), tmp)) { - LOG(ERROR, "%s/uuid is a malformed uuid?? (%s) Probably a bug!!\n", be_path, tmp); - exit(1); - } + if (tmp) { + if(libxl_uuid_from_string(&(vtpm->uuid), tmp)) { + LOG(ERROR, "%s/uuid is a malformed uuid?? (%s) Probably a bug!!\n", be_path, tmp); + free(vtpms); + return 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 Mon Jul 15 13:45:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:45: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 1Uyj5r-0008Ir-2i; Mon, 15 Jul 2013 13:45:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5p-0008II-20 for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:33 +0000 Received: from [85.158.136.67:55200] by server-13.bemta-5.messagelabs.com id 34/CC-11519-CFCF3E15; Mon, 15 Jul 2013 13:45:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-207.messagelabs.com!1373895930!29559368!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24564 invoked from network); 15 Jul 2013 13:45:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-207.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:45:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5l-0003S5-LJ for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj5k-0005Vg-O0 for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:28 +0000 Date: Mon, 15 Jul 2013 13:45:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: eliminate duplicated definition of spin_unlock_wait X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2548700af698867a303e90115a1fa8aa74be5945 Author: Chen Baozi AuthorDate: Thu May 9 16:31:01 2013 +0800 Commit: Ian Campbell CommitDate: Thu Jul 4 10:55:12 2013 +0100 mini-os: eliminate duplicated definition of spin_unlock_wait Signed-off-by: Chen Baozi Acked-by: Samuel Thibault --- extras/mini-os/include/spinlock.h | 2 +- extras/mini-os/include/x86/arch_spinlock.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/include/spinlock.h b/extras/mini-os/include/spinlock.h index 70cf20f..6604e3c 100644 --- a/extras/mini-os/include/spinlock.h +++ b/extras/mini-os/include/spinlock.h @@ -30,7 +30,7 @@ typedef struct { #define spin_is_locked(x) arch_spin_is_locked(x) -#define spin_unlock_wait(x) do { barrier(); } while(spin_is_locked(x)) +#define spin_unlock_wait(x) arch_spin_unlock_wait(x) #define _spin_trylock(lock) ({_raw_spin_trylock(lock) ? \ diff --git a/extras/mini-os/include/x86/arch_spinlock.h b/extras/mini-os/include/x86/arch_spinlock.h index 4b8faf7..c08b6f1 100644 --- a/extras/mini-os/include/x86/arch_spinlock.h +++ b/extras/mini-os/include/x86/arch_spinlock.h @@ -17,7 +17,7 @@ */ #define arch_spin_is_locked(x) (*(volatile signed char *)(&(x)->slock) <= 0) -#define spin_unlock_wait(x) do { barrier(); } while(spin_is_locked(x)) +#define arch_spin_unlock_wait(x) do { barrier(); } while(spin_is_locked(x)) #define spin_lock_string \ "1:\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 Mon Jul 15 13:45:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:45: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 1Uyj5r-0008Ir-2i; Mon, 15 Jul 2013 13:45:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5p-0008II-20 for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:33 +0000 Received: from [85.158.136.67:55200] by server-13.bemta-5.messagelabs.com id 34/CC-11519-CFCF3E15; Mon, 15 Jul 2013 13:45:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-207.messagelabs.com!1373895930!29559368!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24564 invoked from network); 15 Jul 2013 13:45:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-207.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:45:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5l-0003S5-LJ for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj5k-0005Vg-O0 for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:28 +0000 Date: Mon, 15 Jul 2013 13:45:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: eliminate duplicated definition of spin_unlock_wait X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2548700af698867a303e90115a1fa8aa74be5945 Author: Chen Baozi AuthorDate: Thu May 9 16:31:01 2013 +0800 Commit: Ian Campbell CommitDate: Thu Jul 4 10:55:12 2013 +0100 mini-os: eliminate duplicated definition of spin_unlock_wait Signed-off-by: Chen Baozi Acked-by: Samuel Thibault --- extras/mini-os/include/spinlock.h | 2 +- extras/mini-os/include/x86/arch_spinlock.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/include/spinlock.h b/extras/mini-os/include/spinlock.h index 70cf20f..6604e3c 100644 --- a/extras/mini-os/include/spinlock.h +++ b/extras/mini-os/include/spinlock.h @@ -30,7 +30,7 @@ typedef struct { #define spin_is_locked(x) arch_spin_is_locked(x) -#define spin_unlock_wait(x) do { barrier(); } while(spin_is_locked(x)) +#define spin_unlock_wait(x) arch_spin_unlock_wait(x) #define _spin_trylock(lock) ({_raw_spin_trylock(lock) ? \ diff --git a/extras/mini-os/include/x86/arch_spinlock.h b/extras/mini-os/include/x86/arch_spinlock.h index 4b8faf7..c08b6f1 100644 --- a/extras/mini-os/include/x86/arch_spinlock.h +++ b/extras/mini-os/include/x86/arch_spinlock.h @@ -17,7 +17,7 @@ */ #define arch_spin_is_locked(x) (*(volatile signed char *)(&(x)->slock) <= 0) -#define spin_unlock_wait(x) do { barrier(); } while(spin_is_locked(x)) +#define arch_spin_unlock_wait(x) do { barrier(); } while(spin_is_locked(x)) #define spin_lock_string \ "1:\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 Mon Jul 15 13:45:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13: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 1Uyj60-0008LH-7o; Mon, 15 Jul 2013 13: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 1Uyj5y-0008Kn-Lf for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:43 +0000 Received: from [85.158.143.99:8679] by server-2.bemta-4.messagelabs.com id 9F/FA-09492-60DF3E15; Mon, 15 Jul 2013 13:45:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-216.messagelabs.com!1373895940!24382598!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22315 invoked from network); 15 Jul 2013 13:45:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:45:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5v-0003SE-Qb for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj5v-0005Wq-OX for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:39 +0000 Date: Mon, 15 Jul 2013 13:45:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: don't enable VFP on XEN during the boot X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit acd7c3f1bb2bf8ce67bb21737f566806a10e9630 Author: Julien Grall AuthorDate: Mon Jun 17 14:47:12 2013 +0100 Commit: Ian Campbell CommitDate: Thu Jul 4 11:09:57 2013 +0100 xen/arm: don't enable VFP on XEN during the boot We can safely remove VFP support in XEN because: - the guest will enable VFP support when a process requires it - XEN doesn't use VFP Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/Rules.mk | 2 +- xen/arch/arm/setup.c | 3 --- xen/arch/arm/smpboot.c | 2 -- xen/include/asm-arm/vfp.h | 43 ------------------------------------------- 4 files changed, 1 insertions(+), 49 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 422ed04..a18e7fd 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -22,7 +22,7 @@ arm := y ifeq ($(TARGET_SUBARCH),arm32) # Prevent floating-point variables from creeping into Xen. CFLAGS += -msoft-float -CFLAGS += -mcpu=cortex-a15 -mfpu=vfpv3 -mfloat-abi=softfp +CFLAGS += -mcpu=cortex-a15 arm32 := y arm64 := n endif diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index da2a734..b192d15 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -457,8 +456,6 @@ void __init start_xen(unsigned long boot_phys_offset, setup_virt_paging(); - enable_vfp(); - softirq_init(); tasklet_subsys_init(); diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 8011987..c7421fc 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -28,7 +28,6 @@ #include #include #include -#include #include cpumask_t cpu_online_map; @@ -153,7 +152,6 @@ void __cpuinit start_secondary(unsigned long boot_phys_offset, setup_virt_paging(); mmu_init_secondary_cpu(); - enable_vfp(); gic_init_secondary_cpu(); diff --git a/xen/include/asm-arm/vfp.h b/xen/include/asm-arm/vfp.h deleted file mode 100644 index b800816..0000000 --- a/xen/include/asm-arm/vfp.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef __ARM_VFP_H_ -#define __ARM_VFP_H_ - -#include - - -#ifdef CONFIG_ARM_32 - -#define FPEXC_EN (1u << 30) - -/* Save and restore FP state. - * Ought to be using the new vmrs/vmsr names, but older binutils has a - * bug where it only allows them to target fpscr (and not, say, fpexc). */ -#define READ_FP(reg) ({ \ - uint32_t val; \ - asm volatile ("fmrx %0, fp" #reg : "=r" (val)); \ - val; }) - -#define WRITE_FP(reg, val) do { \ - asm volatile ("fmxr fp" #reg ", %0" : : "r" (val)); \ -} while (0) - -/* Start-of-day: Turn on VFP */ -static inline void enable_vfp(void) -{ - WRITE_FP(exc, READ_FP(exc) | FPEXC_EN); -} -#else -static inline void enable_vfp(void) -{ - /* Always enable on 64-bit */ -} -#endif - -#endif -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 15 13:45:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13: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 1Uyj60-0008LH-7o; Mon, 15 Jul 2013 13: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 1Uyj5y-0008Kn-Lf for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:43 +0000 Received: from [85.158.143.99:8679] by server-2.bemta-4.messagelabs.com id 9F/FA-09492-60DF3E15; Mon, 15 Jul 2013 13:45:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-216.messagelabs.com!1373895940!24382598!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22315 invoked from network); 15 Jul 2013 13:45:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:45:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj5v-0003SE-Qb for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj5v-0005Wq-OX for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:39 +0000 Date: Mon, 15 Jul 2013 13:45:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: don't enable VFP on XEN during the boot X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit acd7c3f1bb2bf8ce67bb21737f566806a10e9630 Author: Julien Grall AuthorDate: Mon Jun 17 14:47:12 2013 +0100 Commit: Ian Campbell CommitDate: Thu Jul 4 11:09:57 2013 +0100 xen/arm: don't enable VFP on XEN during the boot We can safely remove VFP support in XEN because: - the guest will enable VFP support when a process requires it - XEN doesn't use VFP Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/Rules.mk | 2 +- xen/arch/arm/setup.c | 3 --- xen/arch/arm/smpboot.c | 2 -- xen/include/asm-arm/vfp.h | 43 ------------------------------------------- 4 files changed, 1 insertions(+), 49 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 422ed04..a18e7fd 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -22,7 +22,7 @@ arm := y ifeq ($(TARGET_SUBARCH),arm32) # Prevent floating-point variables from creeping into Xen. CFLAGS += -msoft-float -CFLAGS += -mcpu=cortex-a15 -mfpu=vfpv3 -mfloat-abi=softfp +CFLAGS += -mcpu=cortex-a15 arm32 := y arm64 := n endif diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index da2a734..b192d15 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -457,8 +456,6 @@ void __init start_xen(unsigned long boot_phys_offset, setup_virt_paging(); - enable_vfp(); - softirq_init(); tasklet_subsys_init(); diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 8011987..c7421fc 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -28,7 +28,6 @@ #include #include #include -#include #include cpumask_t cpu_online_map; @@ -153,7 +152,6 @@ void __cpuinit start_secondary(unsigned long boot_phys_offset, setup_virt_paging(); mmu_init_secondary_cpu(); - enable_vfp(); gic_init_secondary_cpu(); diff --git a/xen/include/asm-arm/vfp.h b/xen/include/asm-arm/vfp.h deleted file mode 100644 index b800816..0000000 --- a/xen/include/asm-arm/vfp.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef __ARM_VFP_H_ -#define __ARM_VFP_H_ - -#include - - -#ifdef CONFIG_ARM_32 - -#define FPEXC_EN (1u << 30) - -/* Save and restore FP state. - * Ought to be using the new vmrs/vmsr names, but older binutils has a - * bug where it only allows them to target fpscr (and not, say, fpexc). */ -#define READ_FP(reg) ({ \ - uint32_t val; \ - asm volatile ("fmrx %0, fp" #reg : "=r" (val)); \ - val; }) - -#define WRITE_FP(reg, val) do { \ - asm volatile ("fmxr fp" #reg ", %0" : : "r" (val)); \ -} while (0) - -/* Start-of-day: Turn on VFP */ -static inline void enable_vfp(void) -{ - WRITE_FP(exc, READ_FP(exc) | FPEXC_EN); -} -#else -static inline void enable_vfp(void) -{ - /* Always enable on 64-bit */ -} -#endif - -#endif -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 15 13:46:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:46:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6J-0008Od-BX; Mon, 15 Jul 2013 13:46:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6I-0008OP-PC for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:02 +0000 Received: from [85.158.143.99:9622] by server-3.bemta-4.messagelabs.com id 8E/26-29480-A1DF3E15; Mon, 15 Jul 2013 13:46:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-216.messagelabs.com!1373895960!21368620!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26655 invoked from network); 15 Jul 2013 13:46:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:46:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6G-0003ST-CH for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj6G-0005Xc-B2 for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:00 +0000 Date: Mon, 15 Jul 2013 13:46:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: record reservations of device IDs under the Xen vendor 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 767423f20561f45795c61ef66b7526f9a567335e Author: James Bulpin AuthorDate: Wed Jul 3 17:52:09 2013 +0000 Commit: Ian Campbell CommitDate: Thu Jul 4 11:13:37 2013 +0100 docs: record reservations of device IDs under the Xen vendor ID This patch introduces a documentation file to record reservations of ranges of PCI device IDs within the Xen vendor ID 0x5853. Signed-off-by: James Bulpin Acked-by: Keir Fraser --- docs/misc/pci-device-reservations.txt | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/docs/misc/pci-device-reservations.txt b/docs/misc/pci-device-reservations.txt new file mode 100644 index 0000000..19bd9d5 --- /dev/null +++ b/docs/misc/pci-device-reservations.txt @@ -0,0 +1,31 @@ +PCI vendor ID 0x5853 has been reserved for use by Xen systems in order to +advertise certain virtual hardware to guest virtual machines. The primary +use of this is with device ID 0x0001 to advertise the Xen Platform PCI +device - the presence of this virtual device enables a guest Operating +System (subject to the availability of suitable drivers) to make use of +paravirtualisation features such as disk and network devices etc. + +Some Xen vendors wish to provide alternative and/or additional guest drivers +that can bind to virtual devices. This may be done using the Xen PCI vendor +ID of 0x5853 and Xen-vendor/device specific PCI device IDs. This file +records reservations made within the device ID range in order to avoid +multiple Xen vendors using conflicting IDs. + +Guidelines + 1. A vendor may request a range of device IDs by submitting a patch to + this file. + 2. Vendor allocations should be in the range 0xc000-0xfffe to reduce the + possibility of clashes with community IDs assigned from the bottom up. + 3. The vendor is responsible for allocations within the range and should + try to record specific device IDs in PCI ID databases such as + http://pciids.sourceforge.net and http//www.pcidatabase.com + +Reservations +============ + + range | vendor/product +--------------+-------------------------------------------------------------- +0x0001 | (Xen Platform PCI device) +0x0002 | Citrix XenServer (grandfathered allocation for XenServer 6.1) +0xc000-0xc0ff | Citrix XenServer +0xc100-0xc1ff | Citrix XenClient -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:46:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:46:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6J-0008Od-BX; Mon, 15 Jul 2013 13:46:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6I-0008OP-PC for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:02 +0000 Received: from [85.158.143.99:9622] by server-3.bemta-4.messagelabs.com id 8E/26-29480-A1DF3E15; Mon, 15 Jul 2013 13:46:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-216.messagelabs.com!1373895960!21368620!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26655 invoked from network); 15 Jul 2013 13:46:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:46:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6G-0003ST-CH for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj6G-0005Xc-B2 for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:00 +0000 Date: Mon, 15 Jul 2013 13:46:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: record reservations of device IDs under the Xen vendor 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 767423f20561f45795c61ef66b7526f9a567335e Author: James Bulpin AuthorDate: Wed Jul 3 17:52:09 2013 +0000 Commit: Ian Campbell CommitDate: Thu Jul 4 11:13:37 2013 +0100 docs: record reservations of device IDs under the Xen vendor ID This patch introduces a documentation file to record reservations of ranges of PCI device IDs within the Xen vendor ID 0x5853. Signed-off-by: James Bulpin Acked-by: Keir Fraser --- docs/misc/pci-device-reservations.txt | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/docs/misc/pci-device-reservations.txt b/docs/misc/pci-device-reservations.txt new file mode 100644 index 0000000..19bd9d5 --- /dev/null +++ b/docs/misc/pci-device-reservations.txt @@ -0,0 +1,31 @@ +PCI vendor ID 0x5853 has been reserved for use by Xen systems in order to +advertise certain virtual hardware to guest virtual machines. The primary +use of this is with device ID 0x0001 to advertise the Xen Platform PCI +device - the presence of this virtual device enables a guest Operating +System (subject to the availability of suitable drivers) to make use of +paravirtualisation features such as disk and network devices etc. + +Some Xen vendors wish to provide alternative and/or additional guest drivers +that can bind to virtual devices. This may be done using the Xen PCI vendor +ID of 0x5853 and Xen-vendor/device specific PCI device IDs. This file +records reservations made within the device ID range in order to avoid +multiple Xen vendors using conflicting IDs. + +Guidelines + 1. A vendor may request a range of device IDs by submitting a patch to + this file. + 2. Vendor allocations should be in the range 0xc000-0xfffe to reduce the + possibility of clashes with community IDs assigned from the bottom up. + 3. The vendor is responsible for allocations within the range and should + try to record specific device IDs in PCI ID databases such as + http://pciids.sourceforge.net and http//www.pcidatabase.com + +Reservations +============ + + range | vendor/product +--------------+-------------------------------------------------------------- +0x0001 | (Xen Platform PCI device) +0x0002 | Citrix XenServer (grandfathered allocation for XenServer 6.1) +0xc000-0xc0ff | Citrix XenServer +0xc100-0xc1ff | Citrix XenClient -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:46:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:46: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 1Uyj6U-0008Qc-G8; Mon, 15 Jul 2013 13:46:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6T-0008QO-3T for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:13 +0000 Received: from [85.158.136.67:59508] by server-3.bemta-5.messagelabs.com id 04/A1-09186-42DF3E15; Mon, 15 Jul 2013 13:46:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-207.messagelabs.com!1373895970!28754082!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7581 invoked from network); 15 Jul 2013 13:46:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-207.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:46:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6Q-0003T2-Hh for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj6Q-0005YA-Fc for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:10 +0000 Date: Mon, 15 Jul 2013 13:46:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] netif.h: fix typo, BLKIF -> NETIF X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8960761b1c0958f73bb9a4a23daa1bfad46af40e Author: Wei Liu AuthorDate: Mon Jul 8 11:04:27 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 8 11:04:27 2013 +0200 netif.h: fix typo, BLKIF -> NETIF Signed-off-by: Wei Liu Acked-by: Ian Campbell --- xen/include/public/io/netif.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/public/io/netif.h b/xen/include/public/io/netif.h index d477751..3aa2dec 100644 --- a/xen/include/public/io/netif.h +++ b/xen/include/public/io/netif.h @@ -206,7 +206,7 @@ struct netif_rx_response { uint16_t id; uint16_t offset; /* Offset in page of start of received packet */ uint16_t flags; /* NETRXF_* */ - int16_t status; /* -ve: BLKIF_RSP_* ; +ve: Rx'ed pkt size. */ + int16_t status; /* -ve: NETIF_RSP_* ; +ve: Rx'ed pkt size. */ }; typedef struct netif_rx_response netif_rx_response_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 Mon Jul 15 13:46:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:46: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 1Uyj6U-0008Qc-G8; Mon, 15 Jul 2013 13:46:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6T-0008QO-3T for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:13 +0000 Received: from [85.158.136.67:59508] by server-3.bemta-5.messagelabs.com id 04/A1-09186-42DF3E15; Mon, 15 Jul 2013 13:46:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-207.messagelabs.com!1373895970!28754082!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7581 invoked from network); 15 Jul 2013 13:46:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-207.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:46:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6Q-0003T2-Hh for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj6Q-0005YA-Fc for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:10 +0000 Date: Mon, 15 Jul 2013 13:46:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] netif.h: fix typo, BLKIF -> NETIF X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8960761b1c0958f73bb9a4a23daa1bfad46af40e Author: Wei Liu AuthorDate: Mon Jul 8 11:04:27 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 8 11:04:27 2013 +0200 netif.h: fix typo, BLKIF -> NETIF Signed-off-by: Wei Liu Acked-by: Ian Campbell --- xen/include/public/io/netif.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/public/io/netif.h b/xen/include/public/io/netif.h index d477751..3aa2dec 100644 --- a/xen/include/public/io/netif.h +++ b/xen/include/public/io/netif.h @@ -206,7 +206,7 @@ struct netif_rx_response { uint16_t id; uint16_t offset; /* Offset in page of start of received packet */ uint16_t flags; /* NETRXF_* */ - int16_t status; /* -ve: BLKIF_RSP_* ; +ve: Rx'ed pkt size. */ + int16_t status; /* -ve: NETIF_RSP_* ; +ve: Rx'ed pkt size. */ }; typedef struct netif_rx_response netif_rx_response_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 Mon Jul 15 13:46:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:46: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 1Uyj6Y-0008RV-Kg; Mon, 15 Jul 2013 13:46:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6X-0008RC-8W for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:17 +0000 Received: from [85.158.143.99:14389] by server-3.bemta-4.messagelabs.com id 0F/86-29480-82DF3E15; Mon, 15 Jul 2013 13:46:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1373895950!16551226!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25748 invoked from network); 15 Jul 2013 13:45:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:45:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj65-0003SN-W4 for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj65-0005XE-Us for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:49 +0000 Date: Mon, 15 Jul 2013 13:45:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm32: implement VFP context switch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b9fa02b9011f8baf753e1539c921804a32b228a8 Author: Julien Grall AuthorDate: Mon Jun 17 14:47:13 2013 +0100 Commit: Ian Campbell CommitDate: Thu Jul 4 11:10:06 2013 +0100 xen/arm32: implement VFP context switch Add support for VFP context switch on arm32 and a dummy support for arm64 Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/arm32/Makefile | 1 + xen/arch/arm/arm32/vfp.c | 95 +++++++++++++++++++++++++++++++++++++++ xen/arch/arm/arm64/Makefile | 1 + xen/arch/arm/arm64/vfp.c | 13 +++++ xen/arch/arm/domain.c | 7 ++- xen/include/asm-arm/arm32/vfp.h | 41 +++++++++++++++++ xen/include/asm-arm/arm64/vfp.h | 16 +++++++ xen/include/asm-arm/cpregs.h | 9 ++++ xen/include/asm-arm/domain.h | 4 ++ xen/include/asm-arm/vfp.h | 25 ++++++++++ 10 files changed, 210 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm32/Makefile b/xen/arch/arm/arm32/Makefile index aaf277a..b903803 100644 --- a/xen/arch/arm/arm32/Makefile +++ b/xen/arch/arm/arm32/Makefile @@ -6,5 +6,6 @@ obj-y += proc-ca15.o obj-y += traps.o obj-y += domain.o +obj-y += vfp.o obj-$(EARLY_PRINTK) += debug.o diff --git a/xen/arch/arm/arm32/vfp.c b/xen/arch/arm/arm32/vfp.c new file mode 100644 index 0000000..6780131 --- /dev/null +++ b/xen/arch/arm/arm32/vfp.c @@ -0,0 +1,95 @@ +#include +#include +#include +#include + +void vfp_save_state(struct vcpu *v) +{ + v->arch.vfp.fpexc = READ_CP32(FPEXC); + + WRITE_CP32(v->arch.vfp.fpexc | FPEXC_EN, FPEXC); + + v->arch.vfp.fpscr = READ_CP32(FPSCR); + + if ( v->arch.vfp.fpexc & FPEXC_EX ) /* Check for sub-architecture */ + { + v->arch.vfp.fpinst = READ_CP32(FPINST); + + if ( v->arch.vfp.fpexc & FPEXC_FP2V ) + v->arch.vfp.fpinst2 = READ_CP32(FPINST2); + /* Disable FPEXC_EX */ + WRITE_CP32((v->arch.vfp.fpexc | FPEXC_EN) & ~FPEXC_EX, FPEXC); + } + + /* Save {d0-d15} */ + asm volatile("stc p11, cr0, %0, #32*4" + : "=Q" (v->arch.vfp.fpregs1)); + + /* 32 x 64 bits registers? */ + if ( (READ_CP32(MVFR0) & MVFR0_A_SIMD_MASK) == 2 ) + { + /* Save {d16-d31} */ + asm volatile("stcl p11, cr0, %0, #32*4" + : "=Q" (v->arch.vfp.fpregs2)); + } + + WRITE_CP32(v->arch.vfp.fpexc & ~(FPEXC_EN), FPEXC); +} + +void vfp_restore_state(struct vcpu *v) +{ + WRITE_CP32(READ_CP32(FPEXC) | FPEXC_EN, FPEXC); + + /* Restore {d0-d15} */ + asm volatile("ldc p11, cr0, %0, #32*4" + : : "Q" (v->arch.vfp.fpregs1)); + + /* 32 x 64 bits registers? */ + if ( (READ_CP32(MVFR0) & MVFR0_A_SIMD_MASK) == 2 ) /* 32 x 64 bits registers */ + /* Restore {d16-d31} */ + asm volatile("ldcl p11, cr0, %0, #32*4" + : : "Q" (v->arch.vfp.fpregs2)); + + if ( v->arch.vfp.fpexc & FPEXC_EX ) + { + WRITE_CP32(v->arch.vfp.fpinst, FPINST); + if ( v->arch.vfp.fpexc & FPEXC_FP2V ) + WRITE_CP32(v->arch.vfp.fpinst2, FPINST2); + } + + WRITE_CP32(v->arch.vfp.fpscr, FPSCR); + + WRITE_CP32(v->arch.vfp.fpexc, FPEXC); +} + +static __init int vfp_init(void) +{ + unsigned int vfpsid; + unsigned int vfparch; + + vfpsid = READ_CP32(FPSID); + + printk("VFP implementer 0x%02x architecture %d part 0x%02x variant 0x%x " + "rev 0x%x\n", + (vfpsid & FPSID_IMPLEMENTER_MASK) >> FPSID_IMPLEMENTER_BIT, + (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT, + (vfpsid & FPSID_PART_MASK) >> FPSID_PART_BIT, + (vfpsid & FPSID_VARIANT_MASK) >> FPSID_VARIANT_BIT, + (vfpsid & FPSID_REV_MASK) >> FPSID_REV_BIT); + + vfparch = (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT; + if ( vfparch < 2 ) + panic("Xen only support VFP 3\n"); + + return 0; +} +presmp_initcall(vfp_init); + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile index 9484548..e06a0a9 100644 --- a/xen/arch/arm/arm64/Makefile +++ b/xen/arch/arm/arm64/Makefile @@ -5,5 +5,6 @@ obj-y += mode_switch.o obj-y += traps.o obj-y += domain.o +obj-y += vfp.o obj-$(EARLY_PRINTK) += debug.o diff --git a/xen/arch/arm/arm64/vfp.c b/xen/arch/arm/arm64/vfp.c new file mode 100644 index 0000000..74e6a50 --- /dev/null +++ b/xen/arch/arm/arm64/vfp.c @@ -0,0 +1,13 @@ +#include +#include +#include + +void vfp_save_state(struct vcpu *v) +{ + /* TODO: implement it */ +} + +void vfp_restore_state(struct vcpu *v) +{ + /* TODO: implement it */ +} diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 4c434a1..f465ab7 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include "vtimer.h" @@ -117,7 +118,8 @@ static void ctxt_switch_from(struct vcpu *p) /* XXX MPU */ - /* XXX VFP */ + /* VFP */ + vfp_save_state(p); /* VGIC */ gic_save_state(p); @@ -143,7 +145,8 @@ static void ctxt_switch_to(struct vcpu *n) /* VGIC */ gic_restore_state(n); - /* XXX VFP */ + /* VFP */ + vfp_restore_state(n); /* XXX MPU */ diff --git a/xen/include/asm-arm/arm32/vfp.h b/xen/include/asm-arm/arm32/vfp.h new file mode 100644 index 0000000..bade3bc --- /dev/null +++ b/xen/include/asm-arm/arm32/vfp.h @@ -0,0 +1,41 @@ +#ifndef _ARM_ARM32_VFP_H +#define _ARM_ARM32_VFP_H + +#define FPEXC_EX (1u << 31) +#define FPEXC_EN (1u << 30) +#define FPEXC_FP2V (1u << 28) + +#define MVFR0_A_SIMD_MASK (0xf << 0) + + +#define FPSID_IMPLEMENTER_BIT (24) +#define FPSID_IMPLEMENTER_MASK (0xff << FPSID_IMPLEMENTER_BIT) +#define FPSID_ARCH_BIT (16) +#define FPSID_ARCH_MASK (0xf << FPSID_ARCH_BIT) +#define FPSID_PART_BIT (8) +#define FPSID_PART_MASK (0xff << FPSID_PART_BIT) +#define FPSID_VARIANT_BIT (4) +#define FPSID_VARIANT_MASK (0xf << FPSID_VARIANT_BIT) +#define FPSID_REV_BIT (0) +#define FPSID_REV_MASK (0xf << FPSID_REV_BIT) + +struct vfp_state +{ + uint64_t fpregs1[16]; /* {d0-d15} */ + uint64_t fpregs2[16]; /* {d16-d31} */ + uint32_t fpexc; + uint32_t fpscr; + /* VFP implementation specific state */ + uint32_t fpinst; + uint32_t fpinst2; +}; + +#endif /* _ARM_ARM32_VFP_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/arm64/vfp.h b/xen/include/asm-arm/arm64/vfp.h new file mode 100644 index 0000000..3733d2c --- /dev/null +++ b/xen/include/asm-arm/arm64/vfp.h @@ -0,0 +1,16 @@ +#ifndef _ARM_ARM64_VFP_H +#define _ARM_ARM64_VFP_H + +struct vfp_state +{ +}; + +#endif /* _ARM_ARM64_VFP_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/cpregs.h b/xen/include/asm-arm/cpregs.h index f08d59a..122dd1a 100644 --- a/xen/include/asm-arm/cpregs.h +++ b/xen/include/asm-arm/cpregs.h @@ -60,6 +60,15 @@ * arguments, which are cp,opc1,crn,crm,opc2. */ +/* Coprocessor 10 */ + +#define FPSID p10,7,c0,c0,0 /* Floating-Point System ID Register */ +#define FPSCR p10,7,c1,c0,0 /* Floating-Point Status and Control Register */ +#define MVFR0 p10,7,c7,c0,0 /* Media and VFP Feature Register 0 */ +#define FPEXC p10,7,c8,c0,0 /* Floating-Point Exception Control Register */ +#define FPINST p10,7,c9,c0,0 /* Floating-Point Instruction Register */ +#define FPINST2 p10,7,c10,c0,0 /* Floating-point Instruction Register 2 */ + /* Coprocessor 14 */ /* CP14 CR0: */ diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index cb251cc..339b6e6 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -6,6 +6,7 @@ #include #include #include +#include #include /* Represents state corresponding to a block of 32 interrupts */ @@ -188,6 +189,9 @@ struct arch_vcpu uint32_t joscr, jmcr; #endif + /* Float-pointer */ + struct vfp_state vfp; + /* CP 15 */ uint32_t csselr; diff --git a/xen/include/asm-arm/vfp.h b/xen/include/asm-arm/vfp.h new file mode 100644 index 0000000..5f10fe5 --- /dev/null +++ b/xen/include/asm-arm/vfp.h @@ -0,0 +1,25 @@ +#ifndef _ASM_VFP_H +#define _ASM_VFP_H + +#include + +#if defined(CONFIG_ARM_32) +# include +#elif defined(CONFIG_ARM_64) +# include +#else +# error "Unknown ARM variant" +#endif + +void vfp_save_state(struct vcpu *v); +void vfp_restore_state(struct vcpu *v); + +#endif /* _ASM_VFP_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 Mon Jul 15 13:46:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:46: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 1Uyj6Y-0008RV-Kg; Mon, 15 Jul 2013 13:46:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6X-0008RC-8W for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:17 +0000 Received: from [85.158.143.99:14389] by server-3.bemta-4.messagelabs.com id 0F/86-29480-82DF3E15; Mon, 15 Jul 2013 13:46:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1373895950!16551226!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25748 invoked from network); 15 Jul 2013 13:45:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:45:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj65-0003SN-W4 for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj65-0005XE-Us for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:45:49 +0000 Date: Mon, 15 Jul 2013 13:45:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm32: implement VFP context switch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b9fa02b9011f8baf753e1539c921804a32b228a8 Author: Julien Grall AuthorDate: Mon Jun 17 14:47:13 2013 +0100 Commit: Ian Campbell CommitDate: Thu Jul 4 11:10:06 2013 +0100 xen/arm32: implement VFP context switch Add support for VFP context switch on arm32 and a dummy support for arm64 Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/arm32/Makefile | 1 + xen/arch/arm/arm32/vfp.c | 95 +++++++++++++++++++++++++++++++++++++++ xen/arch/arm/arm64/Makefile | 1 + xen/arch/arm/arm64/vfp.c | 13 +++++ xen/arch/arm/domain.c | 7 ++- xen/include/asm-arm/arm32/vfp.h | 41 +++++++++++++++++ xen/include/asm-arm/arm64/vfp.h | 16 +++++++ xen/include/asm-arm/cpregs.h | 9 ++++ xen/include/asm-arm/domain.h | 4 ++ xen/include/asm-arm/vfp.h | 25 ++++++++++ 10 files changed, 210 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm32/Makefile b/xen/arch/arm/arm32/Makefile index aaf277a..b903803 100644 --- a/xen/arch/arm/arm32/Makefile +++ b/xen/arch/arm/arm32/Makefile @@ -6,5 +6,6 @@ obj-y += proc-ca15.o obj-y += traps.o obj-y += domain.o +obj-y += vfp.o obj-$(EARLY_PRINTK) += debug.o diff --git a/xen/arch/arm/arm32/vfp.c b/xen/arch/arm/arm32/vfp.c new file mode 100644 index 0000000..6780131 --- /dev/null +++ b/xen/arch/arm/arm32/vfp.c @@ -0,0 +1,95 @@ +#include +#include +#include +#include + +void vfp_save_state(struct vcpu *v) +{ + v->arch.vfp.fpexc = READ_CP32(FPEXC); + + WRITE_CP32(v->arch.vfp.fpexc | FPEXC_EN, FPEXC); + + v->arch.vfp.fpscr = READ_CP32(FPSCR); + + if ( v->arch.vfp.fpexc & FPEXC_EX ) /* Check for sub-architecture */ + { + v->arch.vfp.fpinst = READ_CP32(FPINST); + + if ( v->arch.vfp.fpexc & FPEXC_FP2V ) + v->arch.vfp.fpinst2 = READ_CP32(FPINST2); + /* Disable FPEXC_EX */ + WRITE_CP32((v->arch.vfp.fpexc | FPEXC_EN) & ~FPEXC_EX, FPEXC); + } + + /* Save {d0-d15} */ + asm volatile("stc p11, cr0, %0, #32*4" + : "=Q" (v->arch.vfp.fpregs1)); + + /* 32 x 64 bits registers? */ + if ( (READ_CP32(MVFR0) & MVFR0_A_SIMD_MASK) == 2 ) + { + /* Save {d16-d31} */ + asm volatile("stcl p11, cr0, %0, #32*4" + : "=Q" (v->arch.vfp.fpregs2)); + } + + WRITE_CP32(v->arch.vfp.fpexc & ~(FPEXC_EN), FPEXC); +} + +void vfp_restore_state(struct vcpu *v) +{ + WRITE_CP32(READ_CP32(FPEXC) | FPEXC_EN, FPEXC); + + /* Restore {d0-d15} */ + asm volatile("ldc p11, cr0, %0, #32*4" + : : "Q" (v->arch.vfp.fpregs1)); + + /* 32 x 64 bits registers? */ + if ( (READ_CP32(MVFR0) & MVFR0_A_SIMD_MASK) == 2 ) /* 32 x 64 bits registers */ + /* Restore {d16-d31} */ + asm volatile("ldcl p11, cr0, %0, #32*4" + : : "Q" (v->arch.vfp.fpregs2)); + + if ( v->arch.vfp.fpexc & FPEXC_EX ) + { + WRITE_CP32(v->arch.vfp.fpinst, FPINST); + if ( v->arch.vfp.fpexc & FPEXC_FP2V ) + WRITE_CP32(v->arch.vfp.fpinst2, FPINST2); + } + + WRITE_CP32(v->arch.vfp.fpscr, FPSCR); + + WRITE_CP32(v->arch.vfp.fpexc, FPEXC); +} + +static __init int vfp_init(void) +{ + unsigned int vfpsid; + unsigned int vfparch; + + vfpsid = READ_CP32(FPSID); + + printk("VFP implementer 0x%02x architecture %d part 0x%02x variant 0x%x " + "rev 0x%x\n", + (vfpsid & FPSID_IMPLEMENTER_MASK) >> FPSID_IMPLEMENTER_BIT, + (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT, + (vfpsid & FPSID_PART_MASK) >> FPSID_PART_BIT, + (vfpsid & FPSID_VARIANT_MASK) >> FPSID_VARIANT_BIT, + (vfpsid & FPSID_REV_MASK) >> FPSID_REV_BIT); + + vfparch = (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT; + if ( vfparch < 2 ) + panic("Xen only support VFP 3\n"); + + return 0; +} +presmp_initcall(vfp_init); + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile index 9484548..e06a0a9 100644 --- a/xen/arch/arm/arm64/Makefile +++ b/xen/arch/arm/arm64/Makefile @@ -5,5 +5,6 @@ obj-y += mode_switch.o obj-y += traps.o obj-y += domain.o +obj-y += vfp.o obj-$(EARLY_PRINTK) += debug.o diff --git a/xen/arch/arm/arm64/vfp.c b/xen/arch/arm/arm64/vfp.c new file mode 100644 index 0000000..74e6a50 --- /dev/null +++ b/xen/arch/arm/arm64/vfp.c @@ -0,0 +1,13 @@ +#include +#include +#include + +void vfp_save_state(struct vcpu *v) +{ + /* TODO: implement it */ +} + +void vfp_restore_state(struct vcpu *v) +{ + /* TODO: implement it */ +} diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 4c434a1..f465ab7 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include "vtimer.h" @@ -117,7 +118,8 @@ static void ctxt_switch_from(struct vcpu *p) /* XXX MPU */ - /* XXX VFP */ + /* VFP */ + vfp_save_state(p); /* VGIC */ gic_save_state(p); @@ -143,7 +145,8 @@ static void ctxt_switch_to(struct vcpu *n) /* VGIC */ gic_restore_state(n); - /* XXX VFP */ + /* VFP */ + vfp_restore_state(n); /* XXX MPU */ diff --git a/xen/include/asm-arm/arm32/vfp.h b/xen/include/asm-arm/arm32/vfp.h new file mode 100644 index 0000000..bade3bc --- /dev/null +++ b/xen/include/asm-arm/arm32/vfp.h @@ -0,0 +1,41 @@ +#ifndef _ARM_ARM32_VFP_H +#define _ARM_ARM32_VFP_H + +#define FPEXC_EX (1u << 31) +#define FPEXC_EN (1u << 30) +#define FPEXC_FP2V (1u << 28) + +#define MVFR0_A_SIMD_MASK (0xf << 0) + + +#define FPSID_IMPLEMENTER_BIT (24) +#define FPSID_IMPLEMENTER_MASK (0xff << FPSID_IMPLEMENTER_BIT) +#define FPSID_ARCH_BIT (16) +#define FPSID_ARCH_MASK (0xf << FPSID_ARCH_BIT) +#define FPSID_PART_BIT (8) +#define FPSID_PART_MASK (0xff << FPSID_PART_BIT) +#define FPSID_VARIANT_BIT (4) +#define FPSID_VARIANT_MASK (0xf << FPSID_VARIANT_BIT) +#define FPSID_REV_BIT (0) +#define FPSID_REV_MASK (0xf << FPSID_REV_BIT) + +struct vfp_state +{ + uint64_t fpregs1[16]; /* {d0-d15} */ + uint64_t fpregs2[16]; /* {d16-d31} */ + uint32_t fpexc; + uint32_t fpscr; + /* VFP implementation specific state */ + uint32_t fpinst; + uint32_t fpinst2; +}; + +#endif /* _ARM_ARM32_VFP_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/arm64/vfp.h b/xen/include/asm-arm/arm64/vfp.h new file mode 100644 index 0000000..3733d2c --- /dev/null +++ b/xen/include/asm-arm/arm64/vfp.h @@ -0,0 +1,16 @@ +#ifndef _ARM_ARM64_VFP_H +#define _ARM_ARM64_VFP_H + +struct vfp_state +{ +}; + +#endif /* _ARM_ARM64_VFP_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/cpregs.h b/xen/include/asm-arm/cpregs.h index f08d59a..122dd1a 100644 --- a/xen/include/asm-arm/cpregs.h +++ b/xen/include/asm-arm/cpregs.h @@ -60,6 +60,15 @@ * arguments, which are cp,opc1,crn,crm,opc2. */ +/* Coprocessor 10 */ + +#define FPSID p10,7,c0,c0,0 /* Floating-Point System ID Register */ +#define FPSCR p10,7,c1,c0,0 /* Floating-Point Status and Control Register */ +#define MVFR0 p10,7,c7,c0,0 /* Media and VFP Feature Register 0 */ +#define FPEXC p10,7,c8,c0,0 /* Floating-Point Exception Control Register */ +#define FPINST p10,7,c9,c0,0 /* Floating-Point Instruction Register */ +#define FPINST2 p10,7,c10,c0,0 /* Floating-point Instruction Register 2 */ + /* Coprocessor 14 */ /* CP14 CR0: */ diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index cb251cc..339b6e6 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -6,6 +6,7 @@ #include #include #include +#include #include /* Represents state corresponding to a block of 32 interrupts */ @@ -188,6 +189,9 @@ struct arch_vcpu uint32_t joscr, jmcr; #endif + /* Float-pointer */ + struct vfp_state vfp; + /* CP 15 */ uint32_t csselr; diff --git a/xen/include/asm-arm/vfp.h b/xen/include/asm-arm/vfp.h new file mode 100644 index 0000000..5f10fe5 --- /dev/null +++ b/xen/include/asm-arm/vfp.h @@ -0,0 +1,25 @@ +#ifndef _ASM_VFP_H +#define _ASM_VFP_H + +#include + +#if defined(CONFIG_ARM_32) +# include +#elif defined(CONFIG_ARM_64) +# include +#else +# error "Unknown ARM variant" +#endif + +void vfp_save_state(struct vcpu *v); +void vfp_restore_state(struct vcpu *v); + +#endif /* _ASM_VFP_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 Mon Jul 15 13:46:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:46: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 1Uyj6e-0008Td-P6; Mon, 15 Jul 2013 13:46:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6d-0008T4-F3 for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:23 +0000 Received: from [85.158.138.51:4752] by server-5.bemta-3.messagelabs.com id 18/A3-15398-E2DF3E15; Mon, 15 Jul 2013 13:46:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-174.messagelabs.com!1373895980!27830569!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19296 invoked from network); 15 Jul 2013 13:46:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:46:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6a-0003T8-MO for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj6a-0005YX-KY for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:20 +0000 Date: Mon, 15 Jul 2013 13:46:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] /home/jbeulich/tmp/commit.txt X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 80e3eddcc4896ab40c24506fd05f9795c4039b48 Author: Jan Beulich AuthorDate: Mon Jul 8 13:15:10 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 8 13:15:10 2013 +0200 /home/jbeulich/tmp/commit.txt --- tools/firmware/hvmloader/acpi/build.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index 7281b97..f1dd3f0 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -268,11 +268,13 @@ static int construct_secondary_tables(unsigned long *table_ptrs, table_ptrs[nr_tables++] = (unsigned long)madt; } - /* HPET. Always included in DSDT, so always include it here too. */ - /* (And it's unconditionally required by Windows SVVP tests.) */ - hpet = construct_hpet(); - if (!hpet) return -1; - table_ptrs[nr_tables++] = (unsigned long)hpet; + /* HPET. */ + if ( hpet_exists(ACPI_HPET_ADDRESS) ) + { + hpet = construct_hpet(); + if (!hpet) return -1; + table_ptrs[nr_tables++] = (unsigned long)hpet; + } /* WAET. */ waet = construct_waet(); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:46:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:46: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 1Uyj6e-0008Td-P6; Mon, 15 Jul 2013 13:46:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6d-0008T4-F3 for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:23 +0000 Received: from [85.158.138.51:4752] by server-5.bemta-3.messagelabs.com id 18/A3-15398-E2DF3E15; Mon, 15 Jul 2013 13:46:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-174.messagelabs.com!1373895980!27830569!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19296 invoked from network); 15 Jul 2013 13:46:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:46:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6a-0003T8-MO for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj6a-0005YX-KY for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:20 +0000 Date: Mon, 15 Jul 2013 13:46:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] /home/jbeulich/tmp/commit.txt X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 80e3eddcc4896ab40c24506fd05f9795c4039b48 Author: Jan Beulich AuthorDate: Mon Jul 8 13:15:10 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 8 13:15:10 2013 +0200 /home/jbeulich/tmp/commit.txt --- tools/firmware/hvmloader/acpi/build.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index 7281b97..f1dd3f0 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -268,11 +268,13 @@ static int construct_secondary_tables(unsigned long *table_ptrs, table_ptrs[nr_tables++] = (unsigned long)madt; } - /* HPET. Always included in DSDT, so always include it here too. */ - /* (And it's unconditionally required by Windows SVVP tests.) */ - hpet = construct_hpet(); - if (!hpet) return -1; - table_ptrs[nr_tables++] = (unsigned long)hpet; + /* HPET. */ + if ( hpet_exists(ACPI_HPET_ADDRESS) ) + { + hpet = construct_hpet(); + if (!hpet) return -1; + table_ptrs[nr_tables++] = (unsigned long)hpet; + } /* WAET. */ waet = construct_waet(); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:46:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:46: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 1Uyj6o-0008Vt-UF; Mon, 15 Jul 2013 13:46:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6o-0008VW-6d for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:34 +0000 Received: from [85.158.143.99:42765] by server-1.bemta-4.messagelabs.com id E1/CD-28540-93DF3E15; Mon, 15 Jul 2013 13:46:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1373895991!16551328!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28669 invoked from network); 15 Jul 2013 13:46:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:46:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6k-0003TN-TU for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj6k-0005Yv-PD for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:30 +0000 Date: Mon, 15 Jul 2013 13:46:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "/home/jbeulich/tmp/commit.txt" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 642e4f331599b42492abd9fc9450373aab02dfb6 Author: Jan Beulich AuthorDate: Mon Jul 8 13:16:29 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 8 13:16:29 2013 +0200 Revert "/home/jbeulich/tmp/commit.txt" This reverts commit 80e3eddcc4896ab40c24506fd05f9795c4039b48. --- tools/firmware/hvmloader/acpi/build.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index f1dd3f0..7281b97 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -268,13 +268,11 @@ static int construct_secondary_tables(unsigned long *table_ptrs, table_ptrs[nr_tables++] = (unsigned long)madt; } - /* HPET. */ - if ( hpet_exists(ACPI_HPET_ADDRESS) ) - { - hpet = construct_hpet(); - if (!hpet) return -1; - table_ptrs[nr_tables++] = (unsigned long)hpet; - } + /* HPET. Always included in DSDT, so always include it here too. */ + /* (And it's unconditionally required by Windows SVVP tests.) */ + hpet = construct_hpet(); + if (!hpet) return -1; + table_ptrs[nr_tables++] = (unsigned long)hpet; /* WAET. */ waet = construct_waet(); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:46:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:46: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 1Uyj6o-0008Vt-UF; Mon, 15 Jul 2013 13:46:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6o-0008VW-6d for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:34 +0000 Received: from [85.158.143.99:42765] by server-1.bemta-4.messagelabs.com id E1/CD-28540-93DF3E15; Mon, 15 Jul 2013 13:46:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1373895991!16551328!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28669 invoked from network); 15 Jul 2013 13:46:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:46:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6k-0003TN-TU for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj6k-0005Yv-PD for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:30 +0000 Date: Mon, 15 Jul 2013 13:46:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "/home/jbeulich/tmp/commit.txt" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 642e4f331599b42492abd9fc9450373aab02dfb6 Author: Jan Beulich AuthorDate: Mon Jul 8 13:16:29 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 8 13:16:29 2013 +0200 Revert "/home/jbeulich/tmp/commit.txt" This reverts commit 80e3eddcc4896ab40c24506fd05f9795c4039b48. --- tools/firmware/hvmloader/acpi/build.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index f1dd3f0..7281b97 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -268,13 +268,11 @@ static int construct_secondary_tables(unsigned long *table_ptrs, table_ptrs[nr_tables++] = (unsigned long)madt; } - /* HPET. */ - if ( hpet_exists(ACPI_HPET_ADDRESS) ) - { - hpet = construct_hpet(); - if (!hpet) return -1; - table_ptrs[nr_tables++] = (unsigned long)hpet; - } + /* HPET. Always included in DSDT, so always include it here too. */ + /* (And it's unconditionally required by Windows SVVP tests.) */ + hpet = construct_hpet(); + if (!hpet) return -1; + table_ptrs[nr_tables++] = (unsigned long)hpet; /* WAET. */ waet = construct_waet(); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:46:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:46:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6z-00006Z-8o; Mon, 15 Jul 2013 13:46:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6x-000065-Ek for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:43 +0000 Received: from [85.158.143.35:43766] by server-1.bemta-4.messagelabs.com id B1/FD-28540-24DF3E15; Mon, 15 Jul 2013 13:46:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1373896001!266325!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4637 invoked from network); 15 Jul 2013 13:46:42 -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; 15 Jul 2013 13:46:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6v-0003TW-3z for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj6v-0005Zv-0l for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:41 +0000 Date: Mon, 15 Jul 2013 13:46:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "hvmloader: always include HPET table" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4867685f7916bb594a67f2f64a28bbf5ecb4949c Author: Jan Beulich AuthorDate: Mon Jul 8 13:20:20 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 8 13:20:20 2013 +0200 Revert "hvmloader: always include HPET table" This reverts commit e4fd0475a08fda414da27c4e57b568f147cfc07e. Conflicts: tools/firmware/hvmloader/acpi/build.c Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- tools/firmware/hvmloader/acpi/build.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index 7281b97..f1dd3f0 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -268,11 +268,13 @@ static int construct_secondary_tables(unsigned long *table_ptrs, table_ptrs[nr_tables++] = (unsigned long)madt; } - /* HPET. Always included in DSDT, so always include it here too. */ - /* (And it's unconditionally required by Windows SVVP tests.) */ - hpet = construct_hpet(); - if (!hpet) return -1; - table_ptrs[nr_tables++] = (unsigned long)hpet; + /* HPET. */ + if ( hpet_exists(ACPI_HPET_ADDRESS) ) + { + hpet = construct_hpet(); + if (!hpet) return -1; + table_ptrs[nr_tables++] = (unsigned long)hpet; + } /* WAET. */ waet = construct_waet(); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:46:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:46:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6z-00006Z-8o; Mon, 15 Jul 2013 13:46:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6x-000065-Ek for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:43 +0000 Received: from [85.158.143.35:43766] by server-1.bemta-4.messagelabs.com id B1/FD-28540-24DF3E15; Mon, 15 Jul 2013 13:46:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1373896001!266325!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4637 invoked from network); 15 Jul 2013 13:46:42 -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; 15 Jul 2013 13:46:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj6v-0003TW-3z for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj6v-0005Zv-0l for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:41 +0000 Date: Mon, 15 Jul 2013 13:46:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "hvmloader: always include HPET table" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4867685f7916bb594a67f2f64a28bbf5ecb4949c Author: Jan Beulich AuthorDate: Mon Jul 8 13:20:20 2013 +0200 Commit: Jan Beulich CommitDate: Mon Jul 8 13:20:20 2013 +0200 Revert "hvmloader: always include HPET table" This reverts commit e4fd0475a08fda414da27c4e57b568f147cfc07e. Conflicts: tools/firmware/hvmloader/acpi/build.c Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- tools/firmware/hvmloader/acpi/build.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index 7281b97..f1dd3f0 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -268,11 +268,13 @@ static int construct_secondary_tables(unsigned long *table_ptrs, table_ptrs[nr_tables++] = (unsigned long)madt; } - /* HPET. Always included in DSDT, so always include it here too. */ - /* (And it's unconditionally required by Windows SVVP tests.) */ - hpet = construct_hpet(); - if (!hpet) return -1; - table_ptrs[nr_tables++] = (unsigned long)hpet; + /* HPET. */ + if ( hpet_exists(ACPI_HPET_ADDRESS) ) + { + hpet = construct_hpet(); + if (!hpet) return -1; + table_ptrs[nr_tables++] = (unsigned long)hpet; + } /* WAET. */ waet = construct_waet(); -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:46:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:46:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj79-00008v-Bo; Mon, 15 Jul 2013 13:46:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj77-00008O-V7 for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:54 +0000 Received: from [85.158.137.99:19545] by server-4.bemta-3.messagelabs.com id 2D/1A-24959-D4DF3E15; Mon, 15 Jul 2013 13:46:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-217.messagelabs.com!1373896011!20308022!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7967 invoked from network); 15 Jul 2013 13:46:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:46:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj75-0003Tc-91 for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj75-0005aI-7I for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:51 +0000 Date: Mon, 15 Jul 2013 13:46:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] adjust x86 EFI build X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5656b93d215d7c5160790ea87758625ba1de16b1 Author: Jan Beulich AuthorDate: Wed Jul 10 10:03:40 2013 +0200 Commit: Jan Beulich CommitDate: Wed Jul 10 10:03:40 2013 +0200 adjust x86 EFI build While the rule to generate .init.o files from .o ones already correctly included $(extra-y), the setting of the necessary compiler flag didn't have the same. With some yet to be posted patch this resulted in build breakage because of the compiler deciding not to inline a few functions (which then results in .text not being empty as required for these object files). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/Rules.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 3f0b262..4d182b9 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -101,7 +101,7 @@ obj-y := $(patsubst %/,%/built-in.o,$(obj-y)) subdir-all := $(subdir-y) $(subdir-n) -$(filter %.init.o,$(obj-y) $(obj-bin-y)): CFLAGS += -DINIT_SECTIONS_ONLY +$(filter %.init.o,$(obj-y) $(obj-bin-y) $(extra-y)): CFLAGS += -DINIT_SECTIONS_ONLY $(obj-$(coverage)): CFLAGS += -fprofile-arcs -ftest-coverage -DTEST_COVERAGE -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:46:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:46:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj79-00008v-Bo; Mon, 15 Jul 2013 13:46:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj77-00008O-V7 for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:54 +0000 Received: from [85.158.137.99:19545] by server-4.bemta-3.messagelabs.com id 2D/1A-24959-D4DF3E15; Mon, 15 Jul 2013 13:46:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-217.messagelabs.com!1373896011!20308022!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7967 invoked from network); 15 Jul 2013 13:46:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:46:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj75-0003Tc-91 for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj75-0005aI-7I for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:46:51 +0000 Date: Mon, 15 Jul 2013 13:46:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] adjust x86 EFI build X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5656b93d215d7c5160790ea87758625ba1de16b1 Author: Jan Beulich AuthorDate: Wed Jul 10 10:03:40 2013 +0200 Commit: Jan Beulich CommitDate: Wed Jul 10 10:03:40 2013 +0200 adjust x86 EFI build While the rule to generate .init.o files from .o ones already correctly included $(extra-y), the setting of the necessary compiler flag didn't have the same. With some yet to be posted patch this resulted in build breakage because of the compiler deciding not to inline a few functions (which then results in .text not being empty as required for these object files). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/Rules.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 3f0b262..4d182b9 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -101,7 +101,7 @@ obj-y := $(patsubst %/,%/built-in.o,$(obj-y)) subdir-all := $(subdir-y) $(subdir-n) -$(filter %.init.o,$(obj-y) $(obj-bin-y)): CFLAGS += -DINIT_SECTIONS_ONLY +$(filter %.init.o,$(obj-y) $(obj-bin-y) $(extra-y)): CFLAGS += -DINIT_SECTIONS_ONLY $(obj-$(coverage)): CFLAGS += -fprofile-arcs -ftest-coverage -DTEST_COVERAGE -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:47:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:47:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7M-0000BH-F5; Mon, 15 Jul 2013 13:47:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7K-0000B0-RR for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:06 +0000 Received: from [85.158.139.211:59413] by server-10.bemta-5.messagelabs.com id 4E/FE-03093-A5DF3E15; Mon, 15 Jul 2013 13:47:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1373896024!18105943!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14409 invoked from network); 15 Jul 2013 13:47:05 -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; 15 Jul 2013 13:47:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7F-0003Tl-Dd for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj7F-0005aj-Bo for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:01 +0000 Date: Mon, 15 Jul 2013 13:47:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] also allow building .s files from .c ones X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1d75c9148c3de27a0a2ca94740f04bf501fc6daf Author: Jan Beulich AuthorDate: Wed Jul 10 10:05:34 2013 +0200 Commit: Jan Beulich CommitDate: Wed Jul 10 10:05:34 2013 +0200 also allow building .s files from .c ones ... along the lines of allowing .i files to be built from .c ones as well as .s from .S (aiding the analysis of occasional build problems). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/Makefile | 2 +- xen/Rules.mk | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index b02e2dd..854a370 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -195,7 +195,7 @@ _MAP: .PHONY: FORCE FORCE: -%.o %.i: %.c FORCE +%.o %.i %.s: %.c FORCE $(MAKE) -f $(BASEDIR)/Rules.mk -C $(*D) $(@F) %.o %.s: %.S FORCE diff --git a/xen/Rules.mk b/xen/Rules.mk index 4d182b9..26e5bb6 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -177,6 +177,9 @@ $(filter %.init.o,$(obj-y) $(obj-bin-y) $(extra-y)): %.init.o: %.o Makefile %.i: %.c Makefile $(CPP) $(CFLAGS) $< -o $@ +%.s: %.c Makefile + $(CC) $(CFLAGS) -S $< -o $@ + # -std=gnu{89,99} gets confused by # as an end-of-line comment marker %.s: %.S Makefile $(CPP) $(AFLAGS) $< -o $@ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 15 13:47:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:47:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7M-0000BH-F5; Mon, 15 Jul 2013 13:47:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7K-0000B0-RR for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:06 +0000 Received: from [85.158.139.211:59413] by server-10.bemta-5.messagelabs.com id 4E/FE-03093-A5DF3E15; Mon, 15 Jul 2013 13:47:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1373896024!18105943!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14409 invoked from network); 15 Jul 2013 13:47:05 -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; 15 Jul 2013 13:47:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7F-0003Tl-Dd for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj7F-0005aj-Bo for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:01 +0000 Date: Mon, 15 Jul 2013 13:47:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] also allow building .s files from .c ones X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1d75c9148c3de27a0a2ca94740f04bf501fc6daf Author: Jan Beulich AuthorDate: Wed Jul 10 10:05:34 2013 +0200 Commit: Jan Beulich CommitDate: Wed Jul 10 10:05:34 2013 +0200 also allow building .s files from .c ones ... along the lines of allowing .i files to be built from .c ones as well as .s from .S (aiding the analysis of occasional build problems). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/Makefile | 2 +- xen/Rules.mk | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index b02e2dd..854a370 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -195,7 +195,7 @@ _MAP: .PHONY: FORCE FORCE: -%.o %.i: %.c FORCE +%.o %.i %.s: %.c FORCE $(MAKE) -f $(BASEDIR)/Rules.mk -C $(*D) $(@F) %.o %.s: %.S FORCE diff --git a/xen/Rules.mk b/xen/Rules.mk index 4d182b9..26e5bb6 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -177,6 +177,9 @@ $(filter %.init.o,$(obj-y) $(obj-bin-y) $(extra-y)): %.init.o: %.o Makefile %.i: %.c Makefile $(CPP) $(CFLAGS) $< -o $@ +%.s: %.c Makefile + $(CC) $(CFLAGS) -S $< -o $@ + # -std=gnu{89,99} gets confused by # as an end-of-line comment marker %.s: %.S Makefile $(CPP) $(AFLAGS) $< -o $@ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jul 15 13:47:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:47: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 1Uyj7V-0000DK-Vp; Mon, 15 Jul 2013 13:47:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7U-0000CD-RG for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:16 +0000 Received: from [85.158.139.211:2489] by server-15.bemta-5.messagelabs.com id 25/AA-01226-46DF3E15; Mon, 15 Jul 2013 13:47:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1373896034!18091335!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25291 invoked from network); 15 Jul 2013 13:47:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:47:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7S-0003UN-JI for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj7S-0005bH-Hk for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:14 +0000 Date: Mon, 15 Jul 2013 13:47:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm: correct vfp save/restore asm constraints X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 74d57ce43b2266b274ad89189ca3280c1e286883 Author: Ian Campbell AuthorDate: Wed Jul 10 12:54:00 2013 +0200 Commit: Jan Beulich CommitDate: Wed Jul 10 12:54:00 2013 +0200 arm: correct vfp save/restore asm constraints Some versions of gcc complain: > vfp.c: In function 'vfp_restore_state': > vfp.c:45:27: error: memory input 0 is not directly addressable > vfp.c:51:31: error: memory input 0 is not directly addressable There is no way to express the constraint we want (which is the address of the array, clobbering the whole array). Therefore we have to fake it up by using two constraints. Signed-off-by: Ian Campbell Acked-by: Will.Deacon@arm.com Acked-by: Julien Grall --- xen/arch/arm/arm32/vfp.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/arm32/vfp.c b/xen/arch/arm/arm32/vfp.c index 6780131..0069acd 100644 --- a/xen/arch/arm/arm32/vfp.c +++ b/xen/arch/arm/arm32/vfp.c @@ -22,15 +22,15 @@ void vfp_save_state(struct vcpu *v) } /* Save {d0-d15} */ - asm volatile("stc p11, cr0, %0, #32*4" - : "=Q" (v->arch.vfp.fpregs1)); + asm volatile("stc p11, cr0, [%1], #32*4" + : "=Q" (*v->arch.vfp.fpregs1) : "r" (v->arch.vfp.fpregs1)); /* 32 x 64 bits registers? */ if ( (READ_CP32(MVFR0) & MVFR0_A_SIMD_MASK) == 2 ) { /* Save {d16-d31} */ - asm volatile("stcl p11, cr0, %0, #32*4" - : "=Q" (v->arch.vfp.fpregs2)); + asm volatile("stcl p11, cr0, [%1], #32*4" + : "=Q" (*v->arch.vfp.fpregs2) : "r" (v->arch.vfp.fpregs2)); } WRITE_CP32(v->arch.vfp.fpexc & ~(FPEXC_EN), FPEXC); @@ -38,17 +38,18 @@ void vfp_save_state(struct vcpu *v) void vfp_restore_state(struct vcpu *v) { + //uint64_t test[16]; WRITE_CP32(READ_CP32(FPEXC) | FPEXC_EN, FPEXC); /* Restore {d0-d15} */ - asm volatile("ldc p11, cr0, %0, #32*4" - : : "Q" (v->arch.vfp.fpregs1)); + asm volatile("ldc p11, cr0, [%1], #32*4" + : : "Q" (*v->arch.vfp.fpregs1), "r" (v->arch.vfp.fpregs1)); /* 32 x 64 bits registers? */ if ( (READ_CP32(MVFR0) & MVFR0_A_SIMD_MASK) == 2 ) /* 32 x 64 bits registers */ /* Restore {d16-d31} */ - asm volatile("ldcl p11, cr0, %0, #32*4" - : : "Q" (v->arch.vfp.fpregs2)); + asm volatile("ldcl p11, cr0, [%1], #32*4" + : : "Q" (*v->arch.vfp.fpregs2), "r" (v->arch.vfp.fpregs2)); if ( v->arch.vfp.fpexc & FPEXC_EX ) { -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:47:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:47: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 1Uyj7V-0000DK-Vp; Mon, 15 Jul 2013 13:47:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7U-0000CD-RG for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:16 +0000 Received: from [85.158.139.211:2489] by server-15.bemta-5.messagelabs.com id 25/AA-01226-46DF3E15; Mon, 15 Jul 2013 13:47:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1373896034!18091335!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25291 invoked from network); 15 Jul 2013 13:47:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:47:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7S-0003UN-JI for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj7S-0005bH-Hk for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:14 +0000 Date: Mon, 15 Jul 2013 13:47:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm: correct vfp save/restore asm constraints X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 74d57ce43b2266b274ad89189ca3280c1e286883 Author: Ian Campbell AuthorDate: Wed Jul 10 12:54:00 2013 +0200 Commit: Jan Beulich CommitDate: Wed Jul 10 12:54:00 2013 +0200 arm: correct vfp save/restore asm constraints Some versions of gcc complain: > vfp.c: In function 'vfp_restore_state': > vfp.c:45:27: error: memory input 0 is not directly addressable > vfp.c:51:31: error: memory input 0 is not directly addressable There is no way to express the constraint we want (which is the address of the array, clobbering the whole array). Therefore we have to fake it up by using two constraints. Signed-off-by: Ian Campbell Acked-by: Will.Deacon@arm.com Acked-by: Julien Grall --- xen/arch/arm/arm32/vfp.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/arm32/vfp.c b/xen/arch/arm/arm32/vfp.c index 6780131..0069acd 100644 --- a/xen/arch/arm/arm32/vfp.c +++ b/xen/arch/arm/arm32/vfp.c @@ -22,15 +22,15 @@ void vfp_save_state(struct vcpu *v) } /* Save {d0-d15} */ - asm volatile("stc p11, cr0, %0, #32*4" - : "=Q" (v->arch.vfp.fpregs1)); + asm volatile("stc p11, cr0, [%1], #32*4" + : "=Q" (*v->arch.vfp.fpregs1) : "r" (v->arch.vfp.fpregs1)); /* 32 x 64 bits registers? */ if ( (READ_CP32(MVFR0) & MVFR0_A_SIMD_MASK) == 2 ) { /* Save {d16-d31} */ - asm volatile("stcl p11, cr0, %0, #32*4" - : "=Q" (v->arch.vfp.fpregs2)); + asm volatile("stcl p11, cr0, [%1], #32*4" + : "=Q" (*v->arch.vfp.fpregs2) : "r" (v->arch.vfp.fpregs2)); } WRITE_CP32(v->arch.vfp.fpexc & ~(FPEXC_EN), FPEXC); @@ -38,17 +38,18 @@ void vfp_save_state(struct vcpu *v) void vfp_restore_state(struct vcpu *v) { + //uint64_t test[16]; WRITE_CP32(READ_CP32(FPEXC) | FPEXC_EN, FPEXC); /* Restore {d0-d15} */ - asm volatile("ldc p11, cr0, %0, #32*4" - : : "Q" (v->arch.vfp.fpregs1)); + asm volatile("ldc p11, cr0, [%1], #32*4" + : : "Q" (*v->arch.vfp.fpregs1), "r" (v->arch.vfp.fpregs1)); /* 32 x 64 bits registers? */ if ( (READ_CP32(MVFR0) & MVFR0_A_SIMD_MASK) == 2 ) /* 32 x 64 bits registers */ /* Restore {d16-d31} */ - asm volatile("ldcl p11, cr0, %0, #32*4" - : : "Q" (v->arch.vfp.fpregs2)); + asm volatile("ldcl p11, cr0, [%1], #32*4" + : : "Q" (*v->arch.vfp.fpregs2), "r" (v->arch.vfp.fpregs2)); if ( v->arch.vfp.fpexc & FPEXC_EX ) { -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:47:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:47: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 1Uyj7g-0000Fp-2X; Mon, 15 Jul 2013 13:47:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7f-0000FU-Bf for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:27 +0000 Received: from [85.158.137.99:60508] by server-13.bemta-3.messagelabs.com id 99/8C-27159-E6DF3E15; Mon, 15 Jul 2013 13:47:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-217.messagelabs.com!1373896044!16015226!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8167 invoked from network); 15 Jul 2013 13:47:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:47:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7c-0003UT-Ov for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj7c-0005be-MW for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:24 +0000 Date: Mon, 15 Jul 2013 13:47:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: key handler registration functions can be __init X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 521ce5beba17a34324dbe0077cca85d347cf2b7d Author: Jan Beulich AuthorDate: Wed Jul 10 13:45:55 2013 +0200 Commit: Jan Beulich CommitDate: Wed Jul 10 13:45:55 2013 +0200 x86/HVM: key handler registration functions can be __init This applies to both SVM and VMX. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/svm/vmcb.c | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index ab32e52..21292bb 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -310,7 +310,7 @@ static struct keyhandler vmcb_dump_keyhandler = { .desc = "dump AMD-V VMCBs" }; -void setup_vmcb_dump(void) +void __init setup_vmcb_dump(void) { register_keyhandler('v', &vmcb_dump_keyhandler); } diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index ef0ee7f..de9f592 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1492,7 +1492,7 @@ static struct keyhandler vmcs_dump_keyhandler = { .desc = "dump Intel's VMCS" }; -void setup_vmcs_dump(void) +void __init setup_vmcs_dump(void) { register_keyhandler('v', &vmcs_dump_keyhandler); } -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:47:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:47: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 1Uyj7g-0000Fp-2X; Mon, 15 Jul 2013 13:47:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7f-0000FU-Bf for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:27 +0000 Received: from [85.158.137.99:60508] by server-13.bemta-3.messagelabs.com id 99/8C-27159-E6DF3E15; Mon, 15 Jul 2013 13:47:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-217.messagelabs.com!1373896044!16015226!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8167 invoked from network); 15 Jul 2013 13:47:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:47:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7c-0003UT-Ov for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj7c-0005be-MW for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:24 +0000 Date: Mon, 15 Jul 2013 13:47:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: key handler registration functions can be __init X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 521ce5beba17a34324dbe0077cca85d347cf2b7d Author: Jan Beulich AuthorDate: Wed Jul 10 13:45:55 2013 +0200 Commit: Jan Beulich CommitDate: Wed Jul 10 13:45:55 2013 +0200 x86/HVM: key handler registration functions can be __init This applies to both SVM and VMX. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/svm/vmcb.c | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index ab32e52..21292bb 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -310,7 +310,7 @@ static struct keyhandler vmcb_dump_keyhandler = { .desc = "dump AMD-V VMCBs" }; -void setup_vmcb_dump(void) +void __init setup_vmcb_dump(void) { register_keyhandler('v', &vmcb_dump_keyhandler); } diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index ef0ee7f..de9f592 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1492,7 +1492,7 @@ static struct keyhandler vmcs_dump_keyhandler = { .desc = "dump Intel's VMCS" }; -void setup_vmcs_dump(void) +void __init setup_vmcs_dump(void) { register_keyhandler('v', &vmcs_dump_keyhandler); } -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:47:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:47:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7q-0000IX-7X; Mon, 15 Jul 2013 13:47:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7p-0000IM-Db for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:37 +0000 Received: from [85.158.143.35:17449] by server-2.bemta-4.messagelabs.com id 66/BD-09492-87DF3E15; Mon, 15 Jul 2013 13:47:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1373896055!269527!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31293 invoked from network); 15 Jul 2013 13:47:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:47:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7m-0003Ub-VV for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj7m-0005co-TR for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:34 +0000 Date: Mon, 15 Jul 2013 13:47:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: add xenstore utility man page X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fbfcf225a4b726790a848692cc3830e29ef799b7 Author: David Vrabel AuthorDate: Thu Jul 4 15:25:25 2013 +0100 Commit: Ian Jackson CommitDate: Fri Jul 12 14:17:15 2013 +0100 docs: add xenstore utility man page Signed-off-by: David Vrabel --- docs/man/xenstore.pod.1 | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/docs/man/xenstore.pod.1 b/docs/man/xenstore.pod.1 new file mode 100644 index 0000000..7417289 --- /dev/null +++ b/docs/man/xenstore.pod.1 @@ -0,0 +1,52 @@ +=head1 NAME + +xenstore - interact with Xenstore + +=head1 SYNOPSIS + +B I ... + +=head1 DESCRIPTION + +A set of utilities for interacting with Xenstore. + +=over + +=item B(1) + +Sets the permissions of keys. + +=item B(1) + +Test for the existance of a key. + +=item B(1) + +List keys. + +=item B(1) + +List keys, values and permissions. + +=item B(1) + +Read the value of a key. + +=item B(1) + +Remove keys. + +=item B(1) + +Watch for changes to keys or values. + +=item B(1) + +Add or modify keys and values. + +=back + +=head1 BUGS + +Send bugs to xen-devel@lists.xen.org, see +http://wiki.xen.org/xenwiki/ReportingBugs on how to send bug reports. -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:47:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:47:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7q-0000IX-7X; Mon, 15 Jul 2013 13:47:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7p-0000IM-Db for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:37 +0000 Received: from [85.158.143.35:17449] by server-2.bemta-4.messagelabs.com id 66/BD-09492-87DF3E15; Mon, 15 Jul 2013 13:47:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1373896055!269527!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31293 invoked from network); 15 Jul 2013 13:47:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:47:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7m-0003Ub-VV for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj7m-0005co-TR for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:34 +0000 Date: Mon, 15 Jul 2013 13:47:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: add xenstore utility man page X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fbfcf225a4b726790a848692cc3830e29ef799b7 Author: David Vrabel AuthorDate: Thu Jul 4 15:25:25 2013 +0100 Commit: Ian Jackson CommitDate: Fri Jul 12 14:17:15 2013 +0100 docs: add xenstore utility man page Signed-off-by: David Vrabel --- docs/man/xenstore.pod.1 | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/docs/man/xenstore.pod.1 b/docs/man/xenstore.pod.1 new file mode 100644 index 0000000..7417289 --- /dev/null +++ b/docs/man/xenstore.pod.1 @@ -0,0 +1,52 @@ +=head1 NAME + +xenstore - interact with Xenstore + +=head1 SYNOPSIS + +B I ... + +=head1 DESCRIPTION + +A set of utilities for interacting with Xenstore. + +=over + +=item B(1) + +Sets the permissions of keys. + +=item B(1) + +Test for the existance of a key. + +=item B(1) + +List keys. + +=item B(1) + +List keys, values and permissions. + +=item B(1) + +Read the value of a key. + +=item B(1) + +Remove keys. + +=item B(1) + +Watch for changes to keys or values. + +=item B(1) + +Add or modify keys and values. + +=back + +=head1 BUGS + +Send bugs to xen-devel@lists.xen.org, see +http://wiki.xen.org/xenwiki/ReportingBugs on how to send bug reports. -- generated by git-patchbot for /home/xen/git/xen.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 Jul 15 13:47:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Jul 2013 13:47: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 1Uyj81-0000LQ-CC; Mon, 15 Jul 2013 13:47:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7z-0000Kv-Mv for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:47 +0000 Received: from [85.158.139.211:49158] by server-5.bemta-5.messagelabs.com id 15/0C-27868-28DF3E15; Mon, 15 Jul 2013 13:47:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1373896065!14062199!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11723 invoked from network); 15 Jul 2013 13:47:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Jul 2013 13:47:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Uyj7x-0003Uo-3o for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Uyj7x-0005dB-20 for xen-changelog@lists.xensource.com; Mon, 15 Jul 2013 13:47:45 +0000 Date: Mon, 15 Jul 2013 13:47:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: add xenstore-ls man page X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8cb199926cb71ef5863add46f42c5ab3cef8ea09 Author: David Vrabel AuthorDate: Thu Jul 4 15:25:26 2013 +0100 Commit: Ian Jackson CommitDate: Fri Jul 12 14:17:15 2013 +0100 docs: add xenstore-ls man page Signed-off-by: David Vrabel --- docs/man/xenstore-ls.pod.1 | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/docs/man/xenstore-ls.pod.1 b/docs/man/xenstore-ls.pod.1 new file mode 100644 index 0000000..e04a509 --- /dev/null +++ b/docs/man/xenstore-ls.pod.1 @@ -0,0 +1,62 @@ +=head1 NAME + +xenstore-ls - list Xenstore keys and values + +=head1 SYNOPSIS + +B [I